[106911] trunk/dports

jmr at macports.org jmr at macports.org
Tue Jun 11 07:40:15 PDT 2013


Revision: 106911
          https://trac.macports.org/changeset/106911
Author:   jmr at macports.org
Date:     2013-06-11 07:40:14 -0700 (Tue, 11 Jun 2013)
Log Message:
-----------
Change distribute dependencies back to setuptools and mark py*-distribute replaced_by py*-setuptools (#39237).

Modified Paths:
--------------
    trunk/dports/devel/PIDA/Portfile
    trunk/dports/devel/closure-linter/Portfile
    trunk/dports/devel/flashbake/Portfile
    trunk/dports/net/deluge/Portfile
    trunk/dports/net/gajim-devel/Portfile
    trunk/dports/net/upnp-inspector/Portfile
    trunk/dports/print/pdfposter/Portfile
    trunk/dports/python/py-MMTK/Portfile
    trunk/dports/python/py-Pillow/Portfile
    trunk/dports/python/py-abjad/Portfile
    trunk/dports/python/py-altgraph/Portfile
    trunk/dports/python/py-amqp/Portfile
    trunk/dports/python/py-amqplib/Portfile
    trunk/dports/python/py-antlr3/Portfile
    trunk/dports/python/py-anyjson/Portfile
    trunk/dports/python/py-appscript/Portfile
    trunk/dports/python/py-apptools/Portfile
    trunk/dports/python/py-argparse/Portfile
    trunk/dports/python/py-astlib/Portfile
    trunk/dports/python/py-astrolibcoords/Portfile
    trunk/dports/python/py-autopep8/Portfile
    trunk/dports/python/py-babel/Portfile
    trunk/dports/python/py-baker/Portfile
    trunk/dports/python/py-bdist_mpkg/Portfile
    trunk/dports/python/py-beaker/Portfile
    trunk/dports/python/py-billiard/Portfile
    trunk/dports/python/py-bitarray/Portfile
    trunk/dports/python/py-blessings/Portfile
    trunk/dports/python/py-blist/Portfile
    trunk/dports/python/py-blockcanvas/Portfile
    trunk/dports/python/py-bottleneck/Portfile
    trunk/dports/python/py-bpython/Portfile
    trunk/dports/python/py-carray/Portfile
    trunk/dports/python/py-carrot/Portfile
    trunk/dports/python/py-celery/Portfile
    trunk/dports/python/py-cffi/Portfile
    trunk/dports/python/py-chaco/Portfile
    trunk/dports/python/py-cidrize/Portfile
    trunk/dports/python/py-clientform/Portfile
    trunk/dports/python/py-clonedigger/Portfile
    trunk/dports/python/py-codetools/Portfile
    trunk/dports/python/py-cogen/Portfile
    trunk/dports/python/py-colander/Portfile
    trunk/dports/python/py-country/Portfile
    trunk/dports/python/py-coverage/Portfile
    trunk/dports/python/py-cssselect/Portfile
    trunk/dports/python/py-cssutils/Portfile
    trunk/dports/python/py-curlish/Portfile
    trunk/dports/python/py-cx_Freeze/Portfile
    trunk/dports/python/py-dap/Portfile
    trunk/dports/python/py-dateutil/Portfile
    trunk/dports/python/py-decorator/Portfile
    trunk/dports/python/py-decoratortools/Portfile
    trunk/dports/python/py-demjson/Portfile
    trunk/dports/python/py-dispatcher/Portfile
    trunk/dports/python/py-distribute/Portfile
    trunk/dports/python/py-distutils-extra/Portfile
    trunk/dports/python/py-django/Portfile
    trunk/dports/python/py-django-debug-toolbar/Portfile
    trunk/dports/python/py-django-extensions/Portfile
    trunk/dports/python/py-elementtree/Portfile
    trunk/dports/python/py-elixir/Portfile
    trunk/dports/python/py-enable/Portfile
    trunk/dports/python/py-enchant/Portfile
    trunk/dports/python/py-enthoughtbase/Portfile
    trunk/dports/python/py-enum/Portfile
    trunk/dports/python/py-envisage/Portfile
    trunk/dports/python/py-envoy/Portfile
    trunk/dports/python/py-errorhandler/Portfile
    trunk/dports/python/py-etsdevtools/Portfile
    trunk/dports/python/py-etsproxy/Portfile
    trunk/dports/python/py-eventlet/Portfile
    trunk/dports/python/py-eyed3/Portfile
    trunk/dports/python/py-ez_setup/Portfile
    trunk/dports/python/py-fabric/Portfile
    trunk/dports/python/py-fancycompleter/Portfile
    trunk/dports/python/py-feedparser/Portfile
    trunk/dports/python/py-fixture/Portfile
    trunk/dports/python/py-flask-auth/Portfile
    trunk/dports/python/py-flask-restful/Portfile
    trunk/dports/python/py-flask-sqlalchemy/Portfile
    trunk/dports/python/py-flask-wtf/Portfile
    trunk/dports/python/py-formbuild/Portfile
    trunk/dports/python/py-formencode/Portfile
    trunk/dports/python/py-ftputil/Portfile
    trunk/dports/python/py-gchartwrapper/Portfile
    trunk/dports/python/py-gdata/Portfile
    trunk/dports/python/py-geoalchemy/Portfile
    trunk/dports/python/py-gflags/Portfile
    trunk/dports/python/py-git-sweep/Portfile
    trunk/dports/python/py-gitpython/Portfile
    trunk/dports/python/py-google-api/Portfile
    trunk/dports/python/py-greenlet/Portfile
    trunk/dports/python/py-healpy/Portfile
    trunk/dports/python/py-hgsvn/Portfile
    trunk/dports/python/py-html2text/Portfile
    trunk/dports/python/py-html5lib/Portfile
    trunk/dports/python/py-hypy/Portfile
    trunk/dports/python/py-icalendar/Portfile
    trunk/dports/python/py-igraph/Portfile
    trunk/dports/python/py-imdb/Portfile
    trunk/dports/python/py-imread/Portfile
    trunk/dports/python/py-ipython/Portfile
    trunk/dports/python/py-iso8601/Portfile
    trunk/dports/python/py-jcc/Portfile
    trunk/dports/python/py-jinja/Portfile
    trunk/dports/python/py-jinja2/Portfile
    trunk/dports/python/py-joblib/Portfile
    trunk/dports/python/py-jsbeautifier/Portfile
    trunk/dports/python/py-jubatus-client/Portfile
    trunk/dports/python/py-kid/Portfile
    trunk/dports/python/py-kombu/Portfile
    trunk/dports/python/py-kqueue/Portfile
    trunk/dports/python/py-lepl/Portfile
    trunk/dports/python/py-levenshtein/Portfile
    trunk/dports/python/py-liblzma/Portfile
    trunk/dports/python/py-libmemcached/Portfile
    trunk/dports/python/py-librabbitmq/Portfile
    trunk/dports/python/py-logbook/Portfile
    trunk/dports/python/py-lxml/Portfile
    trunk/dports/python/py-lz4/Portfile
    trunk/dports/python/py-m2crypto/Portfile
    trunk/dports/python/py-macfsevents/Portfile
    trunk/dports/python/py-magic/Portfile
    trunk/dports/python/py-mahotas/Portfile
    trunk/dports/python/py-mako/Portfile
    trunk/dports/python/py-managesieve/Portfile
    trunk/dports/python/py-markupsafe/Portfile
    trunk/dports/python/py-mayavi/Portfile
    trunk/dports/python/py-mdp-toolkit/Portfile
    trunk/dports/python/py-mechanize/Portfile
    trunk/dports/python/py-medusa/Portfile
    trunk/dports/python/py-meld3/Portfile
    trunk/dports/python/py-memcached/Portfile
    trunk/dports/python/py-mercurial_keyring/Portfile
    trunk/dports/python/py-meta/Portfile
    trunk/dports/python/py-meta-devel/Portfile
    trunk/dports/python/py-mhash/Portfile
    trunk/dports/python/py-milk/Portfile
    trunk/dports/python/py-mlpy/Portfile
    trunk/dports/python/py-mongoengine/Portfile
    trunk/dports/python/py-msgpack/Portfile
    trunk/dports/python/py-mustache/Portfile
    trunk/dports/python/py-myghty/Portfile
    trunk/dports/python/py-myghtyutils/Portfile
    trunk/dports/python/py-mysql/Portfile
    trunk/dports/python/py-netaddr/Portfile
    trunk/dports/python/py-netifaces/Portfile
    trunk/dports/python/py-networkx/Portfile
    trunk/dports/python/py-nose/Portfile
    trunk/dports/python/py-ntplib/Portfile
    trunk/dports/python/py-numba/Portfile
    trunk/dports/python/py-numexpr/Portfile
    trunk/dports/python/py-oauth2/Portfile
    trunk/dports/python/py-oauth2client/Portfile
    trunk/dports/python/py-obspy/Portfile
    trunk/dports/python/py-opengl/Portfile
    trunk/dports/python/py-openpyxl/Portfile
    trunk/dports/python/py-orbited/Portfile
    trunk/dports/python/py-pandas/Portfile
    trunk/dports/python/py-passlib/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-pep8/Portfile
    trunk/dports/python/py-pika/Portfile
    trunk/dports/python/py-pip/Portfile
    trunk/dports/python/py-polygon/Portfile
    trunk/dports/python/py-progressbar/Portfile
    trunk/dports/python/py-protobuf/Portfile
    trunk/dports/python/py-psychopy/Portfile
    trunk/dports/python/py-py/Portfile
    trunk/dports/python/py-pybtex/Portfile
    trunk/dports/python/py-pyds9/Portfile
    trunk/dports/python/py-pyepl/Portfile
    trunk/dports/python/py-pyface/Portfile
    trunk/dports/python/py-pygccxml-devel/Portfile
    trunk/dports/python/py-pygments/Portfile
    trunk/dports/python/py-pygraphviz/Portfile
    trunk/dports/python/py-pylibmc/Portfile
    trunk/dports/python/py-pylons/Portfile
    trunk/dports/python/py-pylzma/Portfile
    trunk/dports/python/py-pymacs/Portfile
    trunk/dports/python/py-pymodels/Portfile
    trunk/dports/python/py-pymongo/Portfile
    trunk/dports/python/py-pymorph/Portfile
    trunk/dports/python/py-pymunk/Portfile
    trunk/dports/python/py-pyobjc/Portfile
    trunk/dports/python/py-pyopencl/Portfile
    trunk/dports/python/py-pyplusplus-devel/Portfile
    trunk/dports/python/py-pyproj/Portfile
    trunk/dports/python/py-pyquery/Portfile
    trunk/dports/python/py-pyrant/Portfile
    trunk/dports/python/py-pyro/Portfile
    trunk/dports/python/py-pytest/Portfile
    trunk/dports/python/py-python-daemon/Portfile
    trunk/dports/python/py-pytools/Portfile
    trunk/dports/python/py-pyttsx/Portfile
    trunk/dports/python/py-pyvttbl/Portfile
    trunk/dports/python/py-pywavelets/Portfile
    trunk/dports/python/py-quadtree/Portfile
    trunk/dports/python/py-rabbyt/Portfile
    trunk/dports/python/py-rbtools/Portfile
    trunk/dports/python/py-rdflib/Portfile
    trunk/dports/python/py-readline/Portfile
    trunk/dports/python/py-recaptcha/Portfile
    trunk/dports/python/py-redis/Portfile
    trunk/dports/python/py-requests/Portfile
    trunk/dports/python/py-roman/Portfile
    trunk/dports/python/py-routes/Portfile
    trunk/dports/python/py-rtm/Portfile
    trunk/dports/python/py-rtree/Portfile
    trunk/dports/python/py-scikit-image/Portfile
    trunk/dports/python/py-scikit-learn/Portfile
    trunk/dports/python/py-scikits-bootstrap/Portfile
    trunk/dports/python/py-scikits-statsmodels/Portfile
    trunk/dports/python/py-scimath/Portfile
    trunk/dports/python/py-scrapy/Portfile
    trunk/dports/python/py-scss/Portfile
    trunk/dports/python/py-selenium/Portfile
    trunk/dports/python/py-setupdocs/Portfile
    trunk/dports/python/py-shapely/Portfile
    trunk/dports/python/py-shove/Portfile
    trunk/dports/python/py-simplejson/Portfile
    trunk/dports/python/py-smisk/Portfile
    trunk/dports/python/py-smmap/Portfile
    trunk/dports/python/py-soaplib/Portfile
    trunk/dports/python/py-socketpool/Portfile
    trunk/dports/python/py-sogl/Portfile
    trunk/dports/python/py-south/Portfile
    trunk/dports/python/py-sqlalchemy/Portfile
    trunk/dports/python/py-sqlalchemy-migrate/Portfile
    trunk/dports/python/py-stevedore/Portfile
    trunk/dports/python/py-suds/Portfile
    trunk/dports/python/py-suds-jurko/Portfile
    trunk/dports/python/py-sunpy/Portfile
    trunk/dports/python/py-supervisor/Portfile
    trunk/dports/python/py-symeig/Portfile
    trunk/dports/python/py-tail/Portfile
    trunk/dports/python/py-tempita/Portfile
    trunk/dports/python/py-textile/Portfile
    trunk/dports/python/py-torndb/Portfile
    trunk/dports/python/py-traits/Portfile
    trunk/dports/python/py-traitsui/Portfile
    trunk/dports/python/py-transaction/Portfile
    trunk/dports/python/py-translationstring/Portfile
    trunk/dports/python/py-trep/Portfile
    trunk/dports/python/py-turbocheetah/Portfile
    trunk/dports/python/py-turbogears/Portfile
    trunk/dports/python/py-turbokid/Portfile
    trunk/dports/python/py-tweepy/Portfile
    trunk/dports/python/py-twforms/Portfile
    trunk/dports/python/py-urlwatch/Portfile
    trunk/dports/python/py-urwid/Portfile
    trunk/dports/python/py-virtualenv/Portfile
    trunk/dports/python/py-virtualenv-clone/Portfile
    trunk/dports/python/py-virtualenvwrapper/Portfile
    trunk/dports/python/py-weberror/Portfile
    trunk/dports/python/py-webhelpers/Portfile
    trunk/dports/python/py-webob/Portfile
    trunk/dports/python/py-webpy/Portfile
    trunk/dports/python/py-webtest/Portfile
    trunk/dports/python/py-werkzeug/Portfile
    trunk/dports/python/py-whoosh/Portfile
    trunk/dports/python/py-workerpool/Portfile
    trunk/dports/python/py-x2go/Portfile
    trunk/dports/python/py-xattr/Portfile
    trunk/dports/python/py-xhtml2pdf/Portfile
    trunk/dports/python/py-yolk/Portfile
    trunk/dports/python/py-zc-buildout/Portfile
    trunk/dports/python/py-zc-lockfile/Portfile
    trunk/dports/python/py-zen/Portfile
    trunk/dports/python/py-zodb/Portfile
    trunk/dports/python/py-zope-app-module/Portfile
    trunk/dports/python/py-zope-event/Portfile
    trunk/dports/python/py-zope-keyreference/Portfile
    trunk/dports/python/py-zopeinterface/Portfile
    trunk/dports/python/py25-authkit/Portfile
    trunk/dports/python/py25-clientcookie/Portfile
    trunk/dports/python/py25-couchdb/Portfile
    trunk/dports/python/py25-morbid/Portfile
    trunk/dports/python/py25-rope/Portfile
    trunk/dports/python/py25-stomper/Portfile
    trunk/dports/python/py26-couchdb/Portfile
    trunk/dports/python/py26-couchdbkit/Portfile
    trunk/dports/python/py26-ete2/Portfile
    trunk/dports/python/py26-formalchemy/Portfile
    trunk/dports/python/py26-pdfminer/Portfile
    trunk/dports/python/py26-pygccxml/Portfile
    trunk/dports/python/py26-pygooglechart/Portfile
    trunk/dports/python/py26-pymvpa/Portfile
    trunk/dports/python/py26-pynzb/Portfile
    trunk/dports/python/py26-pyphant/Portfile
    trunk/dports/python/py26-pyphant-fmf/Portfile
    trunk/dports/python/py26-pyphant-imageprocessing/Portfile
    trunk/dports/python/py26-pyphant-osc/Portfile
    trunk/dports/python/py26-pyphant-statistics/Portfile
    trunk/dports/python/py26-pyphant-tools/Portfile
    trunk/dports/python/py26-pyplusplus/Portfile
    trunk/dports/python/py26-recaptcha-client/Portfile
    trunk/dports/python/py26-repoze.what/Portfile
    trunk/dports/python/py26-repoze.what-pylons/Portfile
    trunk/dports/python/py26-repoze.what-quickstart/Portfile
    trunk/dports/python/py26-repoze.what.plugins.sql/Portfile
    trunk/dports/python/py26-repoze.who/Portfile
    trunk/dports/python/py26-repoze.who-friendlyform/Portfile
    trunk/dports/python/py26-repoze.who-testutil/Portfile
    trunk/dports/python/py26-repoze.who.plugins.sa/Portfile
    trunk/dports/python/py26-rope/Portfile
    trunk/dports/python/py26-tvdb/Portfile
    trunk/dports/python/py27-argh/Portfile
    trunk/dports/python/py27-blinker/Portfile
    trunk/dports/python/py27-brownie/Portfile
    trunk/dports/python/py27-couchdb/Portfile
    trunk/dports/python/py27-pathtools/Portfile
    trunk/dports/python/py27-pdfminer/Portfile
    trunk/dports/python/py27-prettytable/Portfile
    trunk/dports/python/py27-rope/Portfile
    trunk/dports/science/bob/Portfile
    trunk/dports/science/nMOLDYN/Portfile
    trunk/dports/sysutils/glances/Portfile
    trunk/dports/sysutils/pssh/Portfile
    trunk/dports/sysutils/timedrive/Portfile
    trunk/dports/textproc/rst2pdf/Portfile
    trunk/dports/www/loggerhead/Portfile
    trunk/dports/x11/gtimelog/Portfile

Modified: trunk/dports/devel/PIDA/Portfile
===================================================================
--- trunk/dports/devel/PIDA/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/devel/PIDA/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -18,7 +18,7 @@
 checksums       sha1    c2ba4fb5e3220d0b8fd5d33f418164b05e840e34 \
                 rmd160  3c622c53e622938b163a5304306821ed90c3404a
 
-depends_build   port:py26-distribute \
+depends_build   port:py26-setuptools \
                 port:pkgconfig
 depends_lib     port:py26-pygtk \
                 port:py26-gnome \

Modified: trunk/dports/devel/closure-linter/Portfile
===================================================================
--- trunk/dports/devel/closure-linter/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/devel/closure-linter/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 master_sites       googlecode:closure-linter
 distname           closure_linter-${version}
 
-depends_lib-append port:py27-distribute \
+depends_lib-append port:py27-setuptools \
                    port:py27-gflags
 
 checksums          rmd160  af22306a32ec58fb083a7bebb82406fa33377ce6 \

Modified: trunk/dports/devel/flashbake/Portfile
===================================================================
--- trunk/dports/devel/flashbake/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/devel/flashbake/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
               sha1 aeb11a79be61b0e97824fbdea70cce8f90383dbb \
               rmd160 846c34b4994637ab0c0bb2e1b3320724f9b41b0a
 
-depends_lib-append  port:py26-distribute \
+depends_lib-append  port:py26-setuptools \
                     port:py26-enum \
                     port:py26-feedparser \
                     port:git-core

Modified: trunk/dports/net/deluge/Portfile
===================================================================
--- trunk/dports/net/deluge/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/net/deluge/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -44,7 +44,7 @@
                 port:py26-chardet \
                 port:py26-game \
                 port:py26-pygtk \
-                port:py26-distribute \
+                port:py26-setuptools \
                 port:py26-xdg \
                 port:py26-twisted \
                 port:py26-twisted-web2 \
@@ -60,7 +60,7 @@
                 port:py27-chardet \
                 port:py27-game \
                 port:py27-pygtk \
-                port:py27-distribute \
+                port:py27-setuptools \
                 port:py27-xdg \
                 port:py27-twisted \
                 port:py27-twisted-web2 \

Modified: trunk/dports/net/gajim-devel/Portfile
===================================================================
--- trunk/dports/net/gajim-devel/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/net/gajim-devel/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
                     patch-setup_osx.py.diff
 
 depends_build       port:intltool \
-                    port:py25-distribute \
+                    port:py25-setuptools \
                     port:py25-macholib \
                     port:py25-py2app
 

Modified: trunk/dports/net/upnp-inspector/Portfile
===================================================================
--- trunk/dports/net/upnp-inspector/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/net/upnp-inspector/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 variant python26 conflicts python27 description {Build for Python 2.6} {
         python.version 26
         depends_build-append \
-                port:py26-distribute
+                port:py26-setuptools
         depends_lib-append \
                 port:py26-pygtk \
                 port:coherence
@@ -39,7 +39,7 @@
 variant python27 conflicts python26 description {Build for Python 2.7} {
         python.version 27
         depends_build-append \
-                port:py27-distribute
+                port:py27-setuptools
         depends_lib-append \
                 port:py27-pygtk \
                 port:coherence

Modified: trunk/dports/print/pdfposter/Portfile
===================================================================
--- trunk/dports/print/pdfposter/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/print/pdfposter/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
 checksums               sha1    efca128a0eba06922cc8c82133dcdd1fb0ef2311 \
                         rmd160  ca57353efdc5b21362edf105938d56ecf09d4c2c
 
-depends_build-append    port:py27-distribute
+depends_build-append    port:py27-setuptools
 
 depends_lib-append      port:py27-pypdf
 

Modified: trunk/dports/python/py-MMTK/Portfile
===================================================================
--- trunk/dports/python/py-MMTK/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-MMTK/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,7 +23,7 @@
                     rmd160  0259d428336f5717307468f8e4ebd57351bacc19
                     
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib         port:py${python.version}-scientific
     build.env-append    CPPFLAGS="-I${prefix}/include -I${prefix}/include/python${python.branch}"
 }

Modified: trunk/dports/python/py-Pillow/Portfile
===================================================================
--- trunk/dports/python/py-Pillow/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-Pillow/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 if {$subport != $name} {
     conflicts       py${python.version}-pil
 
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-tkinter \
                         port:zlib \
                         port:jpeg \

Modified: trunk/dports/python/py-abjad/Portfile
===================================================================
--- trunk/dports/python/py-abjad/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-abjad/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,5 +30,5 @@
                     sha256  9413fb075ebdb6b498ec49e65048432881c629585c0d3bb1cbe813b4a73d1682
 
 if {$subport != $name} {
-    depends_build port:py${python.version}-distribute
+    depends_build port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-altgraph/Portfile
===================================================================
--- trunk/dports/python/py-altgraph/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-altgraph/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 python.versions     24 25 26 27 31 32 33
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
     livecheck.type  none
     if {${python.version} <= 25} {
         version     0.9

Modified: trunk/dports/python/py-amqp/Portfile
===================================================================
--- trunk/dports/python/py-amqp/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-amqp/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions     26 27 31 32 33
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-amqplib/Portfile
===================================================================
--- trunk/dports/python/py-amqplib/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-amqplib/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,5 +29,5 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-antlr3/Portfile
===================================================================
--- trunk/dports/python/py-antlr3/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-antlr3/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 python.versions     25 26 27
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-anyjson/Portfile
===================================================================
--- trunk/dports/python/py-anyjson/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-anyjson/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     if {$subport == "py25-anyjson"} {
         # Depend upon cjson so that the best JSON module for python25 can be used.

Modified: trunk/dports/python/py-appscript/Portfile
===================================================================
--- trunk/dports/python/py-appscript/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-appscript/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.versions     24 25 26 27 31 32
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     post-destroot {
         foreach subdir {appscript_2x appscript_3x} {
             xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}/${subdir}

Modified: trunk/dports/python/py-apptools/Portfile
===================================================================
--- trunk/dports/python/py-apptools/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-apptools/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions     25 26 27
 
 if {$subport != $name} {
-    depends_build-append  port:py${python.version}-distribute
+    depends_build-append  port:py${python.version}-setuptools
     depends_lib-append    port:py${python.version}-configobj\
                           port:py${python.version}-traitsui
 }

Modified: trunk/dports/python/py-argparse/Portfile
===================================================================
--- trunk/dports/python/py-argparse/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-argparse/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions     24 25 26 31
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-astlib/Portfile
===================================================================
--- trunk/dports/python/py-astlib/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-astlib/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 
 if {${subport} != ${name}} {
 
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-pyfits \
                         port:py${python.version}-numpy \
                         port:py${python.version}-scipy \

Modified: trunk/dports/python/py-astrolibcoords/Portfile
===================================================================
--- trunk/dports/python/py-astrolibcoords/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-astrolibcoords/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions         26
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     depends_lib-append      port:py${python.version}-numpy
 

Modified: trunk/dports/python/py-autopep8/Portfile
===================================================================
--- trunk/dports/python/py-autopep8/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-autopep8/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,9 +28,8 @@
 python.versions     26 27 31 32 33
 
 if {${subport} != ${name}} {
-    depends_build-append    port:py${python.version}-distribute
-    depends_run-append      port:py${python.version}-distribute \
-                            port:${realname}_select \
+    depends_lib-append      port:py${python.version}-setuptools
+    depends_run-append      port:${realname}_select \
                             port:py${python.version}-pep8
     select.group            ${realname}
     select.file             ${filespath}/${realname}${python.version}

Modified: trunk/dports/python/py-babel/Portfile
===================================================================
--- trunk/dports/python/py-babel/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-babel/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.versions     25 26 27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-tz
     livecheck.type      none
 } else {

Modified: trunk/dports/python/py-baker/Portfile
===================================================================
--- trunk/dports/python/py-baker/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-baker/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
                     sha256  2d81e99af7d7d6441297a0c13de023fe3f1510718e89d2baacea917ee09d154d
 
 if {${name} != ${subport}} {
-    depends_lib-append	port:py${python.version}-distribute
+    depends_lib-append	port:py${python.version}-setuptools
     distname            ${my_name}-${version}
     livecheck.type      none
 } else {

Modified: trunk/dports/python/py-bdist_mpkg/Portfile
===================================================================
--- trunk/dports/python/py-bdist_mpkg/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-bdist_mpkg/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
     livecheck.type  none
 } else {
     livecheck.type  regex

Modified: trunk/dports/python/py-beaker/Portfile
===================================================================
--- trunk/dports/python/py-beaker/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-beaker/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -40,7 +40,7 @@
                     sha256  5b06dcc9f7b1921bc962235c4051aa5f3f5d3609f42faa6064dc614ace031a3a
 
 if {$name != $subport} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-billiard/Portfile
===================================================================
--- trunk/dports/python/py-billiard/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-billiard/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-bitarray/Portfile
===================================================================
--- trunk/dports/python/py-bitarray/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-bitarray/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,6 +35,6 @@
 python.versions     26 27 31 32
 
 if {${subport} != ${name}} {
-    depends_build         port:py${python.version}-distribute
+    depends_build         port:py${python.version}-setuptools
 }
 

Modified: trunk/dports/python/py-blessings/Portfile
===================================================================
--- trunk/dports/python/py-blessings/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-blessings/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,6 +23,6 @@
                     sha256  1bc5679fdf1807c74eb8da3774dd61ba928134cfb729df664fb60602161af193
 
 if {$name != $subport} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }
 

Modified: trunk/dports/python/py-blist/Portfile
===================================================================
--- trunk/dports/python/py-blist/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-blist/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
 
     post-patch {
         file delete -force ${worksrcpath}/blist.egg-info

Modified: trunk/dports/python/py-blockcanvas/Portfile
===================================================================
--- trunk/dports/python/py-blockcanvas/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-blockcanvas/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     depends_lib     port:py${python.version}-apptools \
                     port:py${python.version}-scimath \
                     port:py${python.version}-etsdevtools \

Modified: trunk/dports/python/py-bottleneck/Portfile
===================================================================
--- trunk/dports/python/py-bottleneck/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-bottleneck/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
                     sha256  eddfdc0492e7b0d2749d4a8861503186446d09d73f3eeb3f064a80313ded2f65
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-cython    \
                         port:py${python.version}-numpy
 

Modified: trunk/dports/python/py-bpython/Portfile
===================================================================
--- trunk/dports/python/py-bpython/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-bpython/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 
     depends_lib-append      port:py${python.version}-parsing \
                             port:py${python.version}-pygments \
-                            port:py${python.version}-distribute
+                            port:py${python.version}-setuptools
 
     # py-babel is only available for Python 2.x
     if {[expr ${python.branch} < 3]} { 

Modified: trunk/dports/python/py-carray/Portfile
===================================================================
--- trunk/dports/python/py-carray/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-carray/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,7 +35,7 @@
 python.versions     26 27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-numpy \
                         port:py${python.version}-cython
 

Modified: trunk/dports/python/py-carrot/Portfile
===================================================================
--- trunk/dports/python/py-carrot/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-carrot/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions     26
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-celery/Portfile
===================================================================
--- trunk/dports/python/py-celery/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-celery/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
 
     depends_lib-append  port:py${python.version}-kombu \
                         port:py${python.version}-anyjson \

Modified: trunk/dports/python/py-cffi/Portfile
===================================================================
--- trunk/dports/python/py-cffi/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-cffi/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
                     sha256  22d49bdb13e962b425fad0a001f8d331c51224235e5850fb2c193180c9757d14
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:libffi
 
     depends_run-append  port:py${python.version}-pycparser

Modified: trunk/dports/python/py-chaco/Portfile
===================================================================
--- trunk/dports/python/py-chaco/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-chaco/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions     25 26 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-enable \
                             port:py${python.version}-numpy
     

Modified: trunk/dports/python/py-cidrize/Portfile
===================================================================
--- trunk/dports/python/py-cidrize/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-cidrize/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.default_version  27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-netaddr
 }
 

Modified: trunk/dports/python/py-clientform/Portfile
===================================================================
--- trunk/dports/python/py-clientform/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-clientform/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions     24 25 26
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 
     test.run            yes
     test.cmd            ${python.bin}

Modified: trunk/dports/python/py-clonedigger/Portfile
===================================================================
--- trunk/dports/python/py-clonedigger/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-clonedigger/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,6 +28,6 @@
     livecheck.url       http://pypi.python.org/pypi/clonedigger
     livecheck.regex     "clonedigger-(.+?).tar.gz"
 } else {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     livecheck.type      none
 }

Modified: trunk/dports/python/py-codetools/Portfile
===================================================================
--- trunk/dports/python/py-codetools/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-codetools/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -40,6 +40,6 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     depends_lib     port:py${python.version}-traits
 }

Modified: trunk/dports/python/py-cogen/Portfile
===================================================================
--- trunk/dports/python/py-cogen/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-cogen/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,5 +29,5 @@
 
 if {$subport != $name} {
     use_zip             yes
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-colander/Portfile
===================================================================
--- trunk/dports/python/py-colander/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-colander/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions     26 27 32
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-iso8601 \
                             port:py${python.version}-translationstring
 }

Modified: trunk/dports/python/py-country/Portfile
===================================================================
--- trunk/dports/python/py-country/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-country/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 python.versions	    26
 
 if {$subport != $name} {
-        depends_build	    port:py${python.version}-distribute
+        depends_build	    port:py${python.version}-setuptools
 
         test.run	    yes
         test.cmd	    ${python.bin}

Modified: trunk/dports/python/py-coverage/Portfile
===================================================================
--- trunk/dports/python/py-coverage/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-coverage/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,8 +28,7 @@
 python.versions     25 26 27 31 32 33
 
 if {${subport} != ${name}} {
-    depends_build-append    port:py${python.version}-distribute
-    depends_run-append      port:py${python.version}-distribute
+    depends_lib-append    port:py${python.version}-setuptools
 
     post-patch {
         # Permissions in the archive are 700

Modified: trunk/dports/python/py-cssselect/Portfile
===================================================================
--- trunk/dports/python/py-cssselect/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-cssselect/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 python.versions         25 26 27 31 32 33
 
 if {${subport} != ${name}} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     post-destroot {
         xinstall -m 644 -W ${worksrcpath} \
             AUTHORS CHANGES LICENSE README.rst \

Modified: trunk/dports/python/py-cssutils/Portfile
===================================================================
--- trunk/dports/python/py-cssutils/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-cssutils/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
                         sha256  f7061a591859c025504c7871ef3b843383a025d570128edf1c63a6ef53753e8d
 
 if {${name} != ${subport}} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 
     post-destroot {
         # We should notify upstream not to install tests.

Modified: trunk/dports/python/py-curlish/Portfile
===================================================================
--- trunk/dports/python/py-curlish/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-curlish/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
                     sha256  742f78d8aaa2c382ddf38f455745ecdf77472273059844514e434c626e2a9277
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib-append  port:curl
     depends_run         port:curlish_select
     select.group        ${realname}

Modified: trunk/dports/python/py-cx_Freeze/Portfile
===================================================================
--- trunk/dports/python/py-cx_Freeze/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-cx_Freeze/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions 25 26 27 31 32
 
 if { ${subport} != ${name} } {
-    depends_lib         port:py${python.version}-distribute  
+    depends_lib         port:py${python.version}-setuptools  
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-dap/Portfile
===================================================================
--- trunk/dports/python/py-dap/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-dap/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
   livecheck.url     http://pypi.python.org/pypi/dap/
   livecheck.regex   {dap (\d+(?:\.\d+)*)}
 } else {
-  depends_lib-append port:py${python.version}-distribute \
+  depends_lib-append port:py${python.version}-setuptools \
                      port:py${python.version}-httplib2
   patchfiles        patch-egg_namespace.diff
   livecheck.type    none

Modified: trunk/dports/python/py-dateutil/Portfile
===================================================================
--- trunk/dports/python/py-dateutil/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-dateutil/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,7 +35,7 @@
         distname  ${my_name}-${version}
     }
     depends_run   path:${python.pkgd}/pytz:py${python.version}-tz \
-                  port:py${python.version}-distribute
+                  port:py${python.version}-setuptools
 
     test.run          yes
     test.cmd          ${python.bin} test.py

Modified: trunk/dports/python/py-decorator/Portfile
===================================================================
--- trunk/dports/python/py-decorator/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-decorator/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
 
 if {${subport} != ${name}} {
     if {${python.version} >= 31} {
-        depends_build-append    port:py${python.version}-distribute
+        depends_build-append    port:py${python.version}-setuptools
     }
     livecheck.type              none
 } else {

Modified: trunk/dports/python/py-decoratortools/Portfile
===================================================================
--- trunk/dports/python/py-decoratortools/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-decoratortools/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
 python.versions		24 25 26
 
 if {$subport != $name} {
-	depends_lib			port:py${python.version}-distribute
+	depends_lib			port:py${python.version}-setuptools
 	post-destroot {
 		xinstall -m 644 -W ${worksrcpath} \
 			README.txt ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-demjson/Portfile
===================================================================
--- trunk/dports/python/py-demjson/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-demjson/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -36,7 +36,7 @@
                   sha256  1d989c310e33569ecc178b8182e53bde8f748bf5ea10cfbc0e331f8c313f6e29
 
 if {$subport != $name} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 }
 
 livecheck.type    regex

Modified: trunk/dports/python/py-dispatcher/Portfile
===================================================================
--- trunk/dports/python/py-dispatcher/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-dispatcher/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions     26
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 
     test.run            yes
     test.cmd            ${python.bin} tests/test.py

Modified: trunk/dports/python/py-distribute/Portfile
===================================================================
--- trunk/dports/python/py-distribute/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-distribute/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -5,59 +5,33 @@
 PortGroup           python 1.0
 
 name                py-distribute
-version             0.6.45
+version             0.7
 categories-append   devel
 license             {PSF ZPL}
-maintainers         jmr openmaintainer
-description         Replacement for setuptools
+maintainers         nomaintainer
+description         Deprecated fork of setuptools
 long_description \
-   Distribute is a fork of the Setuptools project. It is intended to replace \
+   Distribute is a fork of the Setuptools project. It was intended to replace \
    Setuptools as the standard method for working with Python module \
-   distributions.
+   distributions, but has since been reintegrated with Setuptools.
 
 platforms           darwin
 supported_archs     noarch
 
 homepage            https://pypi.python.org/pypi/distribute/
-master_sites        https://pypi.python.org/packages/source/d/distribute/
-distname            distribute-${version}
+distfiles
+archive_sites
 
-checksums           rmd160  7e364e8ae384784332b8fd35f0770e8b7ae69eaa \
-                    sha256  7c0b21329bbd087410ce4be4bf64058c1085a27e5ae5886a52950ff46ab9eb66
-
 python.versions     24 25 26 27 31 32 33
-python.default_version 27
-python.link_binaries no
-python.move_binaries no
 
 if {$subport != $name} {
-    post-destroot {
-       xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}
-       xinstall -m 644 -W ${worksrcpath} CHANGES.txt CONTRIBUTORS.txt \
-          DEVGUIDE.txt README.txt ${destroot}${prefix}/share/doc/${subport}
-       if {${python.version} <= 25} {
-          delete "${destroot}${prefix}/bin/easy_install"
-       } else {
-          ln -s "${python.prefix}/bin/easy_install-${python.branch}" "${destroot}${prefix}/bin/"
-       }
-       foreach exe [glob -directory "${destroot}${python.pkgd}/setuptools" *.exe] {
-          file delete $exe
-       }
-    }
-    livecheck.type      none
+    replaced_by     py${python.version}-setuptools
 } else {
-    livecheck.type      regex
-    livecheck.url       ${homepage}
-    livecheck.regex     distribute-(\\d+(\\.\\d+)+)
+    replaced_by     py-setuptools
 }
+depends_lib
 
-subport py32-distribute {
-    pre-activate {
-        set regref [registry_open $subport $version $revision $portvariants ""]
-        foreach f [registry_prop_retr $regref imagefiles] {
-            if {[file extension $f] == ".pyc" && [file exists $f] && [registry_file_registered $f] == "0"} {
-                file delete -force $f
-            }
-        }
-    }
+pre-configure {
+    ui_error "$subport is obsolete, please install $replaced_by instead."
+    error "obsolete port"
 }

Modified: trunk/dports/python/py-distutils-extra/Portfile
===================================================================
--- trunk/dports/python/py-distutils-extra/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-distutils-extra/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions   25 26
 
 if {$subport != $name} {
-    depends_build     port:py${python.version}-distribute
+    depends_build     port:py${python.version}-setuptools
     depends_lib-append port:intltool
     livecheck.type    none
 } else {

Modified: trunk/dports/python/py-django/Portfile
===================================================================
--- trunk/dports/python/py-django/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-django/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 
 if {${subport} != ${name}} {
 
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     variant bash_completion {
         depends_run-append path:etc/bash_completion:bash-completion

Modified: trunk/dports/python/py-django-debug-toolbar/Portfile
===================================================================
--- trunk/dports/python/py-django-debug-toolbar/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-django-debug-toolbar/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
 python.versions     26
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-django-extensions/Portfile
===================================================================
--- trunk/dports/python/py-django-extensions/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-django-extensions/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,6 +22,6 @@
                     sha256  804982ae6bc9c195b6bc34e1ff9218523c07b72d351a5138e25ab79f34d15336
 
 if {${name} != ${subport}} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     livecheck.type      none
 }

Modified: trunk/dports/python/py-elementtree/Portfile
===================================================================
--- trunk/dports/python/py-elementtree/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-elementtree/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,7 +35,7 @@
     use_zip			yes
     patchfiles		patch-setup.py
 
-    depends_build-append	port:py${python.version}-distribute
+    depends_build-append	port:py${python.version}-setuptools
 
     post-extract { file copy ${filespath}/ez_setup.py ${worksrcpath} }
 

Modified: trunk/dports/python/py-elixir/Portfile
===================================================================
--- trunk/dports/python/py-elixir/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-elixir/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,6 +29,6 @@
 python.versions                 24 25 26
 
 if {$subport != $name} {
-    depends_build               port:py${python.version}-distribute
+    depends_build               port:py${python.version}-setuptools
     depends_lib-append          port:py${python.version}-sqlalchemy
 }

Modified: trunk/dports/python/py-enable/Portfile
===================================================================
--- trunk/dports/python/py-enable/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-enable/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
                             pyqt4_qsize.patch
     patch.pre_args          -p1
 
-    depends_build-append    port:py${python.version}-distribute \
+    depends_build-append    port:py${python.version}-setuptools \
                             port:py${python.version}-cython \
                             port:swig-python
     depends_lib-append      port:py${python.version}-traitsui\

Modified: trunk/dports/python/py-enchant/Portfile
===================================================================
--- trunk/dports/python/py-enchant/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-enchant/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 python.versions         26 27 31 32 33
 
 if {$subport != $name} {
-    depends_lib-append      port:py${python.version}-distribute port:enchant
+    depends_lib-append      port:py${python.version}-setuptools port:enchant
 
     patchfiles              patch-enchant-_enchant.py.diff
 

Modified: trunk/dports/python/py-enthoughtbase/Portfile
===================================================================
--- trunk/dports/python/py-enthoughtbase/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-enthoughtbase/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,5 +26,5 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_build-append  port:py${python.version}-distribute
+    depends_build-append  port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-enum/Portfile
===================================================================
--- trunk/dports/python/py-enum/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-enum/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.versions   24 25 26 27
 
 if {${subport} != ${name}} {
-  depends_build   port:py${python.version}-distribute
+  depends_build   port:py${python.version}-setuptools
 }
 
 if {${name} == ${subport}} {

Modified: trunk/dports/python/py-envisage/Portfile
===================================================================
--- trunk/dports/python/py-envisage/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-envisage/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,6 +27,6 @@
 python.versions        25 26 27
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     depends_lib     port:py${python.version}-apptools
 }

Modified: trunk/dports/python/py-envoy/Portfile
===================================================================
--- trunk/dports/python/py-envoy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-envoy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,6 +23,6 @@
                     sha256  e10aeed89078bb214ff817a189aaf85ab5024025b2e555286872307c9e79b799
 
 if {$name != $subport} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }
 

Modified: trunk/dports/python/py-errorhandler/Portfile
===================================================================
--- trunk/dports/python/py-errorhandler/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-errorhandler/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
     livecheck.url   http://pypi.python.org/pypi/errorhandler
     livecheck.regex errorhandler-(\[1-9\]\\.\[0-9.\]+)\\.tar\\.\[bg\]z
 } else {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
     
     livecheck.type  none
 }

Modified: trunk/dports/python/py-etsdevtools/Portfile
===================================================================
--- trunk/dports/python/py-etsdevtools/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-etsdevtools/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,6 +28,6 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     depends_lib     port:py${python.version}-traits
 }

Modified: trunk/dports/python/py-etsproxy/Portfile
===================================================================
--- trunk/dports/python/py-etsproxy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-etsproxy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,5 +31,5 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build    port:py${python.version}-distribute
+    depends_build    port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-eventlet/Portfile
===================================================================
--- trunk/dports/python/py-eventlet/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-eventlet/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 python.versions     26 27
 
 if {$subport != $name} {
-    depends_lib         port:py${python.version}-distribute \
+    depends_lib         port:py${python.version}-setuptools \
                         port:py${python.version}-greenlet
     
     livecheck.type      none

Modified: trunk/dports/python/py-eyed3/Portfile
===================================================================
--- trunk/dports/python/py-eyed3/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-eyed3/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
     build.cmd       "${python.bin} setup.py"
     destroot.cmd       "${python.bin} setup.py"
     
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 
     pre-destroot	{
         reinplace "s|python|${python.bin}|g" ${worksrcpath}/bin/eyeD3

Modified: trunk/dports/python/py-ez_setup/Portfile
===================================================================
--- trunk/dports/python/py-ez_setup/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-ez_setup/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
     
     post-destroot {
         xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-fabric/Portfile
===================================================================
--- trunk/dports/python/py-fabric/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-fabric/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
 
 if {$subport != $name} {
     
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-ssh2
 }
 

Modified: trunk/dports/python/py-fancycompleter/Portfile
===================================================================
--- trunk/dports/python/py-fancycompleter/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-fancycompleter/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,6 +26,6 @@
     patchfiles          py25-exception-handling.patch
 }
 if {$name != $subport} {
-    depends_build           port:py${python.version}-distribute
+    depends_build           port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-repl
 }

Modified: trunk/dports/python/py-feedparser/Portfile
===================================================================
--- trunk/dports/python/py-feedparser/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-feedparser/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
     post-destroot	{
         xinstall -m 644 -W ${worksrcpath} LICENSE README \
             ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-fixture/Portfile
===================================================================
--- trunk/dports/python/py-fixture/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-fixture/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,5 +32,5 @@
 python.versions 25 26 27
 
 if {$subport != $name} {
-    depends_build port:py${python.version}-distribute
+    depends_build port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-flask-auth/Portfile
===================================================================
--- trunk/dports/python/py-flask-auth/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-flask-auth/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,6 +24,6 @@
                     sha256  a749c1f021a731ba8b40656bf863093840fa8cb4f1d2675571c1073357245285
 
 if {$name != $subport} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-flask
 }

Modified: trunk/dports/python/py-flask-restful/Portfile
===================================================================
--- trunk/dports/python/py-flask-restful/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-flask-restful/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
                     sha256  bff4704fe0a50b8b36e2eebf5701f8a5597d4fefd134b09ab0f80503b03ef7e4
 
 if {$name != $subport} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-flask \
                             port:py${python.version}-mock
 

Modified: trunk/dports/python/py-flask-sqlalchemy/Portfile
===================================================================
--- trunk/dports/python/py-flask-sqlalchemy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-flask-sqlalchemy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
                     sha256  367598fdfc46ee9ee2fe53b7a19b6bd283301979b4ca79fb530e1be8fdabf046
 
 if {$name != $subport} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-flask \
                             port:py${python.version}-sqlalchemy
 }

Modified: trunk/dports/python/py-flask-wtf/Portfile
===================================================================
--- trunk/dports/python/py-flask-wtf/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-flask-wtf/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
                     sha256  a93be7f971f607ef090f9f75249443785d60c339cfc0dc66318965324588b7cd
 
 if {$name != $subport} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-flask \
                             port:py${python.version}-wtforms
 }

Modified: trunk/dports/python/py-formbuild/Portfile
===================================================================
--- trunk/dports/python/py-formbuild/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-formbuild/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,5 +21,5 @@
 python.versions	24
 
 if {$subport != $name} {
-    depends_build		port:py${python.version}-distribute
+    depends_build		port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-formencode/Portfile
===================================================================
--- trunk/dports/python/py-formencode/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-formencode/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -19,7 +19,7 @@
 livecheck.url           ${homepage}
 
 if {$name != $subport} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 }
 
 distname                FormEncode-${version}

Modified: trunk/dports/python/py-ftputil/Portfile
===================================================================
--- trunk/dports/python/py-ftputil/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-ftputil/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-  depends_build   port:py${python.version}-distribute
+  depends_build   port:py${python.version}-setuptools
 
   post-destroot  {
       if {${python.version} == 24 || ${python.version} == 25} {

Modified: trunk/dports/python/py-gchartwrapper/Portfile
===================================================================
--- trunk/dports/python/py-gchartwrapper/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-gchartwrapper/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,6 +29,6 @@
                     rmd160  9bd30093dc66676d4abee2b55dd45cf3505fd4e3
 
 if {${name} != ${subport}} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     livecheck.type      none
 }

Modified: trunk/dports/python/py-gdata/Portfile
===================================================================
--- trunk/dports/python/py-gdata/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-gdata/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
     if {${python.version} == 24} {
         depends_lib-append  port:py${python.version}-elementtree
     }
-    depends_build-append    port:py${python.version}-distribute 
+    depends_build-append    port:py${python.version}-setuptools 
 
     post-destroot {
         eval reinplace \

Modified: trunk/dports/python/py-geoalchemy/Portfile
===================================================================
--- trunk/dports/python/py-geoalchemy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-geoalchemy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
                     sha256  78ce2f57a7982051030ccc9a59eb589bf6e0b3fad93875add4c1f7ef65f91863
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-sqlalchemy \
                         port:py${python.version}-psycopg2
 

Modified: trunk/dports/python/py-gflags/Portfile
===================================================================
--- trunk/dports/python/py-gflags/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-gflags/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 }
 
 livecheck.type      googlecode

Modified: trunk/dports/python/py-git-sweep/Portfile
===================================================================
--- trunk/dports/python/py-git-sweep/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-git-sweep/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,7 +23,7 @@
 
 if {$subport != $name} {
     livecheck.type      none
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib-append  port:py${python.version}-gitpython \
                         port:py${python.version}-gitdb \
                         port:git-sweep_select

Modified: trunk/dports/python/py-gitpython/Portfile
===================================================================
--- trunk/dports/python/py-gitpython/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-gitpython/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,6 +26,6 @@
                   rmd160  75488dcfe0be35066cd39eb63f909f999f17cdda
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     depends_lib     port:py${python.version}-gitdb
 }

Modified: trunk/dports/python/py-google-api/Portfile
===================================================================
--- trunk/dports/python/py-google-api/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-google-api/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
                     ${realname}-samples-${version}${extract.suffix}
 
 if {$subport != $name} {
-    depends_build           port:py${python.version}-distribute
+    depends_build           port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-httplib2 \
                             port:py${python.version}-gflags \
                             port:py${python.version}-uritemplate \

Modified: trunk/dports/python/py-greenlet/Portfile
===================================================================
--- trunk/dports/python/py-greenlet/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-greenlet/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -54,7 +54,7 @@
 python.versions     24 25 26 27 31 32
 
 if {$name != $subport} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-healpy/Portfile
===================================================================
--- trunk/dports/python/py-healpy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-healpy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -43,7 +43,7 @@
     }
 
     depends_build       port:pkgconfig \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
 
     depends_lib-append  port:cfitsio \
                         port:py${python.version}-numpy \

Modified: trunk/dports/python/py-hgsvn/Portfile
===================================================================
--- trunk/dports/python/py-hgsvn/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-hgsvn/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.default_version  27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:mercurial \
                         port:subversion
 

Modified: trunk/dports/python/py-html2text/Portfile
===================================================================
--- trunk/dports/python/py-html2text/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-html2text/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 
 if {${name} != ${subport}} {
 
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     depends_run-append  port:py-html2text_select
 

Modified: trunk/dports/python/py-html5lib/Portfile
===================================================================
--- trunk/dports/python/py-html5lib/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-html5lib/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.default_version 27
 
 if {${subport} != ${name}} {
-    depends_lib         port:py${python.version}-distribute
+    depends_lib         port:py${python.version}-setuptools
 
     post-destroot   {
         set docdir ${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-hypy/Portfile
===================================================================
--- trunk/dports/python/py-hypy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-hypy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.versions     25 26
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib-append  port:hyperestraier
 
     patchfiles          patch-setup.py.diff

Modified: trunk/dports/python/py-icalendar/Portfile
===================================================================
--- trunk/dports/python/py-icalendar/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-icalendar/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 
 if {$subport != $name} {
     
-    depends_lib-append  port:py${python.version}-distribute  port:py${python.version}-tz \
+    depends_lib-append  port:py${python.version}-setuptools  port:py${python.version}-tz \
     port:py${python.version}-dateutil
     
     post-destroot {

Modified: trunk/dports/python/py-igraph/Portfile
===================================================================
--- trunk/dports/python/py-igraph/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-igraph/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 
 if {$subport != $name} {
     depends_lib         port:igraph \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
 
     patchfiles          patch-setup.cfg.diff \
                         patch-setup.py.diff

Modified: trunk/dports/python/py-imdb/Portfile
===================================================================
--- trunk/dports/python/py-imdb/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-imdb/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
                     sha256  38973f80f794238fded6ca1794d4832c9c039d33664f0da27fc5adf595c2588f
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     depends_lib     port:py${python.version}-lxml \
                     port:py${python.version}-sqlalchemy
     build.cmd-append      --without-sqlobject

Modified: trunk/dports/python/py-imread/Portfile
===================================================================
--- trunk/dports/python/py-imread/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-imread/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 patchfiles          patch-setup.py.diff
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-numpy \
                             port:libpng \
                             port:jpeg \

Modified: trunk/dports/python/py-ipython/Portfile
===================================================================
--- trunk/dports/python/py-ipython/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-ipython/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -116,7 +116,7 @@
     }
 
     depends_lib-append      port:py${python.version}-readline \
-                            port:py${python.version}-distribute
+                            port:py${python.version}-setuptools
     depends_run             port:ipython_select
     test.run                no
 

Modified: trunk/dports/python/py-iso8601/Portfile
===================================================================
--- trunk/dports/python/py-iso8601/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-iso8601/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions     26 27 32
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-jcc/Portfile
===================================================================
--- trunk/dports/python/py-jcc/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-jcc/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,5 +35,5 @@
 python.versions     26 27
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-jinja/Portfile
===================================================================
--- trunk/dports/python/py-jinja/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-jinja/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 python.default_version 26
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     patchfiles          patch-setup.py.diff
     post-patch {
        reinplace "s|@@NAME@@|${subport}|g" ${worksrcpath}/setup.py

Modified: trunk/dports/python/py-jinja2/Portfile
===================================================================
--- trunk/dports/python/py-jinja2/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-jinja2/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 python.versions     24 25 26 27 31 32 33
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute \
+    depends_lib     port:py${python.version}-setuptools \
                     port:py${python.version}-markupsafe
     if {${python.version} < 26 || (${python.version} >= 30 && ${python.version} < 33)} {
         version     2.6

Modified: trunk/dports/python/py-joblib/Portfile
===================================================================
--- trunk/dports/python/py-joblib/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-joblib/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
 distname            joblib-${version}
 
 if {$subport != $name} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 
     livecheck.type      none
 } else {

Modified: trunk/dports/python/py-jsbeautifier/Portfile
===================================================================
--- trunk/dports/python/py-jsbeautifier/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-jsbeautifier/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
     distname            js-beautify
     build.dir           ${worksrcpath}/python
     
-    depends_lib         port:py${python.version}-distribute
+    depends_lib         port:py${python.version}-setuptools
     
     post-destroot {
         reinplace "s|#! /usr/bin/env python|#!${python.bin}|" ${build.dir}/js-beautify

Modified: trunk/dports/python/py-jubatus-client/Portfile
===================================================================
--- trunk/dports/python/py-jubatus-client/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-jubatus-client/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
                     sha256  940ac1e7cd46ccc52041b1f7116870620e16d6d4fd22a7aed7173f8d7dac394c
 
 if {${subport} != ${name}} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
     depends_lib-append   port:py${python.version}-msgpack
 
     livecheck.type      none

Modified: trunk/dports/python/py-kid/Portfile
===================================================================
--- trunk/dports/python/py-kid/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-kid/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 
 if {$subport != $name} {
 	depends_lib-append	port:py${python.version}-celementtree
-	depends_build	port:py${python.version}-distribute
+	depends_build	port:py${python.version}-setuptools
 
 	test.run		yes
 	livecheck.type	none

Modified: trunk/dports/python/py-kombu/Portfile
===================================================================
--- trunk/dports/python/py-kombu/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-kombu/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-kqueue/Portfile
===================================================================
--- trunk/dports/python/py-kqueue/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-kqueue/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 
 if {$subport != $name} {
     use_zip             yes
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     post-destroot	{
         xinstall -m 644 -W ${worksrcpath} README.txt TODO test1.py pykqueue.txt \
             ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-lepl/Portfile
===================================================================
--- trunk/dports/python/py-lepl/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-lepl/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 python.versions     26 27 32
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-levenshtein/Portfile
===================================================================
--- trunk/dports/python/py-levenshtein/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-levenshtein/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
 
     post-destroot {
         set realname levenshtein

Modified: trunk/dports/python/py-liblzma/Portfile
===================================================================
--- trunk/dports/python/py-liblzma/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-liblzma/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 
 if {$name != $subport} {
 depends_lib-append	port:xz \
-			port:py${python.version}-distribute
+			port:py${python.version}-setuptools
 
 patchfiles		pyliblzma-python23.diff
 }

Modified: trunk/dports/python/py-libmemcached/Portfile
===================================================================
--- trunk/dports/python/py-libmemcached/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-libmemcached/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
 python.versions     25
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib         port:libmemcached \
                         port:py${python.version}-pyrex
     patchfiles          patch-setup.py.diff

Modified: trunk/dports/python/py-librabbitmq/Portfile
===================================================================
--- trunk/dports/python/py-librabbitmq/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-librabbitmq/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.default_version  27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-logbook/Portfile
===================================================================
--- trunk/dports/python/py-logbook/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-logbook/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.versions     26 27 32 33
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-lxml/Portfile
===================================================================
--- trunk/dports/python/py-lxml/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-lxml/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
 
     depends_lib-append  port:zlib \
                         port:libxml2 \

Modified: trunk/dports/python/py-lz4/Portfile
===================================================================
--- trunk/dports/python/py-lz4/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-lz4/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 python.versions     26 27
 
 if {${subport} != ${name}} {
-    depends_build-append        port:py${python.version}-distribute
+    depends_build-append        port:py${python.version}-setuptools
     livecheck.type              none
 } else {
     livecheck.type              regex

Modified: trunk/dports/python/py-m2crypto/Portfile
===================================================================
--- trunk/dports/python/py-m2crypto/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-m2crypto/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 if {$subport != $name} {
   depends_lib-append port:swig-python \
                      port:openssl \
-                     port:py${python.version}-distribute
+                     port:py${python.version}-setuptools
 
   post-patch {
     reinplace "s|#extra_link_args|extra_link_args|g" ${worksrcpath}/setup.py

Modified: trunk/dports/python/py-macfsevents/Portfile
===================================================================
--- trunk/dports/python/py-macfsevents/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-macfsevents/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
                     sha256  64b2ecee53cf8972c5295354090ab307324913f020139eec44e6de690db24a3f
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     post-destroot {
         xinstall -d ${destroot}${python.prefix}/share/doc/${name}

Modified: trunk/dports/python/py-magic/Portfile
===================================================================
--- trunk/dports/python/py-magic/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-magic/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
 if {$subport != $name} {
     depends_lib-append  \
                     port:file \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-mahotas/Portfile
===================================================================
--- trunk/dports/python/py-mahotas/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mahotas/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
                     sha256  1aa75071916f3b8b70781965ea122a2b5f726d89d0dc360f94f2859342fbaec9
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     depends_lib-append      port:py${python.version}-numpy \
                             port:freeimage

Modified: trunk/dports/python/py-mako/Portfile
===================================================================
--- trunk/dports/python/py-mako/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mako/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -43,7 +43,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-beaker \
                         port:py${python.version}-markupsafe
 

Modified: trunk/dports/python/py-managesieve/Portfile
===================================================================
--- trunk/dports/python/py-managesieve/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-managesieve/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.versions	24 26
 
 if {$subport != $name} {
-    depends_build		port:py${python.version}-distribute
+    depends_build		port:py${python.version}-setuptools
     post-destroot	{
         xinstall -m 644 -W ${worksrcpath} draft-martin-managesieve-07.txt \
             HISTORY README TODO ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-markupsafe/Portfile
===================================================================
--- trunk/dports/python/py-markupsafe/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-markupsafe/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
                     sha256  b7d5d688bdd345bfa897777d297756688cf02e1b3742c56885e2e5c2b996ff82
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     livecheck.type          none
 

Modified: trunk/dports/python/py-mayavi/Portfile
===================================================================
--- trunk/dports/python/py-mayavi/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mayavi/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute \
+    depends_build-append    port:py${python.version}-setuptools \
                             port:py${python.version}-sphinx
     depends_lib-append      port:py${python.version}-apptools \
                             port:py${python.version}-envisage \

Modified: trunk/dports/python/py-mdp-toolkit/Portfile
===================================================================
--- trunk/dports/python/py-mdp-toolkit/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mdp-toolkit/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
                         sha256  3461a54c96a050029ec548c48fa5c60c2bb5b28cc088092438aa95c94d8b3478
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-numpy
 
     depends_build-append \

Modified: trunk/dports/python/py-mechanize/Portfile
===================================================================
--- trunk/dports/python/py-mechanize/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mechanize/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 
     test.run            yes
     test.cmd            ${python.bin}

Modified: trunk/dports/python/py-medusa/Portfile
===================================================================
--- trunk/dports/python/py-medusa/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-medusa/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 python.versions	24
 
 if {$subport != $name} {
-    depends_build-append	port:py${python.version}-distribute
+    depends_build-append	port:py${python.version}-setuptools
 
     patchfiles              patch-ez_setup.py \
                             patch-setup.py

Modified: trunk/dports/python/py-meld3/Portfile
===================================================================
--- trunk/dports/python/py-meld3/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-meld3/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 python.versions	24
 
 if {$subport != $name} {
-    depends_build-append	port:py${python.version}-distribute
+    depends_build-append	port:py${python.version}-setuptools
 
     patchfiles              patch-ez_setup.py \
                             patch-setup.py

Modified: trunk/dports/python/py-memcached/Portfile
===================================================================
--- trunk/dports/python/py-memcached/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-memcached/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
                         sha256  228563f1aa221f73b43509877322fde8a0efa4b65e9d065237b26f682a4a9a88
 
     distname          python-memcached-${version}
-    depends_build     port:py${python.version}-distribute
+    depends_build     port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type    regex

Modified: trunk/dports/python/py-mercurial_keyring/Portfile
===================================================================
--- trunk/dports/python/py-mercurial_keyring/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mercurial_keyring/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 
 if {${subport} != ${name}} {
     depends_run         port:py${python.version}-keyring
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 
     post-destroot {
        xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-meta/Portfile
===================================================================
--- trunk/dports/python/py-meta/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-meta/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 if {$subport != $name} {
     conflicts           port:py${python.version}-meta-devel
 
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     livecheck.type      none
 } else {

Modified: trunk/dports/python/py-meta-devel/Portfile
===================================================================
--- trunk/dports/python/py-meta-devel/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-meta-devel/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 if {$subport != $name} {
     conflicts           py${python.version}-meta
 
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     livecheck.type      none
 } else {

Modified: trunk/dports/python/py-mhash/Portfile
===================================================================
--- trunk/dports/python/py-mhash/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mhash/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     depends_lib-append      port:mhash
 

Modified: trunk/dports/python/py-milk/Portfile
===================================================================
--- trunk/dports/python/py-milk/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-milk/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
     depends_lib-append  port:py${python.version}-numpy \
                         port:eigen3
 

Modified: trunk/dports/python/py-mlpy/Portfile
===================================================================
--- trunk/dports/python/py-mlpy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mlpy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
 python.versions     26 27
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
 
     depends_lib-append \
                     port:gsl \

Modified: trunk/dports/python/py-mongoengine/Portfile
===================================================================
--- trunk/dports/python/py-mongoengine/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mongoengine/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-pymongo
 
     livecheck.type          none

Modified: trunk/dports/python/py-msgpack/Portfile
===================================================================
--- trunk/dports/python/py-msgpack/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-msgpack/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions     26 27 31 32 33
 
 if {${name} != ${subport}} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-mustache/Portfile
===================================================================
--- trunk/dports/python/py-mustache/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mustache/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,5 +27,5 @@
 python.versions     26 27
 
 if {$subport != $name} {
-    depends_build-append   port:py${python.version}-distribute
+    depends_build-append   port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-myghty/Portfile
===================================================================
--- trunk/dports/python/py-myghty/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-myghty/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,5 +32,5 @@
 python.versions	24 25
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-myghtyutils/Portfile
===================================================================
--- trunk/dports/python/py-myghtyutils/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-myghtyutils/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,5 +27,5 @@
 
 if {$subport != $name} {
     use_zip				yes
-    depends_lib			port:py${python.version}-distribute
+    depends_lib			port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-mysql/Portfile
===================================================================
--- trunk/dports/python/py-mysql/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-mysql/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     patch.pre_args      -p1
     patchfiles          patch-site.cfg.diff

Modified: trunk/dports/python/py-netaddr/Portfile
===================================================================
--- trunk/dports/python/py-netaddr/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-netaddr/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.default_version  27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-netifaces/Portfile
===================================================================
--- trunk/dports/python/py-netifaces/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-netifaces/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
 python.versions     25 26 27
 
 if {${name} != ${subport}} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-networkx/Portfile
===================================================================
--- trunk/dports/python/py-networkx/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-networkx/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
                         sha256 eb62de98a0fa74aec9c31fffbac8089a703c6413601678f3fb1a0016bad2bdc1
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-nose/Portfile
===================================================================
--- trunk/dports/python/py-nose/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-nose/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -43,7 +43,7 @@
     select.group        nosetests
     select.file         ${filespath}/nosetests${python.version}
 
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
 
     post-patch {
         reinplace "s|man/man|share/man/man|" ${worksrcpath}/setup.py

Modified: trunk/dports/python/py-ntplib/Portfile
===================================================================
--- trunk/dports/python/py-ntplib/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-ntplib/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
                     sha256   e0cfe76b4ca40d92c10be84818e48ca1e39946c24fd019f16de79bc2d673bee1
 
 if {$subport != $name} {
-    depends_lib         port:py${python.version}-distribute
+    depends_lib         port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-numba/Portfile
===================================================================
--- trunk/dports/python/py-numba/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-numba/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-cython \
 
     depends_lib-append  port:py${python.version}-llvmpy \

Modified: trunk/dports/python/py-numexpr/Portfile
===================================================================
--- trunk/dports/python/py-numexpr/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-numexpr/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -41,7 +41,7 @@
 }
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-numpy
 
     post-destroot {

Modified: trunk/dports/python/py-oauth2/Portfile
===================================================================
--- trunk/dports/python/py-oauth2/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-oauth2/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 
 if {$subport != $name} {
     depends_lib-append \
-                    port:py${python.version}-distribute \
+                    port:py${python.version}-setuptools \
                     port:py${python.version}-httplib2
     post-destroot {
         if {[file exists ${destroot}${python.pkgd}/tests]} {

Modified: trunk/dports/python/py-oauth2client/Portfile
===================================================================
--- trunk/dports/python/py-oauth2client/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-oauth2client/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 distname            ${realname}-${version}
 
 if {$subport != $name} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 
     post-destroot {        
         set egg-info ${destroot}${python.pkgd}/${realname}-${version}-py${python.branch}.egg-info

Modified: trunk/dports/python/py-obspy/Portfile
===================================================================
--- trunk/dports/python/py-obspy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-obspy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,7 +35,7 @@
 python.versions     26 27
 
 if {${subport} != ${name}} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib-append  port:py${python.version}-numpy \
                         port:py${python.version}-scipy \
                         port:py${python.version}-lxml \

Modified: trunk/dports/python/py-opengl/Portfile
===================================================================
--- trunk/dports/python/py-opengl/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-opengl/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions     24 25 26 27 32 33
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     depends_lib     port:py${python.version}-opengl-accelerate \
                     port:py${python.version}-tkinter
     if {${python.version} == 24} {

Modified: trunk/dports/python/py-openpyxl/Portfile
===================================================================
--- trunk/dports/python/py-openpyxl/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-openpyxl/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
                     sha256  6719241d5587fd8f685da261fe0f52636e2bafa40dce9f2ca60f84c47838e10c
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-orbited/Portfile
===================================================================
--- trunk/dports/python/py-orbited/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-orbited/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions   25
 
 if {$subport != $name} {
-    depends_lib-append port:py${python.version}-distribute \
+    depends_lib-append port:py${python.version}-setuptools \
                        port:py${python.version}-morbid \
                        port:py${python.version}-demjson
     livecheck.type    none

Modified: trunk/dports/python/py-pandas/Portfile
===================================================================
--- trunk/dports/python/py-pandas/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pandas/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 if {$subport != $name} {
     depends_lib-append  port:py${python.version}-numpy \
                         port:py${python.version}-dateutil \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-scipy \
                         port:py${python.version}-bottleneck \
                         port:py${python.version}-numexpr \

Modified: trunk/dports/python/py-passlib/Portfile
===================================================================
--- trunk/dports/python/py-passlib/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-passlib/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 distname                passlib-${version}
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     checksums           rmd160  61e37ea0e65118410fe129e456336191fd16471b \
                         sha256  00cfb564feb2d97ebaf6b28acdc9277a0c73c3c1df7b2a7b65605c76e724177b

Modified: trunk/dports/python/py-paste/Portfile
===================================================================
--- trunk/dports/python/py-paste/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-paste/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,5 +26,5 @@
 
 if {$name != $subport} {
     depends_lib-append \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-pastedeploy/Portfile
===================================================================
--- trunk/dports/python/py-pastedeploy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pastedeploy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,5 +23,5 @@
 
 if {$name != $subport} {
     depends_build-append \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-pastewebkit/Portfile
===================================================================
--- trunk/dports/python/py-pastewebkit/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pastewebkit/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,5 +25,5 @@
 python.versions		24
 
 if {$subport != $name} {
-    depends_build	port:py${python.version}-distribute
+    depends_build	port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-paver/Portfile
===================================================================
--- trunk/dports/python/py-paver/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-paver/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -37,7 +37,7 @@
     build.cmd           ${python.bin} setup.py
     destroot.cmd        ${python.bin} setup.py
 
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     post-destroot {
         xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}
         xinstall -m 644 -W ${worksrcpath} LICENSE.txt README.rst \

Modified: trunk/dports/python/py-pep8/Portfile
===================================================================
--- trunk/dports/python/py-pep8/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pep8/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,9 +28,8 @@
 python.versions     25 26 27 31 32 33
 
 if {${subport} != ${name}} {
-    depends_build-append    port:py${python.version}-distribute
-    depends_run-append      port:py${python.version}-distribute \
-                            port:${realname}_select
+    depends_lib-append      port:py${python.version}-setuptools
+    depends_run-append      port:${realname}_select
     select.group            ${realname}
     select.file             ${filespath}/${realname}${python.version}
     notes "

Modified: trunk/dports/python/py-pika/Portfile
===================================================================
--- trunk/dports/python/py-pika/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pika/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
                     sha256  e5c0e3e22e56f1767afdd1ca936711ff4a98a684711a5fb20147debc010f1aa0
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
 
     livecheck.type      none
 } else {

Modified: trunk/dports/python/py-pip/Portfile
===================================================================
--- trunk/dports/python/py-pip/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pip/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
                     sha256  145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     python.link_binaries_suffix
     python.move_binaries no

Modified: trunk/dports/python/py-polygon/Portfile
===================================================================
--- trunk/dports/python/py-polygon/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-polygon/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
 patchfiles-append   patch-setup.py.diff
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     variant numpy description {Build with NumPy support} {
         depends_lib-append  port:py${python.version}-numpy

Modified: trunk/dports/python/py-progressbar/Portfile
===================================================================
--- trunk/dports/python/py-progressbar/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-progressbar/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
                     sha256  00a316c1a99b70a803d7430fd088da24f37dbfb64f81c4772b97fbc1e8031de4
 
 if {${name} != ${subport}} {
-    depends_build     port:py${python.version}-distribute
+    depends_build     port:py${python.version}-setuptools
 
     post-destroot {
         set docdir ${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-protobuf/Portfile
===================================================================
--- trunk/dports/python/py-protobuf/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-protobuf/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -42,7 +42,7 @@
 
 if {$subport != $name} {
     depends_lib     port:protobuf-cpp \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 
     worksrcdir      ${worksrcdir}/python
 

Modified: trunk/dports/python/py-psychopy/Portfile
===================================================================
--- trunk/dports/python/py-psychopy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-psychopy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 python.default_version  26
 
 if {$subport != $name} {
-    depends_lib         port:py${python.version}-distribute \
+    depends_lib         port:py${python.version}-setuptools \
                         port:py${python.version}-matplotlib \
                         port:py${python.version}-pil \
                         port:py${python.version}-scipy \

Modified: trunk/dports/python/py-py/Portfile
===================================================================
--- trunk/dports/python/py-py/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-py/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 distname            py-${version}
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_run-append      port:py${python.version}-pytest
 
     # Deactivate hack

Modified: trunk/dports/python/py-pybtex/Portfile
===================================================================
--- trunk/dports/python/py-pybtex/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pybtex/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
 if {${subport} != ${name}} {
     depends_lib         port:py${python.version}-elementtree \
                         port:py${python.version}-parsing \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-yaml
 
     test.run            yes

Modified: trunk/dports/python/py-pyds9/Portfile
===================================================================
--- trunk/dports/python/py-pyds9/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyds9/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 python.versions     25 26 27
 
 if {$subport != $name} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-pyepl/Portfile
===================================================================
--- trunk/dports/python/py-pyepl/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyepl/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -37,7 +37,7 @@
                             port:py${python.version}-pyrex \
                             port:py${python.version}-ode \
                             port:py${python.version}-game \
-                            port:py${python.version}-distribute
+                            port:py${python.version}-setuptools
 
     patchfiles              patch-setup.py.diff \
                             patch-code-hardware-Makefile.diff \

Modified: trunk/dports/python/py-pyface/Portfile
===================================================================
--- trunk/dports/python/py-pyface/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyface/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.versions         25 26 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-traits
 }
 

Modified: trunk/dports/python/py-pygccxml-devel/Portfile
===================================================================
--- trunk/dports/python/py-pygccxml-devel/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pygccxml-devel/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 
 if {$subport != $name} {
     depends_lib     port:gccxml-devel \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 
     test.run        yes
     test.cmd        python${python.branch}

Modified: trunk/dports/python/py-pygments/Portfile
===================================================================
--- trunk/dports/python/py-pygments/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pygments/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
                     sha256  799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
 
     post-destroot {
         set docdir ${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-pygraphviz/Portfile
===================================================================
--- trunk/dports/python/py-pygraphviz/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pygraphviz/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
     depends_build           port:pkgconfig
     depends_lib-append      port:swig-python \
                             path:bin/dot:graphviz \
-                            port:py${python.version}-distribute
+                            port:py${python.version}-setuptools
     livecheck.type          none
 } else {
     livecheck.type          regex

Modified: trunk/dports/python/py-pylibmc/Portfile
===================================================================
--- trunk/dports/python/py-pylibmc/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pylibmc/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 
 if {$subport != $name} {
     depends_lib-append  port:libmemcached \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
 
     if {${os.platform} == "darwin" && ${os.major} <= 10} {
         patchfiles-append patch-pylibmcmodule.c.diff

Modified: trunk/dports/python/py-pylons/Portfile
===================================================================
--- trunk/dports/python/py-pylons/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pylons/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,7 +35,7 @@
 
 if {$name != $subport} {
     depends_lib-append \
-                    port:py${python.version}-distribute \
+                    port:py${python.version}-setuptools \
                     port:py${python.version}-routes \
                     port:py${python.version}-webhelpers \
                     port:py${python.version}-beaker \

Modified: trunk/dports/python/py-pylzma/Portfile
===================================================================
--- trunk/dports/python/py-pylzma/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pylzma/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute
+                        port:py${python.version}-setuptools
 
     post-destroot {
         xinstall -m 644 -W ${worksrcpath} LICENSE.txt readme.txt doc/usage.txt \

Modified: trunk/dports/python/py-pymacs/Portfile
===================================================================
--- trunk/dports/python/py-pymacs/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pymacs/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,5 +26,5 @@
 python.versions	26 27
 
 if {$subport != $name} {
-    depends_lib       port:py${python.version}-distribute
+    depends_lib       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-pymodels/Portfile
===================================================================
--- trunk/dports/python/py-pymodels/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pymodels/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 python.versions     26
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-pymongo/Portfile
===================================================================
--- trunk/dports/python/py-pymongo/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pymongo/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
                     sha256  84ac1da67d0dabc711fa8259324d4e94b26a85411bcf0c12dc80a427d9f93ecc
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     post-destroot {
         xinstall -m 755 -d ${destroot}${python.prefix}/share/doc/${subport}
         xinstall -m 644 -W ${worksrcpath} README.rst \

Modified: trunk/dports/python/py-pymorph/Portfile
===================================================================
--- trunk/dports/python/py-pymorph/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pymorph/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions     26
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 
     depends_lib-append  port:py${python.version}-numpy
 

Modified: trunk/dports/python/py-pymunk/Portfile
===================================================================
--- trunk/dports/python/py-pymunk/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pymunk/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -38,7 +38,7 @@
 }
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
 
     post-build {
         if {![variant_isset debug]} {

Modified: trunk/dports/python/py-pyobjc/Portfile
===================================================================
--- trunk/dports/python/py-pyobjc/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyobjc/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions 24 25 26 27 31 32 33
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute \
+    depends_lib     port:py${python.version}-setuptools \
                     port:py${python.version}-py2app
 
     set readme_name README.txt

Modified: trunk/dports/python/py-pyopencl/Portfile
===================================================================
--- trunk/dports/python/py-pyopencl/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyopencl/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -39,7 +39,7 @@
 
 if {${subport} != ${name}} {
     depends_build-append \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-numpy \
                         port:py${python.version}-mako
 

Modified: trunk/dports/python/py-pyplusplus-devel/Portfile
===================================================================
--- trunk/dports/python/py-pyplusplus-devel/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyplusplus-devel/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 
 if {$subport != $name} {
     depends_lib     port:py${python.version}-pygccxml-devel \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 }
 
 livecheck.type      none

Modified: trunk/dports/python/py-pyproj/Portfile
===================================================================
--- trunk/dports/python/py-pyproj/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyproj/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 python.versions     26 27 32 33
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     # See http://code.google.com/p/pyproj/issues/detail?id=48
     patchfiles-append   patch-setup.py.diff

Modified: trunk/dports/python/py-pyquery/Portfile
===================================================================
--- trunk/dports/python/py-pyquery/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyquery/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions             26 27 31 32
 
 if {${subport} != ${name}} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_run-append      port:py${python.version}-lxml \
                             port:py${python.version}-cssselect
     post-destroot {

Modified: trunk/dports/python/py-pyrant/Portfile
===================================================================
--- trunk/dports/python/py-pyrant/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyrant/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions     26
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-pyro/Portfile
===================================================================
--- trunk/dports/python/py-pyro/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyro/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 python.versions     26 27 31 32 33
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
     livecheck.type  none
 } else {
     livecheck.url   http://pypi.python.org/pypi/Pyro4

Modified: trunk/dports/python/py-pytest/Portfile
===================================================================
--- trunk/dports/python/py-pytest/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pytest/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 use_zip             yes
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 
     patchfiles          patch-setup.py.diff
 

Modified: trunk/dports/python/py-python-daemon/Portfile
===================================================================
--- trunk/dports/python/py-python-daemon/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-python-daemon/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,5 +30,5 @@
 python.versions     27
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-pytools/Portfile
===================================================================
--- trunk/dports/python/py-pytools/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pytools/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions     26 27 31 32 33
 
 if {${subport} != ${name}} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_run-append      port:py${python.version}-decorator
     livecheck.type          none
 } else {

Modified: trunk/dports/python/py-pyttsx/Portfile
===================================================================
--- trunk/dports/python/py-pyttsx/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyttsx/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -19,7 +19,7 @@
 homepage        https://github.com/parente/pyttsx
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     fetch.type      git
     git.url         https://github.com/parente/pyttsx.git
     git.branch      3d13e83b76e9d43d1e86afde8953fcabebb96c01

Modified: trunk/dports/python/py-pyvttbl/Portfile
===================================================================
--- trunk/dports/python/py-pyvttbl/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pyvttbl/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 use_zip             yes
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-numpy \
                         port:py${python.version}-scipy \
                         port:py${python.version}-matplotlib

Modified: trunk/dports/python/py-pywavelets/Portfile
===================================================================
--- trunk/dports/python/py-pywavelets/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-pywavelets/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 
 if {$subport != $name} {
     depends_build-append \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-cython
 
     livecheck.type      none

Modified: trunk/dports/python/py-quadtree/Portfile
===================================================================
--- trunk/dports/python/py-quadtree/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-quadtree/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
 python.versions 25 26
 
 if {$subport != $name} {
-    depends_build port:py${python.version}-distribute
+    depends_build port:py${python.version}-setuptools
 
     # See http://trac.gispython.org/lab/ticket/110
     patchfiles      patch-quadtree-_treemodule.c.diff

Modified: trunk/dports/python/py-rabbyt/Portfile
===================================================================
--- trunk/dports/python/py-rabbyt/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-rabbyt/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions     26
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-rbtools/Portfile
===================================================================
--- trunk/dports/python/py-rbtools/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-rbtools/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
                     sha256  5e429f882c7dff316911ff54ea98d16ab35fd9101d0a38f64cdbc6cc90cfe5d2
 
 if {$subport != $name} {
-    depends_lib-append      port:py${python.version}-distribute
+    depends_lib-append      port:py${python.version}-setuptools
 }
 
 subport py24-rbtools {

Modified: trunk/dports/python/py-rdflib/Portfile
===================================================================
--- trunk/dports/python/py-rdflib/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-rdflib/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions	24 25 26
 
 if {$subport != $name} {
-    depends_lib-append	port:py${python.version}-distribute
+    depends_lib-append	port:py${python.version}-setuptools
 
     test.run		yes
     test.cmd		${python.bin} run_tests.py

Modified: trunk/dports/python/py-readline/Portfile
===================================================================
--- trunk/dports/python/py-readline/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-readline/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
 
 if {$subport != $name} {
     patchfiles	build.sh.patch setup.py.patch
-    depends_build	port:py${python.version}-distribute
+    depends_build	port:py${python.version}-setuptools
     post-destroot {
         copy -force ${filespath}/readline.pth ${filespath}/readline_path.py \
             ${destroot}${python.pkgd}

Modified: trunk/dports/python/py-recaptcha/Portfile
===================================================================
--- trunk/dports/python/py-recaptcha/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-recaptcha/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions		25
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib-append	port:py${python.version}-crypto
     post-destroot {
         xinstall -m 644 ${worksrcpath}/build/lib/recaptcha/__init__.py ${destroot}${python.pkgd}/recaptcha/

Modified: trunk/dports/python/py-redis/Portfile
===================================================================
--- trunk/dports/python/py-redis/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-redis/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-requests/Portfile
===================================================================
--- trunk/dports/python/py-requests/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-requests/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
                     sha256  156bf3ec27ba9ec7e0cf8fbe02808718099d218de403eb64a714d73ba1a29ab1
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     livecheck.type      none
 } else {

Modified: trunk/dports/python/py-roman/Portfile
===================================================================
--- trunk/dports/python/py-roman/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-roman/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
                     rmd160  a8ca66d5fafd340986a45332d861d6bae259fe1e
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
 
     pre-activate {
         if {[file exists ${python.pkgd}/roman.py]

Modified: trunk/dports/python/py-routes/Portfile
===================================================================
--- trunk/dports/python/py-routes/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-routes/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -34,7 +34,7 @@
 
 if {$name != $subport} {
     depends_build-append \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-rtm/Portfile
===================================================================
--- trunk/dports/python/py-rtm/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-rtm/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 python.default_version 27
 
 if {${subport} != ${name}} {
-  depends_lib-append port:py${python.version}-distribute
+  depends_lib-append port:py${python.version}-setuptools
 }
 
 checksums       rmd160 7328c9d118f07fe05b3764d6eb2d7bb5b44728da \

Modified: trunk/dports/python/py-rtree/Portfile
===================================================================
--- trunk/dports/python/py-rtree/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-rtree/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -37,7 +37,7 @@
                     port:spatialindex
 
     depends_build-append \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 
     patchfiles          patch-rtree_core.py.diff
 }

Modified: trunk/dports/python/py-scikit-image/Portfile
===================================================================
--- trunk/dports/python/py-scikit-image/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-scikit-image/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
     depends_build-append \
                         port:py${python.version}-cython
 
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-numpy
 
     depends_run-append  port:py${python.version}-scipy

Modified: trunk/dports/python/py-scikit-learn/Portfile
===================================================================
--- trunk/dports/python/py-scikit-learn/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-scikit-learn/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
 
 if {$subport != $name} {
     depends_lib-append  \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-numpy \
                         port:py${python.version}-scipy
 

Modified: trunk/dports/python/py-scikits-bootstrap/Portfile
===================================================================
--- trunk/dports/python/py-scikits-bootstrap/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-scikits-bootstrap/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 python.versions     26 27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-numpy \
                         port:py${python.version}-scipy
 

Modified: trunk/dports/python/py-scikits-statsmodels/Portfile
===================================================================
--- trunk/dports/python/py-scikits-statsmodels/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-scikits-statsmodels/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -37,7 +37,7 @@
                     port:py${python.version}-scipy \
                     port:py${python.version}-pandas \
                     port:py${python.version}-cython \
-                    port:py${python.version}-distribute \
+                    port:py${python.version}-setuptools \
                     port:py${python.version}-scikits-module
 
     post-patch {

Modified: trunk/dports/python/py-scimath/Portfile
===================================================================
--- trunk/dports/python/py-scimath/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-scimath/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.default_version  27
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib         port:py${python.version}-traits \
                         port:py${python.version}-scipy
 }

Modified: trunk/dports/python/py-scrapy/Portfile
===================================================================
--- trunk/dports/python/py-scrapy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-scrapy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-lxml port:py${python.version}-twisted
 }
 

Modified: trunk/dports/python/py-scss/Portfile
===================================================================
--- trunk/dports/python/py-scss/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-scss/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,5 +28,5 @@
 if {$subport != $name} {
     livecheck.type          none
 
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-selenium/Portfile
===================================================================
--- trunk/dports/python/py-selenium/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-selenium/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,5 +25,5 @@
                     sha256  cac18c32c1e39e2a3959872dcac5cc0386d6f4f553c6dafb59cbaea8178dc7fc
 
 if {$name != $subport} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-setupdocs/Portfile
===================================================================
--- trunk/dports/python/py-setupdocs/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-setupdocs/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
 
     livecheck.type  none
 } else {

Modified: trunk/dports/python/py-shapely/Portfile
===================================================================
--- trunk/dports/python/py-shapely/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-shapely/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
 if {$name != $subport} {
     depends_lib-append      port:geos
     depends_build-append    port:py${python.version}-cython \
-                            port:py${python.version}-distribute
+                            port:py${python.version}-setuptools
 
     patchfiles      patch-shapely_geos.py.diff
 

Modified: trunk/dports/python/py-shove/Portfile
===================================================================
--- trunk/dports/python/py-shove/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-shove/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 python.versions     26 27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-simplejson/Portfile
===================================================================
--- trunk/dports/python/py-simplejson/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-simplejson/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -38,7 +38,7 @@
                     sha256  941a25bbb00b021dbe026b94278d9fab9f4655e11ab76eb3f022a9ee097f0478
 
 if {$name != $subport} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     post-destroot {
         set docdir ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-smisk/Portfile
===================================================================
--- trunk/dports/python/py-smisk/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-smisk/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 if {$subport != $name} {
     depends_lib-append  port:fcgi \
                         port:py${python.version}-cjson \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-elixir \
                         port:py${python.version}-mako \
                         port:py${python.version}-readline \

Modified: trunk/dports/python/py-smmap/Portfile
===================================================================
--- trunk/dports/python/py-smmap/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-smmap/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,5 +24,5 @@
                   rmd160  a030840a5821bf60160fecd3ed1d28d08a075614
 
 if {$subport != $name} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-soaplib/Portfile
===================================================================
--- trunk/dports/python/py-soaplib/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-soaplib/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,7 +35,7 @@
 python.default_version 27
 
 if {${subport} != ${name}} {
-    depends_lib         port:py${python.version}-distribute \
+    depends_lib         port:py${python.version}-setuptools \
                         port:py${python.version}-tz \
                         port:py${python.version}-lxml
 

Modified: trunk/dports/python/py-socketpool/Portfile
===================================================================
--- trunk/dports/python/py-socketpool/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-socketpool/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,7 +32,7 @@
 python.versions     26 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     post-destroot {
         xinstall -d ${destroot}${python.prefix}/share/doc/

Modified: trunk/dports/python/py-sogl/Portfile
===================================================================
--- trunk/dports/python/py-sogl/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-sogl/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,6 +29,6 @@
 python.versions     26
 
 if {$subport !=$name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     # depends_lib         port:py${python.version}-scipy
 }

Modified: trunk/dports/python/py-south/Portfile
===================================================================
--- trunk/dports/python/py-south/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-south/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     livecheck.type      none
 } else {

Modified: trunk/dports/python/py-sqlalchemy/Portfile
===================================================================
--- trunk/dports/python/py-sqlalchemy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-sqlalchemy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -41,7 +41,7 @@
 }
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     post-destroot {
         # Install example files not installed by the Makefile

Modified: trunk/dports/python/py-sqlalchemy-migrate/Portfile
===================================================================
--- trunk/dports/python/py-sqlalchemy-migrate/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-sqlalchemy-migrate/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions   24 25 26 27
 
 if {$subport != $name} {
-    depends_lib       port:py${python.version}-distribute \
+    depends_lib       port:py${python.version}-setuptools \
                       port:py${python.version}-tempita \
                       port:py${python.version}-decorator
     if {${python.version} <= 25} {

Modified: trunk/dports/python/py-stevedore/Portfile
===================================================================
--- trunk/dports/python/py-stevedore/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-stevedore/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,6 +23,6 @@
 python.versions     25 26 27 31 32 33
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     livecheck.type      none
 }

Modified: trunk/dports/python/py-suds/Portfile
===================================================================
--- trunk/dports/python/py-suds/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-suds/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build-append port:py${python.version}-distribute
+    depends_build-append port:py${python.version}-setuptools
 }
 
 if {${name} == ${subport}} { 

Modified: trunk/dports/python/py-suds-jurko/Portfile
===================================================================
--- trunk/dports/python/py-suds-jurko/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-suds-jurko/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,5 +32,5 @@
 python.default_version  27
 
 if {${subport} != ${name}} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-sunpy/Portfile
===================================================================
--- trunk/dports/python/py-sunpy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-sunpy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -38,7 +38,7 @@
                           port:py${python.version}-pandas \
                           port:py${python.version}-beautifulsoup4 \
                           port:py${python.version}-configobj \
-                          port:py${python.version}-distribute \
+                          port:py${python.version}-setuptools \
                           port:py${python.version}-py
 
 }

Modified: trunk/dports/python/py-supervisor/Portfile
===================================================================
--- trunk/dports/python/py-supervisor/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-supervisor/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
 python.versions	24
 
 if {$subport != $name} {
-    depends_lib-append	port:py${python.version}-distribute \
+    depends_lib-append	port:py${python.version}-setuptools \
                 port:py${python.version}-elementtree \
                 port:py${python.version}-meld3 \
                 port:py${python.version}-medusa

Modified: trunk/dports/python/py-symeig/Portfile
===================================================================
--- trunk/dports/python/py-symeig/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-symeig/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,5 +25,5 @@
 
 if {$subport != $name} {
     depends_lib-append      port:py${python.version}-numpy \
-                            port:py${python.version}-distribute
+                            port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-tail/Portfile
===================================================================
--- trunk/dports/python/py-tail/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-tail/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,5 +29,5 @@
 python.versions     27
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-tempita/Portfile
===================================================================
--- trunk/dports/python/py-tempita/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-tempita/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,7 +23,7 @@
     livecheck.type          regex
     livecheck.url           ${homepage}
 } else {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     livecheck.type          none
 }
 

Modified: trunk/dports/python/py-textile/Portfile
===================================================================
--- trunk/dports/python/py-textile/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-textile/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions     24 25 26
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-torndb/Portfile
===================================================================
--- trunk/dports/python/py-torndb/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-torndb/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
                     sha256  e68eb595112601be08a39ec60b7af312cee843fb1d9bb2bf73169d9c4f5e14e4
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-mysql
 
     livecheck.type          none

Modified: trunk/dports/python/py-traits/Portfile
===================================================================
--- trunk/dports/python/py-traits/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-traits/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,6 +27,6 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-numpy
 }

Modified: trunk/dports/python/py-traitsui/Portfile
===================================================================
--- trunk/dports/python/py-traitsui/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-traitsui/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,6 +25,6 @@
 python.versions     25 26 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-pyface
 }

Modified: trunk/dports/python/py-transaction/Portfile
===================================================================
--- trunk/dports/python/py-transaction/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-transaction/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
                     sha256  41ac906c58c4cbf3635956f0cf5b4dee783dec285ac037852484f0a21181c773
 
 if {$name != $subport} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }
 
 subport py25-transaction {

Modified: trunk/dports/python/py-translationstring/Portfile
===================================================================
--- trunk/dports/python/py-translationstring/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-translationstring/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions     24 25 26 27 31 32
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py-trep/Portfile
===================================================================
--- trunk/dports/python/py-trep/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-trep/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -33,7 +33,7 @@
 python.default_version 27
 
 if {$subport != $name} {
-    depends_lib     port:py${python.version}-distribute \
+    depends_lib     port:py${python.version}-setuptools \
                     port:py${python.version}-numpy \
                     port:py${python.version}-scipy \
                     port:py${python.version}-matplotlib \

Modified: trunk/dports/python/py-turbocheetah/Portfile
===================================================================
--- trunk/dports/python/py-turbocheetah/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-turbocheetah/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
 python.versions     24 25
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib         port:py${python.version}-cheetah
     post-destroot {
         xinstall -m 644 -W ${worksrcpath} \

Modified: trunk/dports/python/py-turbogears/Portfile
===================================================================
--- trunk/dports/python/py-turbogears/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-turbogears/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -49,7 +49,7 @@
                         port:py${python.version}-formencode \
                         port:py${python.version}-pastescript \
                         port:py${python.version}-ruledispatch \
-                        port:py${python.version}-distribute \
+                        port:py${python.version}-setuptools \
                         port:py${python.version}-simplejson \
                         port:py${python.version}-turbocheetah \
                         port:py${python.version}-turbojson \

Modified: trunk/dports/python/py-turbokid/Portfile
===================================================================
--- trunk/dports/python/py-turbokid/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-turbokid/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,7 +25,7 @@
 python.versions     24 25
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib         port:py${python.version}-kid
     post-destroot {
         xinstall -m 644 -W ${worksrcpath} \

Modified: trunk/dports/python/py-tweepy/Portfile
===================================================================
--- trunk/dports/python/py-tweepy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-tweepy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.default_version   27
 
 if {${name} != ${subport}} {
-   depends_build    port:py${python.version}-distribute
+   depends_build    port:py${python.version}-setuptools
    post-destroot {
       xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}
       #xinstall -m 644 -W ${worksrcpath} README ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-twforms/Portfile
===================================================================
--- trunk/dports/python/py-twforms/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-twforms/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,5 +27,5 @@
 python.versions		25
 
 if {$subport != $name} {
-	depends_build	port:py${python.version}-distribute
+	depends_build	port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-urlwatch/Portfile
===================================================================
--- trunk/dports/python/py-urlwatch/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-urlwatch/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 livecheck.regex "Current version: (\\d+(?:\\.\\d+)*)"
 
 if {$subport != $name} {
-    depends_build-append  port:py${python.version}-distribute
+    depends_build-append  port:py${python.version}-setuptools
     depends_lib-append    port:py${python.version}-futures
 
     pre-configure {

Modified: trunk/dports/python/py-urwid/Portfile
===================================================================
--- trunk/dports/python/py-urwid/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-urwid/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 
 if {$subport != $name} {
     if {[vercmp ${python.branch} 3.0] >= 0} {
-        depends_build-append port:py${python.version}-distribute
+        depends_build-append port:py${python.version}-setuptools
     }
     
     post-destroot {

Modified: trunk/dports/python/py-virtualenv/Portfile
===================================================================
--- trunk/dports/python/py-virtualenv/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-virtualenv/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -38,7 +38,7 @@
 }
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
     depends_run-append  port:virtualenv_select
 
     select.group        virtualenv

Modified: trunk/dports/python/py-virtualenv-clone/Portfile
===================================================================
--- trunk/dports/python/py-virtualenv-clone/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-virtualenv-clone/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
 python.versions     25 26 27 31 32 33
 
 if {${name} != ${subport}} {
-    depends_build   port:py${python.version}-distribute
+    depends_build   port:py${python.version}-setuptools
     livecheck.type  none
 } else {
     livecheck.type  regex

Modified: trunk/dports/python/py-virtualenvwrapper/Portfile
===================================================================
--- trunk/dports/python/py-virtualenvwrapper/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-virtualenvwrapper/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,7 +23,7 @@
                     sha256  fe62ea3b8a4e177789092c9412fe2ea1a2c8efd0281216f16887e475bde44210
 
 if {$name != $subport} {
-    depends_lib-append  port:py${python.version}-distribute \
+    depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-stevedore \
                         port:py${python.version}-virtualenv \
                         port:py${python.version}-virtualenv-clone

Modified: trunk/dports/python/py-weberror/Portfile
===================================================================
--- trunk/dports/python/py-weberror/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-weberror/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 livecheck.url           ${homepage}
 
 if {$name != $subport} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append \
         port:py${python.version}-paste \
         port:py${python.version}-pygments \

Modified: trunk/dports/python/py-webhelpers/Portfile
===================================================================
--- trunk/dports/python/py-webhelpers/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-webhelpers/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,6 +30,6 @@
                         sha256  ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583
 
 if {$name != $subport} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-markupsafe
 }

Modified: trunk/dports/python/py-webob/Portfile
===================================================================
--- trunk/dports/python/py-webob/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-webob/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,5 +32,5 @@
                     sha256  21f3a2ecea66129b20ba757fafa087af8ba85e413c77972accdeb56a50f1eff6
 
 if {$name != $subport} {
-    depends_lib         port:py${python.version}-distribute
+    depends_lib         port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-webpy/Portfile
===================================================================
--- trunk/dports/python/py-webpy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-webpy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,7 +23,7 @@
 
 if {${subport} != ${name}} {
 
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
     post-destroot   {
         xinstall -m 644 -W ${worksrcpath} ChangeLog.txt LICENSE.txt README.md \

Modified: trunk/dports/python/py-webtest/Portfile
===================================================================
--- trunk/dports/python/py-webtest/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-webtest/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -19,7 +19,7 @@
 livecheck.url           ${homepage}
 
 if {$name != $subport} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-webob
 }
 

Modified: trunk/dports/python/py-werkzeug/Portfile
===================================================================
--- trunk/dports/python/py-werkzeug/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-werkzeug/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -68,7 +68,7 @@
                     sha256  15bbc16f586a9ec6606e8a6005373491270901ef8fd47a91898f5183cd383a28
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-whoosh/Portfile
===================================================================
--- trunk/dports/python/py-whoosh/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-whoosh/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,5 +25,5 @@
                     sha256  15d451a6045bffed6dfc141a72647ec350e08d218ac0f550b0120af81e5152c7
 
 if {$subport != $name} {
-    depends_lib-append  port:py${python.version}-distribute
+    depends_lib-append  port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-workerpool/Portfile
===================================================================
--- trunk/dports/python/py-workerpool/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-workerpool/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -37,7 +37,7 @@
                     rmd160 e7565d81be215d0c728ef7306efa3ebea0fafebd
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 
     post-destroot {
         xinstall -W ${worksrcpath} -m 644 CHANGES LICENSE README \

Modified: trunk/dports/python/py-x2go/Portfile
===================================================================
--- trunk/dports/python/py-x2go/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-x2go/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
 
 if {${subport} != ${name}} {
     livecheck.type          none
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
 } else {
     livecheck.type          regex
     livecheck.url           ${master_sites}

Modified: trunk/dports/python/py-xattr/Portfile
===================================================================
--- trunk/dports/python/py-xattr/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-xattr/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions	   24 25 26 27
 
 if {$subport != $name} {
-    depends_build  port:py${python.version}-distribute
+    depends_build  port:py${python.version}-setuptools
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-xhtml2pdf/Portfile
===================================================================
--- trunk/dports/python/py-xhtml2pdf/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-xhtml2pdf/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 python.versions         26 27
 
 if {$subport != $name} {
-    depends_build-append    port:py${python.version}-distribute
+    depends_build-append    port:py${python.version}-setuptools
     depends_lib-append      port:py${python.version}-html5lib \
                             port:py${python.version}-pil \
                             port:py${python.version}-pypdf \

Modified: trunk/dports/python/py-yolk/Portfile
===================================================================
--- trunk/dports/python/py-yolk/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-yolk/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 python.versions     24 25 26 27
 
 if {$subport != $name} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 
     post-destroot {
         xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py-zc-buildout/Portfile
===================================================================
--- trunk/dports/python/py-zc-buildout/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-zc-buildout/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
 patchfiles          fix-symlink-removal.patch
 
 if {$name != $subport} {
-    depends_lib-append      port:py${python.version}-distribute
+    depends_lib-append      port:py${python.version}-setuptools
     depends_run             port:buildout_select
     select.group            buildout
     select.file             ${filespath}/buildout${python.version}

Modified: trunk/dports/python/py-zc-lockfile/Portfile
===================================================================
--- trunk/dports/python/py-zc-lockfile/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-zc-lockfile/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,5 +31,5 @@
                     sha256  1f170e46eff20ae6c81cad5465f26702f3d3435e0511fb7983cd61a6ed84d5c0
 
 if {$name != $subport} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-zen/Portfile
===================================================================
--- trunk/dports/python/py-zen/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-zen/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,7 +28,7 @@
                     sha256  b4ee66424a1f78c929d500bc74f56a84339ae7cf18b6b9c41117c3c1d16ba87f
 
 if {$name != $subport} {
-    depends_lib     port:py${python.version}-distribute
+    depends_lib     port:py${python.version}-setuptools
 }
 
 subport py25-zen {

Modified: trunk/dports/python/py-zodb/Portfile
===================================================================
--- trunk/dports/python/py-zodb/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-zodb/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,7 +30,7 @@
                     sha256  c857d8a97d331351a3b964f841c263ebf39c862fe1103563fa020a7df1137338
 
 if {$name != $subport} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
     depends_lib         port:py${python.version}-transaction \
                         port:py${python.version}-zc-lockfile \
                         port:py${python.version}-zconfig \

Modified: trunk/dports/python/py-zope-app-module/Portfile
===================================================================
--- trunk/dports/python/py-zope-app-module/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-zope-app-module/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -32,5 +32,5 @@
                     sha256  ef3c1ec5de3b2f86d8fc250e9b7b28faaed3482d699e27915eec68aac2dd944b
 
 if {$name != $subport} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-zope-event/Portfile
===================================================================
--- trunk/dports/python/py-zope-event/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-zope-event/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -28,5 +28,5 @@
                     sha256  47fef2b2e06c16f337601ae01fb9cbc5301e6c5fb35d35bed6e805986dd71b7d
 
 if {$name != $subport} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-zope-keyreference/Portfile
===================================================================
--- trunk/dports/python/py-zope-keyreference/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-zope-keyreference/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,5 +26,5 @@
                     sha256  8cd20b29e3e9ff5ab78212470d87585358c14f08cdfbd153cfb50bbeba8335fc
 
 if {$name != $subport} {
-    depends_build       port:py${python.version}-distribute
+    depends_build       port:py${python.version}-setuptools
 }

Modified: trunk/dports/python/py-zopeinterface/Portfile
===================================================================
--- trunk/dports/python/py-zopeinterface/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py-zopeinterface/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 
 if {${name} != ${subport}} {
 
-depends_build   port:py${python.version}-distribute
+depends_build   port:py${python.version}-setuptools
 
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/doc/${subport}

Modified: trunk/dports/python/py25-authkit/Portfile
===================================================================
--- trunk/dports/python/py25-authkit/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py25-authkit/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -18,4 +18,4 @@
 				sha1 f3dae685aa210c3a27a58817d9841a4cd3ebe2a4 \
 				rmd160 09b4cdaf4c9ab128660a27685746d799c0d8b1b8
 
-depends_build	port:py25-distribute
+depends_build	port:py25-setuptools

Modified: trunk/dports/python/py25-clientcookie/Portfile
===================================================================
--- trunk/dports/python/py25-clientcookie/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py25-clientcookie/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 			sha1    fc54adb762618d3a9fdeca9ed45b982c2bde940c \
 			rmd160  0c557c11efee3ada975235ed72252176c059e5d2
 
-depends_lib-append	port:py25-distribute
+depends_lib-append	port:py25-setuptools
 
 test.run		yes
 test.cmd		${python.bin}

Modified: trunk/dports/python/py25-couchdb/Portfile
===================================================================
--- trunk/dports/python/py25-couchdb/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py25-couchdb/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,12 +25,12 @@
                     sha1 35004c40084097f03dc06a20556b84762e0214c7 \
                     rmd160 d67c310a07d558cdb7be6f12ad871c722f72dcbd
 
-# Use py25-distribute as a library dependency instead of a build
-# dependency because couchdb/__init__.py uses distribute's
+# Use py25-setuptools as a library dependency instead of a build
+# dependency because couchdb/__init__.py uses setuptools's
 # pkg_resources module.
 depends_lib-append  port:py25-cjson \
                     port:py25-httplib2 \
-                    port:py25-distribute
+                    port:py25-setuptools
 
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/CouchDB

Modified: trunk/dports/python/py25-morbid/Portfile
===================================================================
--- trunk/dports/python/py25-morbid/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py25-morbid/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -18,7 +18,7 @@
 master_sites      http://pypi.python.org/packages/source/m/morbid/
 distname          morbid-${version}
 
-depends_lib-append port:py25-distribute \
+depends_lib-append port:py25-setuptools \
                    port:py25-twisted \
                    port:py25-stomper
 

Modified: trunk/dports/python/py25-rope/Portfile
===================================================================
--- trunk/dports/python/py25-rope/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py25-rope/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -16,7 +16,7 @@
 homepage		http://rope.sourceforge.net/
 master_sites	sourceforge:rope
 distname          rope-${version}
-depends_lib       port:py25-distribute
+depends_lib       port:py25-setuptools
 dist_subdir       ${distname}
 checksums       md5     3ef92a3df40aebe475ac4880b0f6381a \
                 sha1    fbe41650037ee412cda7025c8f95bc7c4e8e0159 \

Modified: trunk/dports/python/py25-stomper/Portfile
===================================================================
--- trunk/dports/python/py25-stomper/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py25-stomper/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
 master_sites      http://pypi.python.org/packages/source/s/stomper/
 distname          stomper-${version}
 
-depends_lib-append port:py25-distribute
+depends_lib-append port:py25-setuptools
 
 checksums         md5     193ba3eaa405aa5b590e2d571b65167d \
                   sha1    b3acfe30ce6b6842886b1668cde3203e4e3ab7a3 \

Modified: trunk/dports/python/py26-couchdb/Portfile
===================================================================
--- trunk/dports/python/py26-couchdb/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-couchdb/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,12 +25,12 @@
                     sha1 35004c40084097f03dc06a20556b84762e0214c7 \
                     rmd160 d67c310a07d558cdb7be6f12ad871c722f72dcbd
 
-# Use py26-distribute as a library dependency instead of a build
-# dependency because couchdb/__init__.py uses distribute's
+# Use py26-setuptools as a library dependency instead of a build
+# dependency because couchdb/__init__.py uses setuptools's
 # pkg_resources module.
 depends_lib-append  port:py26-cjson \
                     port:py26-httplib2 \
-                    port:py26-distribute
+                    port:py26-setuptools
 
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/CouchDB

Modified: trunk/dports/python/py26-couchdbkit/Portfile
===================================================================
--- trunk/dports/python/py26-couchdbkit/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-couchdbkit/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,7 +23,7 @@
                     sha1 df1ef7a0836d4f4988e36bd268bb32c6acd38c0e \
                     rmd160 bc80ddb3eb02c16b9b9cc5c8b810d61616f4d382
 
-depends_build       port:py26-distribute
+depends_build       port:py26-setuptools
 depends_lib-append  port:py26-anyjson
 
 post-destroot {

Modified: trunk/dports/python/py26-ete2/Portfile
===================================================================
--- trunk/dports/python/py26-ete2/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-ete2/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,7 +31,7 @@
                     rmd160  a8f1fb53784340f42fb5dcc0266340c4bcb8e4f6
 distname            ete2-${version}
 
-depends_build       port:py26-distribute
+depends_build       port:py26-setuptools
 depends_run         port:py26-mysql \
                     port:py26-scipy \
                     port:py26-pyqt4

Modified: trunk/dports/python/py26-formalchemy/Portfile
===================================================================
--- trunk/dports/python/py26-formalchemy/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-formalchemy/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -18,7 +18,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 depends_lib-append \
     port:py26-sqlalchemy \
     port:py26-tempita \

Modified: trunk/dports/python/py26-pdfminer/Portfile
===================================================================
--- trunk/dports/python/py26-pdfminer/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pdfminer/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -31,5 +31,5 @@
                     sha1    11027db5ad5d787eab5489250ca32f422d279857 \
                     rmd160  fd9d4ca6a0f4e1e001919388b83da9b1a50f9d34
 
-depends_lib-append  port:py26-distribute
+depends_lib-append  port:py26-setuptools
 

Modified: trunk/dports/python/py26-pygccxml/Portfile
===================================================================
--- trunk/dports/python/py26-pygccxml/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pygccxml/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,7 +23,7 @@
                     rmd160  8ca0afd7dcc37f6b12892f7a2962afb514293a37
 
 depends_lib         port:gccxml-devel \
-                    port:py26-distribute
+                    port:py26-setuptools
 
 test.run            yes
 test.cmd            python2.6

Modified: trunk/dports/python/py26-pygooglechart/Portfile
===================================================================
--- trunk/dports/python/py26-pygooglechart/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pygooglechart/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
                 sha1    a227fa9673280ac260da7d9f0d47168072149722 \
                 rmd160  6e8c5076b1659da5bbdc13f6415a9d39c9e3f42b
 
-depends_build   port:py26-distribute
+depends_build   port:py26-setuptools
 
 post-destroot {
     set docdir ${prefix}/share/doc/${name}

Modified: trunk/dports/python/py26-pymvpa/Portfile
===================================================================
--- trunk/dports/python/py26-pymvpa/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pymvpa/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 
 depends_lib             port:py26-numpy \
                         port:git-core \
-                        port:py26-distribute \
+                        port:py26-setuptools \
                         port:py26-scipy \
                         port:py26-pynifti \
                         port:py26-hcluster \

Modified: trunk/dports/python/py26-pynzb/Portfile
===================================================================
--- trunk/dports/python/py26-pynzb/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pynzb/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -29,7 +29,7 @@
                 sha1    cf39d7f32c15f281ab81b0043b4068d101a2cd1f \
                 rmd160  6c206380753f9a871e6f5d4ad237236cda96586d
 
-depends_build   port:py26-distribute
+depends_build   port:py26-setuptools
 
 livecheck.type    regex
 livecheck.url     ${homepage}

Modified: trunk/dports/python/py26-pyphant/Portfile
===================================================================
--- trunk/dports/python/py26-pyphant/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pyphant/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -35,7 +35,7 @@
 
 platforms           darwin
 depends_lib         port:py26-scipy \
-                    port:py26-distribute \
+                    port:py26-setuptools \
                     port:py26-tables \
                     port:py26-antlr3 \
                     port:py26-matplotlib \

Modified: trunk/dports/python/py26-pyphant-fmf/Portfile
===================================================================
--- trunk/dports/python/py26-pyphant-fmf/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pyphant-fmf/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,4 +30,4 @@
                     sha1    07583c39f14249a776e2190f9cd4b79f65ac7210 \
                     rmd160  9396f178be5bfe65ae4fa1d21247e17ffd50e146
 
-depends_build       port:py26-distribute
+depends_build       port:py26-setuptools

Modified: trunk/dports/python/py26-pyphant-imageprocessing/Portfile
===================================================================
--- trunk/dports/python/py26-pyphant-imageprocessing/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pyphant-imageprocessing/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -19,7 +19,7 @@
 homepage            http://www.fmf.uni-freiburg.de/service/servicegruppen/sg_wissinfo/Software/Pyphant
 
 platforms           darwin
-depends_build       port:py26-distribute
+depends_build       port:py26-setuptools
 depends_lib         port:py26-pil
 
 master_sites        sourceforge:pyphant

Modified: trunk/dports/python/py26-pyphant-osc/Portfile
===================================================================
--- trunk/dports/python/py26-pyphant-osc/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pyphant-osc/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 homepage            http://www.fmf.uni-freiburg.de/service/servicegruppen/sg_wissinfo/Software/Pyphant
 
 platforms           darwin
-depends_build       port:py26-distribute
+depends_build       port:py26-setuptools
 # depends_lib         port:py26-pil
 
 master_sites        sourceforge:pyphant

Modified: trunk/dports/python/py26-pyphant-statistics/Portfile
===================================================================
--- trunk/dports/python/py26-pyphant-statistics/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pyphant-statistics/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -15,7 +15,7 @@
 homepage            http://www.fmf.uni-freiburg.de/service/servicegruppen/sg_wissinfo/Software/Pyphant
 
 platforms           darwin
-depends_build       port:py26-distribute
+depends_build       port:py26-setuptools
 # depends_lib         port:py26-pil
 
 master_sites        sourceforge:pyphant

Modified: trunk/dports/python/py26-pyphant-tools/Portfile
===================================================================
--- trunk/dports/python/py26-pyphant-tools/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pyphant-tools/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 homepage            http://www.fmf.uni-freiburg.de/service/servicegruppen/sg_wissinfo/Software/Pyphant
 
 platforms           darwin
-depends_build       port:py26-distribute
+depends_build       port:py26-setuptools
 # depends_lib         port:py26-pil
 
 master_sites        sourceforge:pyphant

Modified: trunk/dports/python/py26-pyplusplus/Portfile
===================================================================
--- trunk/dports/python/py26-pyplusplus/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-pyplusplus/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,5 +24,5 @@
                     rmd160  7a763d1ee504f2f07941bb85b3031903249dd6b3
 
 depends_lib         port:py26-pygccxml \
-                    port:py26-distribute
+                    port:py26-setuptools
 

Modified: trunk/dports/python/py26-recaptcha-client/Portfile
===================================================================
--- trunk/dports/python/py26-recaptcha-client/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-recaptcha-client/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -18,7 +18,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 
 distname                recaptcha-client-${version}
 master_sites            http://pypi.python.org/packages/source/r/recaptcha-client/

Modified: trunk/dports/python/py26-repoze.what/Portfile
===================================================================
--- trunk/dports/python/py26-repoze.what/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-repoze.what/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -19,7 +19,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 depends_lib-append \
     port:py26-paste \
     port:py26-repoze.who \

Modified: trunk/dports/python/py26-repoze.what-pylons/Portfile
===================================================================
--- trunk/dports/python/py26-repoze.what-pylons/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-repoze.what-pylons/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -19,7 +19,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 depends_lib-append \
     port:py26-decorator \
     port:py26-pylons \

Modified: trunk/dports/python/py26-repoze.what-quickstart/Portfile
===================================================================
--- trunk/dports/python/py26-repoze.what-quickstart/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-repoze.what-quickstart/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 depends_lib-append \
     port:py26-repoze.what \
     port:py26-repoze.what.plugins.sql \

Modified: trunk/dports/python/py26-repoze.what.plugins.sql/Portfile
===================================================================
--- trunk/dports/python/py26-repoze.what.plugins.sql/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-repoze.what.plugins.sql/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 depends_lib-append      port:py26-repoze.what port:py26-sqlalchemy
 
 distname                repoze.what.plugins.sql-${version}

Modified: trunk/dports/python/py26-repoze.who/Portfile
===================================================================
--- trunk/dports/python/py26-repoze.who/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-repoze.who/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 livecheck.url       ${homepage}
 
 depends_lib-append \
-    port:py26-distribute \
+    port:py26-setuptools \
     port:py26-paste \
     port:py26-zopeinterface
 

Modified: trunk/dports/python/py26-repoze.who-friendlyform/Portfile
===================================================================
--- trunk/dports/python/py26-repoze.who-friendlyform/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-repoze.who-friendlyform/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 depends_lib-append \
     port:py26-repoze.who \
     port:py26-webob \

Modified: trunk/dports/python/py26-repoze.who-testutil/Portfile
===================================================================
--- trunk/dports/python/py26-repoze.who-testutil/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-repoze.who-testutil/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 depends_lib-append \
     port:py26-paste \
     port:py26-pastedeploy \

Modified: trunk/dports/python/py26-repoze.who.plugins.sa/Portfile
===================================================================
--- trunk/dports/python/py26-repoze.who.plugins.sa/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-repoze.who.plugins.sa/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -20,7 +20,7 @@
 livecheck.type          regex
 livecheck.url           ${homepage}
 
-depends_build-append    port:py26-distribute
+depends_build-append    port:py26-setuptools
 depends_lib-append      port:py26-repoze.who port:py26-sqlalchemy
 
 distname                repoze.who.plugins.sa-${version}

Modified: trunk/dports/python/py26-rope/Portfile
===================================================================
--- trunk/dports/python/py26-rope/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-rope/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -18,7 +18,7 @@
 homepage        http://rope.sourceforge.net/
 master_sites    sourceforge:rope
 distname        rope-${version}
-depends_lib     port:py26-distribute
+depends_lib     port:py26-setuptools
 dist_subdir     ${distname}
 checksums       md5 3ef92a3df40aebe475ac4880b0f6381a \
                 sha1 fbe41650037ee412cda7025c8f95bc7c4e8e0159 \

Modified: trunk/dports/python/py26-tvdb/Portfile
===================================================================
--- trunk/dports/python/py26-tvdb/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py26-tvdb/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -18,4 +18,4 @@
 git.url                 git://github.com/dbr/tvdb_api.git
 git.branch              ${version}
 
-depends_lib-append      port:py26-distribute
+depends_lib-append      port:py26-setuptools

Modified: trunk/dports/python/py27-argh/Portfile
===================================================================
--- trunk/dports/python/py27-argh/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py27-argh/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,4 +22,4 @@
 checksums           rmd160  fdefc7d0dc7c5f359f48dd5d251f5967a88e7eea \
                     sha256  319f323f6e0a37206fc161b915c40820c74f08ae77e4721de5911d16e54ef8c9
 
-depends_lib-append  port:py27-distribute
+depends_lib-append  port:py27-setuptools

Modified: trunk/dports/python/py27-blinker/Portfile
===================================================================
--- trunk/dports/python/py27-blinker/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py27-blinker/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -24,7 +24,7 @@
 distname            ${real_name}-${version}
 use_zip             yes
 
-depends_lib         port:py27-distribute
+depends_lib         port:py27-setuptools
 
 checksums           md5     b93962f6b0d854a9659d397db2a7894d \
                     sha1    a0d939720065159e7c5900400cbb2a0eb9cb7316 \

Modified: trunk/dports/python/py27-brownie/Portfile
===================================================================
--- trunk/dports/python/py27-brownie/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py27-brownie/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,4 +23,4 @@
                     sha1    6f7bd0dcaf9fe0e7a6a238f78d50b77ea71d67a6 \
                     rmd160  3a8e0c06490d6419cdc1f88d4df604e609f50660
 
-depends_build       port:py27-distribute
+depends_build       port:py27-setuptools

Modified: trunk/dports/python/py27-couchdb/Portfile
===================================================================
--- trunk/dports/python/py27-couchdb/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py27-couchdb/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -25,12 +25,12 @@
                     sha1 35004c40084097f03dc06a20556b84762e0214c7 \
                     rmd160 d67c310a07d558cdb7be6f12ad871c722f72dcbd
 
-# Use py27-distribute as a library dependency instead of a build
-# dependency because couchdb/__init__.py uses distribute's
+# Use py27-setuptools as a library dependency instead of a build
+# dependency because couchdb/__init__.py uses setuptools's
 # pkg_resources module.
 depends_lib-append  port:py27-cjson \
                     port:py27-httplib2 \
-                    port:py27-distribute
+                    port:py27-setuptools
 
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/CouchDB

Modified: trunk/dports/python/py27-pathtools/Portfile
===================================================================
--- trunk/dports/python/py27-pathtools/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py27-pathtools/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -23,4 +23,4 @@
                     sha1    765b6a002a23d802d6a02d5c1bd14922339c98c1 \
                     rmd160  cdc2001f64f953bcff70e1dd85d2527665a12272
 
-depends_build       port:py27-distribute
+depends_build       port:py27-setuptools

Modified: trunk/dports/python/py27-pdfminer/Portfile
===================================================================
--- trunk/dports/python/py27-pdfminer/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py27-pdfminer/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -30,5 +30,5 @@
                     sha1    95644d000d28a5b256c08d40d71d58d5c43e58ab \
                     rmd160  89716c3019186f4fb987ef46f802f835eb899df5
 
-depends_build-append  port:py27-distribute
+depends_build-append  port:py27-setuptools
 

Modified: trunk/dports/python/py27-prettytable/Portfile
===================================================================
--- trunk/dports/python/py27-prettytable/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py27-prettytable/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
 master_sites        http://pypi.python.org/packages/source/P/PrettyTable
 distname            prettytable-${version}
 
-depends_build       port:py27-distribute
+depends_build       port:py27-setuptools
 
 checksums           rmd160  bd1ba3653d6665dec40f0954bc371aab19dc4353 \
                     sha256  4085e520da758d6e22e115377ca5d3723f04fb186303879ab98277070444a9cb

Modified: trunk/dports/python/py27-rope/Portfile
===================================================================
--- trunk/dports/python/py27-rope/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/python/py27-rope/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -18,7 +18,7 @@
 homepage        http://rope.sourceforge.net/
 master_sites    sourceforge:rope
 distname        rope-${version}
-depends_lib     port:py27-distribute
+depends_lib     port:py27-setuptools
 dist_subdir     ${distname}
 checksums       md5 3ef92a3df40aebe475ac4880b0f6381a \
                 sha1 fbe41650037ee412cda7025c8f95bc7c4e8e0159 \

Modified: trunk/dports/science/bob/Portfile
===================================================================
--- trunk/dports/science/bob/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/science/bob/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -55,7 +55,7 @@
 variant python26 conflicts python27 description "Build for python 2.6" {
     depends_build-append  port:py26-sphinx
     
-    depends_lib-append    port:py26-distribute \
+    depends_lib-append    port:py26-setuptools \
       port:py26-numpy \
       port:py26-matplotlib \
       port:py26-sqlalchemy \
@@ -68,7 +68,7 @@
 variant python27 conflicts python26 description "Build for python 2.7" {
     depends_build-append  port:py27-sphinx
     
-    depends_lib-append    port:py27-distribute \
+    depends_lib-append    port:py27-setuptools \
       port:py27-numpy \
       port:py27-matplotlib \
       port:py27-sqlalchemy \

Modified: trunk/dports/science/nMOLDYN/Portfile
===================================================================
--- trunk/dports/science/nMOLDYN/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/science/nMOLDYN/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
 
 patchfiles          setup.py.patch
 
-depends_build       port:py26-distribute
+depends_build       port:py26-setuptools
 depends_lib         port:py26-tkinter \
                     port:py26-MMTK \
                     port:py26-pyro \

Modified: trunk/dports/sysutils/glances/Portfile
===================================================================
--- trunk/dports/sysutils/glances/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/sysutils/glances/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
 checksums           rmd160  013a4d6efcaecc589a10f0a94f248430c3d6021c \
                     sha256  a1d31eed4da0a597ff2458f29e97c46c911e37306461da44b917e7b0b8c417ff
 
-depends_build       port:py${python.version}-distribute
+depends_build       port:py${python.version}-setuptools
 
 depends_lib         port:py${python.version}-psutil
 

Modified: trunk/dports/sysutils/pssh/Portfile
===================================================================
--- trunk/dports/sysutils/pssh/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/sysutils/pssh/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -12,7 +12,7 @@
 supported_archs     noarch
 license             BSD
 maintainers         dports openmaintainer
-depends_build       port:py${python.default_version}-distribute
+depends_build       port:py${python.default_version}-setuptools
 
 description         parallel versions of ssh tools
 long_description    Commands for performing ssh operations in parallel  \

Modified: trunk/dports/sysutils/timedrive/Portfile
===================================================================
--- trunk/dports/sysutils/timedrive/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/sysutils/timedrive/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -21,7 +21,7 @@
 depends_build-append \
                     port:py27-pyqt4 \
                     port:py27-sip \
-                    port:py27-distribute
+                    port:py27-setuptools
 depends_lib-append  port:duplicity
 depends_run-append  port:ncftp
 

Modified: trunk/dports/textproc/rst2pdf/Portfile
===================================================================
--- trunk/dports/textproc/rst2pdf/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/textproc/rst2pdf/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -26,7 +26,7 @@
 
 depends_lib-append  port:py${python.version}-reportlab \
                     port:py${python.version}-docutils \
-                    port:py${python.version}-distribute
+                    port:py${python.version}-setuptools
 
 depends_run         port:py${python.version}-pygments
 

Modified: trunk/dports/www/loggerhead/Portfile
===================================================================
--- trunk/dports/www/loggerhead/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/www/loggerhead/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -27,7 +27,7 @@
                     sha1 910b5f569c8647294cabfa45698909b1fffda1ee \
                     rmd160 847e3c12eff66e9fdf617e0ef7523f7f74e3c82c
 
-depends_lib-append  port:py27-distribute \
+depends_lib-append  port:py27-setuptools \
                     port:py27-paste \
                     port:py27-simpletal \
                     port:bzr

Modified: trunk/dports/x11/gtimelog/Portfile
===================================================================
--- trunk/dports/x11/gtimelog/Portfile	2013-06-11 13:14:23 UTC (rev 106910)
+++ trunk/dports/x11/gtimelog/Portfile	2013-06-11 14:40:14 UTC (rev 106911)
@@ -22,7 +22,7 @@
 test.run            yes
 
 depends_lib         port:py25-pygtk \
-                    port:py25-distribute
+                    port:py25-setuptools
 
 checksums           md5     7363d189c1c1bb386e2095d80ca218b4 \
                     sha1    01ca545eb048b2c8abea96560d6e72c56922bf25 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130611/d6249d17/attachment-0001.html>


More information about the macports-changes mailing list