Revision

72842

Author

ryandesign@macports.org

Date

2010-10-28 11:54:56 -0700 (Thu, 28 Oct 2010)

Log Message

xz and xz-devel conflict

Modified Paths

• trunk/dports/archivers/xz/Portfile
• trunk/dports/archivers/xz-devel/Portfile

Diff

--- trunk/dports/archivers/xz/Portfile	2010-10-28 18:13:44 UTC (rev 72841)
+++ trunk/dports/archivers/xz/Portfile	2010-10-28 18:54:56 UTC (rev 72842)
@@ -23,7 +23,7 @@
 
 depends_lib     port:libiconv port:gettext
 
-conflicts       lzmautils
+conflicts       xz-devel lzmautils
 
 configure.args  --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix}
 

--- trunk/dports/archivers/xz-devel/Portfile	2010-10-28 18:13:44 UTC (rev 72841)
+++ trunk/dports/archivers/xz-devel/Portfile	2010-10-28 18:54:56 UTC (rev 72842)
@@ -23,7 +23,7 @@
 
 depends_lib     port:libiconv port:gettext
 
-conflicts       lzmautils
+conflicts       xz lzmautils
 
 patchfiles      patch-sysctl-darwin.diff