summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-09-09 16:49:18 +0000
committerjoerg <joerg@pkgsrc.org>2009-09-09 16:49:18 +0000
commit03454116519ae599951ccac24c20941ab96d3803 (patch)
treedfbe29207c7d1b4839872dca19f13b04efeb07ba /devel
parent2a2b23d171f2b28bff8da114e5c86620f44c4439 (diff)
downloadpkgsrc-03454116519ae599951ccac24c20941ab96d3803.tar.gz
Handle difference between Python 2.4 and 2.5+
Diffstat (limited to 'devel')
-rw-r--r--devel/py-setuptools/Makefile13
-rw-r--r--devel/py-setuptools/PLIST5
2 files changed, 14 insertions, 4 deletions
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 9fc496e8b88..253bd641bfa 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -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 @@ CHECK_FILES_SKIP+= ${PREFIX}/${PYSITELIB}/easy-install.pth
.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 @@ PYSETUPINSTALLARGS+= --root=/
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-build:
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 --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index e7c1d973e68..2ecea52ee22 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -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}/SOURCES.txt
${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