aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES13
-rw-r--r--Mk/bsd.python.mk131
-rw-r--r--UPDATING24
-rw-r--r--archivers/py-lzma/Makefile1
-rw-r--r--astro/py-metar/Makefile1
-rw-r--r--astro/pyephem/Makefile5
-rw-r--r--audio/py-ao/Makefile1
-rw-r--r--audio/py-apetag/Makefile1
-rw-r--r--audio/py-cddb/Makefile1
-rw-r--r--audio/py-eyed3/Makefile3
-rw-r--r--audio/py-flac/Makefile1
-rw-r--r--audio/py-id3/Makefile1
-rw-r--r--audio/py-karaoke/Makefile1
-rw-r--r--audio/py-libtunepimp/Makefile1
-rw-r--r--audio/py-mad/Makefile1
-rw-r--r--audio/py-musepack/Makefile2
-rw-r--r--audio/py-musicbrainz/Makefile1
-rw-r--r--audio/py-musicbrainz2/Makefile1
-rw-r--r--audio/py-ogg/Makefile1
-rw-r--r--audio/py-openal/Makefile1
-rw-r--r--audio/py-sdl_mixer/Makefile1
-rw-r--r--audio/py-speex/Makefile1
-rw-r--r--audio/py-taglib/Makefile2
-rw-r--r--audio/py-vorbis/Makefile3
-rw-r--r--audio/py-xmms/Makefile1
-rw-r--r--audio/pysol-sound-server/Makefile2
-rw-r--r--audio/pytone/Makefile1
-rw-r--r--audio/sonata/Makefile1
-rw-r--r--cad/pythoncad/Makefile2
-rw-r--r--comms/py-bulksms/Makefile2
-rw-r--r--comms/py-lirc/Makefile1
-rw-r--r--comms/py-serial/Makefile1
-rw-r--r--databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc20
-rw-r--r--databases/hk_classes/Makefile3
-rw-r--r--databases/pgworksheet/Makefile1
-rw-r--r--databases/py-Elixir/Makefile1
-rw-r--r--databases/py-MySQL/Makefile4
-rw-r--r--databases/py-MySQL/files/Makefile.pre.in2
-rw-r--r--databases/py-MySQLdb-devel/Makefile2
-rw-r--r--databases/py-MySQLdb/Makefile2
-rw-r--r--databases/py-PyGreSQL/Makefile1
-rw-r--r--databases/py-PySQLite10/Makefile1
-rw-r--r--databases/py-PySQLite11/Makefile1
-rw-r--r--databases/py-axiom/Makefile1
-rw-r--r--databases/py-bsddb/Makefile2
-rw-r--r--databases/py-cdb/Makefile1
-rw-r--r--databases/py-dbutils/Makefile1
-rw-r--r--databases/py-forgetsql/Makefile1
-rw-r--r--databases/py-gdbm/Makefile1
-rw-r--r--databases/py-memcached/Makefile1
-rw-r--r--databases/py-mssql/Makefile1
-rw-r--r--databases/py-rrdtool_lgpl/Makefile1
-rw-r--r--databases/py-sqlalchemy/Makefile2
-rw-r--r--databases/py-sqlalchemy06/Makefile2
-rw-r--r--databases/py-sqlite3/Makefile4
-rw-r--r--databases/py-sqlobject/Makefile2
-rw-r--r--databases/py-sqlrelay/Makefile2
-rw-r--r--databases/py25-bsddb/Makefile2
-rw-r--r--databases/zodb3/Makefile1
-rw-r--r--deskutils/adesklets/Makefile1
-rw-r--r--deskutils/ljcharm/Makefile1
-rw-r--r--deskutils/py-dosage/Makefile1
-rw-r--r--deskutils/py-tagfu/Makefile2
-rw-r--r--deskutils/pybookreader/Makefile1
-rw-r--r--deskutils/pypanel/Makefile1
-rw-r--r--devel/bazaar-ng/Makefile2
-rw-r--r--devel/bisongen/Makefile1
-rw-r--r--devel/bzr/Makefile2
-rw-r--r--devel/bzrtools/Makefile1
-rw-r--r--devel/codeville/Makefile1
-rw-r--r--devel/ditrack/Makefile3
-rw-r--r--devel/drpython/Makefile1
-rw-r--r--devel/kodos/Makefile1
-rw-r--r--devel/libredblack/Makefile2
-rw-r--r--devel/nx/Makefile1
-rw-r--r--devel/py-Breve/Makefile1
-rw-r--r--devel/py-Jinja/Makefile1
-rw-r--r--devel/py-Jinja2/Makefile1
-rw-r--r--devel/py-asn1/Makefile1
-rw-r--r--devel/py-astng/Makefile1
-rw-r--r--devel/py-babel/Makefile16
-rw-r--r--devel/py-babel/files/pkg-deinstall.in17
-rw-r--r--devel/py-babel/files/pkg-install.in16
-rw-r--r--devel/py-babel/pkg-plist916
-rw-r--r--devel/py-bison/Makefile1
-rw-r--r--devel/py-celementtree/Makefile1
-rw-r--r--devel/py-cheetah/Makefile3
-rw-r--r--devel/py-cjson/Makefile1
-rw-r--r--devel/py-cxx/Makefile2
-rw-r--r--devel/py-dateutil/Makefile1
-rw-r--r--devel/py-decorator/Makefile12
-rw-r--r--devel/py-decorator/pkg-plist13
-rw-r--r--devel/py-dialog/Makefile1
-rw-r--r--devel/py-durus/Makefile1
-rw-r--r--devel/py-elementtree/Makefile1
-rw-r--r--devel/py-epsilon/Makefile1
-rw-r--r--devel/py-fam/Makefile1
-rw-r--r--devel/py-fileutils/Makefile1
-rw-r--r--devel/py-flakes/Makefile1
-rw-r--r--devel/py-fortran/Makefile1
-rw-r--r--devel/py-freebsd/Makefile1
-rw-r--r--devel/py-fusefs/Makefile3
-rw-r--r--devel/py-game/Makefile3
-rw-r--r--devel/py-gdata/Makefile1
-rw-r--r--devel/py-generate/Makefile1
-rw-r--r--devel/py-grouch/Makefile1
-rw-r--r--devel/py-icalendar/Makefile1
-rw-r--r--devel/py-instant/Makefile2
-rw-r--r--devel/py-json-py/Makefile4
-rw-r--r--devel/py-kid/Makefile1
-rw-r--r--devel/py-kjbuckets/Makefile1
-rw-r--r--devel/py-kqueue/Makefile1
-rw-r--r--devel/py-levenshtein/Makefile1
-rw-r--r--devel/py-ll-core/pkg-plist2
-rw-r--r--devel/py-lxml/Makefile1
-rw-r--r--devel/py-magic/Makefile2
-rw-r--r--devel/py-mx-experimental/Makefile1
-rw-r--r--devel/py-myghtyutils/Makefile13
-rw-r--r--devel/py-myghtyutils/pkg-plist4
-rw-r--r--devel/py-ncurses/Makefile1
-rw-r--r--devel/py-nose/Makefile9
-rw-r--r--devel/py-nose/pkg-plist164
-rw-r--r--devel/py-notifier/Makefile1
-rw-r--r--devel/py-ocempgui/Makefile1
-rw-r--r--devel/py-ode/Makefile1
-rw-r--r--devel/py-parsedatetime/Makefile1
-rw-r--r--devel/py-parsing/Makefile1
-rw-r--r--devel/py-pqueue/Makefile1
-rw-r--r--devel/py-protocols-devel/Makefile2
-rw-r--r--devel/py-protocols/Makefile1
-rw-r--r--devel/py-pydasm/Makefile1
-rw-r--r--devel/py-pytz/Makefile1
-rw-r--r--devel/py-pyutil/Makefile24
-rw-r--r--devel/py-pyutil/pkg-plist3
-rw-r--r--devel/py-rbtree/Makefile28
-rw-r--r--devel/py-rbtree/pkg-plist26
-rw-r--r--devel/py-repl/Makefile1
-rw-r--r--devel/py-resourcepackage/Makefile1
-rw-r--r--devel/py-reverse/Makefile1
-rw-r--r--devel/py-reverse/files/patch-setup.py15
-rw-r--r--devel/py-ro/Makefile1
-rw-r--r--devel/py-ruledispatch/Makefile2
-rw-r--r--devel/py-sendfile/Makefile2
-rw-r--r--devel/py-setuptools/Makefile1
-rw-r--r--devel/py-simplejson/Makefile1
-rw-r--r--devel/py-simpleparse/Makefile2
-rw-r--r--devel/py-simpletal/Makefile1
-rw-r--r--devel/py-simpy/Makefile1
-rw-r--r--devel/py-statgrab/Makefile1
-rw-r--r--devel/py-tconfpy/Makefile3
-rw-r--r--devel/py-testgears/Makefile10
-rw-r--r--devel/py-testgears/files/pkg-deinstall.in17
-rw-r--r--devel/py-testgears/pkg-plist3
-rw-r--r--devel/py-trace2html/Makefile1
-rw-r--r--devel/py-turbokid/Makefile4
-rw-r--r--devel/py-turbokid/distinfo9
-rw-r--r--devel/py-twisted/Makefile2
-rw-r--r--devel/py-twistedCore/Makefile1
-rw-r--r--devel/py-twistedFlow/Makefile1
-rw-r--r--devel/py-twistedRunner/Makefile1
-rw-r--r--devel/py-unit/Makefile1
-rw-r--r--devel/py-utils/Makefile2
-rw-r--r--devel/py-utils/files/patch-python2535
-rw-r--r--devel/py-vmaps/Makefile2
-rw-r--r--devel/py-wsgiutils/Makefile15
-rw-r--r--devel/py-wsgiutils/files/pkg-deinstall.in17
-rw-r--r--devel/py-wsgiutils/files/pkg-install.in16
-rw-r--r--devel/py-xdg/Makefile1
-rw-r--r--devel/py-yaml/Makefile1
-rw-r--r--devel/py-zconfig/Makefile1
-rw-r--r--devel/py-zope.interface/Makefile2
-rw-r--r--devel/py-zopeInterface/Makefile2
-rw-r--r--devel/pychecker/Makefile1
-rw-r--r--devel/pylint/Makefile10
-rw-r--r--devel/pylint/pkg-plist4
-rw-r--r--devel/pymacs/Makefile6
-rw-r--r--devel/pyrex/Makefile1
-rw-r--r--devel/scons/Makefile1
-rw-r--r--devel/tpg/Makefile1
-rw-r--r--dns/py-adns/Makefile1
-rw-r--r--dns/py-dns/Makefile1
-rw-r--r--dns/py-twistedNames/Makefile1
-rw-r--r--emulators/dynagen/Makefile1
-rw-r--r--emulators/xgngeo/Makefile1
-rw-r--r--finance/sabernetdcs-client/Makefile4
-rw-r--r--finance/tinyerp-server/Makefile1
-rw-r--r--ftp/py-curl/Makefile1
-rw-r--r--games/adonthell/Makefile5
-rw-r--r--games/balazar/Makefile2
-rw-r--r--games/balazarbrothers/Makefile1
-rw-r--r--games/bubbros/files/patch-bubbob-statesaver.c28
-rw-r--r--games/gnomesudoku/Makefile2
-rw-r--r--games/pydance/Makefile1
-rw-r--r--games/slune/Makefile2
-rw-r--r--graphics/crystalentitylayer-devel/Makefile2
-rw-r--r--graphics/crystalentitylayer/Makefile2
-rw-r--r--graphics/driconf/Makefile2
-rw-r--r--graphics/gnofract4d/Makefile2
-rw-r--r--graphics/imgseek/Makefile1
-rw-r--r--graphics/mirage/Makefile2
-rw-r--r--graphics/py-amanith/Makefile1
-rw-r--r--graphics/py-cgkit/Makefile1
-rw-r--r--graphics/py-chart/Makefile1
-rw-r--r--graphics/py-editobj/Makefile1
-rw-r--r--graphics/py-freeimagepy/Makefile2
-rw-r--r--graphics/py-gd/Makefile1
-rw-r--r--graphics/py-gdchart2/Makefile2
-rw-r--r--graphics/py-graphviz/Makefile1
-rw-r--r--graphics/py-imaging/Makefile2
-rw-r--r--graphics/py-ming/Makefile2
-rw-r--r--graphics/py-opengl/Makefile1
-rw-r--r--graphics/py-soya3d/Makefile2
-rw-r--r--graphics/skencil/Makefile1
-rw-r--r--irc/py-irclib/Makefile1
-rw-r--r--irc/py-supybot/Makefile1
-rw-r--r--japanese/kana-no-quiz/Makefile4
-rw-r--r--japanese/pycodec/Makefile1
-rw-r--r--japanese/trac/Makefile2
-rw-r--r--lang/f2py/Makefile2
-rw-r--r--lang/py-mx-base/Makefile2
-rw-r--r--lang/py-prolog/Makefile1
-rw-r--r--lang/python-doc-html/distinfo17
-rw-r--r--lang/python/Makefile41
-rw-r--r--lang/python/distinfo3
-rw-r--r--lang/python23/Makefile20
-rw-r--r--lang/python23/pkg-plist4
-rw-r--r--lang/python24/Makefile43
-rw-r--r--lang/python24/files/patch-setup.py14
-rw-r--r--lang/python24/pkg-plist12
-rw-r--r--lang/python25/Makefile35
-rw-r--r--lang/python25/distinfo6
-rw-r--r--lang/python25/pkg-plist12
-rw-r--r--lang/python26/Makefile35
-rw-r--r--lang/python26/distinfo6
-rw-r--r--lang/python26/pkg-plist12
-rw-r--r--lang/python27/Makefile35
-rw-r--r--lang/python27/distinfo6
-rw-r--r--lang/python27/pkg-plist12
-rw-r--r--lang/python30/Makefile35
-rw-r--r--lang/python30/distinfo6
-rw-r--r--lang/python30/pkg-plist12
-rw-r--r--lang/python31/Makefile35
-rw-r--r--lang/python31/distinfo6
-rw-r--r--lang/python31/pkg-plist12
-rw-r--r--lang/python32/Makefile35
-rw-r--r--lang/python32/distinfo6
-rw-r--r--lang/python32/pkg-plist12
-rw-r--r--mail/gmail-notify/Makefile3
-rw-r--r--mail/gmail-notify/files/Makefile.in (renamed from mail/gmail-notify/files/Makefile)2
-rw-r--r--mail/mailman/Makefile1
-rw-r--r--mail/mixminion/Makefile2
-rw-r--r--mail/py-spambayes/files/patch-python2557
-rw-r--r--mail/py-spf/Makefile1
-rw-r--r--mail/py-turbomail/Makefile2
-rw-r--r--mail/py-twistedMail/Makefile1
-rw-r--r--math/biggles/Makefile1
-rw-r--r--math/gracetmpl/Makefile4
-rw-r--r--math/py-bitvector/Makefile1
-rw-r--r--math/py-gato/Makefile3
-rw-r--r--math/py-gnuplot/Makefile1
-rw-r--r--math/py-gsl/Makefile1
-rw-r--r--math/py-mpz/Makefile1
-rw-r--r--math/py-numeric/Makefile2
-rw-r--r--math/py-numeric17/Makefile6
-rw-r--r--math/py-probstat/Makefile1
-rw-r--r--math/py-scientific/Makefile1
-rw-r--r--math/vtk-python/Makefile1
-rw-r--r--misc/pantry/Makefile1
-rw-r--r--misc/py-osd/Makefile1
-rw-r--r--misc/py-yolk/Makefile18
-rw-r--r--misc/py-yolk/pkg-plist4
-rw-r--r--misc/pylize/Makefile2
-rw-r--r--net-im/py-jabber/Makefile2
-rw-r--r--net-im/py-msnp/Makefile1
-rw-r--r--net-im/py-pyxmpp/Makefile3
-rw-r--r--net-im/py-twistedWords/Makefile1
-rw-r--r--net-mgmt/py-flowtools/Makefile1
-rw-r--r--net-mgmt/py-ipy/Makefile1
-rw-r--r--net-mgmt/py-snmp/Makefile1
-rw-r--r--net-mgmt/py-snmp2/Makefile1
-rw-r--r--net-mgmt/py-snmp4-apps/Makefile1
-rw-r--r--net-mgmt/py-snmp4-mibs/Makefile1
-rw-r--r--net-mgmt/py-snmp4/Makefile1
-rw-r--r--net-mgmt/py-twistedSNMP/Makefile1
-rw-r--r--net-mgmt/py-yapsnmp/files/patch-configure2
-rw-r--r--net-p2p/btqueue/Makefile1
-rw-r--r--net-p2p/nicotine-plus/Makefile1
-rw-r--r--net-p2p/py-bittornado/Makefile1
-rw-r--r--net-p2p/py-fngrab/Makefile1
-rw-r--r--net-p2p/py-kenosis-bittorrent/Makefile1
-rw-r--r--net-p2p/py-py2play/Makefile1
-rw-r--r--net-p2p/py-vertex/Makefile1
-rw-r--r--net/pdb/pkg-plist20
-rw-r--r--net/py-GeoIP/Makefile1
-rw-r--r--net/py-google/Makefile2
-rw-r--r--net/py-ldap2/Makefile1
-rw-r--r--net/py-libdnet/Makefile2
-rw-r--r--net/py-mantissa/Makefile1
-rw-r--r--net/py-netstring/Makefile1
-rw-r--r--net/py-pcap/Makefile1
-rw-r--r--net/py-pypcap/Makefile2
-rw-r--r--net/py-rrdtool_lgpl/Makefile1
-rw-r--r--net/py-samba/Makefile2
-rw-r--r--net/py-soappy-devel/Makefile1
-rw-r--r--net/py-soappy-devel/files/patch-python2556
-rw-r--r--net/py-soappy/Makefile1
-rw-r--r--net/py-soappy/files/patch-python2556
-rw-r--r--net/py-spreadmodule/Makefile1
-rw-r--r--net/py-tofu/Makefile1
-rw-r--r--net/py-twistedPair/Makefile1
-rw-r--r--net/py-twitter/Makefile9
-rw-r--r--net/py-twitter/pkg-plist4
-rw-r--r--net/py-xmlrpc/Makefile1
-rw-r--r--net/py-yadis/Makefile1
-rw-r--r--net/py-zsi-devel/Makefile1
-rw-r--r--net/py-zsi/Makefile1
-rw-r--r--net/pygopherd/Makefile1
-rw-r--r--net/splatd/Makefile2
-rw-r--r--net/straw/Makefile2
-rw-r--r--net/tcpwatch/Makefile1
-rw-r--r--news/py-twistedNews/Makefile1
-rw-r--r--news/pyne/Makefile4
-rw-r--r--ports-mgmt/pkg_trackinst/Makefile1
-rw-r--r--print/py-fonttools/Makefile3
-rw-r--r--print/py-reportlab/Makefile2
-rw-r--r--print/py-reportlab2/Makefile1
-rw-r--r--print/py-rtf/Makefile1
-rw-r--r--print/ttfquery/Makefile1
-rw-r--r--science/mayavi/Makefile1
-rw-r--r--science/py-paida/Makefile1
-rw-r--r--security/denyhosts/Makefile1
-rw-r--r--security/pssh/Makefile18
-rw-r--r--security/pssh/pkg-plist4
-rw-r--r--security/py-cerealizer/Makefile1
-rw-r--r--security/py-clamav/Makefile1
-rw-r--r--security/py-crack/Makefile4
-rw-r--r--security/py-fchksum/Makefile1
-rw-r--r--security/py-gnupg/Makefile1
-rw-r--r--security/py-gnutls/Makefile1
-rw-r--r--security/py-m2crypto/Makefile1
-rw-r--r--security/py-mcrypt/Makefile1
-rw-r--r--security/py-mhash/Makefile1
-rw-r--r--security/py-openid/Makefile1
-rw-r--r--security/py-openssl/Makefile1
-rw-r--r--security/py-posix1e/Makefile1
-rw-r--r--security/py-pow/Makefile1
-rw-r--r--security/py-twistedConch/Makefile1
-rw-r--r--security/py-xmlsec/Makefile1
-rw-r--r--security/revelation/Makefile2
-rw-r--r--security/umit/Makefile1
-rw-r--r--security/vinetto/Makefile1
-rw-r--r--sysutils/farbot/Makefile2
-rw-r--r--sysutils/luma/Makefile1
-rw-r--r--textproc/py-4suite-xml/Makefile2
-rw-r--r--textproc/py-4suite-xml/pkg-plist1
-rw-r--r--textproc/py-4suite/Makefile4
-rw-r--r--textproc/py-dsv/Makefile1
-rw-r--r--textproc/py-empy/Makefile1
-rw-r--r--textproc/py-enchant/Makefile1
-rw-r--r--textproc/py-excelerator/Makefile1
-rw-r--r--textproc/py-expat/Makefile2
-rw-r--r--textproc/py-genshi-devel/Makefile12
-rw-r--r--textproc/py-genshi-devel/pkg-plist5
-rw-r--r--textproc/py-genshi/Makefile12
-rw-r--r--textproc/py-genshi/pkg-plist5
-rw-r--r--textproc/py-hyperestraier-python/Makefile1
-rw-r--r--textproc/py-hyperestraier/Makefile3
-rw-r--r--textproc/py-ltxml/Makefile1
-rw-r--r--textproc/py-pygments/Makefile16
-rw-r--r--textproc/py-pygments/pkg-plist255
-rw-r--r--textproc/py-rdflib/Makefile23
-rw-r--r--textproc/py-rdflib/pkg-plist4
-rw-r--r--textproc/py-reverend/Makefile1
-rw-r--r--textproc/py-rss2gen/Makefile1
-rw-r--r--textproc/py-rxp/Makefile2
-rw-r--r--textproc/py-sgrep/Makefile2
-rw-r--r--textproc/py-syck/Makefile2
-rw-r--r--textproc/py-tvgrab/Makefile1
-rw-r--r--textproc/py-twistedLore/Makefile1
-rw-r--r--textproc/py-wordnet/Makefile1
-rw-r--r--textproc/py-xlwriter/Makefile1
-rw-r--r--textproc/py-xml/Makefile1
-rw-r--r--textproc/py-xmltools/Makefile3
-rw-r--r--textproc/py-xmltv/Makefile1
-rw-r--r--textproc/py-zpt/Makefile3
-rw-r--r--textproc/py2html/Makefile2
-rw-r--r--textproc/roap/Makefile1
-rw-r--r--textproc/silvercity/Makefile1
-rw-r--r--textproc/xxdiff-scripts/Makefile1
-rw-r--r--www/feedjack/Makefile2
-rw-r--r--www/google-sitemapgen/Makefile1
-rw-r--r--www/mod_python3/Makefile1
-rw-r--r--www/moinmoin/Makefile1
-rw-r--r--www/newsfeed/Makefile1
-rw-r--r--www/plone/Makefile8
-rw-r--r--www/plone3/Makefile8
-rw-r--r--www/py-beaker/Makefile13
-rw-r--r--www/py-beaker/pkg-plist94
-rw-r--r--www/py-beautifulsoup/Makefile1
-rw-r--r--www/py-beautifulsoup30/Makefile1
-rw-r--r--www/py-cherrypy-devel/Makefile1
-rw-r--r--www/py-cherrypy-old/Makefile1
-rw-r--r--www/py-cherrypy/Makefile1
-rw-r--r--www/py-clientform/Makefile2
-rw-r--r--www/py-django-devel/Makefile4
-rw-r--r--www/py-django/Makefile2
-rw-r--r--www/py-django11/Makefile2
-rw-r--r--www/py-django12/Makefile2
-rw-r--r--www/py-django13/Makefile2
-rw-r--r--www/py-flup/Makefile2
-rw-r--r--www/py-forgethtml/Makefile2
-rw-r--r--www/py-formencode/Makefile3
-rw-r--r--www/py-funkload/Makefile18
-rw-r--r--www/py-funkload/pkg-plist4
-rw-r--r--www/py-imdbpy/Makefile1
-rw-r--r--www/py-mechanize/Makefile2
-rw-r--r--www/py-nevow/Makefile1
-rw-r--r--www/py-openssl-proxy/Makefile1
-rw-r--r--www/py-paste/Makefile1
-rw-r--r--www/py-pastedeploy/Makefile1
-rw-r--r--www/py-pastescript/Makefile1
-rw-r--r--www/py-pullparser/Makefile1
-rw-r--r--www/py-pysearch/Makefile1
-rw-r--r--www/py-restclient/Makefile19
-rw-r--r--www/py-restclient/pkg-plist38
-rw-r--r--www/py-routes/Makefile13
-rw-r--r--www/py-routes/pkg-plist48
-rw-r--r--www/py-slimmer/Makefile1
-rw-r--r--www/py-tgwebservices/Makefile2
-rw-r--r--www/py-twistedWeb/Makefile1
-rw-r--r--www/py-twistedWeb2/Makefile1
-rw-r--r--www/py-urljr/Makefile1
-rw-r--r--www/quixote/Makefile1
-rw-r--r--www/session2/Makefile1
-rw-r--r--www/trac-accountmanager/Makefile3
-rw-r--r--www/trac-addcomment/Makefile2
-rw-r--r--www/trac-bzr/Makefile3
-rw-r--r--www/trac-calendar/Makefile1
-rw-r--r--www/trac-codetags/Makefile1
-rw-r--r--www/trac-ctxtnavadd/Makefile1
-rw-r--r--www/trac-down/Makefile3
-rw-r--r--www/trac-hierwiki/Makefile1
-rw-r--r--www/trac-iniadmin/Makefile1
-rw-r--r--www/trac-ldap/Makefile1
-rw-r--r--www/trac-macropost/Makefile1
-rw-r--r--www/trac-mastertickets/Makefile1
-rw-r--r--www/trac-nav/Makefile1
-rw-r--r--www/trac-pagelist/Makefile1
-rw-r--r--www/trac-pagetopdf/Makefile1
-rw-r--r--www/trac-pendingticket/Makefile1
-rw-r--r--www/trac-privatetickets/Makefile2
-rw-r--r--www/trac-restrictedarea/Makefile1
-rw-r--r--www/trac-robotstxt/Makefile1
-rw-r--r--www/trac-simpleticket/Makefile1
-rw-r--r--www/trac-tags/Makefile2
-rw-r--r--www/trac-ticketdelete/Makefile1
-rw-r--r--www/trac-tocmacro/Makefile1
-rw-r--r--www/trac-wantedpages/Makefile1
-rw-r--r--www/trac-webadmin/Makefile3
-rw-r--r--www/trac-wikinegotiator/Makefile1
-rw-r--r--www/trac-xmlrpc/Makefile1
-rw-r--r--www/xist/Makefile1
-rw-r--r--x11-toolkits/py-fltk/Makefile5
-rw-r--r--x11-toolkits/py-fox/Makefile2
-rw-r--r--x11-toolkits/py-gtkextra/Makefile1
-rw-r--r--x11-toolkits/py-gui/Makefile2
-rw-r--r--x11-toolkits/py-tkinter/Makefile2
-rw-r--r--x11-toolkits/py-tktreectrl/Makefile2
-rw-r--r--x11-toolkits/py-wmdockapps/Makefile1
-rw-r--r--x11-toolkits/py-wxPython24/Makefile1
-rw-r--r--x11-toolkits/py-wxPython24/files/patch-aa16
-rw-r--r--x11-toolkits/py-xlib/Makefile2
-rw-r--r--x11-wm/plwm/Makefile4
473 files changed, 2205 insertions, 1325 deletions
diff --git a/CHANGES b/CHANGES
index e0b476cc0d27..99aa8578fce6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,19 @@ in the release notes.
All ports committers are allowed to commit to this file.
+20070730:
+AUTHOR: python@FreeBSD.org
+
+ * The default Python version has been changed from 2.4.x to 2.5.x.
+
+ * A number of variables have been added to bsd.python.mk to support
+ the more integrated support for Python eggs, including:
+ PYDISTUTILS_PKGNAME, PYDISTUTILS_PKGVERSION, PYEASYINSTALL_EGG,
+ PYDISTUTILS_NOEGGINFO, PYDISTUTILS_EGGINFO, PYEASYINSTALL_ARCHDEP
+
+ * More detailed descriptions of the variables can be found in the comments
+ in bsd.python.mk.
+
20070723:
AUTHOR: rafan@FreeBSD.org
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index ea0e87e6c2a2..55781d4a6864 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -81,6 +81,12 @@ Python_Include_MAINTAINER= python@FreeBSD.org
# want to build extensions with an older binary.
# default: depends on the version of your python binary
#
+# PYTHON_DEFAULT_VERSION
+# - Version of the default python binary in your ${PATH}, in
+# the format "python2.5". Set this in your /etc/make.conf
+# in case you want to use an older version as a default.
+# default: python2.5
+#
# PYTHON_WRKSRC - The ${WRKSRC} for your python version. Needed for
# extensions like Tkinter, py-gdbm and py-expat, which
# are built from sources contained in the Python
@@ -122,6 +128,17 @@ Python_Include_MAINTAINER= python@FreeBSD.org
# USE_PYDISTUTILS - Use distutils as do-configure, do-build and do-install
# targets.
#
+# PYSETUP - Name of the setup script used by the distutils package.
+# default: setup.py
+#
+# PYDISTUTILS_PKGNAME
+# - Internal name in the distutils for egg-info.
+# default: ${PORTNAME}
+#
+# PYDISTUTILS_PKGVERSION
+# - Internal version in the distutils for egg-info.
+# default: ${PORTVERSION}
+#
# PYDISTUTILS_CONFIGURE_TARGET
# - Pass this command to distutils on configure stage.
# default: config
@@ -146,8 +163,32 @@ Python_Include_MAINTAINER= python@FreeBSD.org
# - Arguments to install with distutils.
# default: -c -O1 --prefix=${PREFIX}
#
-# PYSETUP - Name of the setup script used by the distutils package.
-# default: setup.py
+# PYDISTUTILS_EGGINFO
+# - Canonical name for egg-info.
+# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info
+#
+# PYDISTUTILS_NOEGGINFO
+# - Skip an egg-info entry from plist when defined.
+#
+# PYEASYINSTALL_EGG
+# - Canonical directory name for easy_install egg packages.
+# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg
+#
+# PYEASYINSATLL_OSARCH
+# - Platform identifier for easy_install.
+# default: -${OPSYS:L}-${_OSRELEASE}-${ARCH}
+# if PYEASYINSTALL_ARCHDEP is defined.
+#
+# PYEASYINSTALL_CMD - Full file path to easy_install command.
+# default: ${LOCALBASE}/bin/easy_install-${PYTHON_VER}
+#
+# PYEASYINSTALL_INSTALL_ARGS
+# - Arguments to easy_install command for egg installation.
+# default: -q -N -S ${PYTHON_SITELIBDIR} ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
+#
+# PYEASYINSTALL_UNINSTALL_ARGS
+# - Arguments to easy_install command for egg uninstallation.
+# default: -q -m -S ${PYTHON_SITELIBDIR} ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
#
# USE_TWISTED - If this option is just yes then build and run
# the dependence to twistedCore is added. Alternatively
@@ -173,8 +214,8 @@ Python_Include_MAINTAINER= python@FreeBSD.org
# specific version of zope.
#
-_PYTHON_PORTBRANCH= 2.4
-_PYTHON_ALLBRANCHES= 2.4 2.5 2.3 # preferred first
+_PYTHON_PORTBRANCH= 2.5
+_PYTHON_ALLBRANCHES= 2.5 2.4 2.3 # preferred first
_ZOPE_PORTBRANCH= 2.7
_ZOPE_ALLBRANCHES= 2.7 2.8 2.9 2.10 3.2
@@ -237,22 +278,24 @@ PYTHON_VERSION= python2.4
# Determine version number of Python to use
+.if !defined(PYTHON_DEFAULT_VERSION)
+. if exists(${LOCALBASE}/bin/python)
+_PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \
+ 'import sys; print sys.version[:3]' 2> /dev/null \
+ || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1
+. else
+_PYTHON_DEFAULT_VERSION= ${_PYTHON_PORTBRANCH}
+. endif
+PYTHON_DEFAULT_VERSION= python${_PYTHON_DEFAULT_VERSION}
+.endif
+
.if defined(PYTHON_VERSION)
_PYTHON_VERSION:= ${PYTHON_VERSION:S/^python//}
_PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_VERSION}
.else
-# Determine the currently installed version. If Python is not installed, a
-# default version number is substituted and the corresponding Python
-# distribution will be built through the dependency processing.
-.if defined(PYTHON_CMD)
-_PYTHON_CMD= ${PYTHON_CMD}
-.else
-_PYTHON_CMD= ${LOCALBASE}/bin/python
+_PYTHON_VERSION:= ${PYTHON_DEFAULT_VERSION:S/^python//}
+_PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_DEFAULT_VERSION}
.endif
-_PYTHON_VERSION!= (${_PYTHON_CMD} -c \
- 'import sys; print sys.version[:3]' 2> /dev/null \
- || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1
-.endif # defined(PYTHON_VERSION)
.if !defined(USE_PYTHON)
.if defined(USE_PYTHON_BUILD)
@@ -323,9 +366,9 @@ PYTHON_PORTVERSION= ${_PYTHON_PORTVERSION}
# Python-2.5
.if ${PYTHON_VERSION} == "python2.5"
-PYTHON_PORTVERSION?=2.5
+PYTHON_PORTVERSION?=2.5.1
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python25
-PYTHON_REL= 250
+PYTHON_REL= 251
PYTHON_SUFFIX= 25
PYTHON_VER= 2.5
@@ -360,8 +403,8 @@ check-makevars::
@${ECHO} "Makefile error: bad value for PYTHON_VERSION: ${PYTHON_VERSION}."
@${ECHO} "Legal values are:"
@${ECHO} " python2.3"
- @${ECHO} " python2.4 (default)"
- @${ECHO} " python2.5"
+ @${ECHO} " python2.4"
+ @${ECHO} " python2.5 (default)"
@${FALSE}
.endif
@@ -381,10 +424,58 @@ PYTHONPREFIX_INCLUDEDIR= ${PYTHON_INCLUDEDIR:S;${PYTHONBASE};${PREFIX};}
PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};}
PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}
+# setuptools support
+.if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
+BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
+RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
+
+PYDISTUTILS_BUILD_TARGET?= bdist_egg
+PYDISTUTILS_INSTALL_TARGET?= easy_install
+PYDISTUTILS_INSTALLARGS?= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG}
+
+.if defined(PYEASYINSTALL_ARCHDEP)
+_OSRELEASE!= ${UNAME} -r
+PYEASYINSTALL_OSARCH?= -${OPSYS:L}-${_OSRELEASE}-${ARCH}
+.endif
+PYEASYINSTALL_EGG?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg
+PYEASYINSTALL_CMD?= ${LOCALBASE}/bin/easy_install-${PYTHON_VER}
+PYEASYINSTALL_INSTALLARGS?= -q -N -S ${PYTHON_SITELIBDIR} \
+ ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
+PYEASYINSTALL_UNINSTALLARGS?= -q -m -S ${PYTHON_SITELIBDIR} \
+ ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
+
+PLIST_SUB+= PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG}
+
+add-plist-post: add-plist-easyinstall
+add-plist-easyinstall:
+ @# @unexec line must be located before any other line while @exec must not.
+ @${CAT} ${TMPPLIST} > ${TMPPLIST}.pei_tmp
+ @${ECHO_CMD} "@unexec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_UNINSTALLARGS}" \
+ > ${TMPPLIST}
+ @${CAT} ${TMPPLIST}.pei_tmp >> ${TMPPLIST}
+ @${ECHO_CMD} "@exec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_INSTALLARGS}" \
+ >> ${TMPPLIST}
+.endif # defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
+
+# distutils support
PYSETUP?= setup.py
PYDISTUTILS_CONFIGUREARGS?=
PYDISTUTILS_BUILDARGS?=
PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX}
+PYDISTUTILS_PKGNAME?= ${PORTNAME}
+PYDISTUTILS_PKGVERSION?=${PORTVERSION}
+PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info
+PYDISTUTILS_EGGINFODIR?=${PYTHON_SITELIBDIR}
+
+.if !defined(PYDISTUTILS_NOEGGINFO) && \
+ (defined(INSTALLS_EGGINFO) || \
+ (defined(USE_PYDISTUTILS) && \
+ ${USE_PYDISTUTILS} != "easy_install")) && \
+ defined(PYTHON_REL) && ${PYTHON_REL} >= 250
+. for egg in ${PYDISTUTILS_EGGINFO}
+PLIST_FILES+= ${PYDISTUTILS_EGGINFODIR:S;${PREFIX}/;;}/${egg}
+. endfor
+.endif
# Fix for programs that build python from a GNU auto* enviornment
CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}"
@@ -436,7 +527,7 @@ PYEXPAT= ${PYTHON_LIBDIR}/lib-dynload/pyexpat.so:${PYTHON_PORTSDIR}
.if defined(PYTHON_REL) && ${PYTHON_REL} < 250
PYCTYPES= ${PYTHON_SITELIBDIR}/ctypes/__init__.py:${PORTSDIR}/devel/py-ctypes
.else
-PYCTYPES= ${PYTHON_LIBDIR}/ctypes/__init__py:${PYTHON_PORTSDIR}
+PYCTYPES= ${PYTHON_LIBDIR}/ctypes/__init__.py:${PYTHON_PORTSDIR}
.endif
.if defined(PYTHON_REL) && ${PYTHON_REL} < 250
diff --git a/UPDATING b/UPDATING
index e807bf2d6c25..cf1039f2c672 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,30 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20070730:
+ AFFECTS: users of py-*
+ AUTHOR: python@FreeBSD.org
+
+The default version of Python has been changed from 2.4.x to 2.5.x.
+If you have 2.4.x installed, perform an upgrade of lang/python24 to
+lang/python25 with a command like:
+
+ # portupgrade -o lang/python25 lang/python24
+
+If want to keep 2.4.x installed alongside 2.5.x, set the PYTHON_DEFAULT_VERSION
+variable to 'python2.5' without quotes in make.conf, then go to lang/python and
+execute
+
+ # portupgrade -R python
+
+Once the installed Python has been updated to 2.5, by using one of the methods
+above, it is required to run the upgrade-site-packages target in lang/python to
+assure that site-packages are made available to the new Python version.
+
+ # cd /usr/ports/lang/python && make upgrade-site-packages
+
+This Makefile target requires ports-mgmt/portupgrade to be installed.
+
20070727:
AFFECTS: autotools
AUTHOR: ade@FreeBSD.org
diff --git a/archivers/py-lzma/Makefile b/archivers/py-lzma/Makefile
index a464d137089d..0ff90f1e1153 100644
--- a/archivers/py-lzma/Makefile
+++ b/archivers/py-lzma/Makefile
@@ -17,5 +17,6 @@ COMMENT= Python binding for the LZMA compression library
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pylzma
.include <bsd.port.mk>
diff --git a/astro/py-metar/Makefile b/astro/py-metar/Makefile
index 705d8d737a6f..d330a53c2e7a 100644
--- a/astro/py-metar/Makefile
+++ b/astro/py-metar/Makefile
@@ -17,5 +17,6 @@ COMMENT= Python module that provides access to NOAA's METAR weather reports
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pymetar
.include <bsd.port.mk>
diff --git a/astro/pyephem/Makefile b/astro/pyephem/Makefile
index 338481a44acc..664e3e125526 100644
--- a/astro/pyephem/Makefile
+++ b/astro/pyephem/Makefile
@@ -16,10 +16,9 @@ MAINTAINER= db@FreeBSD.org
COMMENT= Scientific-grade astronomical computations for Python
USE_PYTHON= 2.4+
-NO_BUILD= yes
+USE_PYDISTUTILS=yes
-do-install:
- (cd ${WRKSRC}; ${PYTHON_CMD} setup.py install)
+post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/pyephem-manual.html ${DOCSDIR}
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index cd9ee57adf2e..495691e8fe06 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao
PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/aomodule.so
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyao
do-configure:
@cd ${WRKSRC} && ${PYTHON_CMD} config_unix.py --prefix "${LOCALBASE}"
diff --git a/audio/py-apetag/Makefile b/audio/py-apetag/Makefile
index 7d752baa647b..cd90752d3a7b 100644
--- a/audio/py-apetag/Makefile
+++ b/audio/py-apetag/Makefile
@@ -17,5 +17,6 @@ COMMENT= Library for APE Tag written in Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= py-ApeTag
.include <bsd.port.mk>
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
index 984bc600e0b1..69d1904f9cb8 100644
--- a/audio/py-cddb/Makefile
+++ b/audio/py-cddb/Makefile
@@ -18,5 +18,6 @@ COMMENT= Python module to fetch information on audio CDs from CDDB
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= CDDB
.include <bsd.port.mk>
diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile
index 1fcbb30f8547..deaee9cb506b 100644
--- a/audio/py-eyed3/Makefile
+++ b/audio/py-eyed3/Makefile
@@ -26,6 +26,9 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
MAN1= eyeD3.1
MANCOMPRESSED= yes
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGNAME= eyeD3
+
post-patch:
${REINPLACE_CMD} -e 's,PYTHON="",,g' -e 's,/usr/local,${LOCALBASE},g' \
-e 's,2\\\.\[23456789\]\\\.,2.[23456789],g' \
diff --git a/audio/py-flac/Makefile b/audio/py-flac/Makefile
index 6b3d82db2f81..99593116e078 100644
--- a/audio/py-flac/Makefile
+++ b/audio/py-flac/Makefile
@@ -21,6 +21,7 @@ USE_PYTHON= yes
USE_GMAKE= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= pyflac
do-build:
@cd ${WRKSRC} && ${GMAKE} build
diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile
index 8178d76285e1..6ed8523a9dd2 100644
--- a/audio/py-id3/Makefile
+++ b/audio/py-id3/Makefile
@@ -19,5 +19,6 @@ WRKSRC= ${WRKDIR}/id3-py-${PORTVERSION}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= ID3
.include <bsd.port.mk>
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 35d87e0695c8..c0298a62f453 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -26,5 +26,6 @@ USE_ZIP= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pykaraoke
.include <bsd.port.mk>
diff --git a/audio/py-libtunepimp/Makefile b/audio/py-libtunepimp/Makefile
index 491d9b406326..ccea3b1cb9f2 100644
--- a/audio/py-libtunepimp/Makefile
+++ b/audio/py-libtunepimp/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= tunepimp.5:${PORTSDIR}/audio/libtunepimp
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= tunepimp
BUILD_WRKSRC= ${WRKSRC}/python
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index 448ad95d2f46..89228f32086b 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -20,6 +20,7 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/madmodule.so
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= pymad
post-patch:
@${REINPLACE_CMD} 's/^\(.*compile.*\)\?\(.*\)\?\(.*\)$$/\1\2\3/' \
diff --git a/audio/py-musepack/Makefile b/audio/py-musepack/Makefile
index f7bb13f3f985..77036f74382a 100644
--- a/audio/py-musepack/Makefile
+++ b/audio/py-musepack/Makefile
@@ -20,6 +20,8 @@ LIB_DEPENDS= mpcdec:${PORTSDIR}/audio/libmpcdec
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= pymusepack
+PYDISTUTILS_PKGVERSION= 0.3
MAKE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile
index a040815eb82f..ff5515967320 100644
--- a/audio/py-musicbrainz/Makefile
+++ b/audio/py-musicbrainz/Makefile
@@ -28,6 +28,7 @@ EXAMPLES= cd2trm.py cdid.py cdlookup.py fileinfolookup.py findartist.py \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-musicbrainz
PYDISTUTILS_BUILDARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib
DESCR= ${PORTSDIR}/audio/libmusicbrainz/pkg-descr
diff --git a/audio/py-musicbrainz2/Makefile b/audio/py-musicbrainz2/Makefile
index fbc3907a2903..030bb8fdf25d 100644
--- a/audio/py-musicbrainz2/Makefile
+++ b/audio/py-musicbrainz2/Makefile
@@ -21,5 +21,6 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-musicbrainz2
.include <bsd.port.mk>
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index e18e01fdf033..e431f81820f7 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/libogg
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyogg
do-configure:
@cd ${WRKSRC} && ${PYTHON_CMD} config_unix.py --prefix ${LOCALBASE}
diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile
index 7e4a20da9ace..34e505e055c3 100644
--- a/audio/py-openal/Makefile
+++ b/audio/py-openal/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
DIST_SUBDIR= python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyOpenAL
WRKSRC= ${WRKDIR}/PyOpenAL-${PORTVERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/py-openal
diff --git a/audio/py-sdl_mixer/Makefile b/audio/py-sdl_mixer/Makefile
index f0a9c369c5b7..28a01c0931dd 100644
--- a/audio/py-sdl_mixer/Makefile
+++ b/audio/py-sdl_mixer/Makefile
@@ -23,6 +23,7 @@ DIST_SUBDIR= python
USE_SDL= sdl mixer
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pysdl_mixer
WRKSRC= ${WRKDIR}/pysdl_mixer-${PORTVERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/py-sdl-mixer
diff --git a/audio/py-speex/Makefile b/audio/py-speex/Makefile
index 54ed2e24c8e2..92278006418a 100644
--- a/audio/py-speex/Makefile
+++ b/audio/py-speex/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/speex.so
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 1.0
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/audio/py-taglib/Makefile b/audio/py-taglib/Makefile
index 5a585301550e..a5d1ed208755 100644
--- a/audio/py-taglib/Makefile
+++ b/audio/py-taglib/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib
WRKSRC= ${WRKDIR}/python-taglib-${PORTVERSION}
USE_AUTOTOOLS= libtool:15
-USE_PYTHON= yes
+USE_PYTHON= -2.4
USE_PYTHON_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index a0fa802da368..131f2b5e3c53 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -23,7 +23,8 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis
PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/ogg/vorbis.so
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-USE_GCC= 3.4
+USE_GCC= 3.4
+PYDISTUTILS_PKGNAME= pyvorbis
do-configure:
@cd ${WRKSRC} && ${PYTHON_CMD} config_unix.py
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index 37ddb006cbeb..e474d50a56b5 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyxmms
USE_BZIP2= yes
USE_GNOME= glib12
XMMS_CONFIG?= ${X11BASE}/bin/xmms-config
diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index ea16fdf197ed..fb11cb450ba2 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -24,5 +24,7 @@ USE_SDL= mixer sdl
USE_BZIP2= yes
USE_PYTHON= yes
HAS_CONFIGURE= yes
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGNAME= pysolsoundserver
.include <bsd.port.mk>
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index b0ec9688bc08..e38d38c63586 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyTone
OPTIONS= MAD "MPEG Audio Decoder (libmad) support" On \
VORBIS "Ogg/Vorbis support" On \
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 0966c330f843..5b4f8c3210cb 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-tool
USE_GETTEXT= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Sonata
RM_OPTS= -R
diff --git a/cad/pythoncad/Makefile b/cad/pythoncad/Makefile
index 09ef4767663e..461e97582b7e 100644
--- a/cad/pythoncad/Makefile
+++ b/cad/pythoncad/Makefile
@@ -19,6 +19,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk2
USE_PYTHON= 2.2+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PythonCAD
+PYDISTUTILS_PKGVERSION= DS1-R32
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/gtkpycad.py ${PREFIX}/bin/gtkpycad
diff --git a/comms/py-bulksms/Makefile b/comms/py-bulksms/Makefile
index 3c2e3b8a7e05..ff44b7799d67 100644
--- a/comms/py-bulksms/Makefile
+++ b/comms/py-bulksms/Makefile
@@ -16,6 +16,8 @@ COMMENT= Python client for the BulkSMS.co.uk HTTP API
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= BulkSMS
+PYDISTUTILS_PKGVERSION= 1.0
WRKSRC= ${WRKDIR}/bulksms
diff --git a/comms/py-lirc/Makefile b/comms/py-lirc/Makefile
index ede501127071..c150164fe7c5 100644
--- a/comms/py-lirc/Makefile
+++ b/comms/py-lirc/Makefile
@@ -28,5 +28,6 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/pylircmodule.so
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= pylirc
.include <bsd.port.mk>
diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile
index 717f708c6c2a..5fb59fb30909 100644
--- a/comms/py-serial/Makefile
+++ b/comms/py-serial/Makefile
@@ -21,5 +21,6 @@ EXTRACT_BEFORE_ARGS= -a
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= pyserial
.include <bsd.port.mk>
diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
new file mode 100644
index 000000000000..a83ec8738c29
--- /dev/null
+++ b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
@@ -0,0 +1,20 @@
+--- glom/libglom/python_embed/py_glom_record.cc.orig Sun Jul 15 13:34:18 2007
++++ glom/libglom/python_embed/py_glom_record.cc Sun Jul 15 13:34:44 2007
+@@ -122,7 +122,7 @@
+
+
+
+-static int
++static Py_ssize_t
+ Record_tp_as_mapping_length(PyGlomRecord *self)
+ {
+ return self->m_pMap_field_values->size();
+@@ -146,7 +146,7 @@
+ }
+ else
+ {
+- g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", self->m_pMap_field_values->size(), pchKey);
++ g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", (int)self->m_pMap_field_values->size(), pchKey);
+ }
+ }
+ else
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index da78e85c6945..ed09ef6471fc 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -34,6 +34,9 @@ CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= ${PREFIX}/lib/hk_classes/
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGVERSION= 1.1
+
NOT_FOR_ARCHS= ia64
NOT_FOR_ARCHS_REASON_ia64= Does not build
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index 855cc92d8778..9e0f569970c1 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -22,6 +22,7 @@ USE_BZIP2= yes
USE_GNOME= pygtk2
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 1.8
post-patch:
${REINPLACE_CMD} -e \
diff --git a/databases/py-Elixir/Makefile b/databases/py-Elixir/Makefile
index 0c0a57dfa264..48137b5bd816 100644
--- a/databases/py-Elixir/Makefile
+++ b/databases/py-Elixir/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/${PYALCHEMY_EGG}:${PORTSDIR}/databases/py-sql
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PYDISTUTILS_BUILD_TARGET= bdist_egg
PYDISTUTILS_INSTALL_TARGET= easy_install
PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYELIXIR_EGG}
diff --git a/databases/py-MySQL/Makefile b/databases/py-MySQL/Makefile
index 4eace29262e0..443ac95fdab7 100644
--- a/databases/py-MySQL/Makefile
+++ b/databases/py-MySQL/Makefile
@@ -17,7 +17,9 @@ COMMENT= Access a MySQL database through Python
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/MySQLmodule.so
-USE_PYTHON= yes
+USE_PYTHON= -2.4
+CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
+MAKE_ENV= ${CONFIGURE_ENV}
.include <bsd.port.pre.mk>
diff --git a/databases/py-MySQL/files/Makefile.pre.in b/databases/py-MySQL/files/Makefile.pre.in
index 2d14294054a0..d8f763d8d6c6 100644
--- a/databases/py-MySQL/files/Makefile.pre.in
+++ b/databases/py-MySQL/files/Makefile.pre.in
@@ -92,7 +92,7 @@ VPATH= .
TARGET= python
# Installed python binary (used only by boot target)
-PYTHON= python
+PYTHON?= python
# Add more -I and -D options here
CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index 426db1f3bd39..674c9a69ea42 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -21,6 +21,8 @@ COMMENT= Access a MySQL database through Python
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
USE_MYSQL= yes
+PYDISTUTILS_PKGNAME= MySQL-python${PYTHON_VER}
+PYDISTUTILS_PKGVERSION= 1.2.2b2
CONFLICTS= py*-MySQLdb-[0-9]*
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index b6d59a0b5a43..4387929f326e 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -19,6 +19,8 @@ COMMENT= Access a MySQL database through Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_MYSQL= yes
+PYDISTUTILS_PKGNAME= MySQL-python
+PYDISTUTILS_PKGVERSION= 1.2.2
CONFLICTS= py*-MySQLdb-devel-[0-9]*
diff --git a/databases/py-PyGreSQL/Makefile b/databases/py-PyGreSQL/Makefile
index 990b58b5facc..1cca9402ce20 100644
--- a/databases/py-PyGreSQL/Makefile
+++ b/databases/py-PyGreSQL/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
USE_PGSQL= yes
USE_PYTHON= yes
DATETIME_DEP= ${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
+INSTALLS_EGGINFO= yes
pre-build:
@ cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' setup.py
diff --git a/databases/py-PySQLite10/Makefile b/databases/py-PySQLite10/Makefile
index ba7d09daaf20..b29bdb9d7011 100644
--- a/databases/py-PySQLite10/Makefile
+++ b/databases/py-PySQLite10/Makefile
@@ -25,6 +25,7 @@ CONFLICTS= py*-PySQLite-1.1.*
WRKSRC= ${WRKDIR}/pysqlite
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pysqlite
MAKE_ENV= LOCALBASE="${LOCALBASE}"
PORTDOCS= *
diff --git a/databases/py-PySQLite11/Makefile b/databases/py-PySQLite11/Makefile
index 2532e0163776..5ef8052f89d9 100644
--- a/databases/py-PySQLite11/Makefile
+++ b/databases/py-PySQLite11/Makefile
@@ -23,6 +23,7 @@ NO_LATEST_LINK= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pysqlite
MAKE_ENV= LOCALBASE="${LOCALBASE}"
PORTDOCS= *
diff --git a/databases/py-axiom/Makefile b/databases/py-axiom/Makefile
index 34f763333e7a..8362aa42e2f8 100644
--- a/databases/py-axiom/Makefile
+++ b/databases/py-axiom/Makefile
@@ -24,5 +24,6 @@ USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_TWISTED= yes
NO_BUILD= yes
+PYDISTUTILS_PKGNAME= Axiom
.include <bsd.port.mk>
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index 915e241a4492..048d14d08530 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -20,6 +20,8 @@ COMMENT= Python bindings to the Berkeley DB library
USE_BDB= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= _bsddb
+PYDISTUTILS_PKGVERSION= 0.0.0
DIST_SUBDIR= python
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile
index 4ad80a96df86..f5b2d7fb3f2d 100644
--- a/databases/py-cdb/Makefile
+++ b/databases/py-cdb/Makefile
@@ -18,6 +18,7 @@ COMMENT= Python interface to DJB's constant database library
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-cdb
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/databases/py-dbutils/Makefile b/databases/py-dbutils/Makefile
index 61363d036b76..0c57f22d5156 100644
--- a/databases/py-dbutils/Makefile
+++ b/databases/py-dbutils/Makefile
@@ -18,6 +18,7 @@ COMMENT= Providing solid, persistent and pooled connections to a database
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= DBUtils
DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME}
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index 250c838889d3..8e2a4d9b6486 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/MySQLdb/__init__.py:${PORTSDIR}/databases/py-M
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= forgetSQL
DOCS= BUGS README TODO
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 2ec16f13bed8..26272084da7e 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -22,6 +22,7 @@ PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/gdbm.so
DIST_SUBDIR= python
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 0.0.0
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
diff --git a/databases/py-memcached/Makefile b/databases/py-memcached/Makefile
index 844c144f47bb..d1ef61141596 100644
--- a/databases/py-memcached/Makefile
+++ b/databases/py-memcached/Makefile
@@ -18,5 +18,6 @@ COMMENT= Python API for memcached, a distributed memory cache daemon
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= python-memcached
.include <bsd.port.mk>
diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile
index 648c5e34a05e..43ebe5da8295 100644
--- a/databases/py-mssql/Makefile
+++ b/databases/py-mssql/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= sybdb.5:${PORTSDIR}/databases/freetds-msdblib
USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pymssql
post-patch:
${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 900f9b7ac9dc..15f258244d57 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= py-rrdtool
LIBDIR?= ${LOCALBASE}/lib # directory where librrd.so lives
diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 27a6a8abb18e..2b920ad5718d 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -24,6 +24,8 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} \
EGG="SQLAlchemy==${PORTVERSION}" \
EXAMPLEDIR=share/examples/${PORTNAME}
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= SQLAlchemy
+PYDISTUTILS_NOEGGINFO= yes
BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools
# make sure we have it @deinstall time to remove the egg
diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index 27a6a8abb18e..2b920ad5718d 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -24,6 +24,8 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} \
EGG="SQLAlchemy==${PORTVERSION}" \
EXAMPLEDIR=share/examples/${PORTNAME}
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= SQLAlchemy
+PYDISTUTILS_NOEGGINFO= yes
BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools
# make sure we have it @deinstall time to remove the egg
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index a7232d5c0775..d33ff720d869 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
-MAINTAINER= perky@FreeBSD.org
+MAINTAINER= python@FreeBSD.org
COMMENT= Standard Python binding to the SQLite3 library
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
@@ -26,6 +26,8 @@ USE_PYDISTUTILS=yes
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
+PYDISTUTILS_NOEGGINFO= yes
+
pre-extract:
@${CAT} ${PKGMESSAGE}
diff --git a/databases/py-sqlobject/Makefile b/databases/py-sqlobject/Makefile
index 222b81281eda..063756123649 100644
--- a/databases/py-sqlobject/Makefile
+++ b/databases/py-sqlobject/Makefile
@@ -23,9 +23,11 @@ RUN_DEPENDS+= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= SQLObject
SQLOBJECTVER?= ${PORTVERSION}
PYTHONVER?= ${PYTHON_VERSION:S/^python//}
PLIST_SUB= PYSQLOBJECT_EGG=${PYSQLOBJECT_EGG}
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
SUB_FILES+= pkg-deinstall pkg-install
SUB_LIST+= EGG="SQLObject==${SQLOBJECTVER}" \
diff --git a/databases/py-sqlrelay/Makefile b/databases/py-sqlrelay/Makefile
index 3a05677e10d2..e7517cfd634d 100644
--- a/databases/py-sqlrelay/Makefile
+++ b/databases/py-sqlrelay/Makefile
@@ -43,7 +43,7 @@ do-extract:
post-patch:
${PERL} -i -p \
- -e 's,"2\.1" "2\.0" "1\.6" "1\.5",${PYTHON_VERSION:S/^python//},g;' \
+ -e 's,"2\.4" "2\.3" "2\.2" "2\.1",${PYTHON_VERSION:S/^python//},g;' \
${WRKSRC}/configure
${CP} ${TEMPLATES}/config.sub ${WRKSRC}
${CP} ${TEMPLATES}/config.guess ${WRKSRC}
diff --git a/databases/py25-bsddb/Makefile b/databases/py25-bsddb/Makefile
index 915e241a4492..048d14d08530 100644
--- a/databases/py25-bsddb/Makefile
+++ b/databases/py25-bsddb/Makefile
@@ -20,6 +20,8 @@ COMMENT= Python bindings to the Berkeley DB library
USE_BDB= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= _bsddb
+PYDISTUTILS_PKGVERSION= 0.0.0
DIST_SUBDIR= python
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index 82bc5c36f6c9..dca3dba9c116 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -18,5 +18,6 @@ COMMENT= The Z - Object Database for python
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= ZODB3
.include <bsd.port.mk>
diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index a5607e259555..1e5a49106f4e 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -32,6 +32,7 @@ INFO= adesklets \
adesklets_fr
SUB_FILES= pkg-message
+INSTALLS_EGGINFO= yes
.include <bsd.port.pre.mk>
diff --git a/deskutils/ljcharm/Makefile b/deskutils/ljcharm/Makefile
index b89d8d21c064..19df5492ea6e 100644
--- a/deskutils/ljcharm/Makefile
+++ b/deskutils/ljcharm/Makefile
@@ -19,6 +19,7 @@ MAN5=charmrc.5
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 1.6.0
post-install:
.if !defined(NOPORTDOCS)
diff --git a/deskutils/py-dosage/Makefile b/deskutils/py-dosage/Makefile
index fb183c382776..68bf4b35e762 100644
--- a/deskutils/py-dosage/Makefile
+++ b/deskutils/py-dosage/Makefile
@@ -16,6 +16,7 @@ COMMENT= An application to keep a local mirror of web comics
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= Dosage
MAN1= mainline.1
diff --git a/deskutils/py-tagfu/Makefile b/deskutils/py-tagfu/Makefile
index f259002e89ce..1d82c9158292 100644
--- a/deskutils/py-tagfu/Makefile
+++ b/deskutils/py-tagfu/Makefile
@@ -17,5 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TagFu
+PYDISTUTILS_PKGVERSION= 0.1
.include <bsd.port.mk>
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index d83369ef2008..eee7df785764 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
USE_PYTHON= 2.2+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyBookReader
USE_GNOME= pygtk2
.include <bsd.port.mk>
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 698d59c8730b..832036c634b7 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
USE_X_PREFIX= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyPanel
PORTDOCS= *
diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index a8aef8af12c3..d0a50e8213ef 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -19,6 +19,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementt
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= bzr
+PYDISTUTILS_PKGVERSION= ${PORTVERSION}.0
MAN1= bzr.1
diff --git a/devel/bisongen/Makefile b/devel/bisongen/Makefile
index 8986f6f2fdf3..1aa67edb05dd 100644
--- a/devel/bisongen/Makefile
+++ b/devel/bisongen/Makefile
@@ -17,6 +17,7 @@ COMMENT= A general-purpose parser generator for Python
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= BisonGen
post-install:
${MKDIR} ${EXAMPLESDIR}
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index a8aef8af12c3..d0a50e8213ef 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -19,6 +19,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementt
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= bzr
+PYDISTUTILS_PKGVERSION= ${PORTVERSION}.0
MAN1= bzr.1
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 84d5399c3d5e..7dde16f2bf4e 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -20,5 +20,6 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bazaar-ng \
WRKSRC= ${WRKDIR}/bzrtools
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= BzrTools
.include <bsd.port.mk>
diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 84e635608fc7..2dd084c32ac3 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -17,6 +17,7 @@ COMMENT= An "anarchic" control version system without unnecessary re-merges
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Codeville
PORTDOCS= \
LICENSE.txt
diff --git a/devel/ditrack/Makefile b/devel/ditrack/Makefile
index 895664d07f57..1de0b21c47bb 100644
--- a/devel/ditrack/Makefile
+++ b/devel/ditrack/Makefile
@@ -17,8 +17,9 @@ COMMENT= A tracking system based on Subversion repository
RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion
NO_BUILD= yes
-USE_PYDISTUTILS= yes
USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= DITrack
WRKSRC= ${WRKDIR}/DITrack-${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index fbeff2cac34d..338951b79396 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -19,6 +19,7 @@ COMMENT= Highly customizable cross-platform ide to aid programming in Python
USE_ZIP= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= DrPython
USE_WX= 2.6
WX_COMPS= python
diff --git a/devel/kodos/Makefile b/devel/kodos/Makefile
index ae72a3b00fd4..d5a65604ac25 100644
--- a/devel/kodos/Makefile
+++ b/devel/kodos/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/qt.so:${PORTSDIR}/x11-toolkits/py-qt
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes
PLIST_FILES= bin/kodos ${PYTHON_SITELIBDIR:S,^${PREFIX}/,,}/kodos.pth
diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile
index 7f31613d9e58..a9a858cd134c 100644
--- a/devel/libredblack/Makefile
+++ b/devel/libredblack/Makefile
@@ -35,5 +35,7 @@ PLIST_SUB+= PYTHON=""
post-patch:
@${REINPLACE_CMD} -e \
's|^CFLAGS =.*$$|CFLAGS = @CFLAGS@|g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|implemented.*Various||g' ${WRKSRC}/rbgen.in
.include <bsd.port.mk>
diff --git a/devel/nx/Makefile b/devel/nx/Makefile
index b9a3836af667..b83a33f73f18 100644
--- a/devel/nx/Makefile
+++ b/devel/nx/Makefile
@@ -26,6 +26,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= networkx
DOCSDIR= ${PREFIX}/share/doc/networkx-${PORTVERSION}
PORTDOCS= *
diff --git a/devel/py-Breve/Makefile b/devel/py-Breve/Makefile
index 72474efd169a..c2f84edfb06c 100644
--- a/devel/py-Breve/Makefile
+++ b/devel/py-Breve/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PYDISTUTILS_BUILD_TARGET= bdist_egg
PYDISTUTILS_INSTALL_TARGET= easy_install
PYDISTUTILS_INSTALLARGS= -N -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PYBREVE_EGG}
diff --git a/devel/py-Jinja/Makefile b/devel/py-Jinja/Makefile
index 7d7cab7e6e20..8f08f40e3505 100644
--- a/devel/py-Jinja/Makefile
+++ b/devel/py-Jinja/Makefile
@@ -25,6 +25,7 @@ PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
PYJINJA_EGG=${PYJINJA_EGG}
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
PYJINJA_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index 7d7cab7e6e20..8f08f40e3505 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -25,6 +25,7 @@ PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
PYJINJA_EGG=${PYJINJA_EGG}
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
PYJINJA_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
diff --git a/devel/py-asn1/Makefile b/devel/py-asn1/Makefile
index 2c8b590c9fa2..c5accf18ad14 100644
--- a/devel/py-asn1/Makefile
+++ b/devel/py-asn1/Makefile
@@ -18,6 +18,7 @@ COMMENT= ASN.1 toolkit for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyasn1
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-astng/Makefile b/devel/py-astng/Makefile
index 8eb9fecba758..72eb56a9bad2 100644
--- a/devel/py-astng/Makefile
+++ b/devel/py-astng/Makefile
@@ -19,5 +19,6 @@ RUN_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/logilab/__init__.py:${PORTSDIR}/devel/py
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= logilab-astng
.include <bsd.port.mk>
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index 8be3e00ef25e..39043adc4b08 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -17,26 +17,13 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dryice@FreeBSD.org
COMMENT= A collection of tools for internationalizing Python applications
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
USE_PYTHON= 2.3+
-USE_PYDISTUTILS= yes
-BABELVER?= ${PORTVERSION}
-PYTHONVER?= ${_PYTHON_VERSION}
-PLIST_SUB= BABELVER=${BABELVER} \
- PYTHONVER=${PYTHONVER}
+USE_PYDISTUTILS= easy_install
.if !defined(NOPORTDOCS)
PORTDOCS= doc/*
.endif
-SUB_FILES+= pkg-deinstall pkg-install
-SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
- EGG="${PORTNAME}==${PORTVERSION}"
-
-PYBABEL_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VERSION:S/^python//}.egg
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
@@ -44,4 +31,5 @@ post-install:
${CP} -r ${WRKSRC}/${docfile} ${DOCSDIR}
.endfor
.endif
+
.include <bsd.port.mk>
diff --git a/devel/py-babel/files/pkg-deinstall.in b/devel/py-babel/files/pkg-deinstall.in
deleted file mode 100644
index c2a4012d7b2e..000000000000
--- a/devel/py-babel/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
- DEINSTALL)
- easy_install -q -N -m -x -S %%PYTHON_SITELIBDIR%% %%EGG%%
- ;;
- POST-DEINSTALL)
- exit 0
- ;;
- *)
- echo "Unexpected Argument $2!!!"
- exit 1
- ;;
-esac
-exit 0
diff --git a/devel/py-babel/files/pkg-install.in b/devel/py-babel/files/pkg-install.in
deleted file mode 100644
index 9cddbe28f167..000000000000
--- a/devel/py-babel/files/pkg-install.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
- POST-INSTALL)
- easy_install -q -N -S %%PYTHON_SITELIBDIR%% %%EGG%%
- ;;
- PRE-INSTALL)
- ;;
- *)
- echo "Unexpected Argument $2!!!"
- exit 1
- ;;
-esac
-exit 0
diff --git a/devel/py-babel/pkg-plist b/devel/py-babel/pkg-plist
index 5080b18e29a9..c528df928981 100644
--- a/devel/py-babel/pkg-plist
+++ b/devel/py-babel/pkg-plist
@@ -1,457 +1,457 @@
bin/pybabel
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/aa.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/aa_DJ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/aa_ER.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/aa_ER_SAAHO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/aa_ET.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/af.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/af_NA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/af_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ak.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ak_GH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/am.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/am_ET.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_AE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_BH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_DZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_EG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_IQ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_JO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_KW.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_LB.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_LY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_MA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_OM.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_QA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_SA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_SD.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_SY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_TN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ar_YE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/as.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/as_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/az.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/az_AZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/az_Cyrl.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/az_Cyrl_AZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/az_Latn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/az_Latn_AZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/be.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/be_BY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/bg.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/bg_BG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/bn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/bn_BD.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/bn_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/bs.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/bs_BA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/byn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/byn_ER.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ca.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ca_ES.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/cch.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/cch_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/cs.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/cs_CZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/cy.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/cy_GB.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/da.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/da_DK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/de.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/de_AT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/de_BE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/de_CH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/de_DE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/de_LI.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/de_LU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/dv.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/dv_MV.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/dz.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/dz_BT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ee.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ee_GH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ee_TG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/el.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/el_CY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/el_GR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/el_POLYTONI.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_AS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_AU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_BE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_BW.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_BZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_CA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_GB.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_GU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_HK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_IE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_JM.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_MH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_MP.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_MT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_NA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_NZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_PH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_PK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_SG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_TT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_UM.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_US.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_US_POSIX.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_VI.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/en_ZW.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/eo.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_AR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_BO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_CL.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_CO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_CR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_DO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_EC.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_ES.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_GT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_HN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_MX.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_NI.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_PA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_PE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_PR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_PY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_SV.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_US.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_UY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/es_VE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/et.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/et_EE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/eu.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/eu_ES.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fa.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fa_AF.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fa_IR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fi.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fi_FI.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fo.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fo_FO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fr.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fr_BE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fr_CA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fr_CH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fr_FR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fr_LU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fr_MC.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fur.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/fur_IT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ga.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gaa.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gaa_GH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ga_IE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gez.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gez_ER.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gez_ET.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gl.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gl_ES.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gu.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gu_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gv.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/gv_GB.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/haw.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/haw_US.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_Arab.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_Arab_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_GH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_Latn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_Latn_GH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_Latn_NE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_Latn_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_NE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ha_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/he.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/he_IL.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hi.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hi_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hr.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hr_HR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hu.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hu_HU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hy.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hy_AM.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/hy_AM_REVISED.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ia.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/id.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/id_ID.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ig.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ig_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/is.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/is_IS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/it.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/it_CH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/it_IT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/iu.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ja.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ja_JP.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ka.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kaj.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kaj_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kam.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kam_KE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ka_GE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kcg.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kcg_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kfo.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kfo_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kk.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kk_KZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kl.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kl_GL.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/km.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/km_KH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kn_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ko.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kok.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kok_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ko_KR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_Arab.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_IQ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_IR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_Latn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_Latn_IQ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_Latn_IR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_Latn_SY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_Latn_TR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_SY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ku_TR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kw.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/kw_GB.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ky.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ky_KG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ln.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ln_CD.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ln_CG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/lo.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/lo_LA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/lt.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/lt_LT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/lv.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/lv_LV.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/mk.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/mk_MK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ml.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ml_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/mn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/mn_MN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/mr.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/mr_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ms.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ms_BN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ms_MY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/mt.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/mt_MT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nb.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nb_NO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ne.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ne_NP.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nl.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nl_BE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nl_NL.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nn_NO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nr.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nr_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nso.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/nso_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ny.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ny_MW.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/om.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/om_ET.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/om_KE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/or.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/or_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pa.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pa_Arab.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pa_Arab_PK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pa_Guru.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pa_Guru_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pa_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pa_PK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pl.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pl_PL.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ps.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ps_AF.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pt.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pt_BR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/pt_PT.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ro.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/root.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ro_RO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ru.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ru_RU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ru_UA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/rw.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/rw_RW.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sa.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sa_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/se.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/se_NO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sh.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sh_BA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sh_CS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sh_YU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sid.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sid_ET.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sk.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sk_SK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sl.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sl_SI.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/so.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/so_DJ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/so_ET.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/so_KE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/so_SO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sq.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sq_AL.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_BA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_CS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Cyrl.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Cyrl_BA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Cyrl_CS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Cyrl_ME.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Cyrl_RS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Cyrl_YU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Latn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Latn_BA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Latn_CS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Latn_ME.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Latn_RS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_Latn_YU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_ME.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_RS.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sr_YU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ss.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ss_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/st.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/st_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sv.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sv_FI.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sv_SE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sw.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sw_KE.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/sw_TZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/syr.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/syr_SY.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ta.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ta_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/te.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/te_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tg.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tg_TJ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/th.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/th_TH.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ti.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tig.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tig_ER.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ti_ER.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ti_ET.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tn_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tr.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tr_TR.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ts.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ts_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tt.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/tt_RU.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uk.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uk_UA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ur.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ur_IN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ur_PK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz_AF.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz_Arab.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz_Arab_AF.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz_Cyrl.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz_Cyrl_UZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz_Latn.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz_Latn_UZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/uz_UZ.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ve.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/ve_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/vi.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/vi_VN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/wal.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/wal_ET.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/xh.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/xh_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/yo.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/yo_NG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_CN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_Hans.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_Hans_CN.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_Hans_SG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_Hant.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_Hant_HK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_Hant_MO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_Hant_TW.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_HK.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_MO.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_SG.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zh_TW.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zu.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata/zu_ZA.dat
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/catalog.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/catalog.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/catalog.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/extract.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/extract.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/extract.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/frontend.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/frontend.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/frontend.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/plurals.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/plurals.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/plurals.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/pofile.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/pofile.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/pofile.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/__init__.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/core.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/core.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/core.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/dates.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/dates.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/dates.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/numbers.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/numbers.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/numbers.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/support.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/support.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/support.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/util.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/util.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/util.pyo
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/__init__.py
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/aa.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/aa_DJ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/aa_ER.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/aa_ER_SAAHO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/aa_ET.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/af.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/af_NA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/af_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ak.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ak_GH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/am.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/am_ET.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_AE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_BH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_DZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_EG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_IQ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_JO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_KW.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_LB.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_LY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_MA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_OM.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_QA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_SA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_SD.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_SY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_TN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ar_YE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/as.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/as_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/az.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/az_AZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/az_Cyrl.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/az_Cyrl_AZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/az_Latn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/az_Latn_AZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/be.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/be_BY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/bg.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/bg_BG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/bn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/bn_BD.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/bn_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/bs.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/bs_BA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/byn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/byn_ER.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ca.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ca_ES.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/cch.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/cch_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/cs.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/cs_CZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/cy.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/cy_GB.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/da.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/da_DK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/de.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/de_AT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/de_BE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/de_CH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/de_DE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/de_LI.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/de_LU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/dv.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/dv_MV.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/dz.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/dz_BT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ee.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ee_GH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ee_TG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/el.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/el_CY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/el_GR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/el_POLYTONI.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_AS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_AU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_BE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_BW.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_BZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_CA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_GB.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_GU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_HK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_IE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_JM.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_MH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_MP.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_MT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_NA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_NZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_PH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_PK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_SG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_TT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_UM.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_US.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_US_POSIX.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_VI.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/en_ZW.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/eo.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_AR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_BO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_CL.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_CO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_CR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_DO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_EC.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_ES.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_GT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_HN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_MX.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_NI.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_PA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_PE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_PR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_PY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_SV.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_US.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_UY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/es_VE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/et.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/et_EE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/eu.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/eu_ES.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fa.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fa_AF.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fa_IR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fi.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fi_FI.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fo.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fo_FO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fr.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fr_BE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fr_CA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fr_CH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fr_FR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fr_LU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fr_MC.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fur.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/fur_IT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ga.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gaa.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gaa_GH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ga_IE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gez.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gez_ER.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gez_ET.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gl.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gl_ES.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gu.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gu_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gv.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/gv_GB.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/haw.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/haw_US.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_Arab.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_Arab_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_GH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_Latn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_Latn_GH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_Latn_NE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_Latn_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_NE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ha_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/he.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/he_IL.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hi.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hi_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hr.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hr_HR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hu.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hu_HU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hy.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hy_AM.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/hy_AM_REVISED.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ia.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/id.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/id_ID.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ig.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ig_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/is.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/is_IS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/it.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/it_CH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/it_IT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/iu.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ja.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ja_JP.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ka.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kaj.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kaj_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kam.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kam_KE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ka_GE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kcg.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kcg_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kfo.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kfo_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kk.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kk_KZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kl.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kl_GL.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/km.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/km_KH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kn_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ko.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kok.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kok_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ko_KR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_Arab.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_IQ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_IR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_Latn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_Latn_IQ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_Latn_IR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_Latn_SY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_Latn_TR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_SY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ku_TR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kw.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/kw_GB.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ky.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ky_KG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ln.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ln_CD.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ln_CG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/lo.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/lo_LA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/lt.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/lt_LT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/lv.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/lv_LV.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/mk.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/mk_MK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ml.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ml_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/mn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/mn_MN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/mr.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/mr_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ms.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ms_BN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ms_MY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/mt.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/mt_MT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nb.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nb_NO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ne.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ne_NP.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nl.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nl_BE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nl_NL.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nn_NO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nr.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nr_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nso.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/nso_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ny.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ny_MW.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/om.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/om_ET.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/om_KE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/or.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/or_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pa.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pa_Arab.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pa_Arab_PK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pa_Guru.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pa_Guru_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pa_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pa_PK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pl.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pl_PL.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ps.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ps_AF.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pt.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pt_BR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/pt_PT.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ro.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/root.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ro_RO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ru.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ru_RU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ru_UA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/rw.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/rw_RW.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sa.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sa_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/se.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/se_NO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sh.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sh_BA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sh_CS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sh_YU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sid.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sid_ET.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sk.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sk_SK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sl.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sl_SI.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/so.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/so_DJ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/so_ET.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/so_KE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/so_SO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sq.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sq_AL.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_BA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_CS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Cyrl.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Cyrl_BA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Cyrl_CS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Cyrl_ME.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Cyrl_RS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Cyrl_YU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Latn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Latn_BA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Latn_CS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Latn_ME.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Latn_RS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_Latn_YU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_ME.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_RS.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sr_YU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ss.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ss_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/st.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/st_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sv.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sv_FI.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sv_SE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sw.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sw_KE.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/sw_TZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/syr.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/syr_SY.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ta.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ta_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/te.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/te_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tg.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tg_TJ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/th.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/th_TH.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ti.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tig.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tig_ER.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ti_ER.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ti_ET.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tn_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tr.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tr_TR.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ts.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ts_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tt.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/tt_RU.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uk.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uk_UA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ur.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ur_IN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ur_PK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz_AF.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz_Arab.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz_Arab_AF.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz_Cyrl.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz_Cyrl_UZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz_Latn.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz_Latn_UZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/uz_UZ.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ve.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/ve_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/vi.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/vi_VN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/wal.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/wal_ET.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/xh.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/xh_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/yo.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/yo_NG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_CN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_Hans.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_Hans_CN.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_Hans_SG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_Hant.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_Hant_HK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_Hant_MO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_Hant_TW.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_HK.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_MO.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_SG.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zh_TW.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zu.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata/zu_ZA.dat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/catalog.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/catalog.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/catalog.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/extract.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/extract.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/extract.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/frontend.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/frontend.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/frontend.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/plurals.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/plurals.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/plurals.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/pofile.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/pofile.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/pofile.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/core.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/core.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/core.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/dates.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/dates.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/dates.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/numbers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/numbers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/numbers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/support.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/support.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/support.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/__init__.pyo
%%PORTDOCS%%%%DOCSDIR%%/api/api-objects.txt
%%PORTDOCS%%%%DOCSDIR%%/api/babel-module.html
%%PORTDOCS%%%%DOCSDIR%%/api/babel.core-module.html
@@ -515,11 +515,11 @@ bin/pybabel
%%PORTDOCS%%%%DOCSDIR%%/setup.txt
%%PORTDOCS%%%%DOCSDIR%%/support.html
%%PORTDOCS%%%%DOCSDIR%%/support.txt
-@dirrm %%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/localedata
-@dirrm %%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel/messages
-@dirrm %%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg/babel
-@dirrm %%PYTHON_SITELIBDIR%%/Babel-%%BABELVER%%-py%%PYTHONVER%%.egg
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/localedata
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel/messages
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/babel
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
%%PORTDOCS%%@dirrm %%DOCSDIR%%/conf
%%PORTDOCS%%@dirrm %%DOCSDIR%%/style
diff --git a/devel/py-bison/Makefile b/devel/py-bison/Makefile
index 33873c8948ec..077e9d62661c 100644
--- a/devel/py-bison/Makefile
+++ b/devel/py-bison/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= bison:${PORTSDIR}/devel/bison
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.1
.if !defined(NOPORTDOCS)
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-celementtree/Makefile b/devel/py-celementtree/Makefile
index 02adb1db73b5..11bb989540e3 100644
--- a/devel/py-celementtree/Makefile
+++ b/devel/py-celementtree/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-e
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 1.0.5-20051216
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 7c307e677276..49cacd104871 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -21,8 +21,11 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
NO_PACKAGE= not yet
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= Cheetah
+PYDISTUTILS_PKGVERSION= 2.0rc7
MAKE_ENV= CHEETAH_USE_SETUPTOOLS=yes
PYDISTUTILS_CONFIGUREARGS= bdist_egg --plat-name=""
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
CHEETAHVER= 2.0rc7
PYTHONVER?= ${_PYTHON_VERSION}
PLIST_SUB= CHEETAHVER=${CHEETAHVER} \
diff --git a/devel/py-cjson/Makefile b/devel/py-cjson/Makefile
index c42c32cb332e..48385c8b1459 100644
--- a/devel/py-cjson/Makefile
+++ b/devel/py-cjson/Makefile
@@ -17,6 +17,7 @@ COMMENT= Fast JSON encoder/decoder for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-cjson
PLIST_FILES= %%PYTHON_SITELIBDIR%%/cjson.so
diff --git a/devel/py-cxx/Makefile b/devel/py-cxx/Makefile
index dbebda404a59..90a4b811eafb 100644
--- a/devel/py-cxx/Makefile
+++ b/devel/py-cxx/Makefile
@@ -20,6 +20,8 @@ COMMENT= Make it easier to extend Python with C++
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= CXX
+PYDISTUTILS_PKGVERSION= 5.3
.if !defined(NOPORTDOCS)
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/devel/py-dateutil/Makefile b/devel/py-dateutil/Makefile
index 2995eee138f6..c9cbad8826e6 100644
--- a/devel/py-dateutil/Makefile
+++ b/devel/py-dateutil/Makefile
@@ -18,5 +18,6 @@ COMMENT= Provides powerful extensions to the standard datetime module
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-dateutil
.include <bsd.port.mk>
diff --git a/devel/py-decorator/Makefile b/devel/py-decorator/Makefile
index 931ab53b87ee..12b6acba12f0 100644
--- a/devel/py-decorator/Makefile
+++ b/devel/py-decorator/Makefile
@@ -15,22 +15,12 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dsh@vlink.ru
COMMENT= Better living through Python with decorators
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-
USE_PYTHON= 2.4+
-USE_PYDISTUTILS= yes
+USE_PYDISTUTILS= easy_install
USE_ZIP= yes
EXTRACT_AFTER_ARGS= -d ${WRKSRC}
-PYDECORATOR_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYDECORATOR_EGG=${PYDECORATOR_EGG}
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
-
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
PORTDOCS= documentation.*
diff --git a/devel/py-decorator/pkg-plist b/devel/py-decorator/pkg-plist
index dd6eb3918b9d..ddf68a1c022f 100644
--- a/devel/py-decorator/pkg-plist
+++ b/devel/py-decorator/pkg-plist
@@ -1,12 +1 @@
-@unexec %%EASY_INSTALL_CMD%% -N -m -q %D/%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/decorator.py
-%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/decorator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/decorator.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N -q %D/%%PYTHON_SITELIBDIR%%/%%PYDECORATOR_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-dialog/Makefile b/devel/py-dialog/Makefile
index 3c6b306c0a9e..44db511833fb 100644
--- a/devel/py-dialog/Makefile
+++ b/devel/py-dialog/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS= cdialog:${PORTSDIR}/devel/cdialog
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pythondialog
EXAMPLESDIR= ${PREFIX}/share/examples/py-dialog
diff --git a/devel/py-durus/Makefile b/devel/py-durus/Makefile
index 210a98f0399c..8a67ff5cc75b 100644
--- a/devel/py-durus/Makefile
+++ b/devel/py-durus/Makefile
@@ -20,6 +20,7 @@ COMMENT= A persistent object storage system for Python
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Durus
MAN1= durus.1
.include <bsd.port.pre.mk>
diff --git a/devel/py-elementtree/Makefile b/devel/py-elementtree/Makefile
index 50991dac7103..f63d7c45a3ab 100644
--- a/devel/py-elementtree/Makefile
+++ b/devel/py-elementtree/Makefile
@@ -17,6 +17,7 @@ COMMENT= Container for hierarchical data structures written in Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 1.2.6-20050316
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile
index cad4fc701ecc..5b865d9516fd 100644
--- a/devel/py-epsilon/Makefile
+++ b/devel/py-epsilon/Makefile
@@ -18,6 +18,7 @@ COMMENT= Epsilon is a set of Python utility modules used by DivMod projects
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Epsilon
USE_TWISTED= yes
NO_BUILD= yes
diff --git a/devel/py-fam/Makefile b/devel/py-fam/Makefile
index 18b2fba921ec..e01a7c901001 100644
--- a/devel/py-fam/Makefile
+++ b/devel/py-fam/Makefile
@@ -19,6 +19,7 @@ COMMENT= Python Interface to the File Alteration Monitor
PLIST_FILES= %%PYTHON_SITELIBDIR%%/_fam.so
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.0.0
USE_FAM= yes
pre-patch:
diff --git a/devel/py-fileutils/Makefile b/devel/py-fileutils/Makefile
index 9a97836789ce..8bf340ebed7e 100644
--- a/devel/py-fileutils/Makefile
+++ b/devel/py-fileutils/Makefile
@@ -19,5 +19,6 @@ COMMENT= File I/O related functions and classes
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= FileUtils
.include <bsd.port.mk>
diff --git a/devel/py-flakes/Makefile b/devel/py-flakes/Makefile
index 5c78277465d7..32f288546dd4 100644
--- a/devel/py-flakes/Makefile
+++ b/devel/py-flakes/Makefile
@@ -17,6 +17,7 @@ COMMENT= Pyflakes is a program that analyzes Python programs for errors
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyflakes
NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/devel/py-fortran/Makefile b/devel/py-fortran/Makefile
index ba160305ff15..837de0919051 100644
--- a/devel/py-fortran/Makefile
+++ b/devel/py-fortran/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= ${PYNUMERIC}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Pyfort
WRKSRC= ${WRKDIR}/${DISTNAME:S/p/P/}
.include <bsd.port.mk>
diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index ca89f79c1cdc..46b206ae6133 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -20,6 +20,7 @@ COMMENT= Python interface to FreeBSD-specific system libraries
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= py-freebsd
PLIST_FILES= %%PYTHON_SITELIBDIR%%/freebsd.so \
%%PYTHON_SITELIBDIR%%/freebsd_compat02.py \
diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile
index 3b14fffdde04..2ae4cfc022dc 100644
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@@ -22,4 +22,7 @@ USE_PYTHON= yes
USE_PYDISTUTILS=yes
USE_GNOME= pkgconfig
+PYDISTUTILS_PKGNAME= fuse-python
+PYDISTUTILS_PKGVERSION= 0.2pre1
+
.include <bsd.port.mk>
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index ce1644a8366f..0893b495856b 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -25,6 +25,9 @@ USE_PYTHON= yes
USE_PYDISTUTILS=yes
USE_XLIB= yes
+PYDISTUTILS_PKGNAME= pygame
+PYDISTUTILS_PKGVERSION= 1.7.1release
+
do-configure:
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} config.py
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 7fa67d6cbea2..e7c9fc4cfe10 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -17,6 +17,7 @@ COMMENT= GData Python Client Library
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= gdata.py
EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME}
diff --git a/devel/py-generate/Makefile b/devel/py-generate/Makefile
index 547ce9480d8b..57a4c4f59224 100644
--- a/devel/py-generate/Makefile
+++ b/devel/py-generate/Makefile
@@ -21,5 +21,6 @@ USE_GMAKE= yes
PLIST_FILES= %%PYTHON_SITELIBDIR%%/generate.so
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 2.2
.include <bsd.port.mk>
diff --git a/devel/py-grouch/Makefile b/devel/py-grouch/Makefile
index 4fc267b8dcfe..5f7f532f518a 100644
--- a/devel/py-grouch/Makefile
+++ b/devel/py-grouch/Makefile
@@ -17,6 +17,7 @@ COMMENT= A system for describing and enforcing a Python object schema
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Grouch
.include <bsd.port.pre.mk>
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index 5fe8e7234f67..873293950bf7 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/devel/py-instant/Makefile b/devel/py-instant/Makefile
index d2e1fbf3b571..7182d3dab397 100644
--- a/devel/py-instant/Makefile
+++ b/devel/py-instant/Makefile
@@ -20,6 +20,8 @@ RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Instant
+PYDISTUTILS_PKGVERSION= 0.8
PLIST_FILES= %%PYTHON_SITELIBDIR%%/Instant.py \
%%PYTHON_SITELIBDIR%%/Instant.pyc \
diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile
index 630039676ede..79f847fbb150 100644
--- a/devel/py-json-py/Makefile
+++ b/devel/py-json-py/Makefile
@@ -19,7 +19,7 @@ COMMENT= A python implementation of a JSON (http//:json.org) reader/writer
NO_WRKSUBDIR= yes
-USE_PYTHON= 2.4
+USE_PYTHON= 2.4+
USE_ZIP= yes
do-build:
@@ -27,7 +27,7 @@ do-build:
cd ${WRKDIR}; \
FILES=$$(${FIND} . -name "*.py" ); \
for FILE in $${FILES}; do \
- ${ECHO} import `basename $${FILE} .py` | python; \
+ ${ECHO} import `basename $${FILE} .py` | ${PYTHON_CMD}; \
done; \
do-install:
diff --git a/devel/py-kid/Makefile b/devel/py-kid/Makefile
index 5cf50e37f1b0..f0508db320e2 100644
--- a/devel/py-kid/Makefile
+++ b/devel/py-kid/Makefile
@@ -27,6 +27,7 @@ PLIST_SUB+= PYKID_EGG=${PYKID_EGG} \
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PYDISTUTILS_BUILD_TARGET= bdist_egg
PYDISTUTILS_INSTALL_TARGET= easy_install
PYDISTUTILS_INSTALLARGS= -N -O1 -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PYKID_EGG}
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index d5a822af6829..5209b39d5fb3 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -19,6 +19,7 @@ COMMENT= Graph and set datatypes for Python (C extension)
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 2.2
WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets
post-install:
diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile
index aea7aa290849..690cab471171 100644
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@@ -21,6 +21,7 @@ USE_BZIP2= yes
USE_PYTHON= yes
FILES= kqsyscallmodule.so KQueue.py KQueue.pyc
PLIST_FILES= ${FILES:S+^+%%PYTHON_SITELIBDIR%%/+g}
+MAKE_ENV= MAINCC=${CC}
.include <bsd.port.pre.mk>
diff --git a/devel/py-levenshtein/Makefile b/devel/py-levenshtein/Makefile
index 7e5cae878385..aca872012001 100644
--- a/devel/py-levenshtein/Makefile
+++ b/devel/py-levenshtein/Makefile
@@ -22,5 +22,6 @@ WRKSRC= ${WRKDIR}/python-Levenshtein-${PORTVERSION}
USE_PYTHON= 2.2+
USE_PYTHON_PREFIX= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-Levenshtein
.include <bsd.port.mk>
diff --git a/devel/py-ll-core/pkg-plist b/devel/py-ll-core/pkg-plist
index 8797520f3142..1a23076f6264 100644
--- a/devel/py-ll-core/pkg-plist
+++ b/devel/py-ll-core/pkg-plist
@@ -27,6 +27,8 @@ bin/ucp.py
%%PYTHON_SITELIBDIR%%/ll/scripts/__init__.pyc
%%PYTHON_SITELIBDIR%%/ll/scripts/__init__.pyo
%%PYTHON_SITELIBDIR%%/ll/scripts/ucp.py
+%%PYTHON_SITELIBDIR%%/ll/scripts/ucp.pyc
+%%PYTHON_SITELIBDIR%%/ll/scripts/ucp.pyo
%%PYTHON_SITELIBDIR%%/ll/sisyphus.py
%%PYTHON_SITELIBDIR%%/ll/sisyphus.pyc
%%PYTHON_SITELIBDIR%%/ll/sisyphus.pyo
diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index 85a8ea29854d..33e25370a071 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
MANUAL_PACKAGE_BUILD=Doesn't build in tinderbox environment
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/devel/py-magic/Makefile b/devel/py-magic/Makefile
index 5b4e45a62ea1..95094ae404a1 100644
--- a/devel/py-magic/Makefile
+++ b/devel/py-magic/Makefile
@@ -18,6 +18,8 @@ COMMENT= Python module for determing file type
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Magic_file_extensions
+PYDISTUTILS_PKGVERSION= 0.1
WRKSRC= ${WRKDIR}/file-${PORTVERSION}/python
diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index 7fdf19e86f02..2fc3f4016e1a 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-b
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= egenix-mx-experimental
post-patch:
@${REINPLACE_CMD} -e "s|LIBGMPH|${PREFIX}/include|" ${WRKSRC}/mxEXPERIMENTAL.py
diff --git a/devel/py-myghtyutils/Makefile b/devel/py-myghtyutils/Makefile
index d86fdd43ff2a..edbfd95d74bf 100644
--- a/devel/py-myghtyutils/Makefile
+++ b/devel/py-myghtyutils/Makefile
@@ -17,18 +17,9 @@ DISTNAME= MyghtyUtils-${PORTVERSION}
MAINTAINER= dryice@FreeBSD.org
COMMENT= Container and Utility Functions from the Myghty Template Framework
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
USE_PYTHON= yes
USE_ZIP= yes
-USE_PYDISTUTILS= yes
-
-PYMYGHTYUTILS_EGG= MyghtyUtils-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYMYGHTYUTILS_EGG=${PYMYGHTYUTILS_EGG}
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
+USE_PYDISTUTILS= easy_install
+PYDISTUTILS_PKGNAME= MyghtyUtils
.include <bsd.port.mk>
diff --git a/devel/py-myghtyutils/pkg-plist b/devel/py-myghtyutils/pkg-plist
index c226b34b7b74..ddf68a1c022f 100644
--- a/devel/py-myghtyutils/pkg-plist
+++ b/devel/py-myghtyutils/pkg-plist
@@ -1,3 +1 @@
-@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYMYGHTYUTILS_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYMYGHTYUTILS_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/%%PYMYGHTYUTILS_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-ncurses/Makefile b/devel/py-ncurses/Makefile
index 6b95dfda25bd..ac317282ed2e 100644
--- a/devel/py-ncurses/Makefile
+++ b/devel/py-ncurses/Makefile
@@ -19,6 +19,7 @@ COMMENT= A ncurses binding for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyncurses
.include <bsd.port.pre.mk>
diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile
index 149c64423705..fd9443503736 100644
--- a/devel/py-nose/Makefile
+++ b/devel/py-nose/Makefile
@@ -17,16 +17,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dryice@FreeBSD.org
COMMENT= A discovery-based unittest extension
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
USE_PYTHON= 2.3+
-USE_PYDISTUTILS= yes
+USE_PYDISTUTILS= easy_install
MAN1= nosetests.1
-NOSEVER?= ${PORTVERSION}
-PYTHONVER?= ${_PYTHON_VERSION}
-PLIST_SUB= NOSEVER=${NOSEVER} \
- PYTHONVER=${PYTHONVER}
post-install:
${INSTALL_MAN} ${WRKSRC}/nosetests.1 ${PREFIX}/man/man1
diff --git a/devel/py-nose/pkg-plist b/devel/py-nose/pkg-plist
index 8da956385be1..9c4a1286895e 100644
--- a/devel/py-nose/pkg-plist
+++ b/devel/py-nose/pkg-plist
@@ -1,83 +1,83 @@
bin/nosetests
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/attrib.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/attrib.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/attrib.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/base.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/base.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/base.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/cover.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/cover.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/cover.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/doctests.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/doctests.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/doctests.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/isolate.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/isolate.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/isolate.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/missed.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/missed.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/missed.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/prof.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/prof.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/prof.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/case.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/case.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/case.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/commands.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/commands.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/commands.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/config.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/config.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/config.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/core.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/core.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/core.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/exc.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/exc.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/exc.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/importer.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/importer.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/importer.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/inspector.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/inspector.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/inspector.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/loader.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/loader.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/loader.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/proxy.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/proxy.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/proxy.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/result.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/result.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/result.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/selector.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/selector.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/selector.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/suite.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/suite.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/suite.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/tools.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/tools.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/tools.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/twistedtools.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/twistedtools.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/twistedtools.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/util.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/util.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/util.pyo
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/__init__.py
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/__init__.pyc
-%%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg/nose
-@dirrm %%PYTHON_SITELIBDIR%%/nose-%%NOSEVER%%-py%%PYTHONVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/attrib.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/attrib.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/attrib.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/cover.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/cover.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/cover.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/doctests.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/doctests.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/doctests.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/isolate.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/isolate.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/isolate.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/missed.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/missed.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/missed.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/prof.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/prof.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/prof.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/case.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/case.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/case.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/commands.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/commands.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/commands.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/config.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/config.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/config.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/core.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/core.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/core.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/exc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/exc.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/exc.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/importer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/importer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/importer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/inspector.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/inspector.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/inspector.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/loader.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/loader.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/loader.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/proxy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/proxy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/proxy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/result.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/result.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/result.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/selector.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/selector.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/selector.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/suite.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/suite.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/suite.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/tools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/tools.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/tools.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/twistedtools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/twistedtools.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/twistedtools.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/__init__.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/nose
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-notifier/Makefile b/devel/py-notifier/Makefile
index 2a6d3e4461fc..c7db4076e8c3 100644
--- a/devel/py-notifier/Makefile
+++ b/devel/py-notifier/Makefile
@@ -17,6 +17,7 @@ COMMENT= A generic notifier/event scheduler abstraction
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pynotifier
EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME}
diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile
index c9cf7ac1122b..fb1694bb7e23 100644
--- a/devel/py-ocempgui/Makefile
+++ b/devel/py-ocempgui/Makefile
@@ -24,6 +24,7 @@ USE_GNOME= atk
USE_GCC= 3.4+
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= OcempGUI
post-patch:
.if defined(NOPORTDOCS)
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index 039ca7222f6d..288f46a8a2eb 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -24,6 +24,7 @@ USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= PyODE
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
diff --git a/devel/py-parsedatetime/Makefile b/devel/py-parsedatetime/Makefile
index 9b8697f5f25a..80ba17ac288e 100644
--- a/devel/py-parsedatetime/Makefile
+++ b/devel/py-parsedatetime/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
PYDISTUTILS_BUILD_TARGET= bdist_egg
diff --git a/devel/py-parsing/Makefile b/devel/py-parsing/Makefile
index 81b6b43eddaa..19178c61a312 100644
--- a/devel/py-parsing/Makefile
+++ b/devel/py-parsing/Makefile
@@ -18,6 +18,7 @@ COMMENT= General parsing module for Python
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pyparsing
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index e29efa7876c5..129f6319fb1b 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -19,6 +19,7 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/pqueue.so
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 0.0.0
WRKSRC= ${WRKDIR}/PQueue
diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile
index 53c1b8a3a1da..06e2672cf93c 100644
--- a/devel/py-protocols-devel/Makefile
+++ b/devel/py-protocols-devel/Makefile
@@ -30,8 +30,10 @@ SUB_LIST+= EGG="PyProtocols==${PYPROTOCOLS_VER}" \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 1.0a0
USE_ZIP= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PYPROTOCOLS_EGG= PyProtocols-${PYPROTOCOLS_VER}-py${PYTHON_VERSION:S/^python//}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg
PYPROTOCOLS_VER?= 1.0a0
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index 2753dd3b786a..bd5ed47bc3fd 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -18,5 +18,6 @@ COMMENT= Python module extending the PEP 246 adapt() function
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyProtocols
.include <bsd.port.mk>
diff --git a/devel/py-pydasm/Makefile b/devel/py-pydasm/Makefile
index f2414fcf0bd3..471f99aef7cc 100644
--- a/devel/py-pydasm/Makefile
+++ b/devel/py-pydasm/Makefile
@@ -18,6 +18,7 @@ COMMENT= A python interface to libdasm
WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 1.2
.if !defined(WITHOUT_EXAMPLES)
PLIST_SUB+= EXAMPLES=""
diff --git a/devel/py-pytz/Makefile b/devel/py-pytz/Makefile
index 24a679f83361..ccd95205b701 100644
--- a/devel/py-pytz/Makefile
+++ b/devel/py-pytz/Makefile
@@ -24,6 +24,7 @@ USE_PYDISTUTILS= yes
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PYDISTUTILS_BUILD_TARGET= bdist_egg
PYDISTUTILS_INSTALL_TARGET= easy_install
PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYPYTZ_EGG}
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index 25275f16cb96..ebd934c45e01 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -17,28 +17,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= quakelee@cn.FreeBSD.org
COMMENT= A collection of mature utilities for Python programmers
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
-
-USE_PYTHON= 2.4
-USE_PYDISTUTILS= yes
-PYTHONVER?= ${_PYTHON_VERSION}
-
-PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYTHONVER=${PYTHONVER} \
- PYUTIL_EGG=${PYUTIL_EGG} \
- PYUTIL_EGG_VER="${PORTNAME}==${PORTVERSION}"
-OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH}
-PYUTIL_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}-${OSINFOS}.egg
+USE_PYTHON= 2.4+
+USE_PYDISTUTILS=easy_install
+PYEASYINSTALL_ARCHDEP= yes
post-patch:
@${REINPLACE_CMD} -e 's|^from\ ez\_setup|#from\ ez\_setup|' \
-e 's|^use_setuptools|#use_setuptools|' ${WRKSRC}/${PYSETUP}
-.include <bsd.port.pre.mk>
-
-OSRELEASE!= ${DESTDIR}/usr/bin/uname -r
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-pyutil/pkg-plist b/devel/py-pyutil/pkg-plist
index 35cd05ee1ae2..ddf68a1c022f 100644
--- a/devel/py-pyutil/pkg-plist
+++ b/devel/py-pyutil/pkg-plist
@@ -1,2 +1 @@
-@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYUTIL_EGG_VER%%
-%%PYTHON_SITELIBDIR%%/%%PYUTIL_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-rbtree/Makefile b/devel/py-rbtree/Makefile
index 4306938e3c95..c92936b8c17a 100644
--- a/devel/py-rbtree/Makefile
+++ b/devel/py-rbtree/Makefile
@@ -16,33 +16,15 @@ DIST_SUBDIR= python
MAINTAINER= python@FreeBSD.org
COMMENT= A fast tree with ordered data and expanded iterator support
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools \
- pyrexc:${PORTSDIR}/devel/pyrex
-RUN_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
-PYDISTUTILS_BUILD_TARGET= bdist_egg
-PYDISTUTILS_INSTALL_TARGET= easy_install
-PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYRBTREE_EGG}
-
-PYRBTREE_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}-${OSINFOS}.egg
-OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH}
-
-PLIST_SUB+= PYRBTREE_EGG=${PYRBTREE_EGG}
+USE_PYDISTUTILS= easy_install
+PYEASYINSTALL_ARCHDEP= yes
.if !defined(NOPORTDOCS)
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
PORTDOCS= *
.endif
-pre-build:
- @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c build -o build-platlib -s lib.${OSINFOS}
- @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c build -o build-temp -s temp.${OSINFOS}-${PYTHON_VER}
- @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c bdist_egg -o plat-name -s ${OSINFOS}
- @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c bdist -o plat-name -s ${OSINFOS}
-
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@@ -52,8 +34,4 @@ post-install:
test: build
(cd ${WRKSRC} && ${PYTHON_CMD} test_rbtree.py)
-.include <bsd.port.pre.mk>
-
-OSRELEASE!= uname -r
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-rbtree/pkg-plist b/devel/py-rbtree/pkg-plist
index a8cbe9543e15..3c60de869620 100644
--- a/devel/py-rbtree/pkg-plist
+++ b/devel/py-rbtree/pkg-plist
@@ -1,14 +1,12 @@
-@unexec easy_install -q -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/EGG-INFO/native_libs.txt
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/rbtree.py
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/rbtree.pyc
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/rbtree.pyo
-%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/rbtree.so
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%
-@exec easy_install -N %D/%%PYTHON_SITELIBDIR%%/%%PYRBTREE_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rbtree.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rbtree.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rbtree.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rbtree.so
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-repl/Makefile b/devel/py-repl/Makefile
index 6f788246a145..2d7064baf2c5 100644
--- a/devel/py-repl/Makefile
+++ b/devel/py-repl/Makefile
@@ -18,5 +18,6 @@ COMMENT= Replacement for readline and interactive environment for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= pyrepl
.include <bsd.port.mk>
diff --git a/devel/py-resourcepackage/Makefile b/devel/py-resourcepackage/Makefile
index 4e2a07ec4ec1..017cb04c77d9 100644
--- a/devel/py-resourcepackage/Makefile
+++ b/devel/py-resourcepackage/Makefile
@@ -19,6 +19,7 @@ COMMENT= Automated resource-as-package embedding mechanism
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= ResourcePackage
post-install:
@${FIND} ${PYTHON_SITELIBDIR}/resourcepackage -type f | \
diff --git a/devel/py-reverse/Makefile b/devel/py-reverse/Makefile
index 2b9192a1f60a..03885e6fa222 100644
--- a/devel/py-reverse/Makefile
+++ b/devel/py-reverse/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${PYXML} \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyreverse
post-install:
@${FIND} ${PYTHON_SITELIBDIR}/logilab/pyreverse ! -type d | \
diff --git a/devel/py-reverse/files/patch-setup.py b/devel/py-reverse/files/patch-setup.py
new file mode 100644
index 000000000000..e224cbd312bb
--- /dev/null
+++ b/devel/py-reverse/files/patch-setup.py
@@ -0,0 +1,15 @@
+--- setup.py.orig Fri Mar 30 08:39:28 2007
++++ setup.py Fri Mar 30 08:39:37 2007
+@@ -16,11 +16,11 @@
+ # You should have received a copy of the GNU General Public License along with
+ # this program; if not, write to the Free Software Foundation, Inc.,
+ # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++from __future__ import nested_scopes
+ """ Generic Setup script, takes package info from __pkginfo__.py file """
+
+ __revision__ = '$Id: setup.py,v 1.17 2005/01/05 11:40:41 syt Exp $'
+
+-from __future__ import nested_scopes
+ import os
+ import sys
+ import shutil
diff --git a/devel/py-ro/Makefile b/devel/py-ro/Makefile
index b39277470983..c5961f0a264f 100644
--- a/devel/py-ro/Makefile
+++ b/devel/py-ro/Makefile
@@ -19,6 +19,7 @@ COMMENT= Python Remote Objects
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Pyro
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile
index 392b3b3db1c1..502be1bcc257 100644
--- a/devel/py-ruledispatch/Makefile
+++ b/devel/py-ruledispatch/Makefile
@@ -25,6 +25,7 @@ NO_PACKAGE= not yet
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.5a0
PLIST_FILES+= lib/${PYTHON_VERSION}/site-packages/${PYRULEDISPATCH_EGG}
@@ -32,6 +33,7 @@ SUB_FILES+= pkg-deinstall pkg-install
SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
EGG="RuleDispatch==${PYRULEDISPATCH_VER}"
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH}
PYRULEDISPATCH_EGG= ${PORTNAME}-${PYRULEDISPATCH_VER}-py${PYTHON_VERSION:S/^python//}-${OSINFOS}.egg
PYRULEDISPATCH_VER?= 0.5a0
diff --git a/devel/py-sendfile/Makefile b/devel/py-sendfile/Makefile
index 8d20e56ae633..958cf4950c2d 100644
--- a/devel/py-sendfile/Makefile
+++ b/devel/py-sendfile/Makefile
@@ -18,6 +18,8 @@ COMMENT= Python interface to the sendfile(2) system call
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= py-sendfile
+PYDISTUTILS_PKGVERSION= 1.0
PLIST_FILES= %%PYTHON_SITELIBDIR%%/sendfile.so
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 1a2696125f5d..826c6397d940 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -17,6 +17,7 @@ COMMENT= Download, build, install, upgrade, and uninstall Python packages
DIST_SUBDIR= python
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PLIST_SUB= VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}
.include <bsd.port.pre.mk>
diff --git a/devel/py-simplejson/Makefile b/devel/py-simplejson/Makefile
index 526beb69e09c..6a364c894ffa 100644
--- a/devel/py-simplejson/Makefile
+++ b/devel/py-simplejson/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX use bsd.python.mk's
PYSIMPLEJSON_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}-${OSINFOS}.egg
OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH}
diff --git a/devel/py-simpleparse/Makefile b/devel/py-simpleparse/Makefile
index 76025967e8af..16d80d56b82a 100644
--- a/devel/py-simpleparse/Makefile
+++ b/devel/py-simpleparse/Makefile
@@ -21,5 +21,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/TextTools/TextTools.py:${PORTSDIR}/lang/py-
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= SimpleParse
+PYDISTUTILS_PKGVERSION= 2.1.0a1
.include <bsd.port.mk>
diff --git a/devel/py-simpletal/Makefile b/devel/py-simpletal/Makefile
index 6ec752f5b633..cbf10bf3fd4d 100644
--- a/devel/py-simpletal/Makefile
+++ b/devel/py-simpletal/Makefile
@@ -17,5 +17,6 @@ COMMENT= Stand alone TAL Python implementation to power HTML & XML templates
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= SimpleTAL
.include <bsd.port.mk>
diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index b3bd8b55cc4f..f800e5fe8378 100644
--- a/devel/py-simpy/Makefile
+++ b/devel/py-simpy/Makefile
@@ -18,6 +18,7 @@ COMMENT= Simulation in Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= SimPy
OPTIONS= TKINTER "Install py-tkinter for plot" off
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
diff --git a/devel/py-statgrab/Makefile b/devel/py-statgrab/Makefile
index d57eb56d2473..04b83fa9e317 100644
--- a/devel/py-statgrab/Makefile
+++ b/devel/py-statgrab/Makefile
@@ -24,5 +24,6 @@ LIB_DEPENDS= statgrab.8:${PORTSDIR}/devel/libstatgrab
DIST_SUBDIR= i-scream
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pystatgrab
.include <bsd.port.mk>
diff --git a/devel/py-tconfpy/Makefile b/devel/py-tconfpy/Makefile
index 53ed9c799fbb..dcb362cd0148 100644
--- a/devel/py-tconfpy/Makefile
+++ b/devel/py-tconfpy/Makefile
@@ -13,6 +13,9 @@ MAINTAINER= tconfpy@tundraware.com
COMMENT= A Python Configuration File Parser
USE_PYTHON= yes
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGNAME= tconfpy
+PYDISTUTILS_PKGVERSION= 0.0.0
MANCOMPRESSED= yes
MAN1= test-tc.1
diff --git a/devel/py-testgears/Makefile b/devel/py-testgears/Makefile
index d645fb149623..82f0f4bbd87f 100644
--- a/devel/py-testgears/Makefile
+++ b/devel/py-testgears/Makefile
@@ -16,15 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python module to run tests written as simple functions
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-# need to remove the egg
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
-SUB_FILES= pkg-deinstall
-SUB_LIST= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
- EGG="${PORTNAME}==${PORTVERSION}"
+USE_PYDISTUTILS=easy_install
.include <bsd.port.mk>
diff --git a/devel/py-testgears/files/pkg-deinstall.in b/devel/py-testgears/files/pkg-deinstall.in
index 92b4ad53ba82..e69de29bb2d1 100644
--- a/devel/py-testgears/files/pkg-deinstall.in
+++ b/devel/py-testgears/files/pkg-deinstall.in
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
- DEINSTALL)
- easy_install -m -x -D -S %%PYTHON_SITELIBDIR%% %%EGG%%
- ;;
- POST-DEINSTALL)
- exit 0
- ;;
- *)
- echo "Unexpected Argument $2!!!"
- exit 1
- ;;
-esac
-exit 0
diff --git a/devel/py-testgears/pkg-plist b/devel/py-testgears/pkg-plist
index 0f8298feb33b..ddf68a1c022f 100644
--- a/devel/py-testgears/pkg-plist
+++ b/devel/py-testgears/pkg-plist
@@ -1,2 +1 @@
-@comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/TestGears-0.2-py2.4.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-trace2html/Makefile b/devel/py-trace2html/Makefile
index da97d25f863e..c087ac3ee481 100644
--- a/devel/py-trace2html/Makefile
+++ b/devel/py-trace2html/Makefile
@@ -22,6 +22,7 @@ USE_PYDISTUTILS= yes
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PYDISTUTILS_BUILD_TARGET= bdist_egg
PYDISTUTILS_INSTALL_TARGET= easy_install
PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYTRACE2HTML_EGG}
diff --git a/devel/py-turbokid/Makefile b/devel/py-turbokid/Makefile
index 1f984d388be7..fc594faa2653 100644
--- a/devel/py-turbokid/Makefile
+++ b/devel/py-turbokid/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= TurboKid
-PORTVERSION= 0.9.9
+PORTVERSION= 1.0.1
CATEGORIES= devel python
MASTER_SITES= http://cheeseshop.python.org/packages/${PYTHON_VER}/T/TurboKid/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/
@@ -21,7 +21,7 @@ BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
RUN_DEPENDS= ${BUILD_DEPENDS}
RUN_DEPENDS+= kid:${PORTSDIR}/devel/py-kid
-USE_PYTHON= 2.4
+USE_PYTHON= 2.4+
NO_BUILD= yes
diff --git a/devel/py-turbokid/distinfo b/devel/py-turbokid/distinfo
index 4135e96aad41..3a913d563cd3 100644
--- a/devel/py-turbokid/distinfo
+++ b/devel/py-turbokid/distinfo
@@ -1,3 +1,6 @@
-MD5 (TurboKid-0.9.9-py2.4.egg) = 3c4cdcc6716e6c2eeb5a3a6d5f16ac35
-SHA256 (TurboKid-0.9.9-py2.4.egg) = bec89877fdb30914799b2e030038e8742d5ea0a35ad6fdf52659519fa8eea08b
-SIZE (TurboKid-0.9.9-py2.4.egg) = 7179
+MD5 (TurboKid-1.0.1-py2.4.egg) = 0e459c886ced830ba6c6dd0356536ed0
+MD5 (TurboKid-1.0.1-py2.5.egg) = 6fcb0d847e5cf8c13816433f75a95b4d
+SHA256 (TurboKid-1.0.1-py2.4.egg) = c68ace1d90ad56107b5c5ac1d4bc8e3d9feb0cf6a63bb3d5fcf9f4804e99e8cd
+SHA256 (TurboKid-1.0.1-py2.5.egg) = 5a2baafd41c767b520b7b7d4b3b6dafb9a2e0fbc1db19786c4f58b9862d266b3
+SIZE (TurboKid-1.0.1-py2.4.egg) = 7360
+SIZE (TurboKid-1.0.1-py2.5.egg) = 7271
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 51688759434d..0aa899a0cd82 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -27,6 +27,8 @@ CONFLICTS= py??-twistedCore-[0-9]*
USE_BZIP2= yes
USE_PYTHON= 2.2+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted
+PYDISTUTILS_PKGVERSION= 1.3.0rc1
PLIST_SUB+= S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 193858182046..e41c5453b23c 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -29,6 +29,7 @@ CONFLICTS= py??-twisted-[0-9]*
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted
MAN1= manhole.1 mktap.1 pyhtmlizer.1 tap2deb.1 tap2rpm.1 tapconvert.1 trial.1 twistd.1
diff --git a/devel/py-twistedFlow/Makefile b/devel/py-twistedFlow/Makefile
index 406d696104fb..293b3934694f 100644
--- a/devel/py-twistedFlow/Makefile
+++ b/devel/py-twistedFlow/Makefile
@@ -25,6 +25,7 @@ WRKSRC= ${WRKDIR}/TwistedFlow-${PORTVERSION}
USE_BZIP2= yes
USE_PYTHON= 2.2+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Flow
PLIST_SUB+= S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
diff --git a/devel/py-twistedRunner/Makefile b/devel/py-twistedRunner/Makefile
index 42c14bef694e..5d35473d6435 100644
--- a/devel/py-twistedRunner/Makefile
+++ b/devel/py-twistedRunner/Makefile
@@ -23,6 +23,7 @@ WRKSRC= ${WRKDIR}/TwistedRunner-${PORTVERSION}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Runner
PLIST_SUB+= S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile
index acb8d1d77dbc..47945811e4b2 100644
--- a/devel/py-unit/Makefile
+++ b/devel/py-unit/Makefile
@@ -21,5 +21,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyUnit
.include <bsd.port.mk>
diff --git a/devel/py-utils/Makefile b/devel/py-utils/Makefile
index 7d6bd0a132af..320ee06dd47f 100644
--- a/devel/py-utils/Makefile
+++ b/devel/py-utils/Makefile
@@ -17,6 +17,8 @@ COMMENT= General utility modules that simplify common programming in Python
USE_PYTHON= 2.2+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pythonutils
+PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/pythonutils
WRKSRC= ${WRKDIR}/pythonutils-${PORTVERSION}
USE_ZIP= yes
diff --git a/devel/py-utils/files/patch-python25 b/devel/py-utils/files/patch-python25
new file mode 100644
index 000000000000..f87e7c74aaec
--- /dev/null
+++ b/devel/py-utils/files/patch-python25
@@ -0,0 +1,35 @@
+--- pythonutils/pathutils.py.orig Fri Mar 30 06:39:37 2007
++++ pythonutils/pathutils.py Fri Mar 30 06:39:49 2007
+@@ -14,13 +14,13 @@
+ # Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
+ # E-mail fuzzyman@voidspace.org.uk
+
++from __future__ import generators
+ """
+ This module contains convenience functions for working with files and paths.
+ """
+
+ __version__ = '0.2.4'
+
+-from __future__ import generators
+ import os
+ import sys
+ import time
+--- pythonutils/odict.py.orig Fri Mar 30 06:41:25 2007
++++ pythonutils/odict.py Fri Mar 30 06:41:35 2007
+@@ -14,6 +14,7 @@
+ # http://groups.google.com/group/pythonutils/
+ # Comments, suggestions and bug reports welcome.
+
++from __future__ import generators
+ """A dict that keeps keys in insertion order"""
+
+ __author__ = ('Nicola Larosa <nico-NoSp@m-tekNico.net>,'
+@@ -27,7 +28,6 @@
+
+ __all__ = ['OrderedDict', 'SequenceOrderedDict']
+
+-from __future__ import generators
+ from warnings import warn
+ from types import SliceType
+
diff --git a/devel/py-vmaps/Makefile b/devel/py-vmaps/Makefile
index 5c09731fba93..082c73dad105 100644
--- a/devel/py-vmaps/Makefile
+++ b/devel/py-vmaps/Makefile
@@ -19,6 +19,8 @@ COMMENT= Python Arrays on mmap()
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Vmaps
+PYDISTUTILS_PKGVERSION= 1.0
.if !defined(NOPORTDOCS)
post-install:
diff --git a/devel/py-wsgiutils/Makefile b/devel/py-wsgiutils/Makefile
index fd699d51f604..7e75990c266c 100644
--- a/devel/py-wsgiutils/Makefile
+++ b/devel/py-wsgiutils/Makefile
@@ -16,19 +16,10 @@ DISTNAME= WSGIUtils-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility libraries for development of simple WSGI programs
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-
-PLIST_FILES= ${PYTHON_SITELIBDIR:S,${PREFIX}/,,}/${PYWSGIUTILS_EGG}
-PLIST_SUB= PYWSGIUTILS_EGG="${PYWSGIUTILS_EGG}"
-
-SUB_FILES+= pkg-deinstall pkg-install
-SUB_LIST+= EGG="WSGIUtils==${PORTVERSION}" \
- PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
+USE_PYDISTUTILS=easy_install
+PYDISTUTILS_PKGNAME= WSGIUtils
-PYWSGIUTILS_EGG= WSGIUtils-${PORTVERSION}-py${PYTHON_VER}.egg
+PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PYEASYINSTALL_EGG}
.include <bsd.port.mk>
diff --git a/devel/py-wsgiutils/files/pkg-deinstall.in b/devel/py-wsgiutils/files/pkg-deinstall.in
deleted file mode 100644
index 8ee207b16f16..000000000000
--- a/devel/py-wsgiutils/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
- DEINSTALL)
- easy_install -q -m -x -S %%PYTHON_SITELIBDIR%% %%EGG%%
- ;;
- POST-DEINSTALL)
- exit 0
- ;;
- *)
- echo "Unexpected Argument $2!!!"
- exit 1
- ;;
-esac
-exit 0
diff --git a/devel/py-wsgiutils/files/pkg-install.in b/devel/py-wsgiutils/files/pkg-install.in
deleted file mode 100644
index 9cddbe28f167..000000000000
--- a/devel/py-wsgiutils/files/pkg-install.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
- POST-INSTALL)
- easy_install -q -N -S %%PYTHON_SITELIBDIR%% %%EGG%%
- ;;
- PRE-INSTALL)
- ;;
- *)
- echo "Unexpected Argument $2!!!"
- exit 1
- ;;
-esac
-exit 0
diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index 02ba1a264f72..6916f59a00b8 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -19,6 +19,7 @@ COMMENT= A python library to access freedesktop.org standards
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pyxdg
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/devel/py-yaml/Makefile b/devel/py-yaml/Makefile
index 2d785ac8d46a..be9b896dedc9 100644
--- a/devel/py-yaml/Makefile
+++ b/devel/py-yaml/Makefile
@@ -18,5 +18,6 @@ COMMENT= Python YAML parser
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyYAML
.include <bsd.port.mk>
diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile
index e1db34aeede0..24c703060f04 100644
--- a/devel/py-zconfig/Makefile
+++ b/devel/py-zconfig/Makefile
@@ -18,5 +18,6 @@ WRKSRC= ${WRKDIR}/ZConfig-${PORTVERSION}
USE_PYTHON= 2.2+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= ZConfig
.include <bsd.port.mk>
diff --git a/devel/py-zope.interface/Makefile b/devel/py-zope.interface/Makefile
index 1db11a1ea8c3..87f153e4defb 100644
--- a/devel/py-zope.interface/Makefile
+++ b/devel/py-zope.interface/Makefile
@@ -22,6 +22,8 @@ MANUAL_PACKAGE_BUILD=Doesn't build in tinderbox environment
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= zope.interface
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
diff --git a/devel/py-zopeInterface/Makefile b/devel/py-zopeInterface/Makefile
index 1db11a1ea8c3..87f153e4defb 100644
--- a/devel/py-zopeInterface/Makefile
+++ b/devel/py-zopeInterface/Makefile
@@ -22,6 +22,8 @@ MANUAL_PACKAGE_BUILD=Doesn't build in tinderbox environment
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= zope.interface
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
diff --git a/devel/pychecker/Makefile b/devel/pychecker/Makefile
index 501ba761fcfc..29caab6e82e7 100644
--- a/devel/pychecker/Makefile
+++ b/devel/pychecker/Makefile
@@ -16,6 +16,7 @@ COMMENT= Python source code checking tool to help hunting common bugs
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyChecker
DOCS= CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS README TODO VERSION
diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index 53c5967c85e3..8dc9237d79fc 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -25,4 +25,12 @@ pre-everything::
@${ECHO_CMD} "You may want to install x11-toolkits/py-tkinter to make pylint-gui work."
@${ECHO_CMD} ""
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 250
+PLIST_SUB+= NOPY25=""
+.else
+PLIST_SUB+= NOPY25="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/pylint/pkg-plist b/devel/pylint/pkg-plist
index 955a021c0468..be9c695535fc 100644
--- a/devel/pylint/pkg-plist
+++ b/devel/pylint/pkg-plist
@@ -92,8 +92,8 @@ bin/symilar
%%PYTHON_SITELIBDIR%%/pylint/test/input/__init__.pyc
%%PYTHON_SITELIBDIR%%/pylint/test/input/__init__.pyo
%%PYTHON_SITELIBDIR%%/pylint/test/input/func___future___import_not_first_stmt.py
-%%PYTHON_SITELIBDIR%%/pylint/test/input/func___future___import_not_first_stmt.pyc
-%%PYTHON_SITELIBDIR%%/pylint/test/input/func___future___import_not_first_stmt.pyo
+%%NOPY25%%%%PYTHON_SITELIBDIR%%/pylint/test/input/func___future___import_not_first_stmt.pyc
+%%NOPY25%%%%PYTHON_SITELIBDIR%%/pylint/test/input/func___future___import_not_first_stmt.pyo
%%PYTHON_SITELIBDIR%%/pylint/test/input/func___name___access.py
%%PYTHON_SITELIBDIR%%/pylint/test/input/func___name___access.pyc
%%PYTHON_SITELIBDIR%%/pylint/test/input/func___name___access.pyo
diff --git a/devel/pymacs/Makefile b/devel/pymacs/Makefile
index aa8c96e51073..2a566ff901ab 100644
--- a/devel/pymacs/Makefile
+++ b/devel/pymacs/Makefile
@@ -25,6 +25,12 @@ USE_EMACS= yes
EMACS_PORT_NAME=xemacs21
.endif
+post-patch:
+.for f in __init__.py pymacs.py
+ ${REINPLACE_CMD} -e 's,# Copyright,# coding:latin1 Copyright,g' \
+ ${WRKSRC}/Pymacs/$f
+.endfor
+
# Install the emacs side of things
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/pymacs.el ${PREFIX}/${EMACS_SITE_LISPDIR}
diff --git a/devel/pyrex/Makefile b/devel/pyrex/Makefile
index b8325812f593..b4c82d80dc51 100644
--- a/devel/pyrex/Makefile
+++ b/devel/pyrex/Makefile
@@ -17,6 +17,7 @@ COMMENT= Programming Language for writing Python extension modules
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= Pyrex
post-install:
@# precompile lexicon pickle
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index a0bc1b5f98f3..4937f0b6a5a2 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -18,6 +18,7 @@ MAN1= scons.1 sconsign.1 scons-time.1
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_EGGINFODIR= ${PREFIX}/lib/scons-${PORTVERSION}
PLIST_SUB= SCONS_VER=${PORTVERSION}
diff --git a/devel/tpg/Makefile b/devel/tpg/Makefile
index e19485533e3f..5c0a0485f56d 100644
--- a/devel/tpg/Makefile
+++ b/devel/tpg/Makefile
@@ -16,6 +16,7 @@ COMMENT= Parser generator in Python
USE_PYTHON= 2.2+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TPG
NO_BUILD= yes
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index e0719a378cb3..27aa4acff9d4 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= adns-python
PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
post-patch:
diff --git a/dns/py-dns/Makefile b/dns/py-dns/Makefile
index 062513da92aa..08b8b7ae5108 100644
--- a/dns/py-dns/Makefile
+++ b/dns/py-dns/Makefile
@@ -20,6 +20,7 @@ COMMENT= DNS (Domain Name Service) library for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pydns
DOCS= README.txt README-guido.txt
DOCSDIR= ${PREFIX}/share/doc/py-dns
diff --git a/dns/py-twistedNames/Makefile b/dns/py-twistedNames/Makefile
index a9ecdd6d4777..4317b5b89214 100644
--- a/dns/py-twistedNames/Makefile
+++ b/dns/py-twistedNames/Makefile
@@ -21,5 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Names
.include <bsd.port.mk>
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index 725bb7d5aebe..5d9ec62be90f 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -18,6 +18,7 @@ RUN_DEPENDS= dynamips:${PORTSDIR}/emulators/dynamips
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.4.4
ALL_TARGET= # empty
USE_GCC= 3.4+
USE_DOS2UNIX= yes
diff --git a/emulators/xgngeo/Makefile b/emulators/xgngeo/Makefile
index 287f91413dad..64a46d7e3ac2 100644
--- a/emulators/xgngeo/Makefile
+++ b/emulators/xgngeo/Makefile
@@ -25,6 +25,7 @@ USE_BZIP2= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= XGngeo
NO_BUILD= yes
.include <bsd.port.pre.mk>
diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile
index f6542b47bb36..d8e816bfbfc7 100644
--- a/finance/sabernetdcs-client/Makefile
+++ b/finance/sabernetdcs-client/Makefile
@@ -21,12 +21,14 @@ RUN_DEPENDS= pygtk-codegen-2.0:${PORTSDIR}/x11-toolkits/py-gtk2 \
${PYTHONPREFIX_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
${PYTHONPREFIX_SITELIBDIR}/Pyro/__init__.py:${PORTSDIR}/devel/py-ro
-USE_PYTHON= 2.4
+USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
USE_BZIP2= yes
DOCSDIR= ${TARGETDIR}/share/doc/sndcs
DATADIR= ${TARGETDIR}/share/sndcs
+PYDISTUTILS_PKGNAME= sndcs
+
.if defined(NOPORTDOCS)
EXTRA_PATCHES= ${FILESDIR}/extra-patch-setup.py
.endif
diff --git a/finance/tinyerp-server/Makefile b/finance/tinyerp-server/Makefile
index 32e20d5528ca..1f3d635d362a 100644
--- a/finance/tinyerp-server/Makefile
+++ b/finance/tinyerp-server/Makefile
@@ -31,6 +31,7 @@ WRKSRC= ${WRKDIR}/server
USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 3.2.0
MAN1= tinyerp-server.1
diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index 88b05260815c..c91fc9fb146f 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pycurl
USE_OPENSSL= yes
DOCSDIR= ${TARGETDIR}/share/doc/py-curl
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 2c23abefeb7e..ef100a64d6ea 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -22,13 +22,14 @@ BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 \
LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis
USE_SDL= mixer sdl
-USE_PYTHON= yes
+USE_PYTHON= -2.4
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-py-debug
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib \
+ PYPACKAGE=${PYTHON_CMD}
.include <bsd.port.pre.mk>
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index 34bcee1616d7..d4fbad01fe1e 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -34,6 +34,8 @@ USE_GL= yes
USE_SDL= sdl mixer
USE_GETTEXT= yes
+PYDISTUTILS_PKGNAME= Balazar
+
post-patch:
@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/setup.cfg
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index 26906d2ed805..b590efb935bf 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -31,6 +31,7 @@ USE_TWISTED= yes
USE_GL= yes
USE_GMAKE= yes
+PYDISTUTILS_PKGNAME= BalazarBrothers
DATADIR= share/balazar_brothers
OPTIONS= OPENAL "Use openal sound system" on \
diff --git a/games/bubbros/files/patch-bubbob-statesaver.c b/games/bubbros/files/patch-bubbob-statesaver.c
new file mode 100644
index 000000000000..129aed58b730
--- /dev/null
+++ b/games/bubbros/files/patch-bubbob-statesaver.c
@@ -0,0 +1,28 @@
+--- bubbob/statesaver.c.orig Sun Jul 15 08:59:52 2007
++++ bubbob/statesaver.c Sun Jul 15 09:01:41 2007
+@@ -44,10 +44,12 @@
+ Py_INCREF(g); /* exhausted -- can return 'g' itself */
+ return g;
+ }
++#if PY_VERSION_HEX < 0x02050000
+ if (f->f_nfreevars || f->f_ncells) {
+ PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
+ return NULL;
+ }
++#endif
+
+ dummy = (PyObject**) malloc(co->co_argcount * sizeof(PyObject*));
+ if (dummy == NULL)
+@@ -95,10 +97,12 @@
+ return -1;
+ }
+ f2 = (PyFrameObject*) x;
++#if PY_VERSION_HEX < 0x02050000
+ if (f2->f_stacksize != f->f_stacksize) {
+ PyErr_SetString(PyExc_TypeError, "stack size mismatch");
+ return -1;
+ }
++#endif
+
+ if (f2->f_stacktop != NULL)
+ while (f2->f_stacktop != f2->f_localsplus)
diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile
index ce84de3e5d86..049316599fa8 100644
--- a/games/gnomesudoku/Makefile
+++ b/games/gnomesudoku/Makefile
@@ -32,6 +32,8 @@ USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
USE_GNOME= gnomehack gnomeprefix pygnome2 pygnomedesktop
+PYDISTUTILS_PKGNAME= gnome-sudoku
+
.if !defined(DISPLAY)
pre-configure:
@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
diff --git a/games/pydance/Makefile b/games/pydance/Makefile
index 321f4d070b25..6527a6f2862b 100644
--- a/games/pydance/Makefile
+++ b/games/pydance/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_NOEGGINFO= yes
.if !defined(WITHOUT_PYDANCE_SONGS)
PLIST_SUB= SONGS=""
diff --git a/games/slune/Makefile b/games/slune/Makefile
index ee2ef5f1522e..fe871b4bd43b 100644
--- a/games/slune/Makefile
+++ b/games/slune/Makefile
@@ -30,6 +30,8 @@ USE_PYDISTUTILS= yes
USE_GL= yes
USE_SDL= sdl mixer
+PYDISTUTILS_PKGNAME= Slune
+
post-patch:
@${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.cfg
diff --git a/graphics/crystalentitylayer-devel/Makefile b/graphics/crystalentitylayer-devel/Makefile
index 2060b3e9d422..c90e70bcff26 100644
--- a/graphics/crystalentitylayer-devel/Makefile
+++ b/graphics/crystalentitylayer-devel/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --enable-debug=no
.endif
.if!defined(WITHOUT_PYTHON)
-USE_PYTHON= yes
+USE_PYTHON= -2.4
.include <${PORTSDIR}/Mk/bsd.python.mk>
.else
CONFIGURE_ARGS+= --without-python
diff --git a/graphics/crystalentitylayer/Makefile b/graphics/crystalentitylayer/Makefile
index 3e5daa3ee0ca..6a7421f6614d 100644
--- a/graphics/crystalentitylayer/Makefile
+++ b/graphics/crystalentitylayer/Makefile
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --enable-debug=yes
.endif
.if!defined(WITHOUT_PYTHON)
-USE_PYTHON= yes
+USE_PYTHON= -2.4
.include <${PORTSDIR}/Mk/bsd.python.mk>
.else
CONFIGURE_ARGS+= --without-python
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index 44457ef17823..c6270e764353 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -19,6 +19,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolki
USE_PYTHON= yes
NO_BUILD= yes
USE_GETTEXT= yes
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_EGGINFODIR= lib/driconf
pre-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index eed2221b5ac2..4ab6b5592b7f 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -22,6 +22,8 @@ USE_PYDISTUTILS=yes
USE_GCC= 3.4+
PORTDOCS= *
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_EGGINFODIR= ${PREFIX}/lib/gnofract4d
.include <bsd.port.pre.mk>
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index b50e1bbc92bd..1de9a0c64caa 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -24,6 +24,7 @@ USE_PYTHON= yes
USE_BZIP2= yes
USE_QT_VER= 3
MAKE_ENV+= QTDIR="${QT_PREFIX}"
+PYDISTUTILS_NOEGGINFO= yes
post-patch:
${REINPLACE_CMD}\
diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile
index da58cf13f9f5..3b444b0dd641 100644
--- a/graphics/mirage/Makefile
+++ b/graphics/mirage/Makefile
@@ -20,4 +20,6 @@ USE_PYTHON= yes
USE_PYDISTUTILS=yes
USE_GETTEXT= yes
+PYDISTUTILS_PKGNAME= Mirage
+
.include <bsd.port.mk>
diff --git a/graphics/py-amanith/Makefile b/graphics/py-amanith/Makefile
index 45273429f2c5..83fd71348b26 100644
--- a/graphics/py-amanith/Makefile
+++ b/graphics/py-amanith/Makefile
@@ -23,6 +23,7 @@ BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13
USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= PyAmanith
post-patch:
${REINPLACE_CMD} -i "" -e 's|^swig-cpp.*|swig-opts = -c++|g' ${WRKSRC}/setup.cfg
diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile
index d0446a61bbf7..f001ea2e17a9 100644
--- a/graphics/py-cgkit/Makefile
+++ b/graphics/py-cgkit/Makefile
@@ -24,6 +24,7 @@ USE_GL= yes
USE_XLIB= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 2.0.0alpha7
.if defined(INSTALL_CGKIT_LIGHT)
PLIST_SUB+= CGKIT_LIGHT="@comment "
diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile
index 857fba0e449f..a14d49ee6288 100644
--- a/graphics/py-chart/Makefile
+++ b/graphics/py-chart/Makefile
@@ -21,6 +21,7 @@ USE_GHOSTSCRIPT_RUN= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyChart
pre-everything::
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
diff --git a/graphics/py-editobj/Makefile b/graphics/py-editobj/Makefile
index 7bfbd173ee18..546ab56a546f 100644
--- a/graphics/py-editobj/Makefile
+++ b/graphics/py-editobj/Makefile
@@ -18,6 +18,7 @@ COMMENT= Create and display a Tkinter dialog box for editing any Python object
DIST_SUBDIR= python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= EditObj
WRKSRC= ${WRKDIR}/EditObj-${PORTVERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/py-editobj
diff --git a/graphics/py-freeimagepy/Makefile b/graphics/py-freeimagepy/Makefile
index 2676d2726604..a7556c40d97a 100644
--- a/graphics/py-freeimagepy/Makefile
+++ b/graphics/py-freeimagepy/Makefile
@@ -22,5 +22,7 @@ WRKSRC= ${WRKDIR}/FreeImagePy
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= FreeImagePy
+PYDISTUTILS_PKGVERSION= 1.0.0
.include <bsd.port.mk>
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index f6c002186ddf..a911326a6ac5 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -23,6 +23,7 @@ USE_XPM= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= gdmodule
DISABLE_SIZE= yes
PYSETUP= Setup.py
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/graphics/py-gdchart2/Makefile b/graphics/py-gdchart2/Makefile
index 6eb5317fba19..357273ac5116 100644
--- a/graphics/py-gdchart2/Makefile
+++ b/graphics/py-gdchart2/Makefile
@@ -24,6 +24,8 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}2
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pygdchart
+PYDISTUTILS_PKGVERSION= 2.0.Beta
post-patch:
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 72890c5823fe..0cfe1dcf2119 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pygraphviz
PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
post-patch:
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 56eabf9ab266..1d5e52d4e6b1 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -25,6 +25,8 @@ LATEST_LINK= py-${PORTNAME}
DIST_SUBDIR= python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PIL
+PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR}/PIL
PORTDOCS= *
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index d9ef9ca022d5..8bb4be4b55e7 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -23,6 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/py_ext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= mingc
+PYDISTUTILS_PKGVERSION= 0.0.3a
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/setup.py
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 5398fb05d426..12dcde35f6af 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -30,6 +30,7 @@ OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}/options
USE_GL= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyOpenGL
.include <bsd.port.pre.mk>
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index ac7a8535b5d4..6de270dcf6f6 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -36,6 +36,8 @@ USE_GL= yes
USE_GMAKE= yes
USE_XLIB= yes
+PYDISTUTILS_PKGNAME= Soya
+
MANDIR= ${WRKDIR}/${DISTNAME}/manpage/man1
MAN1= soya_editor.1
INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 53f093eece8c..b3e4214a9568 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes
CONFFLAGS= --tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -L${LOCALBASE}/lib -ltk84 -ltcl84 -L${X11BASE}/lib -lX11"
diff --git a/irc/py-irclib/Makefile b/irc/py-irclib/Makefile
index 9668e099f13b..9f4a924aa67c 100644
--- a/irc/py-irclib/Makefile
+++ b/irc/py-irclib/Makefile
@@ -18,6 +18,7 @@ COMMENT= IRC protocol client library for Python
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= python-irclib
EXAMPLEFILES= irccat irccat2 servermap testbot.py \
dccreceive dccsend
diff --git a/irc/py-supybot/Makefile b/irc/py-supybot/Makefile
index df1efa400c01..8ec6bd9a9f79 100644
--- a/irc/py-supybot/Makefile
+++ b/irc/py-supybot/Makefile
@@ -19,6 +19,7 @@ COMMENT= Supybot - A Superb Python IRC bot
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.83.1+darcs
DOCS= ACKS ChangeLog INSTALL LICENSE README RELNOTES
diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile
index e44da94feffd..58fe7aacd38d 100644
--- a/japanese/kana-no-quiz/Makefile
+++ b/japanese/kana-no-quiz/Makefile
@@ -25,9 +25,11 @@ RM_OPTS= -f
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_PYTHON= 2.4
+USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= Kana_no_quiz
+
WRKSRC= "${WRKDIR}/Kana no quiz-${DISTVERSION}"
post-extract:
diff --git a/japanese/pycodec/Makefile b/japanese/pycodec/Makefile
index 7670ba29af69..02c2f0f6399a 100644
--- a/japanese/pycodec/Makefile
+++ b/japanese/pycodec/Makefile
@@ -17,6 +17,7 @@ COMMENT= Python Unicode codecs for Japanese charsets
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= JapaneseCodecs
DOCSDIR= ${PREFIX}/share/doc/ja-pycodec
post-patch:
diff --git a/japanese/trac/Makefile b/japanese/trac/Makefile
index 0a13fa492ac1..c9e2686e7ed2 100644
--- a/japanese/trac/Makefile
+++ b/japanese/trac/Makefile
@@ -29,6 +29,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-ja-1
USE_ZIP= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= trac
+PYDISTUTILS_PKGVERSION= 0.10.3.1
MAN1= trac-admin.1 tracd.1
diff --git a/lang/f2py/Makefile b/lang/f2py/Makefile
index a956e60839b0..6bc0235daf0f 100644
--- a/lang/f2py/Makefile
+++ b/lang/f2py/Makefile
@@ -25,6 +25,8 @@ EXPIRATION_DATE= 2007-04-01
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= F2PY
+PYDISTUTILS_PKGVERSION= 2.45.241_1926
PLIST_FILES= bin/f2py
MAN1= f2py.1
diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile
index f68541f6b874..70140298a2eb 100644
--- a/lang/py-mx-base/Makefile
+++ b/lang/py-mx-base/Makefile
@@ -23,6 +23,8 @@ USE_PYDISTUTILS=yes
USE_ZOPE= yes
.endif
+PYDISTUTILS_PKGNAME= egenix-mx-base
+
DOCDIR= ${PREFIX}/share/doc/py-mx
MXHDRDIR= ${PYTHONPREFIX_SITELIBDIR}/mx/stdlib
diff --git a/lang/py-prolog/Makefile b/lang/py-prolog/Makefile
index c49bc40fdab1..d7cd7cc00131 100644
--- a/lang/py-prolog/Makefile
+++ b/lang/py-prolog/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= pl:${PORTSDIR}/lang/swi-pl
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= PyProlog
.include <bsd.port.pre.mk>
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index 70f26dae67fe..9eda45c96968 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -18,6 +18,7 @@ MD5 (python/html-2.4.2.tar.bz2) = 4e3f177f32e15713130d9d9cf35f991f
MD5 (python/html-2.4.3.tar.bz2) = 86edf38b83fde1ff44d0725acf90c95c
MD5 (python/html-2.4.4.tar.bz2) = 21259033b5663533ed64b4592c6925e2
MD5 (python/html-2.4.tar.bz2) = 10cca09fcdf1b5ad269bc9edb652d76f
+MD5 (python/html-2.5.1.tar.bz2) = 74e14b4713a1a43adebdcfe0191c20c8
MD5 (python/html-2.5.tar.bz2) = 3badfa2d460f52b7f9face12abdb2e91
MD5 (python/pdf-a4-2.0.1.tar.bz2) = fec4b5bcc4161bc82d1a4564fe71409a
MD5 (python/pdf-a4-2.0.tar.bz2) = f11c5347eed19ffd012fddf1faa9ab22
@@ -38,6 +39,7 @@ MD5 (python/pdf-a4-2.4.2.tar.bz2) = f9712931eb8dd460000596eec0694bfc
MD5 (python/pdf-a4-2.4.3.tar.bz2) = 85f82cb2df6872e4d6ef3652be184b50
MD5 (python/pdf-a4-2.4.4.tar.bz2) = 2b43ac2c9948af26af61c792397bc3fb
MD5 (python/pdf-a4-2.4.tar.bz2) = 8f6b0a891dbff04f3b6ab07d9f8f6df6
+MD5 (python/pdf-a4-2.5.1.tar.bz2) = ade64ff41d24983ad2ea837525f5399a
MD5 (python/pdf-a4-2.5.tar.bz2) = 9cc4e5a2992fb7be2373c3e03c765536
MD5 (python/pdf-letter-2.0.1.tar.bz2) = c31282a516b5b49b83cb7df3d3f23cb7
MD5 (python/pdf-letter-2.0.tar.bz2) = a0ae00f0e995ad912714ce15ff0ff401
@@ -58,6 +60,7 @@ MD5 (python/pdf-letter-2.4.2.tar.bz2) = 82d1ae6045042c08a6a68f69fe2831c2
MD5 (python/pdf-letter-2.4.3.tar.bz2) = 2f503f360ecd06fde2efdc61b4f1e644
MD5 (python/pdf-letter-2.4.4.tar.bz2) = 80da7a7611b11f4ac059a84d63af3b0e
MD5 (python/pdf-letter-2.4.tar.bz2) = 46e9741fa8d42c813d02f2d7c3342c55
+MD5 (python/pdf-letter-2.5.1.tar.bz2) = bb77cbbf217dfe93fcbecd7256be33a3
MD5 (python/pdf-letter-2.5.tar.bz2) = e58eef4dcf9384ef7ee105068f7bc26e
MD5 (python/postscript-a4-2.0.1.tar.bz2) = ef7b98c07ed7da1e91f2963c38a03b5c
MD5 (python/postscript-a4-2.0.tar.bz2) = f9c6d47319cd2bb87df678e9fa429d72
@@ -78,6 +81,7 @@ MD5 (python/postscript-a4-2.4.2.tar.bz2) = 2ef6f2128333042f82c365697ac8d5be
MD5 (python/postscript-a4-2.4.3.tar.bz2) = f71f0b6d77778ba57a4d7b8cf918bab0
MD5 (python/postscript-a4-2.4.4.tar.bz2) = 8680d3d6043a0dd3d6683e2fb727c2ab
MD5 (python/postscript-a4-2.4.tar.bz2) = 261da37a6faf721846e27e44f3c12f62
+MD5 (python/postscript-a4-2.5.1.tar.bz2) = a3385edf8ca8749959caea9d653bb5e7
MD5 (python/postscript-a4-2.5.tar.bz2) = 831964fa3d53b3afe973995d7fcc05b2
MD5 (python/postscript-letter-2.0.1.tar.bz2) = 13365181bab30ca27c9d7b69c60e0f03
MD5 (python/postscript-letter-2.0.tar.bz2) = 103f3f67b1f4b47aae90fe68bedbd5f7
@@ -98,6 +102,7 @@ MD5 (python/postscript-letter-2.4.2.tar.bz2) = 11d90c85951dc2439e0f32459380dbbd
MD5 (python/postscript-letter-2.4.3.tar.bz2) = ca001fb091019aadb66a25226768c523
MD5 (python/postscript-letter-2.4.4.tar.bz2) = 3daa1afbaff58db82b22b45efc528ccd
MD5 (python/postscript-letter-2.4.tar.bz2) = a54ca46c53f0ed8e2f47e94286c7a419
+MD5 (python/postscript-letter-2.5.1.tar.bz2) = c72bd8f549745e75bfdb00b40eb05285
MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf
SHA256 (python/html-2.0.1.tar.bz2) = d42308dda686cc3a27f11d93bdb05c400f4754f51c8e9734435a3b600ea0689e
SHA256 (python/html-2.0.tar.bz2) = 0462f3ba3cea3867be268232e974e2de3b641a6408045ee7bfe94b790c973e1b
@@ -119,7 +124,9 @@ SHA256 (python/html-2.4.2.tar.bz2) = 963d98c8f9adc4a9301632efe27c3a505f72c447ee6
SHA256 (python/html-2.4.3.tar.bz2) = 6fe6d1c4ee6fed254be260d25f5c44f550d7d634970d33c77dec5a438b1720e9
SHA256 (python/html-2.4.4.tar.bz2) = 6b1a6f1be187b1d0cab69ab7c8c436409468232d376419c978cbb1d019c6f465
SHA256 (python/html-2.4.tar.bz2) = 667d51b683549e708e271573e825d09e6db6a0d4bd97d31ddcad23b52cf1ee36
+SHA256 (python/html-2.5.1.tar.bz2) = 359e820e3af09dc90adddd4b27e18da9664120610cac486681fbb3c8f8240b9c
SHA256 (python/html-2.5.tar.bz2) = 52a473258528bec3617da8cfd9188e8b7b2833ade61d705058ee5b0adef64a5b
+SHA256 (python/latex-2.5.1.tar.bz2) = 3f54572af0acd81d20cb9c2685592371b5fa5cc084f8202306dcac4134206e9a
SHA256 (python/pdf-a4-2.0.1.tar.bz2) = a938337ae963e3b4bfe667380a67dbf50cc4d07701dfcb6fbf33a996f7d79c0e
SHA256 (python/pdf-a4-2.0.tar.bz2) = 829f90149931b8f198378f2dc9df2a3e2bcd02f6a8a67a05add9bf1c5f7079a2
SHA256 (python/pdf-a4-2.1.1.tar.bz2) = 598849b9d3be9745b1092f585299fb814bace5bb5da2d841d6deb51b56df5033
@@ -139,6 +146,7 @@ SHA256 (python/pdf-a4-2.4.2.tar.bz2) = 38445bfc55be1bafb4136c3a2d999a468caf613d5
SHA256 (python/pdf-a4-2.4.3.tar.bz2) = b5d1d850ea60d7251d66e47a6918dc2852465a837ebf39588f561c9da9bd5b79
SHA256 (python/pdf-a4-2.4.4.tar.bz2) = d72bddbebc60430ee971d53e922cdf730c221b9aa610d4b52be3c3796fc8dc68
SHA256 (python/pdf-a4-2.4.tar.bz2) = 40d7fb2618d3a88cbe353fd9ce7ce04b30fc76c85da27c0e90b9f2c98f40a044
+SHA256 (python/pdf-a4-2.5.1.tar.bz2) = caddfc8988d837cdd58e519da5f8b0c29263e85554f6108d9fde1677612dcd22
SHA256 (python/pdf-a4-2.5.tar.bz2) = ac591b0d29276de9bf98c4d1240ac57c5ec55bb5e8bbf62b2888343a8eb1b111
SHA256 (python/pdf-letter-2.0.1.tar.bz2) = e29269a80b77fe8b65d759620dba3445bb67597ede477f6e5904062456a4baed
SHA256 (python/pdf-letter-2.0.tar.bz2) = 278a6b52c7b970fe54eb47bc5bb2dd56ef86225aa5d0dcdc43c65a335c7e426e
@@ -159,6 +167,7 @@ SHA256 (python/pdf-letter-2.4.2.tar.bz2) = 2f364e054c2d4e50197d84359ca1a92fe843d
SHA256 (python/pdf-letter-2.4.3.tar.bz2) = a2aa3cf6334e64e3f025564a824017b7fb2f86344f00db21ea85cc06dafb80bd
SHA256 (python/pdf-letter-2.4.4.tar.bz2) = 8ee0df31d5090b2c0a895854ec0700c49cc50f06dd8d3ff5f2151d7da23caada
SHA256 (python/pdf-letter-2.4.tar.bz2) = e87c19834c20d8adb0b9ac90810d6c3d405e47bc075241fe17d19790c19de3aa
+SHA256 (python/pdf-letter-2.5.1.tar.bz2) = 34cedf5ec3ca21b8e105adad07429e7c6dee49c4c17e7d1466655980b88ee906
SHA256 (python/pdf-letter-2.5.tar.bz2) = d7be3abd1ad5efc62ca0d7ace9165605e6f955b819d33082c73306871f3d8576
SHA256 (python/postscript-a4-2.0.1.tar.bz2) = 9a02e5812d81a9af10f159c463a55c36b2dea77808a5410859a33109dbea7da7
SHA256 (python/postscript-a4-2.0.tar.bz2) = 2d721139e00d745ffc373dbabd99c310d45945a043ccfff9abd38edcbcc7fd34
@@ -179,6 +188,7 @@ SHA256 (python/postscript-a4-2.4.2.tar.bz2) = 753c8af05ca26d3a064c337e79a1f7af26
SHA256 (python/postscript-a4-2.4.3.tar.bz2) = 7dd43824ee9e14db1c2ecb5f25ac6c0ad2618b2c8abd677a8f34f39b850b11c7
SHA256 (python/postscript-a4-2.4.4.tar.bz2) = ec1a4c256f733e0b5917bb5c951b042f39781afec5480b76c28f5a5544784b08
SHA256 (python/postscript-a4-2.4.tar.bz2) = 4530dee0c06486d6c13f19dbf05b8d01e7bb47faaf9855c44916d2e9e992e50f
+SHA256 (python/postscript-a4-2.5.1.tar.bz2) = b00cad86c2da60c05866a23c60f071988ead370b416211c06d50f66b303a7787
SHA256 (python/postscript-a4-2.5.tar.bz2) = 6654fbce933aa2e47b94c5faf75e69036510a10f0e0fbd35108361a130103ab8
SHA256 (python/postscript-letter-2.0.1.tar.bz2) = 871bc7ed57b6dfb9b2f844fe6150204399dda73ebcafc47df4bbeb75b81fb9be
SHA256 (python/postscript-letter-2.0.tar.bz2) = a5d46c151f2a299a208edb13ce362b4dd0f49af7e53beabe01167dcf97914c60
@@ -199,6 +209,7 @@ SHA256 (python/postscript-letter-2.4.2.tar.bz2) = 1ed9da9b4e0c4bd14cd72f477cbf8a
SHA256 (python/postscript-letter-2.4.3.tar.bz2) = ed242d9f6e2ceef2e79c10419a1966add922de573240383cd869779f0ecc3ff0
SHA256 (python/postscript-letter-2.4.4.tar.bz2) = 3f93c91d217ac8d90d4873dd0a62c4a88115f81707582424ab4d102b39a87bc7
SHA256 (python/postscript-letter-2.4.tar.bz2) = d9e89330107bb77e29e9e938b71b8f1ec1ac7e73021c1d284a8def95acb5c7f3
+SHA256 (python/postscript-letter-2.5.1.tar.bz2) = 10f4f80dd2f3ca0844f62faa2eaba3aac02690382abbe9996f43b49c6c4e601f
SHA256 (python/postscript-letter-2.5.tar.bz2) = c2be9ac9cca88cebb2f48b4cc467f6d46a10997b2ad651c2047bf7cccf2ff656
SIZE (python/html-2.0.1.tar.bz2) = 704567
SIZE (python/html-2.0.tar.bz2) = 699404
@@ -220,7 +231,9 @@ SIZE (python/html-2.4.2.tar.bz2) = 1395537
SIZE (python/html-2.4.3.tar.bz2) = 1397233
SIZE (python/html-2.4.4.tar.bz2) = 1398442
SIZE (python/html-2.4.tar.bz2) = 1390125
+SIZE (python/html-2.5.1.tar.bz2) = 1626532
SIZE (python/html-2.5.tar.bz2) = 1562256
+SIZE (python/latex-2.5.1.tar.bz2) = 1379960
SIZE (python/pdf-a4-2.0.1.tar.bz2) = 2297342
SIZE (python/pdf-a4-2.0.tar.bz2) = 2254712
SIZE (python/pdf-a4-2.1.1.tar.bz2) = 3557971
@@ -240,6 +253,7 @@ SIZE (python/pdf-a4-2.4.2.tar.bz2) = 4249646
SIZE (python/pdf-a4-2.4.3.tar.bz2) = 4258522
SIZE (python/pdf-a4-2.4.4.tar.bz2) = 5345687
SIZE (python/pdf-a4-2.4.tar.bz2) = 4203864
+SIZE (python/pdf-a4-2.5.1.tar.bz2) = 5578884
SIZE (python/pdf-a4-2.5.tar.bz2) = 5520351
SIZE (python/pdf-letter-2.0.1.tar.bz2) = 2182069
SIZE (python/pdf-letter-2.0.tar.bz2) = 2133980
@@ -260,6 +274,7 @@ SIZE (python/pdf-letter-2.4.2.tar.bz2) = 4273457
SIZE (python/pdf-letter-2.4.3.tar.bz2) = 4279762
SIZE (python/pdf-letter-2.4.4.tar.bz2) = 5368031
SIZE (python/pdf-letter-2.4.tar.bz2) = 4226357
+SIZE (python/pdf-letter-2.5.1.tar.bz2) = 5604432
SIZE (python/pdf-letter-2.5.tar.bz2) = 5547378
SIZE (python/postscript-a4-2.0.1.tar.bz2) = 994104
SIZE (python/postscript-a4-2.0.tar.bz2) = 977851
@@ -280,6 +295,7 @@ SIZE (python/postscript-a4-2.4.2.tar.bz2) = 1714155
SIZE (python/postscript-a4-2.4.3.tar.bz2) = 1716850
SIZE (python/postscript-a4-2.4.4.tar.bz2) = 1699663
SIZE (python/postscript-a4-2.4.tar.bz2) = 1699997
+SIZE (python/postscript-a4-2.5.1.tar.bz2) = 1845800
SIZE (python/postscript-a4-2.5.tar.bz2) = 1816570
SIZE (python/postscript-letter-2.0.1.tar.bz2) = 941017
SIZE (python/postscript-letter-2.0.tar.bz2) = 923261
@@ -300,4 +316,5 @@ SIZE (python/postscript-letter-2.4.2.tar.bz2) = 1709251
SIZE (python/postscript-letter-2.4.3.tar.bz2) = 1712719
SIZE (python/postscript-letter-2.4.4.tar.bz2) = 1695892
SIZE (python/postscript-letter-2.4.tar.bz2) = 1693474
+SIZE (python/postscript-letter-2.5.1.tar.bz2) = 1839274
SIZE (python/postscript-letter-2.5.tar.bz2) = 1813655
diff --git a/lang/python/Makefile b/lang/python/Makefile
index fc1b1a72cc79..3b3a59fc5dd3 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -6,43 +6,44 @@
#
PORTNAME= python
-PORTVERSION= 2.4.4
-PORTEPOCH= 1
+PORTVERSION= ${PYTHON_VER}
+PORTEPOCH= 2
CATEGORIES= lang python ipv6
MASTER_SITES= # empty
DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= python@FreeBSD.org
-COMMENT= The "meta-port" for the stable version of Python interpreter
+COMMENT= The "meta-port" for the default version of Python interpreter
USE_PYTHON_RUN= yes
-PYTHON_VERSION= python2.4
+PYTHON_VERSION= ${PYTHON_DEFAULT_VERSION}
NO_BUILD= yes
-do-install: # empty
+do-install:
+ @${DO_NADA}
# Major upgrade support
PORTUPGRADE?= ${LOCALBASE}/sbin/portupgrade
PKG_WHICH?= ${LOCALBASE}/sbin/pkg_which
upgrade-site-packages:
- @if [ -x ${PORTUPGRADE} ]; then \
- for ver in 2.1 2.2 2.3 2.5; do \
- if [ -d ${PREFIX}/lib/python$$ver ]; then \
- UPD=`${FIND} ${PREFIX}/lib/python$$ver \
- -type f -print0 | \
- ${XARGS} -0 ${PKG_WHICH} | \
- ${GREP} -Fv '?' | \
- ${EGREP} -v '^python2?[0-5]?-2' | \
- ${SORT} -u`; \
- if [ "$$UPD" ]; then \
- ${PORTUPGRADE} -f $$UPD; \
- fi; \
- fi; \
- done; \
- else \
+ @if [ ! -x ${PORTUPGRADE} ]; then \
${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \
${FALSE}; \
fi
+ @for ver in `echo ${_PYTHON_ALLBRANCHES}|${SED} 's/${PYTHON_VER}//'`; do \
+ if [ -d ${PREFIX}/lib/python$$ver ]; then \
+ UPD=`${FIND} ${PREFIX}/lib/python$$ver \
+ -type f -print0 | \
+ ${XARGS} -0 ${PKG_WHICH} | \
+ ${GREP} -Fv '?' | \
+ ${EGREP} -v '^python2?[0-5]?-2' | \
+ ${SORT} -u`; \
+ if [ "$$UPD" ]; then \
+ ${PORTUPGRADE} -f $$UPD; \
+ fi; \
+ fi; \
+ done \
+
.include <bsd.port.mk>
diff --git a/lang/python/distinfo b/lang/python/distinfo
index 054d4ecd5c4c..2f175c4a9f78 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -17,6 +17,7 @@ MD5 (python/Python-2.4.2.tgz) = 07cfc759546f6723bb367be5b1ce9875
MD5 (python/Python-2.4.3.tgz) = edf994473a8c1a963aaa71e442b285b7
MD5 (python/Python-2.4.4.tgz) = 82d000617baaef269ad5795c595fdc58
MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606
+MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
SHA256 (python/Python-2.1.1.tgz) = 6a5455b2ab72642feffc060a04e8ea543de2d0671a3f9c335b52f2e1e41edc5f
SHA256 (python/Python-2.1.2.tgz) = 389c7badc61f9bdc50788b54dd3ffeaa4b559baf6a4de1425bf90b9c6b4ac66e
@@ -37,6 +38,7 @@ SHA256 (python/Python-2.4.2.tgz) = 2653e1846e87fd9b3ee287fefc965c80c54646548b491
SHA256 (python/Python-2.4.3.tgz) = 985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5
SHA256 (python/Python-2.4.4.tgz) = 92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e
SHA256 (python/Python-2.4.tgz) = ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9
+SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
SIZE (python/Python-2.1.1.tgz) = 6187808
SIZE (python/Python-2.1.2.tgz) = 6189889
@@ -57,4 +59,5 @@ SIZE (python/Python-2.4.2.tgz) = 9239975
SIZE (python/Python-2.4.3.tgz) = 9348239
SIZE (python/Python-2.4.4.tgz) = 9531474
SIZE (python/Python-2.4.tgz) = 9198035
+SIZE (python/Python-2.5.1.tgz) = 11060830
SIZE (python/Python-2.5.tgz) = 11019675
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 33d646e8aaad..fa4fe11865bb 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -7,7 +7,7 @@
PORTNAME= python23
PORTVERSION= 2.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -16,7 +16,6 @@ DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER= python@FreeBSD.org
COMMENT?= An interpreted object-oriented programming language
-CONFLICTS= stackless_python-*
DIST_SUBDIR= python
WRKSRC= ${PYTHON_WRKSRC}
GNU_CONFIGURE= yes
@@ -38,6 +37,9 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//}
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION}
+BIN_SCRIPTS= idle pydoc python python-shared
+BINLINKS_SUB= -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
+
OPTIONS= THREADS "Enable thread support" on \
HUGE_STACK_SIZE "Use a larger thread stack" off \
UCS4 "Use UCS4 for unicode support" on \
@@ -46,6 +48,13 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+MLINKS= ${PYTHON_VERSION}.1 python.1
+PLIST_SUB+= IF_DEFAULT=""
+.else
+PLIST_SUB+= IF_DEFAULT="@comment "
+.endif
+
.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
@@ -171,6 +180,13 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
${PREFIX}/bin
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+ for f in ${BIN_SCRIPTS}; do \
+ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
+ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
+ done
+.endif
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${TOOLSDIR}
@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index d8b1b3638233..53fa3b4e59f3 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -1,6 +1,10 @@
+%%IF_DEFAULT%%bin/idle
bin/idle%%PYVER%%
+%%IF_DEFAULT%%bin/pydoc
bin/pydoc%%PYVER%%
+%%IF_DEFAULT%%bin/python
bin/python%%PYVER%%
+%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
include/%%PYTHON_VERSION%%/Python.h
include/%%PYTHON_VERSION%%/abstract.h
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index f5090983280b..0b6d353a4355 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -7,12 +7,13 @@
PORTNAME= python24
PORTVERSION= 2.4.4
+PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
DISTFILES= ${PYTHON_DISTFILE}
-MAINTAINER= perky@FreeBSD.org
+MAINTAINER= python@FreeBSD.org
COMMENT?= An interpreted object-oriented programming language
DIST_SUBDIR= python
@@ -22,8 +23,8 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= OPT="${CFLAGS}"
MAKE_ENV= VPATH="${WRKSRC}"
USE_LDCONFIG= yes
-INSTALL_TARGET= install
-MAN1= python.1 ${PYTHON_VERSION}.1
+INSTALL_TARGET= altinstall
+MAN1= ${PYTHON_VERSION}.1
USE_PYTHON= yes
PYTHON_VERSION= python2.4
@@ -35,11 +36,9 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//}
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION}
-.if !exists(/usr/bin/ypcat) # the world with NO_NIS
-PLISTCAT= ${GREP} -v 'nis.so$$' ${PKGDIR}/pkg-plist
-.else
-PLISTCAT= ${CAT} ${PKGDIR}/pkg-plist
-.endif
+BIN_SCRIPTS= idle pydoc python python-shared smtpd.py
+BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \
+ -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
OPTIONS= THREADS "Enable thread support" on \
HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -50,6 +49,13 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+MLINKS= ${PYTHON_VERSION}.1 python.1
+PLIST_SUB+= IF_DEFAULT=""
+.else
+PLIST_SUB+= IF_DEFAULT="@comment "
+.endif
+
# workaround for a bug in base curses.h.
CFLAGS+= -D__wchar_t=wchar_t
@@ -91,6 +97,12 @@ PLIST_SUB+= 32BIT_ONLY=""
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
.endif
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_SUB+= NO_NIS="@comment "
+.else
+PLIST_SUB+= NO_NIS=""
+.endif
+
.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014
CONFIGURE_ARGS+= --enable-ipv6
.else
@@ -166,9 +178,9 @@ pre-su-install:
.endfor
pre-install:
- ${PLISTCAT} | ${AWK} '{ print $$0; } \
- /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' \
- > ${PLIST}
+ ${AWK} '{ print $$0; } \
+ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' \
+ ${PKGDIR}/pkg-plist > ${PLIST}
post-install:
@# shared version of executable and library
@@ -180,8 +192,6 @@ post-install:
${INSTALL_PROGRAM} \
${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
${PREFIX}/bin
- cd ${PREFIX}/bin; \
- ${LN} -f ${PYTHON_VERSION:S/thon/thon-shared/} python-shared
@# additional files installing by ports
@${MKDIR} ${MANPREFIX}/man/man1
@@ -190,6 +200,13 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
${WRKDIR}/smtpd2.4.py ${PREFIX}/bin
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+ for f in ${BIN_SCRIPTS}; do \
+ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
+ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
+ done
+.endif
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${TOOLSDIR}
@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
diff --git a/lang/python24/files/patch-setup.py b/lang/python24/files/patch-setup.py
index 167e803a1290..0b578c9ec329 100644
--- a/lang/python24/files/patch-setup.py
+++ b/lang/python24/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig Tue Feb 27 20:10:53 2007
-+++ setup.py Tue Feb 27 20:15:23 2007
+--- setup.py.orig Fri Mar 30 04:28:05 2007
++++ setup.py Fri Mar 30 04:30:54 2007
@@ -15,7 +15,7 @@
from distutils.command.install_lib import install_lib
@@ -52,3 +52,13 @@
libraries = [panel_library] + curses_libs) )
+@@ -1225,8 +1227,7 @@
+ ext_modules=[Extension('struct', ['structmodule.c'])],
+
+ # Scripts to install
+- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
+- 'Lib/smtpd.py']
++ scripts = []
+ )
+
+ # --install-platlib
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 437b6287fa0c..9c946a43e15f 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -1,13 +1,13 @@
-bin/idle
+%%IF_DEFAULT%%bin/idle
bin/idle%%PYVER%%
-bin/pydoc
+%%IF_DEFAULT%%bin/pydoc
bin/pydoc%%PYVER%%
-bin/python
+%%IF_DEFAULT%%bin/python
bin/python%%PYVER%%
-bin/python-shared
+%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
+%%IF_DEFAULT%%bin/smtpd.py
bin/smtpd%%PYVER%%.py
-bin/smtpd.py
%%PYTHON_INCLUDEDIR%%/Python.h
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/abstract.h
@@ -574,7 +574,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/math.so
%%PYTHON_LIBDIR%%/lib-dynload/md5.so
%%PYTHON_LIBDIR%%/lib-dynload/mmap.so
-%%PYTHON_LIBDIR%%/lib-dynload/nis.so
+%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so
%%PYTHON_LIBDIR%%/lib-dynload/operator.so
%%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so
%%PYTHON_LIBDIR%%/lib-dynload/parser.so
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 33f5cff93183..a688a3c2f0b1 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= python25
-PORTVERSION= 2.5
-PORTREVISION= 1
+PORTVERSION= 2.5.1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION}
-.if !exists(/usr/bin/ypcat) # the world with NO_NIS
-PLIST_EXCLUDE= 'nis.so$$'
-.else
-PLIST_EXCLUDE= '^$$' # nothing
-.endif
+BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \
+ python-shared-config
+BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \
+ -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
OPTIONS= THREADS "Enable thread support" on \
HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+MLINKS= ${PYTHON_VERSION}.1 python.1
+PLIST_SUB+= IF_DEFAULT=""
+.else
+PLIST_SUB+= IF_DEFAULT="@comment "
+.endif
+
# workaround for a bug in base curses.h.
CFLAGS+= -D__wchar_t=wchar_t
@@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY=""
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
.endif
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_SUB+= NO_NIS="@comment "
+.else
+PLIST_SUB+= NO_NIS=""
+.endif
+
.if ${OSVERSION} < 400000
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
@@ -180,8 +191,7 @@ pre-su-install:
.endfor
pre-install:
- ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
- ${AWK} '{ print $$0; } \
+ ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST}
@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
@@ -211,6 +221,13 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+ for f in ${BIN_SCRIPTS}; do \
+ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
+ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
+ done
+.endif
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${TOOLSDIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index 7f7cbdee8a65..9a63d62ef45b 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
-SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
-SIZE (python/Python-2.5.tgz) = 11019675
+MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
+SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
+SIZE (python/Python-2.5.1.tgz) = 11060830
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 6526f34bc484..3098736ca2c1 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -1,9 +1,16 @@
+%%IF_DEFAULT%%bin/idle
bin/idle%%PYVER%%
+%%IF_DEFAULT%%bin/pydoc
bin/pydoc%%PYVER%%
+%%IF_DEFAULT%%bin/python
bin/python%%PYVER%%
+%%IF_DEFAULT%%bin/python-config
bin/python%%PYVER%%-config
+%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
+%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
+%%IF_DEFAULT%%bin/smtpd.py
bin/smtpd%%PYVER%%.py
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h
@@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/itertools.so
%%PYTHON_LIBDIR%%/lib-dynload/math.so
%%PYTHON_LIBDIR%%/lib-dynload/mmap.so
-%%PYTHON_LIBDIR%%/lib-dynload/nis.so
+%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so
%%PYTHON_LIBDIR%%/lib-dynload/operator.so
%%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so
%%PYTHON_LIBDIR%%/lib-dynload/parser.so
@@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/exception_hierarchy.txt
%%PYTHON_LIBDIR%%/test/fork_wait.py
%%PYTHON_LIBDIR%%/test/greyrgb.uue
+%%PYTHON_LIBDIR%%/test/infinite_reload.py
%%PYTHON_LIBDIR%%/test/inspect_fodder.py
%%PYTHON_LIBDIR%%/test/inspect_fodder2.py
%%PYTHON_LIBDIR%%/test/list_tests.py
@@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_compile.py
%%PYTHON_LIBDIR%%/test/test_compiler.py
%%PYTHON_LIBDIR%%/test/test_complex.py
+%%PYTHON_LIBDIR%%/test/test_complex_args.py
%%PYTHON_LIBDIR%%/test/test_contains.py
%%PYTHON_LIBDIR%%/test/test_contextlib.py
%%PYTHON_LIBDIR%%/test/test_cookie.py
@@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_strop.py
%%PYTHON_LIBDIR%%/test/test_strptime.py
%%PYTHON_LIBDIR%%/test/test_struct.py
+%%PYTHON_LIBDIR%%/test/test_structmembers.py
%%PYTHON_LIBDIR%%/test/test_structseq.py
%%PYTHON_LIBDIR%%/test/test_subprocess.py
%%PYTHON_LIBDIR%%/test/test_sunaudiodev.py
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 33f5cff93183..a688a3c2f0b1 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= python25
-PORTVERSION= 2.5
-PORTREVISION= 1
+PORTVERSION= 2.5.1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION}
-.if !exists(/usr/bin/ypcat) # the world with NO_NIS
-PLIST_EXCLUDE= 'nis.so$$'
-.else
-PLIST_EXCLUDE= '^$$' # nothing
-.endif
+BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \
+ python-shared-config
+BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \
+ -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
OPTIONS= THREADS "Enable thread support" on \
HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+MLINKS= ${PYTHON_VERSION}.1 python.1
+PLIST_SUB+= IF_DEFAULT=""
+.else
+PLIST_SUB+= IF_DEFAULT="@comment "
+.endif
+
# workaround for a bug in base curses.h.
CFLAGS+= -D__wchar_t=wchar_t
@@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY=""
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
.endif
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_SUB+= NO_NIS="@comment "
+.else
+PLIST_SUB+= NO_NIS=""
+.endif
+
.if ${OSVERSION} < 400000
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
@@ -180,8 +191,7 @@ pre-su-install:
.endfor
pre-install:
- ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
- ${AWK} '{ print $$0; } \
+ ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST}
@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
@@ -211,6 +221,13 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+ for f in ${BIN_SCRIPTS}; do \
+ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
+ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
+ done
+.endif
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${TOOLSDIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 7f7cbdee8a65..9a63d62ef45b 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
-SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
-SIZE (python/Python-2.5.tgz) = 11019675
+MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
+SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
+SIZE (python/Python-2.5.1.tgz) = 11060830
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 6526f34bc484..3098736ca2c1 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -1,9 +1,16 @@
+%%IF_DEFAULT%%bin/idle
bin/idle%%PYVER%%
+%%IF_DEFAULT%%bin/pydoc
bin/pydoc%%PYVER%%
+%%IF_DEFAULT%%bin/python
bin/python%%PYVER%%
+%%IF_DEFAULT%%bin/python-config
bin/python%%PYVER%%-config
+%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
+%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
+%%IF_DEFAULT%%bin/smtpd.py
bin/smtpd%%PYVER%%.py
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h
@@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/itertools.so
%%PYTHON_LIBDIR%%/lib-dynload/math.so
%%PYTHON_LIBDIR%%/lib-dynload/mmap.so
-%%PYTHON_LIBDIR%%/lib-dynload/nis.so
+%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so
%%PYTHON_LIBDIR%%/lib-dynload/operator.so
%%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so
%%PYTHON_LIBDIR%%/lib-dynload/parser.so
@@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/exception_hierarchy.txt
%%PYTHON_LIBDIR%%/test/fork_wait.py
%%PYTHON_LIBDIR%%/test/greyrgb.uue
+%%PYTHON_LIBDIR%%/test/infinite_reload.py
%%PYTHON_LIBDIR%%/test/inspect_fodder.py
%%PYTHON_LIBDIR%%/test/inspect_fodder2.py
%%PYTHON_LIBDIR%%/test/list_tests.py
@@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_compile.py
%%PYTHON_LIBDIR%%/test/test_compiler.py
%%PYTHON_LIBDIR%%/test/test_complex.py
+%%PYTHON_LIBDIR%%/test/test_complex_args.py
%%PYTHON_LIBDIR%%/test/test_contains.py
%%PYTHON_LIBDIR%%/test/test_contextlib.py
%%PYTHON_LIBDIR%%/test/test_cookie.py
@@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_strop.py
%%PYTHON_LIBDIR%%/test/test_strptime.py
%%PYTHON_LIBDIR%%/test/test_struct.py
+%%PYTHON_LIBDIR%%/test/test_structmembers.py
%%PYTHON_LIBDIR%%/test/test_structseq.py
%%PYTHON_LIBDIR%%/test/test_subprocess.py
%%PYTHON_LIBDIR%%/test/test_sunaudiodev.py
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 33f5cff93183..a688a3c2f0b1 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= python25
-PORTVERSION= 2.5
-PORTREVISION= 1
+PORTVERSION= 2.5.1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION}
-.if !exists(/usr/bin/ypcat) # the world with NO_NIS
-PLIST_EXCLUDE= 'nis.so$$'
-.else
-PLIST_EXCLUDE= '^$$' # nothing
-.endif
+BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \
+ python-shared-config
+BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \
+ -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
OPTIONS= THREADS "Enable thread support" on \
HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+MLINKS= ${PYTHON_VERSION}.1 python.1
+PLIST_SUB+= IF_DEFAULT=""
+.else
+PLIST_SUB+= IF_DEFAULT="@comment "
+.endif
+
# workaround for a bug in base curses.h.
CFLAGS+= -D__wchar_t=wchar_t
@@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY=""
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
.endif
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_SUB+= NO_NIS="@comment "
+.else
+PLIST_SUB+= NO_NIS=""
+.endif
+
.if ${OSVERSION} < 400000
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
@@ -180,8 +191,7 @@ pre-su-install:
.endfor
pre-install:
- ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
- ${AWK} '{ print $$0; } \
+ ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST}
@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
@@ -211,6 +221,13 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+ for f in ${BIN_SCRIPTS}; do \
+ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
+ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
+ done
+.endif
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${TOOLSDIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 7f7cbdee8a65..9a63d62ef45b 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
-SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
-SIZE (python/Python-2.5.tgz) = 11019675
+MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
+SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
+SIZE (python/Python-2.5.1.tgz) = 11060830
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 6526f34bc484..3098736ca2c1 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -1,9 +1,16 @@
+%%IF_DEFAULT%%bin/idle
bin/idle%%PYVER%%
+%%IF_DEFAULT%%bin/pydoc
bin/pydoc%%PYVER%%
+%%IF_DEFAULT%%bin/python
bin/python%%PYVER%%
+%%IF_DEFAULT%%bin/python-config
bin/python%%PYVER%%-config
+%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
+%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
+%%IF_DEFAULT%%bin/smtpd.py
bin/smtpd%%PYVER%%.py
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h
@@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/itertools.so
%%PYTHON_LIBDIR%%/lib-dynload/math.so
%%PYTHON_LIBDIR%%/lib-dynload/mmap.so
-%%PYTHON_LIBDIR%%/lib-dynload/nis.so
+%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so
%%PYTHON_LIBDIR%%/lib-dynload/operator.so
%%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so
%%PYTHON_LIBDIR%%/lib-dynload/parser.so
@@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/exception_hierarchy.txt
%%PYTHON_LIBDIR%%/test/fork_wait.py
%%PYTHON_LIBDIR%%/test/greyrgb.uue
+%%PYTHON_LIBDIR%%/test/infinite_reload.py
%%PYTHON_LIBDIR%%/test/inspect_fodder.py
%%PYTHON_LIBDIR%%/test/inspect_fodder2.py
%%PYTHON_LIBDIR%%/test/list_tests.py
@@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_compile.py
%%PYTHON_LIBDIR%%/test/test_compiler.py
%%PYTHON_LIBDIR%%/test/test_complex.py
+%%PYTHON_LIBDIR%%/test/test_complex_args.py
%%PYTHON_LIBDIR%%/test/test_contains.py
%%PYTHON_LIBDIR%%/test/test_contextlib.py
%%PYTHON_LIBDIR%%/test/test_cookie.py
@@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_strop.py
%%PYTHON_LIBDIR%%/test/test_strptime.py
%%PYTHON_LIBDIR%%/test/test_struct.py
+%%PYTHON_LIBDIR%%/test/test_structmembers.py
%%PYTHON_LIBDIR%%/test/test_structseq.py
%%PYTHON_LIBDIR%%/test/test_subprocess.py
%%PYTHON_LIBDIR%%/test/test_sunaudiodev.py
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 33f5cff93183..a688a3c2f0b1 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= python25
-PORTVERSION= 2.5
-PORTREVISION= 1
+PORTVERSION= 2.5.1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION}
-.if !exists(/usr/bin/ypcat) # the world with NO_NIS
-PLIST_EXCLUDE= 'nis.so$$'
-.else
-PLIST_EXCLUDE= '^$$' # nothing
-.endif
+BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \
+ python-shared-config
+BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \
+ -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
OPTIONS= THREADS "Enable thread support" on \
HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+MLINKS= ${PYTHON_VERSION}.1 python.1
+PLIST_SUB+= IF_DEFAULT=""
+.else
+PLIST_SUB+= IF_DEFAULT="@comment "
+.endif
+
# workaround for a bug in base curses.h.
CFLAGS+= -D__wchar_t=wchar_t
@@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY=""
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
.endif
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_SUB+= NO_NIS="@comment "
+.else
+PLIST_SUB+= NO_NIS=""
+.endif
+
.if ${OSVERSION} < 400000
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
@@ -180,8 +191,7 @@ pre-su-install:
.endfor
pre-install:
- ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
- ${AWK} '{ print $$0; } \
+ ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST}
@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
@@ -211,6 +221,13 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+ for f in ${BIN_SCRIPTS}; do \
+ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
+ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
+ done
+.endif
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${TOOLSDIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index 7f7cbdee8a65..9a63d62ef45b 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
-SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
-SIZE (python/Python-2.5.tgz) = 11019675
+MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
+SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
+SIZE (python/Python-2.5.1.tgz) = 11060830
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 6526f34bc484..3098736ca2c1 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -1,9 +1,16 @@
+%%IF_DEFAULT%%bin/idle
bin/idle%%PYVER%%
+%%IF_DEFAULT%%bin/pydoc
bin/pydoc%%PYVER%%
+%%IF_DEFAULT%%bin/python
bin/python%%PYVER%%
+%%IF_DEFAULT%%bin/python-config
bin/python%%PYVER%%-config
+%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
+%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
+%%IF_DEFAULT%%bin/smtpd.py
bin/smtpd%%PYVER%%.py
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h
@@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/itertools.so
%%PYTHON_LIBDIR%%/lib-dynload/math.so
%%PYTHON_LIBDIR%%/lib-dynload/mmap.so
-%%PYTHON_LIBDIR%%/lib-dynload/nis.so
+%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so
%%PYTHON_LIBDIR%%/lib-dynload/operator.so
%%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so
%%PYTHON_LIBDIR%%/lib-dynload/parser.so
@@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/exception_hierarchy.txt
%%PYTHON_LIBDIR%%/test/fork_wait.py
%%PYTHON_LIBDIR%%/test/greyrgb.uue
+%%PYTHON_LIBDIR%%/test/infinite_reload.py
%%PYTHON_LIBDIR%%/test/inspect_fodder.py
%%PYTHON_LIBDIR%%/test/inspect_fodder2.py
%%PYTHON_LIBDIR%%/test/list_tests.py
@@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_compile.py
%%PYTHON_LIBDIR%%/test/test_compiler.py
%%PYTHON_LIBDIR%%/test/test_complex.py
+%%PYTHON_LIBDIR%%/test/test_complex_args.py
%%PYTHON_LIBDIR%%/test/test_contains.py
%%PYTHON_LIBDIR%%/test/test_contextlib.py
%%PYTHON_LIBDIR%%/test/test_cookie.py
@@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_strop.py
%%PYTHON_LIBDIR%%/test/test_strptime.py
%%PYTHON_LIBDIR%%/test/test_struct.py
+%%PYTHON_LIBDIR%%/test/test_structmembers.py
%%PYTHON_LIBDIR%%/test/test_structseq.py
%%PYTHON_LIBDIR%%/test/test_subprocess.py
%%PYTHON_LIBDIR%%/test/test_sunaudiodev.py
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 33f5cff93183..a688a3c2f0b1 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= python25
-PORTVERSION= 2.5
-PORTREVISION= 1
+PORTVERSION= 2.5.1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION}
-.if !exists(/usr/bin/ypcat) # the world with NO_NIS
-PLIST_EXCLUDE= 'nis.so$$'
-.else
-PLIST_EXCLUDE= '^$$' # nothing
-.endif
+BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \
+ python-shared-config
+BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \
+ -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
OPTIONS= THREADS "Enable thread support" on \
HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+MLINKS= ${PYTHON_VERSION}.1 python.1
+PLIST_SUB+= IF_DEFAULT=""
+.else
+PLIST_SUB+= IF_DEFAULT="@comment "
+.endif
+
# workaround for a bug in base curses.h.
CFLAGS+= -D__wchar_t=wchar_t
@@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY=""
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
.endif
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_SUB+= NO_NIS="@comment "
+.else
+PLIST_SUB+= NO_NIS=""
+.endif
+
.if ${OSVERSION} < 400000
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
@@ -180,8 +191,7 @@ pre-su-install:
.endfor
pre-install:
- ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
- ${AWK} '{ print $$0; } \
+ ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST}
@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
@@ -211,6 +221,13 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+ for f in ${BIN_SCRIPTS}; do \
+ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
+ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
+ done
+.endif
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${TOOLSDIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 7f7cbdee8a65..9a63d62ef45b 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
-SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
-SIZE (python/Python-2.5.tgz) = 11019675
+MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
+SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
+SIZE (python/Python-2.5.1.tgz) = 11060830
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 6526f34bc484..3098736ca2c1 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -1,9 +1,16 @@
+%%IF_DEFAULT%%bin/idle
bin/idle%%PYVER%%
+%%IF_DEFAULT%%bin/pydoc
bin/pydoc%%PYVER%%
+%%IF_DEFAULT%%bin/python
bin/python%%PYVER%%
+%%IF_DEFAULT%%bin/python-config
bin/python%%PYVER%%-config
+%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
+%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
+%%IF_DEFAULT%%bin/smtpd.py
bin/smtpd%%PYVER%%.py
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h
@@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/itertools.so
%%PYTHON_LIBDIR%%/lib-dynload/math.so
%%PYTHON_LIBDIR%%/lib-dynload/mmap.so
-%%PYTHON_LIBDIR%%/lib-dynload/nis.so
+%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so
%%PYTHON_LIBDIR%%/lib-dynload/operator.so
%%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so
%%PYTHON_LIBDIR%%/lib-dynload/parser.so
@@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/exception_hierarchy.txt
%%PYTHON_LIBDIR%%/test/fork_wait.py
%%PYTHON_LIBDIR%%/test/greyrgb.uue
+%%PYTHON_LIBDIR%%/test/infinite_reload.py
%%PYTHON_LIBDIR%%/test/inspect_fodder.py
%%PYTHON_LIBDIR%%/test/inspect_fodder2.py
%%PYTHON_LIBDIR%%/test/list_tests.py
@@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_compile.py
%%PYTHON_LIBDIR%%/test/test_compiler.py
%%PYTHON_LIBDIR%%/test/test_complex.py
+%%PYTHON_LIBDIR%%/test/test_complex_args.py
%%PYTHON_LIBDIR%%/test/test_contains.py
%%PYTHON_LIBDIR%%/test/test_contextlib.py
%%PYTHON_LIBDIR%%/test/test_cookie.py
@@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_strop.py
%%PYTHON_LIBDIR%%/test/test_strptime.py
%%PYTHON_LIBDIR%%/test/test_struct.py
+%%PYTHON_LIBDIR%%/test/test_structmembers.py
%%PYTHON_LIBDIR%%/test/test_structseq.py
%%PYTHON_LIBDIR%%/test/test_subprocess.py
%%PYTHON_LIBDIR%%/test/test_sunaudiodev.py
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 33f5cff93183..a688a3c2f0b1 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= python25
-PORTVERSION= 2.5
-PORTREVISION= 1
+PORTVERSION= 2.5.1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION}
-.if !exists(/usr/bin/ypcat) # the world with NO_NIS
-PLIST_EXCLUDE= 'nis.so$$'
-.else
-PLIST_EXCLUDE= '^$$' # nothing
-.endif
+BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \
+ python-shared-config
+BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \
+ -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
OPTIONS= THREADS "Enable thread support" on \
HUGE_STACK_SIZE "Use a larger thread stack" off \
@@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+MLINKS= ${PYTHON_VERSION}.1 python.1
+PLIST_SUB+= IF_DEFAULT=""
+.else
+PLIST_SUB+= IF_DEFAULT="@comment "
+.endif
+
# workaround for a bug in base curses.h.
CFLAGS+= -D__wchar_t=wchar_t
@@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY=""
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
.endif
+.if !exists(/usr/bin/ypcat) # the world with NO_NIS
+PLIST_SUB+= NO_NIS="@comment "
+.else
+PLIST_SUB+= NO_NIS=""
+.endif
+
.if ${OSVERSION} < 400000
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
@@ -180,8 +191,7 @@ pre-su-install:
.endfor
pre-install:
- ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \
- ${AWK} '{ print $$0; } \
+ ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST}
@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
@@ -211,6 +221,13 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+ for f in ${BIN_SCRIPTS}; do \
+ TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
+ cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \
+ done
+.endif
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${TOOLSDIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index 7f7cbdee8a65..9a63d62ef45b 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
-SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
-SIZE (python/Python-2.5.tgz) = 11019675
+MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
+SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
+SIZE (python/Python-2.5.1.tgz) = 11060830
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 6526f34bc484..3098736ca2c1 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -1,9 +1,16 @@
+%%IF_DEFAULT%%bin/idle
bin/idle%%PYVER%%
+%%IF_DEFAULT%%bin/pydoc
bin/pydoc%%PYVER%%
+%%IF_DEFAULT%%bin/python
bin/python%%PYVER%%
+%%IF_DEFAULT%%bin/python-config
bin/python%%PYVER%%-config
+%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
+%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
+%%IF_DEFAULT%%bin/smtpd.py
bin/smtpd%%PYVER%%.py
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h
@@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/itertools.so
%%PYTHON_LIBDIR%%/lib-dynload/math.so
%%PYTHON_LIBDIR%%/lib-dynload/mmap.so
-%%PYTHON_LIBDIR%%/lib-dynload/nis.so
+%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so
%%PYTHON_LIBDIR%%/lib-dynload/operator.so
%%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so
%%PYTHON_LIBDIR%%/lib-dynload/parser.so
@@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/exception_hierarchy.txt
%%PYTHON_LIBDIR%%/test/fork_wait.py
%%PYTHON_LIBDIR%%/test/greyrgb.uue
+%%PYTHON_LIBDIR%%/test/infinite_reload.py
%%PYTHON_LIBDIR%%/test/inspect_fodder.py
%%PYTHON_LIBDIR%%/test/inspect_fodder2.py
%%PYTHON_LIBDIR%%/test/list_tests.py
@@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_compile.py
%%PYTHON_LIBDIR%%/test/test_compiler.py
%%PYTHON_LIBDIR%%/test/test_complex.py
+%%PYTHON_LIBDIR%%/test/test_complex_args.py
%%PYTHON_LIBDIR%%/test/test_contains.py
%%PYTHON_LIBDIR%%/test/test_contextlib.py
%%PYTHON_LIBDIR%%/test/test_cookie.py
@@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_strop.py
%%PYTHON_LIBDIR%%/test/test_strptime.py
%%PYTHON_LIBDIR%%/test/test_struct.py
+%%PYTHON_LIBDIR%%/test/test_structmembers.py
%%PYTHON_LIBDIR%%/test/test_structseq.py
%%PYTHON_LIBDIR%%/test/test_subprocess.py
%%PYTHON_LIBDIR%%/test/test_sunaudiodev.py
diff --git a/mail/gmail-notify/Makefile b/mail/gmail-notify/Makefile
index 4fba0aa38388..4dd2574e24a6 100644
--- a/mail/gmail-notify/Makefile
+++ b/mail/gmail-notify/Makefile
@@ -29,10 +29,11 @@ EXTRAS_WRKSRC!= cd ${PORTSDIR}/x11-toolkits/py-gnome-extras && ${MAKE} -V WRKSRC
post-patch:
${SED} -e 's|@DATADIR@|${DATADIR}|' ${FILESDIR}/gmail-notifier > ${WRKSRC}/gmail-notifier
+ ${SED} -e 's|@PYTHON_INCLUDEDIR@|${PYTHON_INCLUDEDIR}|' ${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile
pre-configure:
${CP} ${EXTRAS_WRKSRC}/egg/tray/eggtrayicon.[ch] ${EXTRAS_WRKSRC}/egg/tray/trayicon* ${WRKSRC}
- ${CP} ${FILESDIR}/config.h ${FILESDIR}/Makefile ${WRKSRC}
+ ${CP} ${FILESDIR}/config.h ${WRKSRC}
${RM} ${WRKSRC}/pytrayicon.so
do-install:
diff --git a/mail/gmail-notify/files/Makefile b/mail/gmail-notify/files/Makefile.in
index e41173e1bc5c..f74e771bba28 100644
--- a/mail/gmail-notify/files/Makefile
+++ b/mail/gmail-notify/files/Makefile.in
@@ -1,7 +1,7 @@
# $FreeBSD$
# Makefile to build trayicon.so
-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I${LOCALBASE}/include/python2.4/ -I. -Wall -I${LOCALBASE}/share/pygtk/2.0 -I${LOCALBASE}/libdata/pkgconfig -DEGG_COMPILATION -fPIC
+CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I@PYTHON_INCLUDEDIR@ -I. -Wall -I${LOCALBASE}/share/pygtk/2.0 -I${LOCALBASE}/libdata/pkgconfig -DEGG_COMPILATION -fPIC
LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
DEFS_DIR= ${LOCALBASE}/share/pygtk/2.0/defs/
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index effc37829e84..00d09813b87c 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -161,6 +161,7 @@ pre-install:
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
+ @${RM} -f ${MAILMANDIR}/pythonlib/*.egg-info
.for dir in cron scripts
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${MAILMANDIR}/${dir}
.endfor
diff --git a/mail/mixminion/Makefile b/mail/mixminion/Makefile
index fb01820e715c..72b01c420b4a 100644
--- a/mail/mixminion/Makefile
+++ b/mail/mixminion/Makefile
@@ -15,6 +15,8 @@ COMMENT= A Type III Anonymous Remailer
USE_OPENSSL= yes
USE_PYTHON= 2.0+
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGVERSION= ${DISTVERSION}
MAN1= mixminion.1
MAN5= mixminiond.conf.5 mixminionrc.5
diff --git a/mail/py-spambayes/files/patch-python25 b/mail/py-spambayes/files/patch-python25
new file mode 100644
index 000000000000..5c35df105b78
--- /dev/null
+++ b/mail/py-spambayes/files/patch-python25
@@ -0,0 +1,57 @@
+--- spambayes/Corpus.py.orig Thu Jul 26 13:14:51 2007
++++ spambayes/Corpus.py Thu Jul 26 13:15:11 2007
+@@ -1,5 +1,7 @@
+ #! /usr/local/bin/python2.5
+
++from __future__ import generators
++
+ '''Corpus.py - Spambayes corpus management framework.
+
+ Classes:
+@@ -78,8 +80,6 @@
+
+ __author__ = "Tim Stone <tim@fourstonesExpressions.com>"
+ __credits__ = "Richie Hindle, Tim Peters, all the spambayes contributors."
+-
+-from __future__ import generators
+
+ try:
+ True, False
+--- spambayes/FileCorpus.py.orig Thu Jul 26 13:14:55 2007
++++ spambayes/FileCorpus.py Thu Jul 26 13:15:21 2007
+@@ -1,5 +1,7 @@
+ #! /usr/local/bin/python2.5
+
++from __future__ import generators
++
+ """FileCorpus.py - Corpus composed of file system artifacts
+
+ Classes:
+@@ -81,8 +83,6 @@
+
+ __author__ = "Tim Stone <tim@fourstonesExpressions.com>"
+ __credits__ = "Richie Hindle, Tim Peters, all the spambayes contributors."
+-
+-from __future__ import generators
+
+ from spambayes import Corpus
+ from spambayes import message
+--- spambayes/message.py.orig Thu Jul 26 13:15:02 2007
++++ spambayes/message.py Thu Jul 26 13:15:29 2007
+@@ -1,5 +1,7 @@
+ #! /usr/local/bin/python2.5
+
++from __future__ import generators
++
+ """message.py - Core Spambayes classes.
+
+ Classes:
+@@ -74,8 +76,6 @@
+
+ __author__ = "Tim Stone <tim@fourstonesExpressions.com>"
+ __credits__ = "Mark Hammond, Tony Meyer, all the spambayes contributors."
+-
+-from __future__ import generators
+
+ try:
+ True, False
diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile
index a3bd9b14ba27..4e04493df9dd 100644
--- a/mail/py-spf/Makefile
+++ b/mail/py-spf/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/DNS/__init__.py:${PORTSDIR}/dns/py-dns
DIST_SUBDIR= python
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pyspf
DOCSDIR?= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/mail/py-turbomail/Makefile b/mail/py-turbomail/Makefile
index 7e106f716f0c..b00d74316179 100644
--- a/mail/py-turbomail/Makefile
+++ b/mail/py-turbomail/Makefile
@@ -29,6 +29,8 @@ SUB_LIST= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TurboMail
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
PYTURBOMAIL_EGG= TurboMail-${PORTVERSION}-py${PYTHON_VER}.egg
diff --git a/mail/py-twistedMail/Makefile b/mail/py-twistedMail/Makefile
index 79e8bb44b2b5..cb1e98f3e89a 100644
--- a/mail/py-twistedMail/Makefile
+++ b/mail/py-twistedMail/Makefile
@@ -22,5 +22,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Mail
.include <bsd.port.mk>
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index 01dce83dceb2..2cdd0e2b8521 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS= plot:${PORTSDIR}/graphics/plotutils
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python2-biggles
USE_LDCONFIG= yes
post-patch:
diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile
index 903ab6e2b613..239d174eb1bb 100644
--- a/math/gracetmpl/Makefile
+++ b/math/gracetmpl/Makefile
@@ -34,6 +34,10 @@ MAKE_ARGS= PREFIX="${PREFIX}" \
ALL_TARGET= all pythonwrap
INSTALL_TARGET= install pythonwrap_install
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGNAME= graceTMPL
+PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR}/graceTMPL
+
post-extract:
@${ECHO_CMD} -n > ${WRKSRC}/Makefile.defs
diff --git a/math/py-bitvector/Makefile b/math/py-bitvector/Makefile
index e4b2eccad81a..9ca0e5eea122 100644
--- a/math/py-bitvector/Makefile
+++ b/math/py-bitvector/Makefile
@@ -18,6 +18,7 @@ COMMENT= A pure-Python memory-efficient packed representation for bit arrays
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= BitVector
PLIST_FILES= %%PYTHON_SITELIBDIR%%/BitVector.py \
%%PYTHON_SITELIBDIR%%/BitVector.pyc \
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index 791a5b7f6790..d4acdc123fe0 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -24,6 +24,9 @@ WRKSRC= ${WRKDIR}/Gato
GATO_DIR= ${PREFIX}/lib/${PYTHON_VERSION}/site-packages/Gato
EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}
+post-patch:
+ @ ${REINPLACE_CMD} -e 's,^.*__future__.*$$,,' ${WRKSRC}/DataStructures.py
+
pre-build:
@ ${TOUCH} ${WRKSRC}/__init__.py
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index 6dbdfb191fee..f4781f2f64db 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= gnuplot-py
post-install:
.if !defined(NOPORTDOCS)
diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index 7ba44612f8bb..404bfc3e25fe 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -25,5 +25,6 @@ LIB_DEPENDS= gsl.10:${PORTSDIR}/math/gsl
PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pygsl
.include <bsd.port.mk>
diff --git a/math/py-mpz/Makefile b/math/py-mpz/Makefile
index 10da01e33334..51e736f15c06 100644
--- a/math/py-mpz/Makefile
+++ b/math/py-mpz/Makefile
@@ -24,6 +24,7 @@ PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/mpz.so
DIST_SUBDIR= python
USE_PYTHON= -2.3
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 0.0.0
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 4e04b77be2c8..e7a2d3e89db1 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -21,6 +21,8 @@ COMMENT= The Numeric Extension to Python
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= Numeric
+PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/Numeric
WRKSRC= ${WRKDIR}/Numeric-${PORTVERSION}
diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index 968f8b248a19..83a67834e55b 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -18,6 +18,12 @@ COMMENT= The Numeric Extension to Python
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_EGGINFO= Numeric/Numeric-0.0.0-py${PYTHON_VER}.egg-info \
+ Numeric/Numeric-${PORTVERSION}-py${PYTHON_VER}.egg-info \
+ RNG-3.0-py${PYTHON_VER}.egg-info \
+ MA-4.1.0-py${PYTHON_VER}.egg-info \
+ FFTPACK-1.0-py${PYTHON_VER}.egg-info
+
PYSETUP= setup_all.py
NO_LATEST_LINK= yes
diff --git a/math/py-probstat/Makefile b/math/py-probstat/Makefile
index 1864c43e6afc..753f6c3b0e40 100644
--- a/math/py-probstat/Makefile
+++ b/math/py-probstat/Makefile
@@ -22,5 +22,6 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/probstat.so
PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.9
.include <bsd.port.mk>
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 13d568aed54c..a14a075ee3b5 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${PYNUMERIC}
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= ScientificPython
DOCDIR= ${PREFIX}/share/doc/py-scientific
EXAMPLEDIR= ${PREFIX}/share/examples/py-scientific
diff --git a/math/vtk-python/Makefile b/math/vtk-python/Makefile
index e08e7c04b1c3..0785d527de95 100644
--- a/math/vtk-python/Makefile
+++ b/math/vtk-python/Makefile
@@ -39,6 +39,7 @@ CMAKE_DEFS= -DVTK_WRAP_PYTHON:BOOL=ON \
-DEXPAT_INCLUDE_DIR:PATH=${LOCALBASE}/include \
-DCMAKE_BACKWARDS_COMPATIBILITY:STRING=2.2
+EXTRA_PATCHES+= ${.CURDIR}/files/extra-patch-Common-vtkPythonUtil.cxx
PLIST_SUB+= VTK_PTH_LOCATION_DIR=${PYTHON_SITELIBDIR}
.include "${MASTERDIR}/Makefile"
diff --git a/misc/pantry/Makefile b/misc/pantry/Makefile
index 13059c13fe97..7fcdee3d880d 100644
--- a/misc/pantry/Makefile
+++ b/misc/pantry/Makefile
@@ -18,6 +18,7 @@ USE_PYTHON= yes
USE_PYDISTUTILS=yes
MAN1= ${PORTNAME}.1
PORTDATA= master
+PYDISTUTILS_PKGVERSION= ${DISTVERSION}
post-extract:
@${MV} ${WRKSRC}/docs/${PORTNAME}.1 ${WRKSRC}/
diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index c782977a7c47..74204ef6572f 100644
--- a/misc/py-osd/Makefile
+++ b/misc/py-osd/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/twistd:${PORTSDIR}/devel/py-twisted
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyosd
PORTDOCS= AUTHORS ChangeLog ChangeLog.old README README.daemon pyosd.html
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/misc/py-yolk/Makefile b/misc/py-yolk/Makefile
index b0772f66e495..fe0b10764aa3 100644
--- a/misc/py-yolk/Makefile
+++ b/misc/py-yolk/Makefile
@@ -16,31 +16,17 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= A Python tool for listing packages installed by setuptools
-BUILD_DEPENDS+= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS+= ${BUILD_DEPENDS}
-
OPTIONS= PYPI_RSS "Enable fetching PyPI RSS feed" On
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USE_PYDISTUTILS= easy_install
.if !defined (NO_INSTALL_MAN)
MAN1= ${PORTNAME}.1
.endif
-PYDISTUTILS_BUILD_TARGET= bdist_egg
-PYDISTUTILS_INSTALL_TARGET= easy_install
-PYDISTUTILS_INSTALLARGS= -N -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PYYOLK_EGG}
-
-PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYYOLK_EGG=${PYYOLK_EGG} PYYOLK_EGG_VER=${PYYOLK_EGG_VER} \
- PORTEXAMPLES=${PORTEXAMPLES}
-
-EASY_INSTALL_CMD= easy_install-${PYTHON_VER}
-
-PYYOLK_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-PYYOLK_EGG_VER= "${PORTNAME}==${PORTVERSION}"
+PLIST_SUB= PORTEXAMPLES=${PORTEXAMPLES}
.include <bsd.port.pre.mk>
diff --git a/misc/py-yolk/pkg-plist b/misc/py-yolk/pkg-plist
index d807ab317ef4..a07205a75158 100644
--- a/misc/py-yolk/pkg-plist
+++ b/misc/py-yolk/pkg-plist
@@ -11,6 +11,4 @@ bin/yolk
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins/yolk_portage
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@unexec %%EASY_INSTALL_CMD%% -q -x -m -N -S %D/%%PYTHON_SITELIBDIR%% %%PYYOLK_EGG_VER%%
-%%PYTHON_SITELIBDIR%%/%%PYYOLK_EGG%%
-@exec %%EASY_INSTALL_CMD%% -x -N -S %D/%%PYTHON_SITELIBDIR%% %%PYYOLK_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/misc/pylize/Makefile b/misc/pylize/Makefile
index 2c28bb3cfea2..b7e76fa2535d 100644
--- a/misc/pylize/Makefile
+++ b/misc/pylize/Makefile
@@ -26,6 +26,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/HTMLgen.py:${PORTSDIR}/www/py-HTMLgen \
USE_BZIP2= yes
USE_PYTHON= 2.0+
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGVERSION= ${PORTVERSION:S/.b/b/}
PLIST_FILES= bin/pylize
diff --git a/net-im/py-jabber/Makefile b/net-im/py-jabber/Makefile
index d7ea7eab5a20..ecd9b79fab97 100644
--- a/net-im/py-jabber/Makefile
+++ b/net-im/py-jabber/Makefile
@@ -21,6 +21,8 @@ RUN_DEPENDS= ${PYEXPAT}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= jabber.py
+PYDISTUTILS_PKGVERSION= 0.3-1
post-install:
@${ECHO} "jabber" > ${PYTHON_SITELIBDIR}/jabber.pth
diff --git a/net-im/py-msnp/Makefile b/net-im/py-msnp/Makefile
index f41b54bf47d4..d98a051924a1 100644
--- a/net-im/py-msnp/Makefile
+++ b/net-im/py-msnp/Makefile
@@ -19,6 +19,7 @@ COMMENT= MSN messaging in Python
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= msnp.py
.if !defined(NOPORTDOCS)
post-install:
diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index 7ec5d55605f8..cd56d0a8ba02 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -24,6 +24,9 @@ USE_PYTHON= 2.3+
#USE_PYDISTUTILS= yes
USE_BZIP2= yes
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGVERSION= 1.0.0_svn
+
post-extract:
@${MKDIR} ${WRKSRC}/.svn
diff --git a/net-im/py-twistedWords/Makefile b/net-im/py-twistedWords/Makefile
index 6e1156a5f611..3da2727ad575 100644
--- a/net-im/py-twistedWords/Makefile
+++ b/net-im/py-twistedWords/Makefile
@@ -21,5 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Words
.include <bsd.port.mk>
diff --git a/net-mgmt/py-flowtools/Makefile b/net-mgmt/py-flowtools/Makefile
index cba3867cf8b8..19d73e4d4b91 100644
--- a/net-mgmt/py-flowtools/Makefile
+++ b/net-mgmt/py-flowtools/Makefile
@@ -22,5 +22,6 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/flowtools.so
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyflowtools
.include <bsd.port.mk>
diff --git a/net-mgmt/py-ipy/Makefile b/net-mgmt/py-ipy/Makefile
index 19b081282aa4..0fe7f741434a 100644
--- a/net-mgmt/py-ipy/Makefile
+++ b/net-mgmt/py-ipy/Makefile
@@ -19,6 +19,7 @@ COMMENT= A Python module for handling IPv4 and IPv6 Addresses and Networks
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= IPy
test: install
${PYTHON_CMD} ${WRKSRC}/test/test_IPy.py
diff --git a/net-mgmt/py-snmp/Makefile b/net-mgmt/py-snmp/Makefile
index 6df47435c9d4..f7591e3942bd 100644
--- a/net-mgmt/py-snmp/Makefile
+++ b/net-mgmt/py-snmp/Makefile
@@ -20,6 +20,7 @@ CONFLICTS= py??-snmp2-[0-9]* py??-snmp4-[0-9]*
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pysnmp
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/net-mgmt/py-snmp2/Makefile b/net-mgmt/py-snmp2/Makefile
index 4115b3287ab1..fb62bd612751 100644
--- a/net-mgmt/py-snmp2/Makefile
+++ b/net-mgmt/py-snmp2/Makefile
@@ -20,6 +20,7 @@ CONFLICTS= py??-snmp4-[0-9]* py??-snmp-3.*
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pysnmp
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
MYPORTDOCS= CHANGES LICENSE MANIFEST PKG-INFO README contribution/WARNING
diff --git a/net-mgmt/py-snmp4-apps/Makefile b/net-mgmt/py-snmp4-apps/Makefile
index 8a504ee6e757..cf90eb750f43 100644
--- a/net-mgmt/py-snmp4-apps/Makefile
+++ b/net-mgmt/py-snmp4-apps/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysnmp/v4/__init__.py:${PORTSDIR}/net-mgmt/py-
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pysnmp-apps
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index 8093139f933d..f786f34e4a41 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyasn1/__init__.py:${PORTSDIR}/devel/py-asn1
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pysnmp-mibs
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index a7d1db3c86f2..785a3621304d 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -23,6 +23,7 @@ CONFLICTS= py??-snmp-[0-9]* py??-snmp2-[0-9]*
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pysnmp
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/net-mgmt/py-twistedSNMP/Makefile b/net-mgmt/py-twistedSNMP/Makefile
index b84b6debae6a..098459892580 100644
--- a/net-mgmt/py-twistedSNMP/Makefile
+++ b/net-mgmt/py-twistedSNMP/Makefile
@@ -22,5 +22,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TwistedSNMP
.include <bsd.port.mk>
diff --git a/net-mgmt/py-yapsnmp/files/patch-configure b/net-mgmt/py-yapsnmp/files/patch-configure
index e83d1a7065f7..1837464b7cc2 100644
--- a/net-mgmt/py-yapsnmp/files/patch-configure
+++ b/net-mgmt/py-yapsnmp/files/patch-configure
@@ -5,7 +5,7 @@
-for PYTHONINCPATH in python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
-+for PYTHONINCPATH in python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
++for PYTHONINCPATH in python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
do
as_ac_Header=`echo "ac_cv_header_$PYTHONINCPATH/Python.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/net-p2p/btqueue/Makefile b/net-p2p/btqueue/Makefile
index e86552410664..c837bd3834c9 100644
--- a/net-p2p/btqueue/Makefile
+++ b/net-p2p/btqueue/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
CONFLICTS= py??-*[Bb]it[Tt]ornado* py??-*[Bb]it[Tt]orrent*
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= BTQueue
DATADIR= ${PREFIX}/share/BTQueue
DOCSDIR= ${PREFIX}/share/doc/BTQueue
diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
index 302a24f4fc1a..1de2505304a7 100644
--- a/net-p2p/nicotine-plus/Makefile
+++ b/net-p2p/nicotine-plus/Makefile
@@ -26,6 +26,7 @@ USE_GNOME= pygtk2
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_GETTEXT= yes
+PYDISTUTILS_PKGNAME= nicotine
DOCSDIR= share/doc/${PKGNAMEPREFIX:S/-//}
DATADIR= share/${PKGNAMEPREFIX:S/-//}
diff --git a/net-p2p/py-bittornado/Makefile b/net-p2p/py-bittornado/Makefile
index b8dc5bd114fc..52d10e96e40a 100644
--- a/net-p2p/py-bittornado/Makefile
+++ b/net-p2p/py-bittornado/Makefile
@@ -24,6 +24,7 @@ CONFLICTS= py??-*[Bb]it[Tt]ornado-core-[0-9]* py??-*[Bb]it[Tt]orrent*-[0-9]* btq
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= T-0.3.18._BitTornado_
WRKSRC= ${WRKDIR}/${PORTNAME}-CVS
diff --git a/net-p2p/py-fngrab/Makefile b/net-p2p/py-fngrab/Makefile
index 6c4e02f1e230..ba6c4c05d059 100644
--- a/net-p2p/py-fngrab/Makefile
+++ b/net-p2p/py-fngrab/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= FreenetGrab
post-install:
@${MV} ${PREFIX}/bin/fngrab.py ${PREFIX}/bin/fngrab
diff --git a/net-p2p/py-kenosis-bittorrent/Makefile b/net-p2p/py-kenosis-bittorrent/Makefile
index 451921f6cb9a..98bb0f38cf07 100644
--- a/net-p2p/py-kenosis-bittorrent/Makefile
+++ b/net-p2p/py-kenosis-bittorrent/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kenosis/__init__.py:${PORTSDIR}/net-p2p/py-ken
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.95
WRKSRC= ${WRKDIR}/${DISTNAME}/bt
diff --git a/net-p2p/py-py2play/Makefile b/net-p2p/py-py2play/Makefile
index 1117621f642f..d24025b35ad5 100644
--- a/net-p2p/py-py2play/Makefile
+++ b/net-p2p/py-py2play/Makefile
@@ -18,6 +18,7 @@ COMMENT= Peer-to-peer network game engine
DIST_SUBDIR= python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Py2Play
EXAMPLESDIR= ${PREFIX}/share/examples/py-py2play
post-install:
diff --git a/net-p2p/py-vertex/Makefile b/net-p2p/py-vertex/Makefile
index de303ced869e..99feb914fdde 100644
--- a/net-p2p/py-vertex/Makefile
+++ b/net-p2p/py-vertex/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/epsilon/__init__.py:${PORTSDIR}/devel/py-epsil
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Vertex
USE_TWISTED= yes
NO_BUILD= yes
diff --git a/net/pdb/pkg-plist b/net/pdb/pkg-plist
index d9bdda1eaea3..9de94282249d 100644
--- a/net/pdb/pkg-plist
+++ b/net/pdb/pkg-plist
@@ -1,11 +1,11 @@
bin/pdb.py
-lib/python2.4/site-packages/pktdbg/__init__.py
-lib/python2.4/site-packages/pktdbg/__init__.pyc
-lib/python2.4/site-packages/pktdbg/__init__.pyo
-lib/python2.4/site-packages/pktdbg/cli.py
-lib/python2.4/site-packages/pktdbg/cli.pyc
-lib/python2.4/site-packages/pktdbg/cli.pyo
-lib/python2.4/site-packages/pktdbg/packetstream.py
-lib/python2.4/site-packages/pktdbg/packetstream.pyc
-lib/python2.4/site-packages/pktdbg/packetstream.pyo
-@dirrm lib/python2.4/site-packages/pktdbg
+%%PYTHON_SITELIBDIR%%/pktdbg/__init__.py
+%%PYTHON_SITELIBDIR%%/pktdbg/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pktdbg/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pktdbg/cli.py
+%%PYTHON_SITELIBDIR%%/pktdbg/cli.pyc
+%%PYTHON_SITELIBDIR%%/pktdbg/cli.pyo
+%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.py
+%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.pyc
+%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/pktdbg
diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile
index 5b82b334fa4a..b629547a93aa 100644
--- a/net/py-GeoIP/Makefile
+++ b/net/py-GeoIP/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= GeoIP.5:${PORTSDIR}/net/GeoIP
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= GeoIP-Python
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
EXAMPLE_FILES= README test.py test_city.py test_org.py test_region.py
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index 1f362bfee53d..0e33c2e7d212 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -20,6 +20,8 @@ RUN_DEPENDS= ${PYXML}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pygoogle
+PYDISTUTILS_PKGVERSION= 0.5
.if !defined(NOPORTDOCS)
PORTDOCS= *
diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index 4942ba395ca7..db91466b7cab 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -18,6 +18,7 @@ COMMENT= An LDAP module for python, for OpenLDAP2
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_OPENLDAP= yes
+PYDISTUTILS_PKGNAME= python-ldap
REPLACE_ARGS= -e 's,/usr/local/openldap-2.3/lib,${LOCALBASE}/lib,' \
-e 's,/usr/local/openldap-2.3/include,${LOCALBASE}/include,'
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index e0ac15d5e5d9..ebd7e2203a21 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -24,6 +24,8 @@ LIBDNET_SLAVE= yes
USE_PYTHON= yes
CONFIGURE_ARGS= --with-python
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGNAME= dnet
.if defined(MAINTAINER_MODE)
regression-test: install
diff --git a/net/py-mantissa/Makefile b/net/py-mantissa/Makefile
index 36330fc9b804..37ce90fd9699 100644
--- a/net/py-mantissa/Makefile
+++ b/net/py-mantissa/Makefile
@@ -35,6 +35,7 @@ USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_TWISTED= yes
NO_BUILD= yes
+PYDISTUTILS_PKGNAME= Mantissa
.include <bsd.port.pre.mk>
diff --git a/net/py-netstring/Makefile b/net/py-netstring/Makefile
index 2ba0ce23a1eb..6a0e550fd65f 100644
--- a/net/py-netstring/Makefile
+++ b/net/py-netstring/Makefile
@@ -16,5 +16,6 @@ COMMENT= Python module implenting the netstring protocol
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-netstring
.include <bsd.port.mk>
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index 178eac4324a8..0a7646515f2b 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -24,6 +24,7 @@ BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_PYTHON_PREFIX= yes
+PYDISTUTILS_PKGNAME= pylibpcap
WRKSRC= ${WRKDIR}/pylibpcap-${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile
index 2af58eafe98d..9ff166a639f3 100644
--- a/net/py-pypcap/Makefile
+++ b/net/py-pypcap/Makefile
@@ -19,6 +19,8 @@ BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex
USE_PYTHON= yes
USE_PYTHON_PREFIX= yes
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGNAME= pcap
PLIST_FILES= %%PYTHON_SITELIBDIR%%/pcap.so
diff --git a/net/py-rrdtool_lgpl/Makefile b/net/py-rrdtool_lgpl/Makefile
index 900f9b7ac9dc..15f258244d57 100644
--- a/net/py-rrdtool_lgpl/Makefile
+++ b/net/py-rrdtool_lgpl/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= py-rrdtool
LIBDIR?= ${LOCALBASE}/lib # directory where librrd.so lives
diff --git a/net/py-samba/Makefile b/net/py-samba/Makefile
index 0064a0b3a15c..93c0cac51b72 100644
--- a/net/py-samba/Makefile
+++ b/net/py-samba/Makefile
@@ -23,6 +23,8 @@ PKGDIR= ${.CURDIR}
USE_PYTHON= 2.1+
USE_PYDISTUTILS= yes
PYSETUP= python/setup.py
+PYDISTUTILS_PKGNAME= Samba_Python_Extensions
+PYDISTUTILS_PKGVERSION= 0.1
CONFIGURE_ARGS+= --with-python
diff --git a/net/py-soappy-devel/Makefile b/net/py-soappy-devel/Makefile
index 7c8d08d085cb..ff4d3c5d1b6e 100644
--- a/net/py-soappy-devel/Makefile
+++ b/net/py-soappy-devel/Makefile
@@ -19,6 +19,7 @@ COMMENT= A SOAP implementation
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= SOAPpy
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst
RUN_DEPENDS+= ${PYXML} \
diff --git a/net/py-soappy-devel/files/patch-python25 b/net/py-soappy-devel/files/patch-python25
new file mode 100644
index 000000000000..59027527c954
--- /dev/null
+++ b/net/py-soappy-devel/files/patch-python25
@@ -0,0 +1,56 @@
+--- ./SOAPpy/Client.py.orig Fri Mar 30 08:44:36 2007
++++ ./SOAPpy/Client.py Fri Mar 30 08:44:40 2007
+@@ -40,10 +40,10 @@
+ ################################################################################
+ """
+
++from __future__ import nested_scopes
+ ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+
+ #import xml.sax
+ import urllib
+--- ./SOAPpy/GSIServer.py.orig Fri Mar 30 08:44:40 2007
++++ ./SOAPpy/GSIServer.py Fri Mar 30 08:44:44 2007
+@@ -43,10 +43,10 @@
+ ################################################################################
+ """
+
++from __future__ import nested_scopes
+ ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+
+ #import xml.sax
+ import re
+--- ./SOAPpy/Server.py.orig Fri Mar 30 08:44:49 2007
++++ ./SOAPpy/Server.py Fri Mar 30 08:44:52 2007
+@@ -40,10 +40,10 @@
+ ################################################################################
+ """
+
++from __future__ import nested_scopes
+ ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+
+ #import xml.sax
+ import re
+--- ./SOAPpy/Types.py.orig Fri Mar 30 08:44:52 2007
++++ ./SOAPpy/Types.py Fri Mar 30 08:44:56 2007
+@@ -33,10 +33,10 @@
+ ################################################################################
+ """
+
++from __future__ import nested_scopes
+ ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+
+ import UserList
+ import base64
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 604b44445f3f..6497a0da33e7 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -18,6 +18,7 @@ COMMENT= A SOAP implementation
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= SOAPpy
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst
RUN_DEPENDS+= ${PYXML} \
diff --git a/net/py-soappy/files/patch-python25 b/net/py-soappy/files/patch-python25
new file mode 100644
index 000000000000..2970754d4f8a
--- /dev/null
+++ b/net/py-soappy/files/patch-python25
@@ -0,0 +1,56 @@
+--- ./SOAPpy/Client.py.orig Fri Mar 30 08:41:24 2007
++++ ./SOAPpy/Client.py Fri Mar 30 08:41:31 2007
+@@ -40,10 +40,10 @@
+ ################################################################################
+ """
+
++from __future__ import nested_scopes
+ ident = '$Id: Client.py,v 1.20 2004/04/10 04:22:52 irjudson Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+
+ #import xml.sax
+ import urllib
+--- ./SOAPpy/GSIServer.py.orig Fri Mar 30 08:41:46 2007
++++ ./SOAPpy/GSIServer.py Fri Mar 30 08:42:16 2007
+@@ -43,10 +43,10 @@
+ ################################################################################
+ """
+
++from __future__ import nested_scopes
+ ident = '$Id: GSIServer.py,v 1.4 2004/02/04 03:21:02 irjudson Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+
+ #import xml.sax
+ import re
+--- ./SOAPpy/Server.py.orig Fri Mar 30 08:41:53 2007
++++ ./SOAPpy/Server.py Fri Mar 30 08:42:24 2007
+@@ -40,10 +40,10 @@
+ ################################################################################
+ """
+
++from __future__ import nested_scopes
+ ident = '$Id: Server.py,v 1.20 2004/04/28 21:47:10 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+
+ #import xml.sax
+ import re
+--- ./SOAPpy/Types.py.orig Fri Mar 30 08:41:56 2007
++++ ./SOAPpy/Types.py Fri Mar 30 08:42:29 2007
+@@ -33,10 +33,10 @@
+ ################################################################################
+ """
+
++from __future__ import nested_scopes
+ ident = '$Id: Types.py,v 1.17 2004/09/11 03:03:33 warnes Exp $'
+ from version import __version__
+
+-from __future__ import nested_scopes
+
+ import UserList
+ import base64
diff --git a/net/py-spreadmodule/Makefile b/net/py-spreadmodule/Makefile
index b264bda63c60..3bb3017da0ab 100644
--- a/net/py-spreadmodule/Makefile
+++ b/net/py-spreadmodule/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS= spread.1:${PORTSDIR}/net/spread
PLIST_FILES= %%PYTHON_SITELIBDIR%%/spread.so
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= SpreadModule
post-patch:
@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/setup.py
diff --git a/net/py-tofu/Makefile b/net/py-tofu/Makefile
index 0d28bb403ea7..8f0a661b36cb 100644
--- a/net/py-tofu/Makefile
+++ b/net/py-tofu/Makefile
@@ -20,6 +20,7 @@ USE_BZIP2= yes
USE_PYTHON= yes
USE_TWISTED= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Tofu
WRKSRC= ${WRKDIR}/Tofu-${PORTVERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/py-tofu
diff --git a/net/py-twistedPair/Makefile b/net/py-twistedPair/Makefile
index 39aa58dc9ac4..cf62a8e9a974 100644
--- a/net/py-twistedPair/Makefile
+++ b/net/py-twistedPair/Makefile
@@ -25,6 +25,7 @@ WRKSRC= ${WRKDIR}/TwistedPair-${PORTVERSION}
USE_BZIP2= yes
USE_PYTHON= 2.2+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Pair
PLIST_SUB+= S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
diff --git a/net/py-twitter/Makefile b/net/py-twitter/Makefile
index 595ebd78287c..39bda9c1fdfc 100644
--- a/net/py-twitter/Makefile
+++ b/net/py-twitter/Makefile
@@ -20,12 +20,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>0:${PORTSDIR}/devel/py-simplejs
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_BUILD_TARGET= bdist_egg
-PYDISTUTILS_INSTALL_TARGET= easy_install
-PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYTWITTER_EGG}
-
-PYTWITTER_EGG= python_${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-PLIST_SUB+= PYTWITTER_EGG=${PYTWITTER_EGG}
+USE_PYDISTUTILS= easy_install
+PYDISTUTILS_PKGNAME= python_twitter
.include <bsd.port.mk>
diff --git a/net/py-twitter/pkg-plist b/net/py-twitter/pkg-plist
index 1d4e3719a04b..ddf68a1c022f 100644
--- a/net/py-twitter/pkg-plist
+++ b/net/py-twitter/pkg-plist
@@ -1,3 +1 @@
-@unexec easy_install -q -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYTWITTER_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYTWITTER_EGG%%
-@exec easy_install -N %D/%%PYTHON_SITELIBDIR%%/%%PYTWITTER_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/net/py-xmlrpc/Makefile b/net/py-xmlrpc/Makefile
index fc2da483c08d..629549e0c9f1 100644
--- a/net/py-xmlrpc/Makefile
+++ b/net/py-xmlrpc/Makefile
@@ -18,6 +18,7 @@ COMMENT= A fast implementation of the xmlrpc spec for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= py-xmlrpc
EXAMPLESDIR= ${PREFIX}/share/examples/py-xmlrpc
.if !defined(NOPORTDOCS)
diff --git a/net/py-yadis/Makefile b/net/py-yadis/Makefile
index c63665793d5d..b70dd1c69259 100644
--- a/net/py-yadis/Makefile
+++ b/net/py-yadis/Makefile
@@ -17,5 +17,6 @@ COMMENT= Python support for the Yadis service discovery protocol
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= python-yadis
.include <bsd.port.mk>
diff --git a/net/py-zsi-devel/Makefile b/net/py-zsi-devel/Makefile
index 9fb89f4b3554..3050f5aec552 100644
--- a/net/py-zsi-devel/Makefile
+++ b/net/py-zsi-devel/Makefile
@@ -26,6 +26,7 @@ CONFLICTS= py-zsi-1.*
USE_PYTHON= 2.0+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 2.0_rc3
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}${PKGNAMESUFFIX}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}${PKGNAMESUFFIX}
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index 2319a2e1c6af..06e2b27739a5 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -21,6 +21,7 @@ CONFLICTS= py-zsi-devel-2.*
USE_PYTHON= 2.0+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= ZSI
post-install:
.if !defined(NOPORTDOCS)
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index b9bc9ef306e2..6d0715680fe3 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -18,6 +18,7 @@ COMMENT= Multiprotocol Information Server
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 2.0.15
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN8= pygopherd.8
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index 90fe23a764b4..dd01f5305309 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -22,6 +22,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= splat
+PYDISTUTILS_PKGVERSION= 1.1-rc4
USE_RC_SUBR= splatd.sh
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
MAN5= splat.conf.5
diff --git a/net/straw/Makefile b/net/straw/Makefile
index 7f77c7efee8a..eb3a6fcfce6b 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -24,6 +24,8 @@ USE_XLIB= yes
USE_GNOME= gnomehier libglade2 pygnome2 pygnomeextras
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Straw
+PYDISTUTILS_EGGINFODIR= ${PREFIX}/share/gnome
PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} \
--install-lib=${PREFIX}/share/gnome \
--with-desktop-file-dir=share/gnome/applications
diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile
index fec80f280741..dad48f3e3c10 100644
--- a/net/tcpwatch/Makefile
+++ b/net/tcpwatch/Makefile
@@ -21,5 +21,6 @@ PLIST_FILES= bin/tcpwatch.py
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 1.2.1
.include <bsd.port.mk>
diff --git a/news/py-twistedNews/Makefile b/news/py-twistedNews/Makefile
index 55c5aa4c6026..bc29d5a95eb4 100644
--- a/news/py-twistedNews/Makefile
+++ b/news/py-twistedNews/Makefile
@@ -21,5 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_News
.include <bsd.port.mk>
diff --git a/news/pyne/Makefile b/news/pyne/Makefile
index cf6aa88e1db7..c135f02526fe 100644
--- a/news/pyne/Makefile
+++ b/news/pyne/Makefile
@@ -21,6 +21,10 @@ INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/src/po
USE_GNOME= pygtk2
USE_PYTHON= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's/# Originally/# coding:latin1/g' \
+ ${WRKSRC}/src/po/pygettext.py
+
pre-build:
@${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/pyne.sh
@${ECHO_CMD} "exec ${PYTHON_CMD} -O ${PYTHON_SITELIBDIR}/pyne/pyne.py \$$*" >> ${WRKDIR}/pyne.sh
diff --git a/ports-mgmt/pkg_trackinst/Makefile b/ports-mgmt/pkg_trackinst/Makefile
index f71752d4e026..d93855212296 100644
--- a/ports-mgmt/pkg_trackinst/Makefile
+++ b/ports-mgmt/pkg_trackinst/Makefile
@@ -13,6 +13,7 @@ MAINTAINER= perky@FreeBSD.org
COMMENT= PkgDB/pkg-plist generator by tracking installation
USE_PYTHON= 2.3+
+INSTALLS_EGGINFO= yes
MAKE_ENV= PYTHON_CMD=${PYTHON_CMD}
.include <bsd.port.pre.mk>
diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile
index 960342bece42..d8056649ce37 100644
--- a/print/py-fonttools/Makefile
+++ b/print/py-fonttools/Makefile
@@ -26,6 +26,9 @@ WRKSRC= ${WRKDIR}/fonttools
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR}/FontTools
+PYDISTUTILS_PKGNAME= FontTools
+PYDISTUTILS_PKGVERSION= 1.0
DOCDIR= ${PREFIX}/share/doc/py-fonttools
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 6f5566d74032..24d450a1b158 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -21,6 +21,8 @@ COMMENT= Library to create PDF documents using the Python language
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Reportlab
+PYDISTUTILS_PKGVERSION= 1.20
WRKSRC= ${WRKDIR}/reportlab_${PORTVERSION:S/./_/g}/reportlab
MAKE_ENV= PACKAGE_PATH="${REPORTLABDIR}"
diff --git a/print/py-reportlab2/Makefile b/print/py-reportlab2/Makefile
index 72ddcd9294d8..884ea6cae029 100644
--- a/print/py-reportlab2/Makefile
+++ b/print/py-reportlab2/Makefile
@@ -20,6 +20,7 @@ COMMENT= Library to create PDF documents using the Python language
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Reportlab
WRKSRC= ${WRKDIR}/reportlab_${PORTVERSION:S/./_/}/reportlab
MAKE_ENV= PACKAGE_PATH="${REPORTLABDIR}"
diff --git a/print/py-rtf/Makefile b/print/py-rtf/Makefile
index 21eb3ad3ec00..f6ffd8fbd45c 100644
--- a/print/py-rtf/Makefile
+++ b/print/py-rtf/Makefile
@@ -18,6 +18,7 @@ COMMENT= Library to create RTF documents using the Python language
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyRTF
EXAMPLESDIR= ${PREFIX}/share/examples/py-rtf
diff --git a/print/ttfquery/Makefile b/print/ttfquery/Makefile
index 1a68ad5a2849..00457421a538 100644
--- a/print/ttfquery/Makefile
+++ b/print/ttfquery/Makefile
@@ -21,5 +21,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/FontTools.pth:${PORTSDIR}/print/py-fonttools \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TTFQuery
.include <bsd.port.mk>
diff --git a/science/mayavi/Makefile b/science/mayavi/Makefile
index ef7042303513..d1087c86dd56 100644
--- a/science/mayavi/Makefile
+++ b/science/mayavi/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/vtk.pth:${PORTSDIR}/math/vtk-python \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= MayaVi
CPIO_ARGS= --quiet -pdum -R
post-install:
diff --git a/science/py-paida/Makefile b/science/py-paida/Makefile
index 64f23b7d950e..0e3bf5fd8e49 100644
--- a/science/py-paida/Makefile
+++ b/science/py-paida/Makefile
@@ -23,5 +23,6 @@ BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tki
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 3.2.1_2.8
.include <bsd.port.mk>
diff --git a/security/denyhosts/Makefile b/security/denyhosts/Makefile
index 7c94d9a5423a..0ce7a7e97366 100644
--- a/security/denyhosts/Makefile
+++ b/security/denyhosts/Makefile
@@ -18,6 +18,7 @@ COMMENT= Script to thwart ssh attacks
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= DenyHosts
USE_RC_SUBR= denyhosts
SUB_FILES= pkg-message
diff --git a/security/pssh/Makefile b/security/pssh/Makefile
index e3a4d8daf00c..543dc2737c66 100644
--- a/security/pssh/Makefile
+++ b/security/pssh/Makefile
@@ -16,23 +16,9 @@ MASTER_SITE_SUBDIR= brooks
MAINTAINER= brooks@FreeBSD.org
COMMENT= Parallel versions of the openssh tools
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools \
- rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
USE_PYTHON= YES
-USE_PYDISTUTILS=yes
-
-PLIST_SUB+= PSSH_EGG=${PSSH_EGG} \
- EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PSSH_EGG=${PSSH_EGG} \
- EGG="pssh==${PORTVERSION}"
-
-PYDISTUTILS_BUILD_TARGET= bdist_egg
-PYDISTUTILS_INSTALL_TARGET= easy_install
-PYDISTUTILS_INSTALLARGS= -N -O1 -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PSSH_EGG}
-
-EASY_INSTALL_CMD= easy_install-${PYTHON_VER}
-PSSH_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
+USE_PYDISTUTILS=easy_install
.include <bsd.port.mk>
diff --git a/security/pssh/pkg-plist b/security/pssh/pkg-plist
index 0ac9198fbad4..251f21024f2a 100644
--- a/security/pssh/pkg-plist
+++ b/security/pssh/pkg-plist
@@ -1,8 +1,6 @@
-@unexec %%EASY_INSTALL_CMD%% -q -N -m -x -S %D/%%PYTHON_SITELIBDIR%% %%EGG%%
bin/prsync
bin/pnuke
bin/pslurp
bin/pssh
bin/pscp
-%%PYTHON_SITELIBDIR%%/%%PSSH_EGG%%
-@exec %%EASY_INSTALL_CMD%% -q -x -N -S %D/%%PYTHON_SITELIBDIR%% %%EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-cerealizer/Makefile b/security/py-cerealizer/Makefile
index d6b90d124d30..98e4983827de 100644
--- a/security/py-cerealizer/Makefile
+++ b/security/py-cerealizer/Makefile
@@ -19,5 +19,6 @@ COMMENT= Secure pickle-like module
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Cerealizer
.include <bsd.port.mk>
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index 2aacd1349bd1..d4db878ce5ae 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS= clamav.2:${PORTSDIR}/security/clamav
DIST_SUBDIR= python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyclamav
PYDISTUTILS_BUILDARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/security/py-crack/Makefile b/security/py-crack/Makefile
index f8d3c1b0c206..e8772d7b821b 100644
--- a/security/py-crack/Makefile
+++ b/security/py-crack/Makefile
@@ -33,6 +33,10 @@ CONFIGURE_ENV= "CPPFLAGS=-I${LOCALBASE}/include" \
MAKE_ENV= "CPPFLAGS=-I${LOCALBASE}/include -fPIC" \
"LDFLAGS=-L${LOCALBASE}/lib"
+post-patch:
+ ${REINPLACE_CMD} -e 's/setup(/setup(name="${PORTNAME}",version="${PORTVERSION}",/' \
+ ${WRKSRC}/distutil.py
+
post-install:
${INSTALL_DATA} ${WRKSRC}/crack.py ${PYTHONPREFIX_SITELIBDIR}
diff --git a/security/py-fchksum/Makefile b/security/py-fchksum/Makefile
index fbd49ff39bcb..9c32816a6964 100644
--- a/security/py-fchksum/Makefile
+++ b/security/py-fchksum/Makefile
@@ -19,5 +19,6 @@ COMMENT= Python module to find the checksum of files
PLIST_FILES= %%PYTHON_SITELIBDIR%%/fchksum.so
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-fchksum
.include <bsd.port.mk>
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index 7f74cc5c8b65..bd6e88793897 100644
--- a/security/py-gnupg/Makefile
+++ b/security/py-gnupg/Makefile
@@ -19,5 +19,6 @@ COMMENT= Python module for GnuPG interface
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= GnuPGInterface
.include <bsd.port.mk>
diff --git a/security/py-gnutls/Makefile b/security/py-gnutls/Makefile
index 5dc245c6c796..e12be8c48367 100644
--- a/security/py-gnutls/Makefile
+++ b/security/py-gnutls/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS= gnutls.13:${PORTSDIR}/security/gnutls
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python_gnutls
EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME}
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index fc8abc0c54b5..8161e56b4447 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -21,6 +21,7 @@ USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
USE_OPENSSL= yes
WITH_OPENSSL_PORT= yes
+PYDISTUTILS_PKGNAME= M2Crypto
.if defined(WITH_OPENSSL_PORT)
PYDISTUTILS_BUILDARGS= --openssl="${LOCALBASE}"
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 5f3b2cbd83dd..7a55a03ab5ee 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS= mcrypt:${PORTSDIR}/security/libmcrypt
USE_PYTHON= yes
USE_PYDISTUTILS=yes
PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib
+PYDISTUTILS_PKGNAME= python-mcrypt
CFLAGS+= -I${LOCALBASE}/include
PLIST_FILES= %%PYTHON_SITELIBDIR%%/mcrypt.so
diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile
index ff58dc81efb4..92fe01f1ac4d 100644
--- a/security/py-mhash/Makefile
+++ b/security/py-mhash/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS= mhash:${PORTSDIR}/security/mhash
PLIST_FILES= %%PYTHON_SITELIBDIR%%/mhash.so
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= python-mhash
CFLAGS+= -I${LOCALBASE}/include
MAKE_ENV= "LDFLAGS=-L${LOCALBASE}/lib"
diff --git a/security/py-openid/Makefile b/security/py-openid/Makefile
index 25aec06becb3..77c82da6dffb 100644
--- a/security/py-openid/Makefile
+++ b/security/py-openid/Makefile
@@ -20,5 +20,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/urljr:${PORTSDIR}/www/py-urljr \
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= python-openid
.include <bsd.port.mk>
diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile
index ae17806d5db4..26216fa9c670 100644
--- a/security/py-openssl/Makefile
+++ b/security/py-openssl/Makefile
@@ -20,6 +20,7 @@ COMMENT= Python interface to the OpenSSL library
USE_PYTHON= yes
USE_PYTHON_PREFIX= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyOpenSSL
USE_OPENSSL= yes
.include <bsd.port.mk>
diff --git a/security/py-posix1e/Makefile b/security/py-posix1e/Makefile
index 42ed64582cf6..f5c00c6e1379 100644
--- a/security/py-posix1e/Makefile
+++ b/security/py-posix1e/Makefile
@@ -18,6 +18,7 @@ COMMENT= Python module for manipulating POSIX.1e ACLs
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pylibacl
.include <bsd.port.pre.mk>
diff --git a/security/py-pow/Makefile b/security/py-pow/Makefile
index 170c6039c5a3..843ca977e3d0 100644
--- a/security/py-pow/Makefile
+++ b/security/py-pow/Makefile
@@ -19,6 +19,7 @@ COMMENT= Python OpenSSL Wrappers
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= POW
USE_OPENSSL= yes
PORTDOCS= POW.pdf
diff --git a/security/py-twistedConch/Makefile b/security/py-twistedConch/Makefile
index 5685f1b1ffe5..0fad61db51c6 100644
--- a/security/py-twistedConch/Makefile
+++ b/security/py-twistedConch/Makefile
@@ -21,5 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Conch
.include <bsd.port.mk>
diff --git a/security/py-xmlsec/Makefile b/security/py-xmlsec/Makefile
index e03c96f9fc57..b5dc715d6d41 100644
--- a/security/py-xmlsec/Makefile
+++ b/security/py-xmlsec/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
USE_PYTHON= 2.2+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pyxmlsec
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index 14384867c563..cf054647fb76 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -37,6 +37,8 @@ BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's|\(rvl_py_version=\)".*$$|\1""|' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|\(-Wl\)|$$(LDFLAGS) \1|' \
${WRKSRC}/src/wrap/crack/Makefile.in
@${REINPLACE_CMD} -e 's|#include <crack.h>||' \
diff --git a/security/umit/Makefile b/security/umit/Makefile
index a721bf1f75b9..45adb40b12cc 100644
--- a/security/umit/Makefile
+++ b/security/umit/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \
USE_BZIP2= yes
USE_PYTHON= yes
USE_GNOME= pygtk2
+INSTALLS_EGGINFO= yes
.include <bsd.port.pre.mk>
diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile
index 561c2ab3e1d0..f63db8766643 100644
--- a/security/vinetto/Makefile
+++ b/security/vinetto/Makefile
@@ -20,6 +20,7 @@ OPTIONS= IMAGING "Build with ability to extract graphic thumbnails" on
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 0.06alpha
.include <bsd.port.pre.mk>
diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile
index df6db8ce3119..b78ce2689aa4 100644
--- a/sysutils/farbot/Makefile
+++ b/sysutils/farbot/Makefile
@@ -21,6 +21,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= farb
+PYDISTUTILS_PKGVERSION= 0.1
post-install:
${INSTALL_DATA} ${WRKSRC}/farbot.conf ${PREFIX}/etc/farbot.conf.sample
diff --git a/sysutils/luma/Makefile b/sysutils/luma/Makefile
index 357aa3c73440..d9493a28f5ae 100644
--- a/sysutils/luma/Makefile
+++ b/sysutils/luma/Makefile
@@ -26,6 +26,7 @@ USE_PYDISTUTILS= yes
PYSETUP= install.py
PYDISTUTILS_BUILDARGS= build
PYDISTUTILS_INSTALLARGS= --prefix=${PREFIX}
+PYDISTUTILS_NOEGGINFO= yes
USE_OPENLDAP= yes
MAN1= luma.1
diff --git a/textproc/py-4suite-xml/Makefile b/textproc/py-4suite-xml/Makefile
index ced79cabbc9f..3199c4962da3 100644
--- a/textproc/py-4suite-xml/Makefile
+++ b/textproc/py-4suite-xml/Makefile
@@ -20,6 +20,8 @@ USE_BZIP2= yes
REINPLACE_ARGS= -i "" -E
USE_PYTHON= 2.2.1+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= 4Suite-XML
+PYDISTUTILS_PKGVERSION= 1.0
CONFLICTS= py*-4suite-[01]*
diff --git a/textproc/py-4suite-xml/pkg-plist b/textproc/py-4suite-xml/pkg-plist
index 56bfce5a460a..e6df78b9490b 100644
--- a/textproc/py-4suite-xml/pkg-plist
+++ b/textproc/py-4suite-xml/pkg-plist
@@ -346,7 +346,6 @@
%%LIBDIR%%/tests/Xml/Xslt/test_harness.py
%%LIBDIR%%/tests/Xml/__init__.py
%%LIBDIR%%/tests/test.py
-%%PYTHON_SITELIBDIR%%/4Suite_XML-1.0-py2.4.egg-info
%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/Lib/CommandLine/Arguments.py
%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/Lib/CommandLine/Arguments.pyc
%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/Lib/CommandLine/Command.py
diff --git a/textproc/py-4suite/Makefile b/textproc/py-4suite/Makefile
index 6185df7bf64c..dc947a3884da 100644
--- a/textproc/py-4suite/Makefile
+++ b/textproc/py-4suite/Makefile
@@ -20,8 +20,10 @@ COMMENT= A collection of Python tools for XML and RDF processing
USE_BZIP2= yes
REINPLACE_ARGS= -i "" -E
-USE_PYTHON= 2.2.1+
+USE_PYTHON= 2.2-2.4
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= 4Suite
+PYDISTUTILS_PKGVERSION= 1.0b1
CONFLICTS= py*-4Suite-1* py*-xml-0.7*
diff --git a/textproc/py-dsv/Makefile b/textproc/py-dsv/Makefile
index a156c2722476..b982f50926d8 100644
--- a/textproc/py-dsv/Makefile
+++ b/textproc/py-dsv/Makefile
@@ -23,6 +23,7 @@ WX_COMPS= python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= DSV
DSV_BASEDIR= ${PYTHONPREFIX_SITELIBDIR}/DSV
post-install:
diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile
index 90c8e3bd3777..fa874a9b7c57 100644
--- a/textproc/py-empy/Makefile
+++ b/textproc/py-empy/Makefile
@@ -17,5 +17,6 @@ COMMENT= A powerful and robust templating system for Python
USE_PYTHON= 1.5+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 3.1
.include <bsd.port.mk>
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index d56fa488dcd6..03eac6c6a628 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -25,6 +25,7 @@ USE_PYDISTUTILS= yes
USE_WX= 2.6
WX_COMPS= python:run
+PYDISTUTILS_PKGNAME= pyenchant
PYDISTUTILS_INSTALL_TARGET= install_lib
PYDISTUTILS_INSTALLARGS=
diff --git a/textproc/py-excelerator/Makefile b/textproc/py-excelerator/Makefile
index 05885f1781d8..ec7e2d0497f4 100644
--- a/textproc/py-excelerator/Makefile
+++ b/textproc/py-excelerator/Makefile
@@ -18,6 +18,7 @@ COMMENT= A Python library for generating Excel 97/2000/XP/2003 files
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyExcelerator
USE_ZIP= yes
WRKSRC= ${WRKDIR}/pyExcelerator-${PORTVERSION}
diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile
index 243c5e7b7b03..40a5d75b80bf 100644
--- a/textproc/py-expat/Makefile
+++ b/textproc/py-expat/Makefile
@@ -23,6 +23,8 @@ DIST_SUBDIR= python
PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/pyexpat.so
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pyexpat
+PYDISTUTILS_PKGVERSION= 0.0.0
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
diff --git a/textproc/py-genshi-devel/Makefile b/textproc/py-genshi-devel/Makefile
index eed450711622..41d20a527099 100644
--- a/textproc/py-genshi-devel/Makefile
+++ b/textproc/py-genshi-devel/Makefile
@@ -17,17 +17,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python toolkit for stream-based generation of output for the web
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
-PYGENSHI_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYGENSHI_EGG=${PYGENSHI_EGG}
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
+USE_PYDISTUTILS= easy_install
.include <bsd.port.mk>
diff --git a/textproc/py-genshi-devel/pkg-plist b/textproc/py-genshi-devel/pkg-plist
index bde4759ebc5a..ddf68a1c022f 100644
--- a/textproc/py-genshi-devel/pkg-plist
+++ b/textproc/py-genshi-devel/pkg-plist
@@ -1,4 +1 @@
-@comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYGENSHI_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYGENSHI_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/PYGENSHI_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index eed450711622..41d20a527099 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -17,17 +17,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python toolkit for stream-based generation of output for the web
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
-PYGENSHI_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYGENSHI_EGG=${PYGENSHI_EGG}
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
+USE_PYDISTUTILS= easy_install
.include <bsd.port.mk>
diff --git a/textproc/py-genshi/pkg-plist b/textproc/py-genshi/pkg-plist
index bde4759ebc5a..ddf68a1c022f 100644
--- a/textproc/py-genshi/pkg-plist
+++ b/textproc/py-genshi/pkg-plist
@@ -1,4 +1 @@
-@comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYGENSHI_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYGENSHI_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/PYGENSHI_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-hyperestraier-python/Makefile b/textproc/py-hyperestraier-python/Makefile
index ec67ff276b08..a3bdd11dc194 100644
--- a/textproc/py-hyperestraier-python/Makefile
+++ b/textproc/py-hyperestraier-python/Makefile
@@ -19,5 +19,6 @@ COMMENT= Pure Python HyperEstraier library
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 0.9.1
.include <bsd.port.mk>
diff --git a/textproc/py-hyperestraier/Makefile b/textproc/py-hyperestraier/Makefile
index 336164f9f831..b6577c174a65 100644
--- a/textproc/py-hyperestraier/Makefile
+++ b/textproc/py-hyperestraier/Makefile
@@ -18,6 +18,9 @@ BUILD_DEPENDS= swig>=1.3:${PORTSDIR}/devel/swig13
LIB_DEPENDS= estraier.8:${PORTSDIR}/textproc/hyperestraier
USE_PYTHON= yes
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGNAME= HyperEstraier
+PYDISTUTILS_PKGVERSION= 0.01
MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/py-ltxml/Makefile b/textproc/py-ltxml/Makefile
index 475ba79d9ef0..41dcece46d7c 100644
--- a/textproc/py-ltxml/Makefile
+++ b/textproc/py-ltxml/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyLTXML
USE_LDCONFIG= yes
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 04723a97ebeb..8313612697cd 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -16,21 +16,9 @@ DISTNAME= Pygments-${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= A syntax highlighter written in Python
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_BUILD_TARGET= bdist_egg
-PYDISTUTILS_INSTALL_TARGET= easy_install
-PYDISTUTILS_INSTALLARGS= -N -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PYPYGMENTS_EGG}
-
-PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
- PYPYGMENTS_EGG=${PYPYGMENTS_EGG}
-
-EASY_INSTALL_CMD= easy_install-${PYTHON_VER}
-PYPYGMENTS_EGG= ${DISTNAME}-py${PYTHON_VER}.egg
+USE_PYDISTUTILS= easy_install
+PYDISTUTILS_PKGNAME= Pygments
.if !defined(NOPORTDOCS)
DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME}
diff --git a/textproc/py-pygments/pkg-plist b/textproc/py-pygments/pkg-plist
index fdb7d3490e2c..56e991570f50 100644
--- a/textproc/py-pygments/pkg-plist
+++ b/textproc/py-pygments/pkg-plist
@@ -1,110 +1,154 @@
@comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -q -x -N -m -S %D/%%PYTHON_SITELIBDIR%% %%PORTNAME%%==%%PORTVERSION%%
bin/pygmentize
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/EGG-INFO/scripts/pygmentize
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/cmdline.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/cmdline.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/console.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/console.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/filter.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/filter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/filters/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/filters/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatter.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/_mapping.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/_mapping.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/bbcode.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/bbcode.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/html.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/html.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/latex.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/latex.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/other.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/other.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/rtf.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/rtf.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/terminal.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters/terminal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexer.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/_luabuiltins.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/_luabuiltins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/_mapping.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/_mapping.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/_phpbuiltins.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/_phpbuiltins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/agile.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/agile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/compiled.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/compiled.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/dotnet.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/dotnet.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/other.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/other.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/special.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/special.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/templates.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/templates.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/text.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/text.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/web.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers/web.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/plugin.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/plugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/scanner.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/scanner.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/style.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/style.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/autumn.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/autumn.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/borland.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/borland.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/colorful.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/colorful.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/default.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/default.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/friendly.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/friendly.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/fruity.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/fruity.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/manni.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/manni.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/murphy.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/murphy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/native.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/native.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/pastie.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/pastie.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/perldoc.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/perldoc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/trac.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles/trac.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/token.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/token.pyc
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/util.py
-%%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/util.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/styles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/lexers
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/formatters
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments/filters
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/pygments
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYPYGMENTS_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/pygmentize
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/cmdline.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/cmdline.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/cmdline.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/console.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/console.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/console.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/filter.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/filter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/filter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/filters/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/filters/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/filters/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatter.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/_mapping.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/_mapping.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/_mapping.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/bbcode.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/bbcode.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/bbcode.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/html.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/html.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/html.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/latex.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/latex.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/latex.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/other.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/other.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/other.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/rtf.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/rtf.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/rtf.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/terminal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/terminal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters/terminal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_luabuiltins.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_luabuiltins.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_luabuiltins.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_mapping.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_mapping.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_mapping.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_phpbuiltins.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_phpbuiltins.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/_phpbuiltins.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/agile.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/agile.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/agile.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/compiled.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/compiled.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/compiled.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/dotnet.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/dotnet.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/dotnet.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/other.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/other.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/other.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/special.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/special.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/special.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/templates.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/templates.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/templates.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/text.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/text.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/text.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/web.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/web.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers/web.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/plugin.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/plugin.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/plugin.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/scanner.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/scanner.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/scanner.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/style.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/style.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/style.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/autumn.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/autumn.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/autumn.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/borland.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/borland.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/borland.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/colorful.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/colorful.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/colorful.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/default.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/default.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/default.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/friendly.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/friendly.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/friendly.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/fruity.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/fruity.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/fruity.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/manni.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/manni.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/manni.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/murphy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/murphy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/murphy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/native.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/native.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/native.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/pastie.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/pastie.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/pastie.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/perldoc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/perldoc.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/perldoc.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/trac.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/trac.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles/trac.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/token.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/token.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/token.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/util.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/styles
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/lexers
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/formatters
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments/filters
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pygments
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
%%PORTDOCS%%%%DOCSDIR%%/api.html
%%PORTDOCS%%%%DOCSDIR%%/authors.html
%%PORTDOCS%%%%DOCSDIR%%/changelog.html
@@ -125,4 +169,3 @@ bin/pygmentize
%%PORTDOCS%%%%DOCSDIR%%/tokens.html
%%PORTDOCS%%%%DOCSDIR%%/unicode.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %%EASY_INSTALL_CMD%% -N -x -S %D/%%PYTHON_SITELIBDIR%% %%PORTNAME%%==%%PORTVERSION%%
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index a97187ad8a2e..ac5367fac424 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -15,25 +15,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= python@FreeBSD.org
COMMENT= A Python library for RDF manipulation
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
-PYRDFLIB_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}-${OSINFOS}.egg
-OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH}
-
-PLIST_SUB+= PYRDFLIB_EGG=${PYRDFLIB_EGG}
-
-pre-build:
- @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c build -o build-platlib -s lib.${OSINFOS}
- @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c build -o build-temp -s temp.${OSINFOS}-${PYTHON_VER}
- @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c bdist_egg -o plat-name -s ${OSINFOS}
- @cd ${WRKSRC} && ${PYTHON_CMD} setup.py setopt -c bdist -o plat-name -s ${OSINFOS}
-
-.include <bsd.port.pre.mk>
-
-OSRELEASE!= uname -r
+USE_PYDISTUTILS= easy_install
+PYEASYINSTALL_ARCHDEP= yes
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/py-rdflib/pkg-plist b/textproc/py-rdflib/pkg-plist
index 34cc7741c318..a0092b0b1d1a 100644
--- a/textproc/py-rdflib/pkg-plist
+++ b/textproc/py-rdflib/pkg-plist
@@ -1,4 +1,2 @@
-@unexec easy_install -q -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYRDFLIB_EGG%%
bin/rdfpipe
-%%PYTHON_SITELIBDIR%%/%%PYRDFLIB_EGG%%
-@exec easy_install -N %D/%%PYTHON_SITELIBDIR%%/%%PYRDFLIB_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/textproc/py-reverend/Makefile b/textproc/py-reverend/Makefile
index 9ab3d5157e82..133d5cba4e30 100644
--- a/textproc/py-reverend/Makefile
+++ b/textproc/py-reverend/Makefile
@@ -18,6 +18,7 @@ COMMENT= A simple Bayesian classifier written in Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Reverend
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/textproc/py-rss2gen/Makefile b/textproc/py-rss2gen/Makefile
index 2fd0fcf82024..f7e2e51fa932 100644
--- a/textproc/py-rss2gen/Makefile
+++ b/textproc/py-rss2gen/Makefile
@@ -17,5 +17,6 @@ COMMENT= A Python library for generating RSS 2.0 feeds
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= PyRSS2Gen
.include <bsd.port.mk>
diff --git a/textproc/py-rxp/Makefile b/textproc/py-rxp/Makefile
index 77230f60ae32..eca1f553df63 100644
--- a/textproc/py-rxp/Makefile
+++ b/textproc/py-rxp/Makefile
@@ -19,6 +19,8 @@ COMMENT= Fast validating XML parser for Python
NO_WRKSUBDIR= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pyRXP
+PYDISTUTILS_PKGVERSION= 0.5
EXAMPLESDIR= ${PREFIX}/share/examples/py-rxp
DOCSDIR= ${PREFIX}/share/doc/py-rxp
diff --git a/textproc/py-sgrep/Makefile b/textproc/py-sgrep/Makefile
index d23003544022..ce6da45ea3fb 100644
--- a/textproc/py-sgrep/Makefile
+++ b/textproc/py-sgrep/Makefile
@@ -24,6 +24,8 @@ WRKSRC= ${WRKDIR}/sgrep-${SGREP_VER}
GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pysgrep
+PYDISTUTILS_PKGVERSION= 1.0a
post-extract:
@${TAR} -zxf ${DISTDIR}/pysgrep-${PORTVERSION}.tar.gz -C ${WRKSRC}
diff --git a/textproc/py-syck/Makefile b/textproc/py-syck/Makefile
index adc8cf71e24d..c258f45d00be 100644
--- a/textproc/py-syck/Makefile
+++ b/textproc/py-syck/Makefile
@@ -24,6 +24,8 @@ PLIST_FILES= ${PYFILES_} ${PYFILES_:S/$/c/} ${PYFILES_:S/$/o/}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Syck
+PYDISTUTILS_PKGVERSION= 1.0
WRKSRC= ${WRKDIR}/${DISTNAME}/ext/python
.include <bsd.port.mk>
diff --git a/textproc/py-tvgrab/Makefile b/textproc/py-tvgrab/Makefile
index fdc205cb1112..abe1b93cf894 100644
--- a/textproc/py-tvgrab/Makefile
+++ b/textproc/py-tvgrab/Makefile
@@ -22,6 +22,7 @@ EXTRACT_DEPENDS= ${PYTHON_SITELIBDIR}/dateutil/__init__.py:${PORTSDIR}/devel/py-
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pytvgrab_lib
PORTDOCS= README
diff --git a/textproc/py-twistedLore/Makefile b/textproc/py-twistedLore/Makefile
index 71c26eb39f40..572acd2eb42a 100644
--- a/textproc/py-twistedLore/Makefile
+++ b/textproc/py-twistedLore/Makefile
@@ -21,5 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Lore
.include <bsd.port.mk>
diff --git a/textproc/py-wordnet/Makefile b/textproc/py-wordnet/Makefile
index a52e8ad14400..cce0d004ea7a 100644
--- a/textproc/py-wordnet/Makefile
+++ b/textproc/py-wordnet/Makefile
@@ -23,6 +23,7 @@ COMMENT= Python Interface to WordNet
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pywordnet
WRKSRC= ${WRKDIR}/py${PORTNAME}-${PORTVERSION}
PLIST_SUB= WNDATA=${WORDNETDATA}
diff --git a/textproc/py-xlwriter/Makefile b/textproc/py-xlwriter/Makefile
index ccd1ff4e4ad4..4acc8c10e62c 100644
--- a/textproc/py-xlwriter/Makefile
+++ b/textproc/py-xlwriter/Makefile
@@ -19,6 +19,7 @@ COMMENT= A python library for generating Excel-compatible spreadsheets
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_ZIP= yes
+PYDISTUTILS_PKGNAME= pyXLWriter
post-install:
${MKDIR} ${EXAMPLESDIR}
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index d75e25dbabf2..fe013661f1ad 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -18,6 +18,7 @@ COMMENT= PyXML: Python XML library enhancements
USE_PYTHON= 2.1+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= PyXML
.include <bsd.port.pre.mk>
diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile
index 86cfcaacaee0..680d0e3be889 100644
--- a/textproc/py-xmltools/Makefile
+++ b/textproc/py-xmltools/Makefile
@@ -25,4 +25,7 @@ USE_PYDISTUTILS= yes
RUN_DEPENDS= ${PYXML} \
${PYTHON_SITELIBDIR}/_xmlplus/xpath/__init__.py:${PORTSDIR}/textproc/py-4suite
+post-patch:
+ ${REINPLACE_CMD} 's/from.*import.*nested_scopes//' ${WRKSRC}/setup.py
+
.include <bsd.port.post.mk>
diff --git a/textproc/py-xmltv/Makefile b/textproc/py-xmltv/Makefile
index 23506062d305..fa96a7ffb221 100644
--- a/textproc/py-xmltv/Makefile
+++ b/textproc/py-xmltv/Makefile
@@ -20,6 +20,7 @@ COMMENT= A Python module that provides access to XMLTV TV listings
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-xmltv
.ifndef(NOPORTDOCS)
PORTDOCS= README.txt
diff --git a/textproc/py-zpt/Makefile b/textproc/py-zpt/Makefile
index 22d71d9641be..f37bef5df15f 100644
--- a/textproc/py-zpt/Makefile
+++ b/textproc/py-zpt/Makefile
@@ -19,6 +19,9 @@ COMMENT= A Zope-less version of Zope Page Templates
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= ZopePageTemplates
+PYDISTUTILS_PKGVERSION= 0.0.0
+PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/ZopePageTemplates
WRKSRC= ${WRKDIR}/ZopePageTemplates
.include <bsd.port.mk>
diff --git a/textproc/py2html/Makefile b/textproc/py2html/Makefile
index ae0fd07dd293..2fd2ee564843 100644
--- a/textproc/py2html/Makefile
+++ b/textproc/py2html/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= perky@FreeBSD.org
COMMENT= Python Highlighter for HTML
USE_PYTHON= yes
-PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
MAKE_ENV= PORTSDIR=${PORTSDIR}
+INSTALLS_EGGINFO= yes
.include <bsd.port.mk>
diff --git a/textproc/roap/Makefile b/textproc/roap/Makefile
index 00feda771e3d..7dc3f7a2f313 100644
--- a/textproc/roap/Makefile
+++ b/textproc/roap/Makefile
@@ -18,6 +18,7 @@ COMMENT= Region Oriented Ascii Processor
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Region_Oriented_Ascii_Processor
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
DOCS= README README.ja USAGE USAGE.ja
diff --git a/textproc/silvercity/Makefile b/textproc/silvercity/Makefile
index 4279ea678570..a7e57c150fe1 100644
--- a/textproc/silvercity/Makefile
+++ b/textproc/silvercity/Makefile
@@ -18,6 +18,7 @@ COMMENT= A lexing package for over 20 programming and markup languages
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= SilverCity
USE_DOS2UNIX= yes
.include <bsd.port.mk>
diff --git a/textproc/xxdiff-scripts/Makefile b/textproc/xxdiff-scripts/Makefile
index 96abb6e2a3af..2328a42ec900 100644
--- a/textproc/xxdiff-scripts/Makefile
+++ b/textproc/xxdiff-scripts/Makefile
@@ -20,5 +20,6 @@ BUILD_DEPENDS= xxdiff:${PORTSDIR}/textproc/xxdiff
USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= xxdiff-scripts
.include <bsd.port.mk>
diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile
index 0ef744d9f231..b257f1a64870 100644
--- a/www/feedjack/Makefile
+++ b/www/feedjack/Makefile
@@ -22,6 +22,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedpars
DIST_SUBDIR= python
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Feedjack
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PLIST_SUB= FEEDJACKVER=${PORTVERSION} \
PYTHONVER=${_PYTHON_VERSION}
diff --git a/www/google-sitemapgen/Makefile b/www/google-sitemapgen/Makefile
index d4bb58be56a9..1cec22869fbb 100644
--- a/www/google-sitemapgen/Makefile
+++ b/www/google-sitemapgen/Makefile
@@ -17,5 +17,6 @@ COMMENT= Script to analyze web server and generate Google Sitemap files
USE_PYTHON= YES
USE_PYDISTUTILS=YES
+PYDISTUTILS_PKGNAME= sitemap_gen
.include <bsd.port.mk>
diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile
index 69ab43086a78..06fa35c163c3 100644
--- a/www/mod_python3/Makefile
+++ b/www/mod_python3/Makefile
@@ -18,6 +18,7 @@ COMMENT= Apache module that embeds the Python interpreter within the server
USE_APACHE= 2.0+
USE_PYTHON= yes
+INSTALLS_EGGINFO= yes
LATEST_LINK= mod_python3
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" \
diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index f0038e85f193..94f6802e47dc 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -17,6 +17,7 @@ COMMENT= A Python clone of WikiWiki
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= moin
PLIST_SUB+= PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||}
SUB_FILES= pkg-install
diff --git a/www/newsfeed/Makefile b/www/newsfeed/Makefile
index 0cdd140305bb..e7e5398365ce 100644
--- a/www/newsfeed/Makefile
+++ b/www/newsfeed/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS= py*-tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter \
USE_PYTHON= yes
USE_TK= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= NewsFeed
post-patch:
@${REINPLACE_CMD} -e '/py_modules=/s|,.*|],|;/sounds/s|d.*|)|' ${WRKSRC}/setup.py
diff --git a/www/plone/Makefile b/www/plone/Makefile
index 2c14b212c33b..c31cdee6ec9d 100644
--- a/www/plone/Makefile
+++ b/www/plone/Makefile
@@ -77,4 +77,10 @@ post-install:
@${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} && defined(PACKAGE_BUILDING)
+IGNORE= can't be built: the default Python version should be ${PYTHON_VERSION} in order to build a package in the build cluster
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/plone3/Makefile b/www/plone3/Makefile
index 2c14b212c33b..c31cdee6ec9d 100644
--- a/www/plone3/Makefile
+++ b/www/plone3/Makefile
@@ -77,4 +77,10 @@ post-install:
@${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} && defined(PACKAGE_BUILDING)
+IGNORE= can't be built: the default Python version should be ${PYTHON_VERSION} in order to build a package in the build cluster
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/py-beaker/Makefile b/www/py-beaker/Makefile
index 6d870b519d69..20bebe6af36f 100644
--- a/www/py-beaker/Makefile
+++ b/www/py-beaker/Makefile
@@ -17,17 +17,8 @@ DISTNAME= Beaker-${PORTVERSION}
MAINTAINER= dryice@FreeBSD.org
COMMENT= A Session and Caching library with WSGI Middleware
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS+= ${BUILD_DEPENDS}
-
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
-PYBEAKER_EGG= Beaker-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYBEAKER_EGG=${PYBEAKER_EGG}
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
+USE_PYDISTUTILS= easy_install
+PYDISTUTILS_PKGNAME= Beaker
.include <bsd.port.mk>
diff --git a/www/py-beaker/pkg-plist b/www/py-beaker/pkg-plist
index cac08f098f61..3b3b847eebf4 100644
--- a/www/py-beaker/pkg-plist
+++ b/www/py-beaker/pkg-plist
@@ -1,48 +1,46 @@
-@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/cache.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/container.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/container.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/container.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/converters.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/converters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/converters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/middleware.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/middleware.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/middleware.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/session.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/session.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/synchronization.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/synchronization.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/synchronization.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/util.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/database.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/database.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/database.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/memcached.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/memcached.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/memcached.pyo
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/PYBEAKER_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/cache.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/cache.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/cache.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/container.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/container.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/container.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/converters.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/converters.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/converters.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/middleware.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/middleware.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/middleware.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/session.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/session.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/session.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/synchronization.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/synchronization.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/synchronization.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/database.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/database.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/database.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/memcached.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/memcached.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/memcached.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/__init__.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-beautifulsoup/Makefile b/www/py-beautifulsoup/Makefile
index f4a8e6a0807e..13e155a22825 100644
--- a/www/py-beautifulsoup/Makefile
+++ b/www/py-beautifulsoup/Makefile
@@ -17,5 +17,6 @@ COMMENT= HTML/XML Parser for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= BeautifulSoup
.include <bsd.port.mk>
diff --git a/www/py-beautifulsoup30/Makefile b/www/py-beautifulsoup30/Makefile
index f4a8e6a0807e..13e155a22825 100644
--- a/www/py-beautifulsoup30/Makefile
+++ b/www/py-beautifulsoup30/Makefile
@@ -17,5 +17,6 @@ COMMENT= HTML/XML Parser for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= BeautifulSoup
.include <bsd.port.mk>
diff --git a/www/py-cherrypy-devel/Makefile b/www/py-cherrypy-devel/Makefile
index 02f05d89adee..c724032401df 100644
--- a/www/py-cherrypy-devel/Makefile
+++ b/www/py-cherrypy-devel/Makefile
@@ -17,6 +17,7 @@ COMMENT= A pythonic, object-oriented web development framework
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= CherryPy
LN_OPTS= -sf
RM_OPTS= -r
diff --git a/www/py-cherrypy-old/Makefile b/www/py-cherrypy-old/Makefile
index 76f89fad6164..68571aac179c 100644
--- a/www/py-cherrypy-old/Makefile
+++ b/www/py-cherrypy-old/Makefile
@@ -20,6 +20,7 @@ COMMENT= A pythonic, object-oriented web development framework
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= CherryPy
LN_OPTS= -sf
RM_OPTS= -r
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index 02f05d89adee..c724032401df 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -17,6 +17,7 @@ COMMENT= A pythonic, object-oriented web development framework
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= CherryPy
LN_OPTS= -sf
RM_OPTS= -r
diff --git a/www/py-clientform/Makefile b/www/py-clientform/Makefile
index 03b3a5e80217..c6a89ce9622f 100644
--- a/www/py-clientform/Makefile
+++ b/www/py-clientform/Makefile
@@ -21,6 +21,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= ClientForm
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PYCLIENTFORM_EGG= ClientForm-${PORTVERSION}-py${PYTHON_VER}.egg
diff --git a/www/py-django-devel/Makefile b/www/py-django-devel/Makefile
index 2785cd0e3001..b73dfb1ca3b8 100644
--- a/www/py-django-devel/Makefile
+++ b/www/py-django-devel/Makefile
@@ -24,6 +24,10 @@ USE_GETTEXT= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+INSTALLS_EGGINFO= yes
+PYDISTUTILS_PKGNAME= Django
+PYDISTUTILS_PKGVERSION= 0.97_pre
+
CONFLICTS= py2[0-9]-django-[0-9]*
DOCSDIR= ${PREFIX}/share/doc/py-django
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 0ebc37f53f99..3687cddf3fa6 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -20,6 +20,8 @@ COMMENT= High-level Python Web framework
USE_GETTEXT= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Django
+PYDISTUTILS_PKGVERSION= 0.96_None
CONFLICTS= py2[0-9]-django-devel-[0-9]*
diff --git a/www/py-django11/Makefile b/www/py-django11/Makefile
index 0ebc37f53f99..3687cddf3fa6 100644
--- a/www/py-django11/Makefile
+++ b/www/py-django11/Makefile
@@ -20,6 +20,8 @@ COMMENT= High-level Python Web framework
USE_GETTEXT= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Django
+PYDISTUTILS_PKGVERSION= 0.96_None
CONFLICTS= py2[0-9]-django-devel-[0-9]*
diff --git a/www/py-django12/Makefile b/www/py-django12/Makefile
index 0ebc37f53f99..3687cddf3fa6 100644
--- a/www/py-django12/Makefile
+++ b/www/py-django12/Makefile
@@ -20,6 +20,8 @@ COMMENT= High-level Python Web framework
USE_GETTEXT= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Django
+PYDISTUTILS_PKGVERSION= 0.96_None
CONFLICTS= py2[0-9]-django-devel-[0-9]*
diff --git a/www/py-django13/Makefile b/www/py-django13/Makefile
index 0ebc37f53f99..3687cddf3fa6 100644
--- a/www/py-django13/Makefile
+++ b/www/py-django13/Makefile
@@ -20,6 +20,8 @@ COMMENT= High-level Python Web framework
USE_GETTEXT= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Django
+PYDISTUTILS_PKGVERSION= 0.96_None
CONFLICTS= py2[0-9]-django-devel-[0-9]*
diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile
index e5a77a8461b3..5317e47155ec 100644
--- a/www/py-flup/Makefile
+++ b/www/py-flup/Makefile
@@ -21,6 +21,8 @@ RUN_DEPENDS= ${BUILD_DEPENDES}
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.5
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
diff --git a/www/py-forgethtml/Makefile b/www/py-forgethtml/Makefile
index 7c49a71a70ea..7c2c9d4dc281 100644
--- a/www/py-forgethtml/Makefile
+++ b/www/py-forgethtml/Makefile
@@ -18,6 +18,8 @@ COMMENT= Python module for object-oriented HTML generation
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= forgetHTML
+PYDISTUTILS_PKGVERSION= 0.8
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile
index c55a85a20ba2..f1f8bc2abe4f 100644
--- a/www/py-formencode/Makefile
+++ b/www/py-formencode/Makefile
@@ -25,6 +25,9 @@ USE_PYTHON= yes
USE_PYDISTUTILS=yes
USE_GETTEXT= yes
+PYDISTUTILS_PKGNAME= FormEncode
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
+
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESSDIR= ${PREFIX}/share/examples/py-${PORTNAME}
FORMENCODEVER?= ${PORTVERSION}
diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index 59551b58cfe0..4ba6c354999d 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -16,28 +16,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= FunkLoad is a functional and load web tester
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
- ${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-docutils \
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-docutils \
${PYTHON_SITELIBDIR}/gdchart.so:${PORTSDIR}/graphics/py-gdchart \
${PYTHON_SITELIBDIR}/webunit/__init__.py:${PORTSDIR}/www/py-webunit \
${PYXML} \
tcpwatch.py:${PORTSDIR}/net/tcpwatch
USE_PYTHON= 2.4+
-USE_PYDISTUTILS= yes
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
-
-PYDISTUTILS_BUILD_TARGET= bdist_egg
-PYDISTUTILS_INSTALL_TARGET= easy_install
-PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYFUNKLOAD_EGG}
-
-PYFUNKLOAD_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYFUNKLOAD_EGG=${PYFUNKLOAD_EGG} \
- PYFUNKLOAD_EGG_VER="${PORTNAME}==${PORTVERSION}"
+USE_PYDISTUTILS= easy_install
DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME}
diff --git a/www/py-funkload/pkg-plist b/www/py-funkload/pkg-plist
index b26f8aa30408..f1916e775384 100644
--- a/www/py-funkload/pkg-plist
+++ b/www/py-funkload/pkg-plist
@@ -1,6 +1,4 @@
-@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYFUNKLOAD_EGG_VER%%
-%%PYTHON_SITELIBDIR%%/%%PYFUNKLOAD_EGG%%
-@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PYFUNKLOAD_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
bin/fl-build-report
bin/fl-credential-ctl
bin/fl-import-from-tm-recorder
diff --git a/www/py-imdbpy/Makefile b/www/py-imdbpy/Makefile
index 3b5c96e7618e..a259b4ead1bc 100644
--- a/www/py-imdbpy/Makefile
+++ b/www/py-imdbpy/Makefile
@@ -18,6 +18,7 @@ COMMENT= Retrieve and manage the data of the IMDb movie database
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= IMDbPY
.if !defined(NOPORTDOCS)
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile
index d91c34aeb803..8d1872eef3a9 100644
--- a/www/py-mechanize/Makefile
+++ b/www/py-mechanize/Makefile
@@ -24,6 +24,8 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.1.6b
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
PYDISTUTILS_BUILD_TARGET= bdist_egg
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 92b4361ac7ee..d0ffe2fc28a7 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -21,6 +21,7 @@ USE_PYDISTUTILS= yes
USE_TWISTED= yes
USE_GETTEXT= yes
NO_BUILD= yes
+PYDISTUTILS_PKGNAME= Nevow
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKSRC}/pkg-message
diff --git a/www/py-openssl-proxy/Makefile b/www/py-openssl-proxy/Makefile
index 0802fbbd2165..581836a7be8a 100644
--- a/www/py-openssl-proxy/Makefile
+++ b/www/py-openssl-proxy/Makefile
@@ -19,5 +19,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-op
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= pyOpenSSLProxy
.include <bsd.port.mk>
diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index be2c742901d7..2296691f9fd3 100644
--- a/www/py-paste/Makefile
+++ b/www/py-paste/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PASTEVER?= ${PORTVERSION}
PYTHONVER?= ${_PYTHON_VERSION}
PLIST_SUB= PASTEVER=${PASTEVER} \
diff --git a/www/py-pastedeploy/Makefile b/www/py-pastedeploy/Makefile
index 4d4c95db7ae4..8fa8ce3a440d 100644
--- a/www/py-pastedeploy/Makefile
+++ b/www/py-pastedeploy/Makefile
@@ -23,6 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PLIST_SUB= PYPASTEDEPLOY_EGG=${PYPASTEDEPLOY_EGG}
diff --git a/www/py-pastescript/Makefile b/www/py-pastescript/Makefile
index 1d3d8a64b5ce..b535066f65e8 100644
--- a/www/py-pastescript/Makefile
+++ b/www/py-pastescript/Makefile
@@ -31,6 +31,7 @@ NO_PACKAGE= no, not yet
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
SUB_FILES+= pkg-deinstall pkg-install
SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
diff --git a/www/py-pullparser/Makefile b/www/py-pullparser/Makefile
index 436d9f1df6d3..65d072d3856e 100644
--- a/www/py-pullparser/Makefile
+++ b/www/py-pullparser/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
PYDISTUTILS_BUILD_TARGET= bdist_egg
diff --git a/www/py-pysearch/Makefile b/www/py-pysearch/Makefile
index bd1b01c77bd5..ba84f91401f8 100644
--- a/www/py-pysearch/Makefile
+++ b/www/py-pysearch/Makefile
@@ -17,6 +17,7 @@ COMMENT= Yahoo Search Web Services SDK for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pYsearch
DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME}
diff --git a/www/py-restclient/Makefile b/www/py-restclient/Makefile
index 32a320949dab..f91f698c0257 100644
--- a/www/py-restclient/Makefile
+++ b/www/py-restclient/Makefile
@@ -14,25 +14,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Convenient library for writing REST clients
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
- ${PYTHON_SITELIBDIR}/httplib2/__init__.py:${PORTSDIR}/www/py-httplib2
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/httplib2/__init__.py:${PORTSDIR}/www/py-httplib2
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
-
-PYDISTUTILS_BUILD_TARGET= bdist_egg
-PYDISTUTILS_INSTALL_TARGET= easy_install
-PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYRESTCLIENT_EGG}
-
-PYRESTCLIENT_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYRESTCLIENT_EGG=${PYRESTCLIENT_EGG} \
- PYRESTCLIENT_EGG_VER="${PORTNAME}==${PORTVERSION}"
-
+USE_PYDISTUTILS= easy_install
post-patch:
${REINPLACE_CMD} -e 's,install_requires.*,,' ${WRKSRC}/setup.py
diff --git a/www/py-restclient/pkg-plist b/www/py-restclient/pkg-plist
index b0d7671f2ffe..f4c33d3c76e7 100644
--- a/www/py-restclient/pkg-plist
+++ b/www/py-restclient/pkg-plist
@@ -1,20 +1,18 @@
-@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYRESTCLIENT_EGG_VER%%
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/test_everything.py
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/test_everything.pyc
-%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/test_everything.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%
-@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PYRESTCLIENT_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-routes/Makefile b/www/py-routes/Makefile
index 8a878a90c60c..ad35fc7c0419 100644
--- a/www/py-routes/Makefile
+++ b/www/py-routes/Makefile
@@ -17,17 +17,8 @@ DISTNAME= Routes-${PORTVERSION}
MAINTAINER= dryice@FreeBSD.org
COMMENT= A Routing package for Python that matches URLs to dicts and vice versa
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS+= ${BUILD_DEPENDS}
-
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
-PYROUTES_EGG= Routes-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYROUTES_EGG=${PYROUTES_EGG}
-
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
+USE_PYDISTUTILS= easy_install
+PYDISTUTILS_PKGNAME= Routes
.include <bsd.port.mk>
diff --git a/www/py-routes/pkg-plist b/www/py-routes/pkg-plist
index 9026491e47bf..b5e843f8939b 100644
--- a/www/py-routes/pkg-plist
+++ b/www/py-routes/pkg-plist
@@ -1,25 +1,23 @@
-@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/base.py
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/middleware.py
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/middleware.pyc
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/middleware.pyo
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/threadinglocal.py
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/threadinglocal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/threadinglocal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/util.py
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/PYROUTES_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/middleware.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/middleware.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/middleware.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/threadinglocal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/threadinglocal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/threadinglocal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/__init__.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/py-slimmer/Makefile b/www/py-slimmer/Makefile
index f10f8ff7c269..fe27987dad2b 100644
--- a/www/py-slimmer/Makefile
+++ b/www/py-slimmer/Makefile
@@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/slimmer
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION= 0.1.19
PLIST_FILES= %%PYTHON_SITELIBDIR%%/slimmer.py \
%%PYTHON_SITELIBDIR%%/slimmer.pyc \
diff --git a/www/py-tgwebservices/Makefile b/www/py-tgwebservices/Makefile
index d97e70d5ee9f..581ce8ded933 100644
--- a/www/py-tgwebservices/Makefile
+++ b/www/py-tgwebservices/Makefile
@@ -23,6 +23,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
+PYDISTUTILS_PKGNAME= TGWebServices
PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
diff --git a/www/py-twistedWeb/Makefile b/www/py-twistedWeb/Makefile
index 91f732a02114..a36f99c1d821 100644
--- a/www/py-twistedWeb/Makefile
+++ b/www/py-twistedWeb/Makefile
@@ -21,5 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Web
.include <bsd.port.mk>
diff --git a/www/py-twistedWeb2/Makefile b/www/py-twistedWeb2/Makefile
index e01aa4fc19ce..062995290548 100644
--- a/www/py-twistedWeb2/Makefile
+++ b/www/py-twistedWeb2/Makefile
@@ -22,5 +22,6 @@ WRKSRC= ${WRKDIR}/TwistedWeb2-${PORTVERSION}
USE_BZIP2= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Twisted_Web2
.include <bsd.port.mk>
diff --git a/www/py-urljr/Makefile b/www/py-urljr/Makefile
index 00a1b7f9dfe7..5f5743343cf5 100644
--- a/www/py-urljr/Makefile
+++ b/www/py-urljr/Makefile
@@ -19,5 +19,6 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/curl:${PORTSDIR}/ftp/py-curl
USE_PYTHON= 2.2+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-urljr
.include <bsd.port.mk>
diff --git a/www/quixote/Makefile b/www/quixote/Makefile
index 75f8df9eba9d..3111974d3a20 100644
--- a/www/quixote/Makefile
+++ b/www/quixote/Makefile
@@ -17,6 +17,7 @@ COMMENT= A framework for developing web applications in Python
USE_PYTHON= 2.3-2.4
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= Quixote
.include <bsd.port.pre.mk>
diff --git a/www/session2/Makefile b/www/session2/Makefile
index 52d650a1c314..0aa520bfd23a 100644
--- a/www/session2/Makefile
+++ b/www/session2/Makefile
@@ -17,6 +17,7 @@ COMMENT= A quixote session manager with persistence support
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGVERSION= 0.6
OPTIONS= MYSQL "MySQLdb support" on
OPTIONS+= POSTGRESQL "psycopg support" on
diff --git a/www/trac-accountmanager/Makefile b/www/trac-accountmanager/Makefile
index 17fb880e2960..f72d2a4e6fb2 100644
--- a/www/trac-accountmanager/Makefile
+++ b/www/trac-accountmanager/Makefile
@@ -24,6 +24,9 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TracAccountManager
+PYDISTUTILS_PKGVERSION= 0.1.3
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
WRKSRC= ${WRKDIR}/accountmanagerplugin
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
diff --git a/www/trac-addcomment/Makefile b/www/trac-addcomment/Makefile
index 8c57fec82013..333eb739e5db 100644
--- a/www/trac-addcomment/Makefile
+++ b/www/trac-addcomment/Makefile
@@ -23,6 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}macro
NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= TracAddCommentMacro
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
.include <bsd.port.mk>
diff --git a/www/trac-bzr/Makefile b/www/trac-bzr/Makefile
index fb3ff81a89dc..14c6486f56f4 100644
--- a/www/trac-bzr/Makefile
+++ b/www/trac-bzr/Makefile
@@ -19,8 +19,9 @@ BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
RUN_DEPENDS= ${BUILD_DEPENDS}
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2.4
+USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
+PYDISTUTILS_NOEGGINFO= yes
USE_BZIP2= yes
diff --git a/www/trac-calendar/Makefile b/www/trac-calendar/Makefile
index ac6c7fddcdac..1e616e66ac61 100644
--- a/www/trac-calendar/Makefile
+++ b/www/trac-calendar/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-codetags/Makefile b/www/trac-codetags/Makefile
index 5a7c3af20652..8a4d204743f4 100644
--- a/www/trac-codetags/Makefile
+++ b/www/trac-codetags/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-ctxtnavadd/Makefile b/www/trac-ctxtnavadd/Makefile
index 82ee5258ceca..140533898e67 100644
--- a/www/trac-ctxtnavadd/Makefile
+++ b/www/trac-ctxtnavadd/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION:S/.r/_r/} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-down/Makefile b/www/trac-down/Makefile
index c46e68446919..0ca94cf9f7a5 100644
--- a/www/trac-down/Makefile
+++ b/www/trac-down/Makefile
@@ -21,6 +21,9 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TracDown
+PYDISTUTILS_PKGVERSION= 0.0.1
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
diff --git a/www/trac-hierwiki/Makefile b/www/trac-hierwiki/Makefile
index 6850b55a8191..669cd0a36ff2 100644
--- a/www/trac-hierwiki/Makefile
+++ b/www/trac-hierwiki/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION:S/r/_r/} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-iniadmin/Makefile b/www/trac-iniadmin/Makefile
index 09663dc8abbb..4b0308968e4a 100644
--- a/www/trac-iniadmin/Makefile
+++ b/www/trac-iniadmin/Makefile
@@ -24,5 +24,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-ldap/Makefile b/www/trac-ldap/Makefile
index 761c0b5f9494..832226f4003c 100644
--- a/www/trac-ldap/Makefile
+++ b/www/trac-ldap/Makefile
@@ -24,5 +24,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION}dev PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-macropost/Makefile b/www/trac-macropost/Makefile
index 17943177971e..e59fd4196056 100644
--- a/www/trac-macropost/Makefile
+++ b/www/trac-macropost/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-mastertickets/Makefile b/www/trac-mastertickets/Makefile
index 038cf67ad101..b4ea3f2acb39 100644
--- a/www/trac-mastertickets/Makefile
+++ b/www/trac-mastertickets/Makefile
@@ -24,5 +24,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-nav/Makefile b/www/trac-nav/Makefile
index 5c4935711922..93702e2380e3 100644
--- a/www/trac-nav/Makefile
+++ b/www/trac-nav/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-pagelist/Makefile b/www/trac-pagelist/Makefile
index 141d0b4e1497..34b7e83a638b 100644
--- a/www/trac-pagelist/Makefile
+++ b/www/trac-pagelist/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-pagetopdf/Makefile b/www/trac-pagetopdf/Makefile
index 998916a02c2d..13f06863bf22 100644
--- a/www/trac-pagetopdf/Makefile
+++ b/www/trac-pagetopdf/Makefile
@@ -25,6 +25,7 @@ NO_BUILD= yes
USE_PYDISTUTILS=yes
WRKSRC= ${WRKDIR}/${PORTNAME}plugin
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
do-build:
@${DO_NADA}
diff --git a/www/trac-pendingticket/Makefile b/www/trac-pendingticket/Makefile
index 804e75c74ced..3f4c616a3304 100644
--- a/www/trac-pendingticket/Makefile
+++ b/www/trac-pendingticket/Makefile
@@ -23,6 +23,7 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
post-patch:
cd ${WRKDIR}/${PORTNAME}plugin && ${PATCH} < ${PATCHDIR}/close_old_pending.py.patch
diff --git a/www/trac-privatetickets/Makefile b/www/trac-privatetickets/Makefile
index 5629e572efbf..a0c9219a33e5 100644
--- a/www/trac-privatetickets/Makefile
+++ b/www/trac-privatetickets/Makefile
@@ -21,6 +21,8 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TracPrivateTickets
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
diff --git a/www/trac-restrictedarea/Makefile b/www/trac-restrictedarea/Makefile
index a924d6f6b20a..2117b049225f 100644
--- a/www/trac-restrictedarea/Makefile
+++ b/www/trac-restrictedarea/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-robotstxt/Makefile b/www/trac-robotstxt/Makefile
index 76f248d35540..52d86ccd20b1 100644
--- a/www/trac-robotstxt/Makefile
+++ b/www/trac-robotstxt/Makefile
@@ -28,6 +28,7 @@ EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
PYDISTUTILS_BUILD_TARGET= bdist_egg
PYDISTUTILS_INSTALL_TARGET= easy_install
PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${TRACROBO_EGG}
+PYDISTUTILS_NOEGGINFO= yes
TRACROBO_EGG= TracRobotsTxt-${PORTVERSION}-py${PYTHON_VER}.egg
diff --git a/www/trac-simpleticket/Makefile b/www/trac-simpleticket/Makefile
index e5b0cfe21edd..04ea0bc374ff 100644
--- a/www/trac-simpleticket/Makefile
+++ b/www/trac-simpleticket/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile
index f40d616681ec..c450abf3ad22 100644
--- a/www/trac-tags/Makefile
+++ b/www/trac-tags/Makefile
@@ -21,8 +21,10 @@ BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools
USE_PYTHON= 2.3+
NO_BUILD= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= TracTags
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
WRKSRC= ${WRKDIR}/${PORTNAME}plugin
+PYDISTUTILS_NOEGGINFO= yes
do-build:
@${DO_NADA}
diff --git a/www/trac-ticketdelete/Makefile b/www/trac-ticketdelete/Makefile
index 7829d482ab9f..2f4a609df9a0 100644
--- a/www/trac-ticketdelete/Makefile
+++ b/www/trac-ticketdelete/Makefile
@@ -24,5 +24,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-tocmacro/Makefile b/www/trac-tocmacro/Makefile
index 9c2d0294cf60..be7c6ea510a1 100644
--- a/www/trac-tocmacro/Makefile
+++ b/www/trac-tocmacro/Makefile
@@ -22,5 +22,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-wantedpages/Makefile b/www/trac-wantedpages/Makefile
index c429d4c84dbe..e0dd76ada685 100644
--- a/www/trac-wantedpages/Makefile
+++ b/www/trac-wantedpages/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-webadmin/Makefile b/www/trac-webadmin/Makefile
index b44803a3d00e..75c513bfa285 100644
--- a/www/trac-webadmin/Makefile
+++ b/www/trac-webadmin/Makefile
@@ -22,6 +22,9 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= TracWebAdmin
+PYDISTUTILS_PKGVERSION= 0.1.2
+PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
WRKSRC= ${WRKDIR}/${PORTNAME}
EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
diff --git a/www/trac-wikinegotiator/Makefile b/www/trac-wikinegotiator/Makefile
index cf9808868f13..d0805ce1acdb 100644
--- a/www/trac-wikinegotiator/Makefile
+++ b/www/trac-wikinegotiator/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/trac-xmlrpc/Makefile b/www/trac-xmlrpc/Makefile
index 8236970c29d0..f9dbe79244cd 100644
--- a/www/trac-xmlrpc/Makefile
+++ b/www/trac-xmlrpc/Makefile
@@ -23,5 +23,6 @@ NO_BUILD= yes
USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO= yes
.include <bsd.port.mk>
diff --git a/www/xist/Makefile b/www/xist/Makefile
index 6d841c0bcebe..854e33ba84b1 100644
--- a/www/xist/Makefile
+++ b/www/xist/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS= ${PYXML} \
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
USE_BZIP2= yes
+PYDISTUTILS_PKGNAME= ll-xist
post-install:
.for file in doc2txt dtd2xsc tld2xsc
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index 1a0aeab65292..9a95f49b341e 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -19,10 +19,13 @@ COMMENT= Python interface to FLTK window toolkit
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
-USE_PYTHON= yes
+USE_PYTHON= -2.4
USE_PYDISTUTILS= yes
USE_XLIB= yes
+PYDISTUTILS_PKGNAME= pyFltk
+PYDISTUTILS_PKGVERSION= 1.1b3
+
MAKE_ENV+= FLTK_HOME=${X11BASE}/include OPENGL_HOME=${X11BASE}/include
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/x11-toolkits/py-fox/Makefile b/x11-toolkits/py-fox/Makefile
index 83e7fb47e079..2c9760bde679 100644
--- a/x11-toolkits/py-fox/Makefile
+++ b/x11-toolkits/py-fox/Makefile
@@ -24,6 +24,8 @@ USE_PYDISTUTILS= yes
USE_XLIB= yes
USE_GL= yes
+PYDISTUTILS_PKGNAME= FXPy
+
WRKSRC= ${WRKDIR}/FXPy-${PORTVERSION}
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/x11-toolkits/py-gtkextra/Makefile b/x11-toolkits/py-gtkextra/Makefile
index cca363ce897a..ef66bbdcddf8 100644
--- a/x11-toolkits/py-gtkextra/Makefile
+++ b/x11-toolkits/py-gtkextra/Makefile
@@ -24,5 +24,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-gtkextra
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index 50065ba42e85..4ebf920a096a 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -21,6 +21,8 @@ USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_GNOME= pygtk2
+PYDISTUTILS_PKGNAME= PyGUI
+
DOCSDIR= share/doc/${PKGNAMEPREFIX}${PORTNAME}
EXAMPLESDIR= share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index 2016d990a6d8..c19c3a2f0db1 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -23,6 +23,8 @@ DIST_SUBDIR= python
PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/_tkinter.so
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= Tkinter
+PYDISTUTILS_PKGVERSION= 0.0.0
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 176e99fb4199..b4574b37b1dc 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -24,5 +24,7 @@ USE_TK_RUN= yes
USE_ZIP= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME= TkinterTreectrl
+PYDISTUTILS_PKGVERSION= 0.4
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile
index 5507cf87ffa7..ce1141530b19 100644
--- a/x11-toolkits/py-wmdockapps/Makefile
+++ b/x11-toolkits/py-wmdockapps/Makefile
@@ -19,6 +19,7 @@ COMMENT= Tools for making dockapps in Python
USE_XLIB= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= pywmdockapps
post-patch:
${REINPLACE_CMD} 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/setup.py
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 6b5e99b3849c..5da7ca741286 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -26,6 +26,7 @@ USE_GMAKE= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}"
+PYDISTUTILS_NOEGGINFO= yes
USE_WX= 2.4
DEMO_DIR= ${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
diff --git a/x11-toolkits/py-wxPython24/files/patch-aa b/x11-toolkits/py-wxPython24/files/patch-aa
new file mode 100644
index 000000000000..42bd28ded7f2
--- /dev/null
+++ b/x11-toolkits/py-wxPython24/files/patch-aa
@@ -0,0 +1,16 @@
+--- wxPython/py/introspect.py.orig Mon Jul 30 08:07:25 2007
++++ wxPython/py/introspect.py Mon Jul 30 08:07:35 2007
+@@ -1,11 +1,11 @@
+ """Provides a variety of introspective-type support functions for
+ things like call tips and command auto completion."""
+
++from __future__ import nested_scopes
++
+ __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+ __cvsid__ = "$Id: introspect.py,v 1.1.2.2 2003/05/19 21:41:24 PKO Exp $"
+ __revision__ = "$Revision: 1.1.2.2 $"[11:-2]
+-
+-from __future__ import nested_scopes
+
+ import cStringIO
+ import inspect
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 5fa6e3926cb9..df565d8db980 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -18,5 +18,7 @@ COMMENT= X11 library for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
+PYDISTUTILS_PKGNAME= python-xlib
+PYDISTUTILS_PKGVERSION= 0.12
.include <bsd.port.mk>
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index f975e82c3e76..5ccfaedc0801 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -22,6 +22,10 @@ INFO= plwm
USE_PYTHON= yes
GNU_CONFIGURE= yes
+post-patch:
+ ${REINPLACE_CMD} -e 's,whrandom,random,g' ${WRKSRC}/plwm/inspect.py
+ ${REINPLACE_CMD} -e 's,$$Id,coding: utf-8 ,g' ${WRKSRC}/plwm/mw_apm.py
+
pre-install:
makeinfo -o ${PREFIX}/info/plwm.info ${WRKSRC}/doc/plwm.texi