[58989] trunk/dports/python

jmr at macports.org jmr at macports.org
Thu Oct 8 03:48:18 PDT 2009


Revision: 58989
          http://trac.macports.org/changeset/58989
Author:   jmr at macports.org
Date:     2009-10-08 03:48:12 -0700 (Thu, 08 Oct 2009)
Log Message:
-----------
py2app ports: mark conflicts with -devel versions

Modified Paths:
--------------
    trunk/dports/python/py-py2app/Portfile
    trunk/dports/python/py-py2app-devel/Portfile
    trunk/dports/python/py25-py2app/Portfile
    trunk/dports/python/py25-py2app-devel/Portfile
    trunk/dports/python/py26-py2app/Portfile
    trunk/dports/python/py26-py2app-devel/Portfile

Modified: trunk/dports/python/py-py2app/Portfile
===================================================================
--- trunk/dports/python/py-py2app/Portfile	2009-10-08 09:54:58 UTC (rev 58988)
+++ trunk/dports/python/py-py2app/Portfile	2009-10-08 10:48:12 UTC (rev 58989)
@@ -23,6 +23,8 @@
     sha1 c75b4cdaaa10a22d05e9533bb33763a318490ef7 \
     rmd160 bb33523c770cc0f423208c8799d9b2b74567108b
 
+conflicts       py-py2app-devel
+
 depends_lib-append	port:py-setuptools \
     port:py-altgraph \
     port:py-macholib \

Modified: trunk/dports/python/py-py2app-devel/Portfile
===================================================================
--- trunk/dports/python/py-py2app-devel/Portfile	2009-10-08 09:54:58 UTC (rev 58988)
+++ trunk/dports/python/py-py2app-devel/Portfile	2009-10-08 10:48:12 UTC (rev 58989)
@@ -24,6 +24,8 @@
 svn.url             http://svn.pythonmac.org/py2app/py2app/trunk/
 worksrcdir          trunk
 
+conflicts           py-py2app
+
 depends_lib-append  port:py-setuptools \
                     port:py-altgraph \
                     port:py-macholib \

Modified: trunk/dports/python/py25-py2app/Portfile
===================================================================
--- trunk/dports/python/py25-py2app/Portfile	2009-10-08 09:54:58 UTC (rev 58988)
+++ trunk/dports/python/py25-py2app/Portfile	2009-10-08 10:48:12 UTC (rev 58989)
@@ -25,6 +25,8 @@
                     sha1 f9b5c3424913b94cd707389eca392c1255345f65 \
                     rmd160 ac3b98c86fac6d659847e749c86cd09ae45e43e3
 
+conflicts           py25-py2app-devel
+
 depends_lib-append  port:py25-setuptools \
                     port:py25-altgraph \
                     port:py25-macholib \

Modified: trunk/dports/python/py25-py2app-devel/Portfile
===================================================================
--- trunk/dports/python/py25-py2app-devel/Portfile	2009-10-08 09:54:58 UTC (rev 58988)
+++ trunk/dports/python/py25-py2app-devel/Portfile	2009-10-08 10:48:12 UTC (rev 58989)
@@ -25,6 +25,8 @@
 svn.revision        83
 worksrcdir          trunk
 
+conflicts           py25-py2app
+
 set apymacholibfile "/lib/python2.5/site-packages/macholib/__init__.py"
 
 depends_lib-append  port:py25-setuptools \

Modified: trunk/dports/python/py26-py2app/Portfile
===================================================================
--- trunk/dports/python/py26-py2app/Portfile	2009-10-08 09:54:58 UTC (rev 58988)
+++ trunk/dports/python/py26-py2app/Portfile	2009-10-08 10:48:12 UTC (rev 58989)
@@ -25,6 +25,8 @@
                     sha1 f9b5c3424913b94cd707389eca392c1255345f65 \
                     rmd160 ac3b98c86fac6d659847e749c86cd09ae45e43e3
 
+conflicts           py26-py2app-devel
+
 depends_lib-append  port:py26-setuptools \
                     port:py26-altgraph \
                     port:py26-macholib \

Modified: trunk/dports/python/py26-py2app-devel/Portfile
===================================================================
--- trunk/dports/python/py26-py2app-devel/Portfile	2009-10-08 09:54:58 UTC (rev 58988)
+++ trunk/dports/python/py26-py2app-devel/Portfile	2009-10-08 10:48:12 UTC (rev 58989)
@@ -25,6 +25,8 @@
 svn.revision        83
 worksrcdir          trunk
 
+conflicts           py26-py2app
+
 set apymacholibfile "/lib/python2.6/site-packages/macholib/__init__.py"
 
 depends_lib-append  port:py26-setuptools \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091008/65d6390d/attachment-0001.html>


More information about the macports-changes mailing list