Modified: trunk/dports/archivers/xz/Portfile (74168 => 74169)
--- trunk/dports/archivers/xz/Portfile 2010-12-06 15:56:58 UTC (rev 74168)
+++ trunk/dports/archivers/xz/Portfile 2010-12-06 17:33:15 UTC (rev 74169)
@@ -23,8 +23,6 @@
depends_lib port:libiconv port:gettext
-conflicts xz-devel
-
configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix}
# previous version defaulted to static liblzma (through --enable-dynamic=mixed)
Modified: trunk/dports/archivers/xz-devel/Portfile (74168 => 74169)
--- trunk/dports/archivers/xz-devel/Portfile 2010-12-06 15:56:58 UTC (rev 74168)
+++ trunk/dports/archivers/xz-devel/Portfile 2010-12-06 17:33:15 UTC (rev 74169)
@@ -23,7 +23,8 @@
depends_lib port:libiconv port:gettext
-conflicts xz lzmautils
+conflicts lzmautils
+replaced_by xz
patchfiles patch-sysctl-darwin.diff