[118066] trunk/dports

[ryandesign at macports.org]

Revision: 118066
          https://trac.macports.org/changeset/118066
Author:   ryandesign at macports.org
Date:     2014-03-20 11:49:22 -0700 (Thu, 20 Mar 2014)
Log Message:
-----------
googlecl and osxutils conflict (#26743)

Modified Paths:
--------------
    trunk/dports/sysutils/osxutils/Portfile
    trunk/dports/www/googlecl/Portfile

Modified: trunk/dports/sysutils/osxutils/Portfile
===================================================================
--- trunk/dports/sysutils/osxutils/Portfile	2014-03-20 18:43:33 UTC (rev 118065)
+++ trunk/dports/sysutils/osxutils/Portfile	2014-03-20 18:49:22 UTC (rev 118066)
@@ -35,5 +35,8 @@
                     ARCH_FLAG="[get_canonical_archflags cc]" \
                     OPT="${configure.optflags}"
 
+# ${prefix}/bin/google
+conflicts-append    googlecl
+
 # ${prefix}/bin/fileinfo
 conflicts-append    leptonica

Modified: trunk/dports/www/googlecl/Portfile
===================================================================
--- trunk/dports/www/googlecl/Portfile	2014-03-20 18:43:33 UTC (rev 118065)
+++ trunk/dports/www/googlecl/Portfile	2014-03-20 18:49:22 UTC (rev 118066)
@@ -25,3 +25,6 @@
 depends_lib-append port:py27-gdata
 
 python.link_binaries_suffix
+
+# ${prefix}/bin/google
+conflicts-append osxutils
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140320/2e81f47a/attachment.html>