- 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

9 files changed, 9 insertions, 1 deletions

diff --git a/net-mgmt/py-flowtools/Makefile b/net-mgmt/py-flowtools/Makefile
index cba3867..19d73e4 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 19b0812..0fe7f74 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 6df4743..f7591e3 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 4115b32..fb62bd6 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 8a504ee..cf90eb7 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 8093139..f786f34 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 a7d1db3..785a362 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 b84b6de..0984598 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 e83d1a7..1837464 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