- Make Python 2.5.1 the default Python version

 - Add significantly better support in bsd.python.mk for working with
   Python Eggs and the easy_install system

Tested by:	pointyhat runs
Approved by:	pav (portmgr)
Most work by:	perky
Thanks to:	pav

28 files changed, 154 insertions, 20 deletions

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>