[139374] trunk/dports

ryandesign at macports.org ryandesign at macports.org
Fri Aug 14 10:36:52 PDT 2015


Revision: 139374
          https://trac.macports.org/changeset/139374
Author:   ryandesign at macports.org
Date:     2015-08-14 10:36:52 -0700 (Fri, 14 Aug 2015)
Log Message:
-----------
num-utils and argyll conflict (#48571); num-utils and normalize conflict

Modified Paths:
--------------
    trunk/dports/audio/normalize/Portfile
    trunk/dports/graphics/argyll/Portfile
    trunk/dports/sysutils/num-utils/Portfile

Modified: trunk/dports/audio/normalize/Portfile
===================================================================
--- trunk/dports/audio/normalize/Portfile	2015-08-14 14:47:10 UTC (rev 139373)
+++ trunk/dports/audio/normalize/Portfile	2015-08-14 17:36:52 UTC (rev 139374)
@@ -49,5 +49,8 @@
 	configure.args-append	--enable-xmms
 }
 
+# conflicts with num-utils on ${prefix}/bin/normalize
+conflicts-append    num-utils
+
 livecheck.type	regex
 livecheck.regex	${name}-(\[0-9.\]+)\\.tar

Modified: trunk/dports/graphics/argyll/Portfile
===================================================================
--- trunk/dports/graphics/argyll/Portfile	2015-08-14 14:47:10 UTC (rev 139373)
+++ trunk/dports/graphics/argyll/Portfile	2015-08-14 17:36:52 UTC (rev 139374)
@@ -119,3 +119,6 @@
         }
     }
 }
+
+# conflicts with num-utils on ${prefix}/bin/average
+conflicts-append    num-utils

Modified: trunk/dports/sysutils/num-utils/Portfile
===================================================================
--- trunk/dports/sysutils/num-utils/Portfile	2015-08-14 14:47:10 UTC (rev 139373)
+++ trunk/dports/sysutils/num-utils/Portfile	2015-08-14 17:36:52 UTC (rev 139374)
@@ -35,3 +35,9 @@
 
 test.run		yes
 test.target		test
+
+# conflicts with argyll on ${prefix}/bin/average
+conflicts-append    argyll
+
+# conflicts with normalize on ${prefix}/bin/normalize
+conflicts-append    normalize
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150814/22e3d69d/attachment-0001.html>


More information about the macports-changes mailing list