Revision

83081

Author

ciserlohn@macports.org

Date

2011-08-25 10:24:32 -0700 (Thu, 25 Aug 2011)

Log Message

moreutils, parallel: mark ports as conflicting (fixes #30972)

Modified Paths

• trunk/dports/sysutils/moreutils/Portfile
• trunk/dports/sysutils/parallel/Portfile

Diff

--- trunk/dports/sysutils/moreutils/Portfile	2011-08-25 17:07:14 UTC (rev 83080)
+++ trunk/dports/sysutils/moreutils/Portfile	2011-08-25 17:24:32 UTC (rev 83081)
@@ -26,6 +26,7 @@
 
 homepage    http://packages.debian.org/unstable/utils/moreutils
 master_sites    http://ftp.debian.org/debian/pool/main/m/moreutils/
+conflicts       parallel
 distname        ${name}_${version}
 worksrcdir      ${name}
 checksums       md5     73477f418ea2de81a045019cc71267f3 \

--- trunk/dports/sysutils/parallel/Portfile	2011-08-25 17:07:14 UTC (rev 83080)
+++ trunk/dports/sysutils/parallel/Portfile	2011-08-25 17:24:32 UTC (rev 83081)
@@ -18,6 +18,8 @@
 master_sites        gnu
 use_bzip2           yes
 
+conflicts           moreutils
+
 checksums           rmd160  5b2b431d1889836e3a4f92342c9b0d65031952d8 \
                     sha256  cbfe5b7a01850c1fe1c5487aba817bc2ec543441034e886dddbf0a9ed649d267