[83751] trunk/dports

jmr at macports.org jmr at macports.org
Sat Sep 10 09:39:09 PDT 2011


Revision: 83751
          http://trac.macports.org/changeset/83751
Author:   jmr at macports.org
Date:     2011-09-10 09:39:04 -0700 (Sat, 10 Sep 2011)
Log Message:
-----------
replace py-setuptools with py24-distribute

Modified Paths:
--------------
    trunk/dports/devel/protobuf-python/Portfile
    trunk/dports/python/py-altgraph/Portfile
    trunk/dports/python/py-amqplib/Portfile
    trunk/dports/python/py-appscript/Portfile
    trunk/dports/python/py-bdist_mpkg/Portfile
    trunk/dports/python/py-beaker/Portfile
    trunk/dports/python/py-blist/Portfile
    trunk/dports/python/py-clientcookie/Portfile
    trunk/dports/python/py-dap/Portfile
    trunk/dports/python/py-dateutil/Portfile
    trunk/dports/python/py-decoratortools/Portfile
    trunk/dports/python/py-dispatcher/Portfile
    trunk/dports/python/py-django/Portfile
    trunk/dports/python/py-elementtree/Portfile
    trunk/dports/python/py-enum/Portfile
    trunk/dports/python/py-flup/Portfile
    trunk/dports/python/py-formbuild/Portfile
    trunk/dports/python/py-formencode/Portfile
    trunk/dports/python/py-gdata/Portfile
    trunk/dports/python/py-hgsvn/Portfile
    trunk/dports/python/py-jinja2/Portfile
    trunk/dports/python/py-kombu/Portfile
    trunk/dports/python/py-kqueue/Portfile
    trunk/dports/python/py-lxml/Portfile
    trunk/dports/python/py-m2crypto/Portfile
    trunk/dports/python/py-mako/Portfile
    trunk/dports/python/py-managesieve/Portfile
    trunk/dports/python/py-medusa/Portfile
    trunk/dports/python/py-meld3/Portfile
    trunk/dports/python/py-memcached/Portfile
    trunk/dports/python/py-migrate/Portfile
    trunk/dports/python/py-myghtyutils/Portfile
    trunk/dports/python/py-mysql/Portfile
    trunk/dports/python/py-nose/Portfile
    trunk/dports/python/py-opengl/Portfile
    trunk/dports/python/py-paste/Portfile
    trunk/dports/python/py-pastedeploy/Portfile
    trunk/dports/python/py-pastewebkit/Portfile
    trunk/dports/python/py-paver/Portfile
    trunk/dports/python/py-pika/Portfile
    trunk/dports/python/py-pip/Portfile
    trunk/dports/python/py-pygments/Portfile
    trunk/dports/python/py-pylons/Portfile
    trunk/dports/python/py-pyobjc2/Portfile
    trunk/dports/python/py-pyproj/Portfile
    trunk/dports/python/py-rdflib/Portfile
    trunk/dports/python/py-setuptools/Portfile
    trunk/dports/python/py-simplejson/Portfile
    trunk/dports/python/py-smisk/Portfile
    trunk/dports/python/py-sqlalchemy/Portfile
    trunk/dports/python/py-sqlalchemy-migrate/Portfile
    trunk/dports/python/py-supervisor/Portfile
    trunk/dports/python/py-textile/Portfile
    trunk/dports/python/py-turbocheetah/Portfile
    trunk/dports/python/py-turbogears/Portfile
    trunk/dports/python/py-turbokid/Portfile
    trunk/dports/python/py-virtualenv/Portfile
    trunk/dports/python/py-virtualenvwrapper/Portfile
    trunk/dports/python/py-vobject/Portfile
    trunk/dports/python/py-webhelpers/Portfile
    trunk/dports/python/py-werkzeug/Portfile
    trunk/dports/python/py-workerpool/Portfile
    trunk/dports/python/py-xattr/Portfile
    trunk/dports/python/py-yolk/Portfile
    trunk/dports/python/py26-mercurial_keyring/Portfile
    trunk/dports/python/py26-midgard2/Portfile

Modified: trunk/dports/devel/protobuf-python/Portfile
===================================================================
--- trunk/dports/devel/protobuf-python/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/devel/protobuf-python/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -41,7 +41,7 @@
 supported_archs noarch
 
 depends_lib     port:protobuf-cpp \
-                port:py-setuptools
+                port:py24-distribute
 
 worksrcdir      ${worksrcdir}/python
 

Modified: trunk/dports/python/py-altgraph/Portfile
===================================================================
--- trunk/dports/python/py-altgraph/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-altgraph/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -30,9 +30,7 @@
 
 python.versions     24 25 26 27
 
