[pkgsrc/trunk]: pkgsrc/devel/py-setuptools Handle difference between Python 2...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5ccd80f1085
branches:  trunk
changeset: 564686:b5ccd80f1085
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Sep 09 16:49:18 2009 +0000

description:
Handle difference between Python 2.4 and 2.5+

diffstat:

 devel/py-setuptools/Makefile |  13 +++++++++++--
 devel/py-setuptools/PLIST    |   5 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r cba76518b8d5 -r b5ccd80f1085 devel/py-setuptools/Makefile
--- a/devel/py-setuptools/Makefile      Wed Sep 09 16:47:07 2009 +0000
+++ b/devel/py-setuptools/Makefile      Wed Sep 09 16:49:18 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/09/07 14:22:39 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/09/09 16:49:18 joerg Exp $
 #
 
 EGG_VERSION=           0.6c9
@@ -28,6 +28,8 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.include "../../lang/python/extension.mk"
+
 PYSETUPINSTALLARGS=    --single-version-externally-managed
 .if ${_USE_DESTDIR} == "no"
 PYSETUPINSTALLARGS+=   --root=/
@@ -36,6 +38,14 @@
 FILES_SUBST+=  PYSITELIB=${PREFIX}/${PYSITELIB}
 FILES_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX}
 
+PLIST_VARS+=   py24 py25
+
+.if ${PYPKGPREFIX} == "py24"
+PLIST.py24=            yes
+.else
+PLIST.py25=            yes
+.endif
+
 post-extract:
        chmod -R go-w ${WRKSRC}
 
@@ -51,5 +61,4 @@
 post-install:
        ${INSTALL_SCRIPT} ${WRKDIR}/manage-eggs.py ${DESTDIR}${PREFIX}/bin/${PYPKGPREFIX}-manage-eggs
 
-.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r cba76518b8d5 -r b5ccd80f1085 devel/py-setuptools/PLIST
--- a/devel/py-setuptools/PLIST Wed Sep 09 16:47:07 2009 +0000
+++ b/devel/py-setuptools/PLIST Wed Sep 09 16:49:18 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/09/07 14:22:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/09/09 16:49:18 joerg Exp $
 bin/easy_install-${PYVERSSUFFIX}
 bin/${PYPKGPREFIX}-manage-eggs
 ${PYSITELIB}/easy_install.py
@@ -12,7 +12,8 @@
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/${EGG_INFODIR}/zip-safe
+${PLIST.py24}${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PLIST.py25}${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/setuptools/__init__.py
 ${PYSITELIB}/setuptools/__init__.pyc
 ${PYSITELIB}/setuptools/__init__.pyo