diff --git a/devel/py-setuptools/DEINSTALL b/devel/py-setuptools/DEINSTALL deleted file mode 100644 index 749c93472fc74..0000000000000 --- a/devel/py-setuptools/DEINSTALL +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2006/11/14 13:33:29 joerg Exp $ -# - -case $STAGE in -DEINSTALL) - ${RM} @PYSITELIB@/easy-install.pth - ;; -esac diff --git a/devel/py-setuptools/INSTALL b/devel/py-setuptools/INSTALL deleted file mode 100644 index 436c8ac5d4e6c..0000000000000 --- a/devel/py-setuptools/INSTALL +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2006/11/14 13:33:29 joerg Exp $ -# - -case $STAGE in -POST-INSTALL) - cat > @PYSITELIB@/easy-install.pth << EOF -import sys; sys.__plen = len(sys.path) -./setuptools-0.6c1-py@PYVERSSUFFIX@.egg -import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new) -EOF - ;; -esac diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile index d0af5f711e759..2702c5bfe31ae 100644 --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -1,18 +1,19 @@ -# $NetBSD: Makefile,v 1.21 2012/10/31 11:19:34 asau Exp $ +# $NetBSD: Makefile,v 1.22 2013/07/04 06:43:12 wiz Exp $ -EGG_VERSION= 0.6c11 +EGG_VERSION= 0.7.7 DISTNAME= setuptools-${EGG_VERSION} EGG_NAME= setuptools-${EGG_VERSION} PKGNAME= ${PYPKGPREFIX}-setuptools-${EGG_VERSION} -PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= http://pypi.python.org/packages/source/s/setuptools/ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://peak.telecommunity.com/DevCenter/setuptools COMMENT= New Python packaging system +LICENSE= python-software-foundation OR zpl -PYDISTUTILSPKG= yes +PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCLUDE_3X= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} PYPKGPREFIX=${PYPKGPREFIX} PLIST_SUBST+= EGG_NAME=${EGGNAME} @@ -20,37 +21,20 @@ PLIST_SUBST+= EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \ "$${EGG_INFODIR}") } -CHECK_FILES_SKIP+= ${PREFIX}/${PYSITELIB}/easy-install.pth +REPLACE_PYTHON= setuptools/command/easy_install.py +REPLACE_PYTHON+= setuptools/tests/test_resources.py -.include "../../mk/bsd.prefs.mk" - -.include "../../lang/python/extension.mk" +.include "../../mk/bsd.fast.prefs.mk" PYSETUPINSTALLARGS= --single-version-externally-managed .if ${_USE_DESTDIR} == "no" PYSETUPINSTALLARGS+= --root=/ .endif -FILES_SUBST+= PYSITELIB=${PREFIX}/${PYSITELIB} -FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - .if ${OPSYS} == "Darwin" DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat .endif -post-extract: - chmod -R go-w ${WRKSRC} - -post-build: - ${SED} -e 's,@PYTHON@,${PYTHONBIN},' \ - -e 's,@PYPREFIX@,${PYPKGPREFIX},' \ - -e 's,@PYSITELIB@,${PREFIX}/${PYSITELIB},' \ - ${FILESDIR}/manage-eggs.py > ${WRKDIR}/manage-eggs.py - ${SED} -e 's,@PYTHON@,${PYTHONBIN},' \ - -e 's,@PKGVERSION@,${EGG_VERSION},' \ - ${FILESDIR}/easy_install.py > ${WRKDIR}/easy_install.py - -post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/manage-eggs.py ${DESTDIR}${PREFIX}/bin/${PYPKGPREFIX}-manage-eggs - +.include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST index 1481488f35463..e3bbd65780844 100644 --- a/devel/py-setuptools/PLIST +++ b/devel/py-setuptools/PLIST @@ -1,16 +1,25 @@ -@comment $NetBSD: PLIST,v 1.6 2012/04/08 19:08:54 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2013/07/04 06:43:12 wiz Exp $ bin/easy_install-${PYVERSSUFFIX} -bin/${PYPKGPREFIX}-manage-eggs +${PYSITELIB}/_markerlib/__init__.py +${PYSITELIB}/_markerlib/__init__.pyc +${PYSITELIB}/_markerlib/__init__.pyo +${PYSITELIB}/_markerlib/markers.py +${PYSITELIB}/_markerlib/markers.pyc +${PYSITELIB}/_markerlib/markers.pyo ${PYSITELIB}/easy_install.py ${PYSITELIB}/easy_install.pyc ${PYSITELIB}/easy_install.pyo ${PYSITELIB}/pkg_resources.py ${PYSITELIB}/pkg_resources.pyc ${PYSITELIB}/pkg_resources.pyo +${PYSITELIB}/${EGG_INFODIR}/EGG-INFO/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt +${PYSITELIB}/${EGG_INFODIR}/entry_points.txt.orig +${PYSITELIB}/${EGG_INFODIR}/requires.txt +${PYSITELIB}/${EGG_INFODIR}/requires.txt.orig ${PYSITELIB}/${EGG_INFODIR}/top_level.txt ${PYSITELIB}/${EGG_INFODIR}/zip-safe ${PYSITELIB}/setuptools/__init__.py @@ -19,7 +28,6 @@ ${PYSITELIB}/setuptools/__init__.pyo ${PYSITELIB}/setuptools/archive_util.py ${PYSITELIB}/setuptools/archive_util.pyc ${PYSITELIB}/setuptools/archive_util.pyo -${PYSITELIB}/setuptools/cli.exe ${PYSITELIB}/setuptools/command/__init__.py ${PYSITELIB}/setuptools/command/__init__.pyc ${PYSITELIB}/setuptools/command/__init__.pyo @@ -83,6 +91,9 @@ ${PYSITELIB}/setuptools/command/test.pyo ${PYSITELIB}/setuptools/command/upload.py ${PYSITELIB}/setuptools/command/upload.pyc ${PYSITELIB}/setuptools/command/upload.pyo +${PYSITELIB}/setuptools/command/upload_docs.py +${PYSITELIB}/setuptools/command/upload_docs.pyc +${PYSITELIB}/setuptools/command/upload_docs.pyo ${PYSITELIB}/setuptools/depends.py ${PYSITELIB}/setuptools/depends.pyc ${PYSITELIB}/setuptools/depends.pyo @@ -92,25 +103,78 @@ ${PYSITELIB}/setuptools/dist.pyo ${PYSITELIB}/setuptools/extension.py ${PYSITELIB}/setuptools/extension.pyc ${PYSITELIB}/setuptools/extension.pyo -${PYSITELIB}/setuptools/gui.exe ${PYSITELIB}/setuptools/package_index.py ${PYSITELIB}/setuptools/package_index.pyc ${PYSITELIB}/setuptools/package_index.pyo +${PYSITELIB}/setuptools/py24compat.py +${PYSITELIB}/setuptools/py24compat.pyc +${PYSITELIB}/setuptools/py24compat.pyo +${PYSITELIB}/setuptools/py27compat.py +${PYSITELIB}/setuptools/py27compat.pyc +${PYSITELIB}/setuptools/py27compat.pyo ${PYSITELIB}/setuptools/sandbox.py ${PYSITELIB}/setuptools/sandbox.pyc ${PYSITELIB}/setuptools/sandbox.pyo +${PYSITELIB}/setuptools/script template (dev).py +${PYSITELIB}/setuptools/script template (dev).pyc +${PYSITELIB}/setuptools/script template (dev).pyo +${PYSITELIB}/setuptools/script template.py +${PYSITELIB}/setuptools/script template.pyc +${PYSITELIB}/setuptools/script template.pyo +${PYSITELIB}/setuptools/site-patch.py +${PYSITELIB}/setuptools/site-patch.pyc +${PYSITELIB}/setuptools/site-patch.pyo +${PYSITELIB}/setuptools/ssl_support.py +${PYSITELIB}/setuptools/ssl_support.pyc +${PYSITELIB}/setuptools/ssl_support.pyo ${PYSITELIB}/setuptools/tests/__init__.py ${PYSITELIB}/setuptools/tests/__init__.pyc ${PYSITELIB}/setuptools/tests/__init__.pyo ${PYSITELIB}/setuptools/tests/doctest.py ${PYSITELIB}/setuptools/tests/doctest.pyc ${PYSITELIB}/setuptools/tests/doctest.pyo +${PYSITELIB}/setuptools/tests/py26compat.py +${PYSITELIB}/setuptools/tests/py26compat.pyc +${PYSITELIB}/setuptools/tests/py26compat.pyo +${PYSITELIB}/setuptools/tests/server.py +${PYSITELIB}/setuptools/tests/server.pyc +${PYSITELIB}/setuptools/tests/server.pyo +${PYSITELIB}/setuptools/tests/test_bdist_egg.py +${PYSITELIB}/setuptools/tests/test_bdist_egg.pyc +${PYSITELIB}/setuptools/tests/test_bdist_egg.pyo +${PYSITELIB}/setuptools/tests/test_build_ext.py +${PYSITELIB}/setuptools/tests/test_build_ext.pyc +${PYSITELIB}/setuptools/tests/test_build_ext.pyo +${PYSITELIB}/setuptools/tests/test_develop.py +${PYSITELIB}/setuptools/tests/test_develop.pyc +${PYSITELIB}/setuptools/tests/test_develop.pyo +${PYSITELIB}/setuptools/tests/test_dist_info.py +${PYSITELIB}/setuptools/tests/test_dist_info.pyc +${PYSITELIB}/setuptools/tests/test_dist_info.pyo +${PYSITELIB}/setuptools/tests/test_easy_install.py +${PYSITELIB}/setuptools/tests/test_easy_install.pyc +${PYSITELIB}/setuptools/tests/test_easy_install.pyo +${PYSITELIB}/setuptools/tests/test_egg_info.py +${PYSITELIB}/setuptools/tests/test_egg_info.pyc +${PYSITELIB}/setuptools/tests/test_egg_info.pyo +${PYSITELIB}/setuptools/tests/test_markerlib.py +${PYSITELIB}/setuptools/tests/test_markerlib.pyc +${PYSITELIB}/setuptools/tests/test_markerlib.pyo ${PYSITELIB}/setuptools/tests/test_packageindex.py ${PYSITELIB}/setuptools/tests/test_packageindex.pyc ${PYSITELIB}/setuptools/tests/test_packageindex.pyo ${PYSITELIB}/setuptools/tests/test_resources.py ${PYSITELIB}/setuptools/tests/test_resources.pyc ${PYSITELIB}/setuptools/tests/test_resources.pyo -${PYSITELIB}/site.py -${PYSITELIB}/site.pyc -${PYSITELIB}/site.pyo +${PYSITELIB}/setuptools/tests/test_sandbox.py +${PYSITELIB}/setuptools/tests/test_sandbox.pyc +${PYSITELIB}/setuptools/tests/test_sandbox.pyo +${PYSITELIB}/setuptools/tests/test_sdist.py +${PYSITELIB}/setuptools/tests/test_sdist.pyc +${PYSITELIB}/setuptools/tests/test_sdist.pyo +${PYSITELIB}/setuptools/tests/test_test.py +${PYSITELIB}/setuptools/tests/test_test.pyc +${PYSITELIB}/setuptools/tests/test_test.pyo +${PYSITELIB}/setuptools/tests/test_upload_docs.py +${PYSITELIB}/setuptools/tests/test_upload_docs.pyc +${PYSITELIB}/setuptools/tests/test_upload_docs.pyo diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo index 7103fbec14e6e..ac0e68eadc1da 100644 --- a/devel/py-setuptools/distinfo +++ b/devel/py-setuptools/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2009/10/31 02:10:34 wiz Exp $ +$NetBSD: distinfo,v 1.8 2013/07/04 06:43:12 wiz Exp $ -SHA1 (setuptools-0.6c11.tar.gz) = 8d1ad6384d358c547c50c60f1bfdb3362c6c4a7d -RMD160 (setuptools-0.6c11.tar.gz) = 7af8f39e5e74d96d10cc0d00b15a26462d66f42c -Size (setuptools-0.6c11.tar.gz) = 256862 bytes -SHA1 (patch-aa) = b986fa7ff36e974c70915984efee59f531a488d7 +SHA1 (setuptools-0.7.7.tar.gz) = 55f9285d5f0b1e75f935d57bbe979399b44e0b4a +RMD160 (setuptools-0.7.7.tar.gz) = 84b28be42f900decfb61adc14c47f8a41999c350 +Size (setuptools-0.7.7.tar.gz) = 754684 bytes +SHA1 (patch-setup.py) = 8072ebce17d029f7efc1c05528d1e5c0d0f40800 diff --git a/devel/py-setuptools/files/easy_install.py b/devel/py-setuptools/files/easy_install.py deleted file mode 100644 index 4c8c38b7d5164..0000000000000 --- a/devel/py-setuptools/files/easy_install.py +++ /dev/null @@ -1,9 +0,0 @@ -#!@PYTHON@ -# EASY-INSTALL-ENTRY-SCRIPT: 'setuptools==@PKGVERSION@','console_scripts','easy_install' -__requires__ = 'setuptools==@PKGVERSION@' -import sys -from pkg_resources import load_entry_point - -sys.exit( - load_entry_point('setuptools==@PKGVERSION@', 'console_scripts', 'easy_install')() -) diff --git a/devel/py-setuptools/files/manage-eggs.py b/devel/py-setuptools/files/manage-eggs.py deleted file mode 100644 index 6d6db67c3af22..0000000000000 --- a/devel/py-setuptools/files/manage-eggs.py +++ /dev/null @@ -1,20 +0,0 @@ -#!@PYTHON@ - -import sys - -from setuptools.command.easy_install import PthDistributions -from pkg_resources import find_distributions - -usage = "@PYPREFIX@-manage-eggs [ register | unregister ] egg\n" - -if len(sys.argv) != 3 or sys.argv[1] not in ("register", "unregister"): - sys.stderr.write(usage) - sys.exit(1) - -pth = PthDistributions("@PYSITELIB@/easy-install.pth") -distrib = find_distributions(sys.argv[2], True).next() -if sys.argv[1] == "register": - pth.add(distrib) -elif sys.argv[1] == "unregister": - pth.remove(distrib) -pth.save() diff --git a/devel/py-setuptools/patches/patch-aa b/devel/py-setuptools/patches/patch-aa deleted file mode 100644 index e59d5949d5671..0000000000000 --- a/devel/py-setuptools/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2009/09/07 14:22:39 joerg Exp $ - ---- setup.py.orig 2009-09-06 22:37:49.000000000 +0200 -+++ setup.py -@@ -67,7 +67,6 @@ setup( - ], - - "console_scripts": [ -- "easy_install = setuptools.command.easy_install:main", - "easy_install-%s = setuptools.command.easy_install:main" - % sys.version[:3] - ], diff --git a/devel/py-setuptools/patches/patch-setup.py b/devel/py-setuptools/patches/patch-setup.py new file mode 100644 index 0000000000000..80fa940a289fb --- /dev/null +++ b/devel/py-setuptools/patches/patch-setup.py @@ -0,0 +1,16 @@ +$NetBSD: patch-setup.py,v 1.1 2013/07/04 06:43:13 wiz Exp $ + +Do not install easy_install without python version suffix to allow +parallel installation of this package for multiple python versions. + +--- setup.py.orig 2013-07-02 15:45:46.000000000 +0000 ++++ setup.py +@@ -54,7 +54,7 @@ from setuptools.command.test import test + + scripts = [] + +-console_scripts = ["easy_install = setuptools.command.easy_install:main"] ++console_scripts = [] + + # Gentoo distributions manage the python-version-specific scripts themselves, + # so they define an environment variable to suppress the creation of the