-if {$subport == "py24-altgraph"} {
-    depends_lib     port:py-setuptools
-} elseif {$subport != $name} {
+if {$subport != $name} {
     depends_lib     port:py${python.version}-distribute
 }
 

Modified: trunk/dports/python/py-amqplib/Portfile
===================================================================
--- trunk/dports/python/py-amqplib/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-amqplib/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -28,8 +28,6 @@
 
 python.versions     24 25 26 27
 
-if {$subport == "py24-amqplib"} {
-    depends_lib     port:py-setuptools
-} elseif {$subport != $name} {
+if {$subport != $name} {
     depends_lib     port:py${python.version}-distribute
 }

Modified: trunk/dports/python/py-appscript/Portfile
===================================================================
--- trunk/dports/python/py-appscript/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-appscript/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -20,7 +20,7 @@
 master_sites       http://pypi.python.org/packages/source/a/appscript/
 distname           appscript-${version}
 
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 
 #depends_lib-append port:py-htmltemplate
 

Modified: trunk/dports/python/py-bdist_mpkg/Portfile
===================================================================
--- trunk/dports/python/py-bdist_mpkg/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-bdist_mpkg/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -31,11 +31,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    if {${python.version} == "24"} {
-        depends_lib     port:py-setuptools
-    } else {
-        depends_lib     port:py${python.version}-distribute
-    }
+    depends_lib     port:py${python.version}-distribute
     if {${python.version} == "24" || ${python.version} == "25"} {
         post-destroot {
             move ${destroot}${prefix}/bin/bdist_mpkg \

Modified: trunk/dports/python/py-beaker/Portfile
===================================================================
--- trunk/dports/python/py-beaker/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-beaker/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -20,7 +20,7 @@
 master_sites        http://cheeseshop.python.org/packages/source/B/Beaker/
 distname            Beaker-${version}
 
-depends_lib         port:py-setuptools \
+depends_lib         port:py24-distribute \
                     port:py-myghtyutils
 
 checksums           md5     de84e7511119dc0b8eb4ac177d3e2512 \

Modified: trunk/dports/python/py-blist/Portfile
===================================================================
--- trunk/dports/python/py-blist/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-blist/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -28,7 +28,7 @@
 python.versions     24 25 26 27
 
 if {$subport == "py24-blist"} {
-    depends_lib     port:py-setuptools port:py-ctypes
+    depends_lib     port:py24-distribute port:py-ctypes
 } elseif {$subport != $name} {
     depends_lib     port:py${python.version}-distribute
 }

Modified: trunk/dports/python/py-clientcookie/Portfile
===================================================================
--- trunk/dports/python/py-clientcookie/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-clientcookie/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -22,7 +22,7 @@
 			sha1    fc54adb762618d3a9fdeca9ed45b982c2bde940c \
 			rmd160  0c557c11efee3ada975235ed72252176c059e5d2
 
-depends_lib-append	port:py-setuptools \
+depends_lib-append	port:py24-distribute \
                         port:py-bsddb
 
 test.run		yes

Modified: trunk/dports/python/py-dap/Portfile
===================================================================
--- trunk/dports/python/py-dap/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-dap/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -19,7 +19,7 @@
 master_sites      http://pypi.python.org/packages/source/d/dap/
 distname          dap-${version}
 
-depends_lib-append port:py-setuptools \
+depends_lib-append port:py24-distribute \
                    port:py-httplib2
 
 checksums         md5 3c66004a63eec7ecc9e471a29f4ccc8a \

Modified: trunk/dports/python/py-dateutil/Portfile
===================================================================
--- trunk/dports/python/py-dateutil/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-dateutil/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -26,25 +26,22 @@
 
 python.versions   24 25 26 27
 
-if {${subport} == "py24-dateutil"} {
-    depends_run   port:py-tz \
-                  port:py-setuptools
-} elseif {${subport} != ${name}} {
+if {${subport} != ${name}} {
     depends_run   port:py${python.version}-tz \
                   port:py${python.version}-distribute
-}
 
-test.run          yes
-test.cmd          ${python.bin} test.py
-test.target
-test.env          PYTHONPATH=${worksrcpath}/build/lib
-
-post-destroot {
-  if {${name} != ${subport}} {
-  set docdir ${prefix}/share/doc/${subport}
-  xinstall -d ${destroot}${docdir}
-  xinstall -m 0644 -W ${worksrcpath} LICENSE README NEWS ${destroot}${docdir}
-  }
+    test.run          yes
+    test.cmd          ${python.bin} test.py
+    test.target
+    test.env          PYTHONPATH=${worksrcpath}/build/lib
+    
+    post-destroot {
+      if {${name} != ${subport}} {
+      set docdir ${prefix}/share/doc/${subport}
+      xinstall -d ${destroot}${docdir}
+      xinstall -m 0644 -W ${worksrcpath} LICENSE README NEWS ${destroot}${docdir}
+      }
+    }
 }
 
 livecheck.type    regex

Modified: trunk/dports/python/py-decoratortools/Portfile
===================================================================
--- trunk/dports/python/py-decoratortools/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-decoratortools/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -19,7 +19,7 @@
 checksums			md5 84df0a86aabec6a7d802439ffaa17585 \
 				sha1 2043250d06129ca71c47b26024f4800c47d4843a \
 				rmd160 f605ef9ffd0cb6605a9b68442bdb20af2b69023b
-depends_lib			port:py-setuptools
+depends_lib			port:py24-distribute
 post-destroot {
 	xinstall -m 644 -W ${worksrcpath} \
 		README.txt ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/python/py-dispatcher/Portfile
===================================================================
--- trunk/dports/python/py-dispatcher/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-dispatcher/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -20,7 +20,7 @@
 distname		PyDispatcher-${version}
 checksums		md5 8b1695ed6f5bdbda8fbcde82b62d505c
 
-depends_build   port:py-setuptools
+depends_build   port:py24-distribute
 
 test.run		yes
 test.cmd		${python.bin} tests/test.py

Modified: trunk/dports/python/py-django/Portfile
===================================================================
--- trunk/dports/python/py-django/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-django/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -20,7 +20,7 @@
                     sha1    d8347a9062404de49e2f474e6e99395361f34db8 \
                     rmd160  e28338a82d662df999a68a4473ed76bd00c974fc
 
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 
 variant bash_completion {
     depends_run-append  port:bash-completion

Modified: trunk/dports/python/py-elementtree/Portfile
===================================================================
--- trunk/dports/python/py-elementtree/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-elementtree/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -23,7 +23,7 @@
 use_zip			yes
 patchfiles		patch-setup.py 
 
-depends_build-append	port:py-setuptools
+depends_build-append	port:py24-distribute
 
 post-extract { file copy ${filespath}/ez_setup.py ${worksrcpath} }
 

Modified: trunk/dports/python/py-enum/Portfile
===================================================================
--- trunk/dports/python/py-enum/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-enum/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -15,4 +15,4 @@
 distname            enum-${version}
 checksums           md5 de84f1b3f85e5f926bb9700fee2ed4f8
 
-depends_build       port:py-setuptools
+depends_build       port:py24-distribute

Modified: trunk/dports/python/py-flup/Portfile
===================================================================
--- trunk/dports/python/py-flup/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-flup/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -22,4 +22,4 @@
                     sha1 b80b3df5845c23c39633d5ddbe3ca9010a49b3ae \
                     rmd160 7fa70d43e6a6055b159cfabd9f0a7e872ca8442b
 
-depends_lib         port:py-setuptools
+depends_lib         port:py24-distribute

Modified: trunk/dports/python/py-formbuild/Portfile
===================================================================
--- trunk/dports/python/py-formbuild/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-formbuild/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -16,4 +16,4 @@
 distname		FormBuild-${version}
 checksums		sha1 d5ecac453d0083ea89f394cc373af1440ea844a9
 
-depends_lib		port:py-setuptools
+depends_lib		port:py24-distribute

Modified: trunk/dports/python/py-formencode/Portfile
===================================================================
--- trunk/dports/python/py-formencode/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-formencode/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -17,7 +17,7 @@
 checksums		md5     da23d54af521d1feab12b4caf30e3111 \
 				sha1    573359ec15934be9b1e74c11e1796b8df872c677 \
 				rmd160  e829668f767ff47a5b62416d8ee2ea282fa633bd
-depends_lib-append	port:py-setuptools
+depends_lib-append	port:py24-distribute
 
 post-destroot {
 	xinstall -m 644 -W ${worksrcpath}/docs community.txt index.txt news.txt \

Modified: trunk/dports/python/py-gdata/Portfile
===================================================================
--- trunk/dports/python/py-gdata/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-gdata/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -22,7 +22,7 @@
                     sha1    5eed0e01ab931e3f706ec544fc8f06ecac384e91 \
                     rmd160  9a0f2b7ba5bfc0cd813ac7ef54068acfae0992b6
 
-depends_lib         port:py-setuptools \
+depends_lib         port:py24-distribute \
                     port:py-elementtree
                     
 livecheck.type      googlecode

Modified: trunk/dports/python/py-hgsvn/Portfile
===================================================================
--- trunk/dports/python/py-hgsvn/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-hgsvn/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -25,17 +25,14 @@
 
 if {$subport != $name} {
 
+    depends_lib-append  port:py${python.version}-distribute \
+                        port:mercurial \
+                        port:subversion
+
     if {${python.version} == 24} {
-        depends_lib-append  port:py-setuptools
         depends_run-append  port:py-elementtree
     }
 
-    if {${python.version} == 27 || ${python.version} == 26 || ${python.version} == 25} {
-        depends_lib-append  port:py${python.version}-distribute \
-                            port:mercurial \
-                            port:subversion
-    }
-
     post-destroot {
             xinstall -m 644 -W ${worksrcpath} AUTHORS.txt COPYING.txt README.txt TODO.txt  \
                     ${destroot}${prefix}/share/doc/py${python.version}-hgsvn

Modified: trunk/dports/python/py-jinja2/Portfile
===================================================================
--- trunk/dports/python/py-jinja2/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-jinja2/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -23,7 +23,7 @@
                     sha1 7776001de0269df324bd80ffeecd6e6c19382e8e \
                     rmd160 4a24259599484b823af42d476fbf004b2de7f7ca
 
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 
 patchfiles          patch-setup.py.diff
 post-patch {

Modified: trunk/dports/python/py-kombu/Portfile
===================================================================
--- trunk/dports/python/py-kombu/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-kombu/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -27,9 +27,7 @@
 
 python.versions     24 25 26 27
 
-if {$subport == "py24-kombu"} {
-    depends_lib     port:py-setuptools
-} elseif {$subport != $name} {
+if {$subport != $name} {
     depends_lib     port:py${python.version}-distribute
 }
 

Modified: trunk/dports/python/py-kqueue/Portfile
===================================================================
--- trunk/dports/python/py-kqueue/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-kqueue/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -19,7 +19,7 @@
                     sha1 2b59840332786d08af84fd936bf47a11affc5ef6 \
                     rmd160 882e5525742e3ac1c638faf91de4dd9230c54a1d
 use_zip             yes
-depends_build       port:py-setuptools
+depends_build       port:py24-distribute
 post-destroot	{
     xinstall -m 644 -W ${worksrcpath} README.txt TODO test1.py pykqueue.txt \
         ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/python/py-lxml/Portfile
===================================================================
--- trunk/dports/python/py-lxml/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-lxml/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -23,4 +23,4 @@
                   sha1 5354b3dd5f0bd16589da9970e0da7df60aaaa2f5 \
                   rmd160 dbb0adc4ba9da3d313c73d68ecf909efea1d33c8
 distname          lxml-${version}
-depends_lib-append port:libxml2 port:libxslt port:py-setuptools
+depends_lib-append port:libxml2 port:libxslt port:py24-distribute

Modified: trunk/dports/python/py-m2crypto/Portfile
===================================================================
--- trunk/dports/python/py-m2crypto/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-m2crypto/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -22,29 +22,26 @@
                    sha1 3c7135b952092e4f2eee7a94c5153319cccba94e \
                    rmd160 313dcab450846a0363e7192a10364bdfd5dfae85
 
-depends_lib-append port:swig-python \
-                   port:openssl
+if {$subport != $name} {
+    depends_lib-append port:swig-python \
+                       port:openssl \
+                       port:py${python.version}-distribute
 
-if {${subport} == "py24-m2crypto"} {
-    depends_lib-append port:py-setuptools
-} elseif {$subport != $name} {
-    depends_lib-append port:py${python.version}-distribute
+    post-patch {
+      reinplace "s|#extra_link_args|extra_link_args|g" ${worksrcpath}/setup.py
+      reinplace "s|self.openssl = '/usr'|self.openssl = '${prefix}'|g" \
+        ${worksrcpath}/setup.py
+    }
+    
+    post-destroot {
+      if {${name} != ${subport}} {
+      xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}
+      eval file copy [glob ${worksrcpath}/doc/*] \
+        ${destroot}${prefix}/share/doc/${subport}
+      }
+    }
 }
 
-post-patch {
-  reinplace "s|#extra_link_args|extra_link_args|g" ${worksrcpath}/setup.py
-  reinplace "s|self.openssl = '/usr'|self.openssl = '${prefix}'|g" \
-    ${worksrcpath}/setup.py
-}
-
-post-destroot {
-  if {${name} != ${subport}} {
-  xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}
-  eval file copy [glob ${worksrcpath}/doc/*] \
-    ${destroot}${prefix}/share/doc/${subport}
-  }
-}
-
 livecheck.type     regex
 livecheck.url      ${homepage}
 livecheck.regex    M2Crypto-(\[0-9\\.\]+)\.tar\.gz

Modified: trunk/dports/python/py-mako/Portfile
===================================================================
--- trunk/dports/python/py-mako/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-mako/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -32,7 +32,7 @@
 master_sites        http://cheeseshop.python.org/packages/source/M/Mako/
 distname            Mako-${version}
 
-depends_build       port:py-setuptools
+depends_build       port:py24-distribute
 
 livecheck.url       ${homepage}download.html
 livecheck.type      regex

Modified: trunk/dports/python/py-managesieve/Portfile
===================================================================
--- trunk/dports/python/py-managesieve/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-managesieve/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -17,7 +17,7 @@
 homepage		http://python-managesieve.origo.ethz.ch
 master_sites		http://download.origo.ethz.ch/python-managesieve/833/
 distname		managesieve-${version}
-depends_build		port:py-setuptools
+depends_build		port:py24-distribute
 use_bzip2               yes
 checksums		md5 add9cd4b54d51e18af99e79a0da26f8e	\
 			sha1 33c255058b57dfab62557255c5bf2321b700d1ff

Modified: trunk/dports/python/py-medusa/Portfile
===================================================================
--- trunk/dports/python/py-medusa/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-medusa/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -14,7 +14,7 @@
 master_sites		http://www.amk.ca/files/python/
 distname		medusa-${version}
 
-depends_build-append	port:py-setuptools
+depends_build-append	port:py24-distribute
 
 checksums		md5 5d10505036bc38f8d4cb51d87516e069
 

Modified: trunk/dports/python/py-meld3/Portfile
===================================================================
--- trunk/dports/python/py-meld3/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-meld3/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -14,7 +14,7 @@
 master_sites		http://www.plope.com/software/meld3/ 
 distname		meld3-${version}
 
-depends_build-append	port:py-setuptools
+depends_build-append	port:py24-distribute
 
 checksums		md5 45992df3b24f23e051ff3c647dd24bdf
 

Modified: trunk/dports/python/py-memcached/Portfile
===================================================================
--- trunk/dports/python/py-memcached/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-memcached/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -22,7 +22,7 @@
                   sha1 869919041c85bb1215108b928b724a0cfb404706 \
                   rmd160 12db87c5ccfcd30c27b05977226f52f6738ed878
 distname          python-memcached-${version}
-depends_build     port:py-setuptools
+depends_build     port:py24-distribute
 
 livecheck.type    regex
 livecheck.url     ${master_sites}

Modified: trunk/dports/python/py-migrate/Portfile
===================================================================
--- trunk/dports/python/py-migrate/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-migrate/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -21,4 +21,4 @@
 
 checksums			sha1 49c9e99fb170aa1865b05cc2b5c48fa544346374
 
-depends_build		port:py-setuptools
+depends_build		port:py24-distribute

Modified: trunk/dports/python/py-myghtyutils/Portfile
===================================================================
--- trunk/dports/python/py-myghtyutils/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-myghtyutils/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -20,6 +20,6 @@
 distname			MyghtyUtils-${version}
 use_zip				yes
 
-depends_lib			port:py-setuptools
+depends_lib			port:py24-distribute
 
 checksums			md5 a15cda5919509024245802f4028b1560

Modified: trunk/dports/python/py-mysql/Portfile
===================================================================
--- trunk/dports/python/py-mysql/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-mysql/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -17,7 +17,7 @@
 checksums			md5 532268f02870bea18c1d465e88afff30
 patchfiles			patch-_mysql.c.diff
 
-depends_lib-append	port:py-setuptools
+depends_lib-append	port:py24-distribute
 
 variant mysql4 conflicts mysql5 description {Build with MySQL 4} {
 	depends_lib-append	port:mysql4

Modified: trunk/dports/python/py-nose/Portfile
===================================================================
--- trunk/dports/python/py-nose/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-nose/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -33,11 +33,7 @@
 python.versions     24 25 26 27 31 32
 
 if {$subport != $name} {
-    if {${python.version} == "24"} {
-        depends_lib		port:py-setuptools
-    } else {
-        depends_lib		port:py${python.version}-distribute
-    }
+    depends_lib		port:py${python.version}-distribute
 
     post-patch {
         reinplace "s|man/man|share/man/man|" ${worksrcpath}/setup.py

Modified: trunk/dports/python/py-opengl/Portfile
===================================================================
--- trunk/dports/python/py-opengl/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-opengl/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -25,7 +25,7 @@
                      sha1    af25a39bb38d2e3934df289478f7f63f6a1c22a5 \
                      rmd160  2793dc5e13364d56fe6714ea28dc8a94ff174eae
 
-depends_build-append port:py-setuptools
+depends_build-append port:py24-distribute
 depends_lib-append   port:py-ctypes port:py-numpy
 
 test.run             yes

Modified: trunk/dports/python/py-paste/Portfile
===================================================================
--- trunk/dports/python/py-paste/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-paste/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -24,4 +24,4 @@
                     sha1 0ae45557b0cc6cfe0a8d66c8051da0ea30d83d96 \
                     rmd160 d17640143ff644bc4084d45b98a261d8c4ea3e1e
 
-depends_build       port:py-setuptools
+depends_build       port:py24-distribute

Modified: trunk/dports/python/py-pastedeploy/Portfile
===================================================================
--- trunk/dports/python/py-pastedeploy/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-pastedeploy/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -21,4 +21,4 @@
 				sha1 84cdb077618db0b0c03b91298e91f8db70082547 \
 				rmd160 72ce5acb08f889a9c0c694e1344bdb24067864ae
 
-depends_lib			port:py-setuptools
+depends_lib			port:py24-distribute

Modified: trunk/dports/python/py-pastewebkit/Portfile
===================================================================
--- trunk/dports/python/py-pastewebkit/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-pastewebkit/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -20,4 +20,4 @@
 				sha1 07cdc22f7a15e31db22cd20c44e0333be2bffd80 \
 				rmd160 4d19e591be25c8c9fcd3b152d794750976ef49d3
 
-depends_build	port:py-setuptools
+depends_build	port:py24-distribute

Modified: trunk/dports/python/py-paver/Portfile
===================================================================
--- trunk/dports/python/py-paver/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-paver/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -24,7 +24,7 @@
 checksums           sha1    b1d9f5fa7d8bdd2955abd255bd246bc1299a50b3 \
                     rmd160  2de00b419a44e775b686f221255754130ce96521
 
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/python/py-pika/Portfile
===================================================================
--- trunk/dports/python/py-pika/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-pika/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -27,9 +27,7 @@
 
 python.versions     24 25 26 27
 
-if {$subport == "py24-pika"} {
-    depends_lib     port:py-setuptools
-} elseif {$subport != $name} {
+if {$subport != $name} {
     depends_lib     port:py${python.version}-distribute
 }
 

Modified: trunk/dports/python/py-pip/Portfile
===================================================================
--- trunk/dports/python/py-pip/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-pip/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -23,7 +23,7 @@
                     sha1  bb137ac723389651e6cf56c0c95af0a6547443b6 \
                     rmd160  2a398d35c63f62194528aa16ce989ce532f6b895
 
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
@@ -36,4 +36,3 @@
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/pip
 livecheck.regex     pip (0\.\[0-9\]+\.\[0-9\]+)
-

Modified: trunk/dports/python/py-pygments/Portfile
===================================================================
--- trunk/dports/python/py-pygments/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-pygments/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -21,7 +21,7 @@
 master_sites        http://pypi.python.org/packages/source/P/Pygments
 distname            Pygments-${version}
 
-depends_lib         port:py-setuptools
+depends_lib         port:py24-distribute
 
 checksums           md5     70c40ff5331460cabfcb24f86a8d451d \
                     sha1    b71e33147fc402e361227b30e1f589eecafd42a7 \

Modified: trunk/dports/python/py-pylons/Portfile
===================================================================
--- trunk/dports/python/py-pylons/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-pylons/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -28,7 +28,7 @@
                     sha1 d3ed6ea2618925c99180381ccd08b390acb46142 \
                     rmd160 4fa37c53a26fa8f30482c2d80fb4fd68abfde9f0
 
-depends_lib     port:py-setuptools \
+depends_lib     port:py24-distribute \
                 port:py-routes \
                 port:py-myghty \
                 port:py-paste \

Modified: trunk/dports/python/py-pyobjc2/Portfile
===================================================================
--- trunk/dports/python/py-pyobjc2/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-pyobjc2/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -22,7 +22,7 @@
 
 homepage        http://pyobjc.sourceforge.net/
 
-depends_lib-append     port:py-setuptools \
+depends_lib-append     port:py24-distribute \
                 port:py-py2app-devel \
                 port:py-elementtree
 

Modified: trunk/dports/python/py-pyproj/Portfile
===================================================================
--- trunk/dports/python/py-pyproj/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-pyproj/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -30,13 +30,8 @@
 
 python.versions     24 25 26 27
 
-if {$subport == "py24-pyproj"} {
-    depends_lib-append  port:py-setuptools
-} elseif {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
-}
-
 if {$subport != $name} {
+    depends_lib-append  port:py${python.version}-distribute
     post-destroot {
         xinstall -m 644 -W ${worksrcpath} \
             README README.html PKG-INFO \

Modified: trunk/dports/python/py-rdflib/Portfile
===================================================================
--- trunk/dports/python/py-rdflib/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-rdflib/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -22,7 +22,7 @@
 checksums		md5     ce7c73ffd2fe8a4a527143168bc91058 \
 				sha1    89e47b38ddd6c3386db21cc4f433762287e334e2 \
 				rmd160  0d0ce273d11fc4fc06313c76691186f2be1588a2
-depends_lib-append	port:py-setuptools
+depends_lib-append	port:py24-distribute
 
 test.run		yes
 test.cmd		${python.bin} run_tests.py

Modified: trunk/dports/python/py-setuptools/Portfile
===================================================================
--- trunk/dports/python/py-setuptools/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-setuptools/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -1,10 +1,11 @@
 # $Id$
 
 PortSystem			1.0
-PortGroup			python24 1.0
 
 name				py-setuptools
+replaced_by         py24-distribute
 version				0.6c11
+revision            1
 categories-append	devel
 maintainers			nomaintainer
 description			distutils enhancement for build and distribution
@@ -16,22 +17,13 @@
 platforms			darwin
 
 homepage			http://peak.telecommunity.com/DevCenter/setuptools
-master_sites		http://pypi.python.org/packages/source/s/setuptools/
-distname			setuptools-${version}
+distfiles
+archive_sites
 
-checksums			md5     7df2a529a074f613b509fb44feefe74e \
-					sha1    8d1ad6384d358c547c50c60f1bfdb3362c6c4a7d \
-					rmd160  7af8f39e5e74d96d10cc0d00b15a26462d66f42c
-
-post-destroot {
-	xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-	xinstall -m 644 -W ${worksrcpath} EasyInstall.txt api_tests.txt \
-		pkg_resources.txt setuptools.txt \
-		${destroot}${prefix}/share/doc/${name}
-	# To avoid conflict between py-setuptools and py25-setuptools (See r31503)
-	file delete ${destroot}${prefix}/bin/easy_install
+use_configure	no
+pre-configure {
+    ui_error "${name} has been replaced by ${replaced_by}. Please install ${replaced_by} instead."
+    return -code error "obsolete port"
 }
 
-livecheck.type      regex
-livecheck.url       [lindex ${master_sites} 0]
-livecheck.regex     {setuptools-(\d+(?:\.[0-9a-z]+)*)\.tar}
+livecheck.type      none

Modified: trunk/dports/python/py-simplejson/Portfile
===================================================================
--- trunk/dports/python/py-simplejson/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-simplejson/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -17,7 +17,7 @@
 master_sites        http://cheeseshop.python.org/packages/source/s/simplejson/
 distname            simplejson-${version}
 
-depends_lib         port:py-setuptools
+depends_lib         port:py24-distribute
 
 checksums           md5     af5e67a39ca3408563411d357e6d5e47 \
                     sha1    b5b26059adbe677b06c299bed30557fcb0c7df8c \

Modified: trunk/dports/python/py-smisk/Portfile
===================================================================
--- trunk/dports/python/py-smisk/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-smisk/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -20,7 +20,7 @@
 checksums           sha1 e0b1f278816c03967f178b63659f20cf40ec17b4
 
 depends_lib-append  port:fcgi \
-                    port:py-setuptools \
+                    port:py24-distribute \
                     port:py-readline \
                     port:py-elixir \
                     port:py-mako \

Modified: trunk/dports/python/py-sqlalchemy/Portfile
===================================================================
--- trunk/dports/python/py-sqlalchemy/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-sqlalchemy/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -24,7 +24,7 @@
 checksums               sha1    58bdee2dbb339e77cf5ef716fc3b52a82ec1cf4e \
                         rmd160  ffdd5d137b8ea7a6b60788678d62a0cfdb11cdae
 
-depends_lib             port:py-setuptools
+depends_lib             port:py24-distribute
 
 default_variants        +cextensions
 

Modified: trunk/dports/python/py-sqlalchemy-migrate/Portfile
===================================================================
--- trunk/dports/python/py-sqlalchemy-migrate/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-sqlalchemy-migrate/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -23,7 +23,7 @@
 checksums         md5 d4f17e2c7fcfbb7bd0df628d974c8e3e \
                   sha1 047e95dcc82cb0ff00262ccfa572156af6748c11 \
                   rmd160 18b4f57ac3b3d01e49e7d01142d9f8156f221159
-depends_lib       port:py-setuptools
+depends_lib       port:py24-distribute
 distname          sqlalchemy-migrate-${version}
 
 post-destroot {

Modified: trunk/dports/python/py-supervisor/Portfile
===================================================================
--- trunk/dports/python/py-supervisor/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-supervisor/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -14,7 +14,7 @@
 master_sites		${homepage}
 distname		supervisor-${version}
 
-depends_lib-append	port:py-setuptools \
+depends_lib-append	port:py24-distribute \
 			port:py-elementtree \
 			port:py-meld3 \
 			port:py-medusa 

Modified: trunk/dports/python/py-textile/Portfile
===================================================================
--- trunk/dports/python/py-textile/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-textile/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -18,6 +18,6 @@
 master_sites        http://cheeseshop.python.org/packages/source/t/textile
 distname            textile-${version}
 
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 
 checksums           md5 3e14bca38c70e9dd74a635776f01175c

Modified: trunk/dports/python/py-turbocheetah/Portfile
===================================================================
--- trunk/dports/python/py-turbocheetah/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-turbocheetah/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -19,7 +19,7 @@
 checksums           md5 daf99f38f6696ac64b7df8ac2e003a03 \
                     sha1 f2e983c1a57e00e4abbffb906280e147dcd787e9 \
                     rmd160 6d224c43740a9d0e13bb8a765d710df0ec169986
-depends_build       port:py-setuptools
+depends_build       port:py24-distribute
 depends_lib         port:py-cheetah
 post-destroot {
 	xinstall -m 644 -W ${worksrcpath} \

Modified: trunk/dports/python/py-turbogears/Portfile
===================================================================
--- trunk/dports/python/py-turbogears/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-turbogears/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -43,7 +43,7 @@
                     port:py-formencode \
                     port:py-pastescript \
                     port:py-ruledispatch \
-                    port:py-setuptools \
+                    port:py24-distribute \
                     port:py-simplejson \
                     port:py-turbocheetah \
                     port:py-turbojson \

Modified: trunk/dports/python/py-turbokid/Portfile
===================================================================
--- trunk/dports/python/py-turbokid/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-turbokid/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -19,7 +19,7 @@
 checksums           md5 0dc9eba1783244a9800b8c4316d38341 \
                     sha1 31f07da56fe8899aff73fbe1f251e0c985a3239f \
                     rmd160 407792b9e77ec53314955daf83bd32e5b0b9be07
-depends_build       port:py-setuptools
+depends_build       port:py24-distribute
 depends_lib         port:py-kid
 post-destroot {
     xinstall -m 644 -W ${worksrcpath} \

Modified: trunk/dports/python/py-virtualenv/Portfile
===================================================================
--- trunk/dports/python/py-virtualenv/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-virtualenv/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -21,7 +21,7 @@
                     sha1    f875868d680b83bdfa86a23536d19bb00b28b40d \
                     rmd160  1a5b11bad5c8ec50129724db99632755c637a9d7
 
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/python/py-virtualenvwrapper/Portfile
===================================================================
--- trunk/dports/python/py-virtualenvwrapper/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-virtualenvwrapper/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -23,7 +23,7 @@
                     sha1 096cf9eb9c8d592e27fc351cd9c24a2f6f4b68a3 \
                     rmd160 f4748de229f5ae10c14e8dc26f107122d4b3604d
 
-depends_lib-append  port:py-setuptools\
+depends_lib-append  port:py24-distribute \
                     port:py-virtualenv
 
 post-destroot	{

Modified: trunk/dports/python/py-vobject/Portfile
===================================================================
--- trunk/dports/python/py-vobject/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-vobject/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -24,7 +24,7 @@
                     rmd160 ca1b1f207b6b7d4418a401938656627e6404aacf
 
 depends_lib         port:py-dateutil \
-                    port:py-setuptools
+                    port:py24-distribute
 
 test.run            yes
 test.cmd            ${python.bin} test_vobject.py

Modified: trunk/dports/python/py-webhelpers/Portfile
===================================================================
--- trunk/dports/python/py-webhelpers/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-webhelpers/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -19,7 +19,7 @@
 master_sites			http://cheeseshop.python.org/packages/source/W/WebHelpers/
 distname			WebHelpers-${version}
 
-depends_lib			port:py-setuptools
+depends_lib			port:py24-distribute
 
 checksums			md5 16aacff76caf2e3c2284f1915e2fc57f \
 				sha1 abec1fafd02aae92b63ba0fd3f32091460b3cc76 \

Modified: trunk/dports/python/py-werkzeug/Portfile
===================================================================
--- trunk/dports/python/py-werkzeug/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-werkzeug/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -7,7 +7,7 @@
 version             0.4.1
 revision            1
 categories-append   devel
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 platforms           darwin
 maintainers         nomaintainer
 supported_archs     noarch

Modified: trunk/dports/python/py-workerpool/Portfile
===================================================================
--- trunk/dports/python/py-workerpool/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-workerpool/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -34,7 +34,7 @@
                     sha1 34da871db2615a474f8332e2aa33285a2d808bb7 \
                     rmd160 e7565d81be215d0c728ef7306efa3ebea0fafebd
 
-depends_build       port:py-setuptools
+depends_build       port:py24-distribute
 
 post-destroot {
     xinstall -m 644 -W ${worksrcpath} CHANGES LICENSE README \

Modified: trunk/dports/python/py-xattr/Portfile
===================================================================
--- trunk/dports/python/py-xattr/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-xattr/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -23,7 +23,7 @@
 checksums          md5 abcc67c93b28edbefcf10d3e6e324f89 \
                    sha256 7c025768496f3162f79059456c870ab5ef7094c39bb1f138446df44981e18069
 
-depends_lib-append  port:py-setuptools
+depends_lib-append  port:py24-distribute
 
 livecheck.type      regex
 livecheck.url       http://svn.red-bean.com/bob/xattr/releases/

Modified: trunk/dports/python/py-yolk/Portfile
===================================================================
--- trunk/dports/python/py-yolk/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py-yolk/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -29,7 +29,7 @@
     }
 }
 
-depends_build       port:py-setuptools
+depends_build       port:py24-distribute
 
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/yolk

Modified: trunk/dports/python/py26-mercurial_keyring/Portfile
===================================================================
--- trunk/dports/python/py26-mercurial_keyring/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py26-mercurial_keyring/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -27,12 +27,7 @@
 depends_run         port:py26-keyring
 depends_build       port:py26-distribute
 
-variant use_setuptools description "relies on setuptools rather than distribute python module" {
-    depends_build-delete    port:py26-distribute
-    depends_build-append    port:py26-setuptools
-}
 
-
 post-destroot {
    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    xinstall -m 644 -W ${worksrcpath} README.txt \

Modified: trunk/dports/python/py26-midgard2/Portfile
===================================================================
--- trunk/dports/python/py26-midgard2/Portfile	2011-09-10 16:06:10 UTC (rev 83750)
+++ trunk/dports/python/py26-midgard2/Portfile	2011-09-10 16:39:04 UTC (rev 83751)
@@ -19,7 +19,7 @@
 
 platforms           darwin
 
-#depends_build		port:py26-setuptools
+#depends_build		port:py26-distribute
 depends_lib         port:midgard2-core \
     port:py26-gobject
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110910/fd0b17bd/attachment-0001.html>


More information about the macports-changes mailing list