pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/py-setuptools Switch to the tgz sources and inst...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a9f8b0c605a
branches:  trunk
changeset: 564564:4a9f8b0c605a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Sep 07 14:22:39 2009 +0000

description:
Switch to the tgz sources and install as single version primitive.
Bump revision.

diffstat:

 devel/py-setuptools/Makefile         |   47 ++----
 devel/py-setuptools/PLIST            |  231 +++++++++++++++++-----------------
 devel/py-setuptools/distinfo         |    9 +-
 devel/py-setuptools/patches/patch-aa |   12 +
 4 files changed, 151 insertions(+), 148 deletions(-)

diffs (truncated from 352 to 300 lines):

diff -r 3f2d9c217706 -r 4a9f8b0c605a devel/py-setuptools/Makefile
--- a/devel/py-setuptools/Makefile      Mon Sep 07 11:19:50 2009 +0000
+++ b/devel/py-setuptools/Makefile      Mon Sep 07 14:22:39 2009 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2009/09/06 23:35:59 abs Exp $
+# $NetBSD: Makefile,v 1.14 2009/09/07 14:22:39 joerg Exp $
 #
 
 EGG_VERSION=           0.6c9
-DISTNAME=              setuptools-${EGG_VERSION}-py2.4.egg
+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/2.4/s/setuptools/
-EXTRACT_SUFX=          # empty
+MASTER_SITES=          http://pypi.python.org/packages/source/s/setuptools/
 
 MAINTAINER=            joerg%NetBSD.org@localhost
 HOMEPAGE=              http://peak.telecommunity.com/DevCenter/setuptools
@@ -15,34 +16,30 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 PYTHON_VERSIONS_ACCEPTED= 26 25 24
-USE_TOOLS+=            unzip pax
+PYDISTUTILSPKG=                yes
 
-PY_PATCHPLIST= yes
-PLIST_SUBST+=  EGG_NAME=${EGG_NAME}
 PLIST_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX} PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+=  EGG_NAME=${EGGNAME}
+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
 
+.include "../../mk/bsd.prefs.mk"
+
+PYSETUPINSTALLARGS=    --single-version-externally-managed
+.if ${_USE_DESTDIR} == "no"
+PYSETUPINSTALLARGS+=   --root=/
+.endif
+
 FILES_SUBST+=  PYSITELIB=${PREFIX}/${PYSITELIB}
 FILES_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX}
 
-INSTALLATION_DIRS=     bin
-
-EGG_NAME=      ${DISTNAME:S/2.4/${PYVERSSUFFIX}/}
-TARGET_NAME=   ${PREFIX}/${PYSITELIB}/${EGG_NAME}
-
-do-extract:
-       # Ugly workaround for NetBSD-current's unzip(1) not appearing to look for a zip
-       # header anywhere but byte offset 0. Unfortunately the workaround then makes
-       # normal unzip report an error after extraction, hence the '|| true'
-       ${MKDIR} ${WRKSRC}
-       dd if=${DISTDIR}/${DISTNAME} of=${WRKDIR}/tmp.zip skip=376 bs=1
-       ${TOOLS_CMD.unzip} -d ${WRKSRC} ${WRKDIR}/tmp.zip || true
-
 post-extract:
        chmod -R go-w ${WRKSRC}
 
-do-build:
+post-build:
        ${SED} -e 's,@PYTHON@,${PYTHONBIN},' \
               -e 's,@PYPREFIX@,${PYPKGPREFIX},' \
               -e 's,@PYSITELIB@,${PREFIX}/${PYSITELIB},' \
@@ -50,15 +47,9 @@
        ${SED} -e 's,@PYTHON@,${PYTHONBIN},' \
               -e 's,@PKGVERSION@,${EGG_VERSION},' \
               ${FILESDIR}/easy_install.py > ${WRKDIR}/easy_install.py
-       ${PY_COMPILE_ALL} -f -d ${TARGET_NAME} ${WRKSRC}
-       ${PY_COMPILE_O_ALL} -f -d ${TARGET_NAME} ${WRKSRC}
 
-do-install:
-       ${INSTALL_SCRIPT} ${WRKDIR}/easy_install.py \
-               ${DESTDIR}${PREFIX}/bin/easy_install${PYVERSSUFFIX}
+post-install:
        ${INSTALL_SCRIPT} ${WRKDIR}/manage-eggs.py ${DESTDIR}${PREFIX}/bin/${PYPKGPREFIX}-manage-eggs
-       cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TARGET_NAME}
-       ${ECHO} ./${EGG_NAME} > ${DESTDIR}${PREFIX}/${PYSITELIB}/setuptools.pth
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3f2d9c217706 -r 4a9f8b0c605a devel/py-setuptools/PLIST
--- a/devel/py-setuptools/PLIST Mon Sep 07 11:19:50 2009 +0000
+++ b/devel/py-setuptools/PLIST Mon Sep 07 14:22:39 2009 +0000
@@ -1,117 +1,116 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:05 joerg Exp $
-bin/easy_install${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.4 2009/09/07 14:22:39 joerg Exp $
+bin/easy_install-${PYVERSSUFFIX}
 bin/${PYPKGPREFIX}-manage-eggs
-${PYSITELIB}/${EGG_NAME}/EGG-INFO/PKG-INFO
-${PYSITELIB}/${EGG_NAME}/EGG-INFO/SOURCES.txt
-${PYSITELIB}/${EGG_NAME}/EGG-INFO/dependency_links.txt
-${PYSITELIB}/${EGG_NAME}/EGG-INFO/entry_points.txt
-${PYSITELIB}/${EGG_NAME}/EGG-INFO/not-zip-safe
-${PYSITELIB}/${EGG_NAME}/EGG-INFO/top_level.txt
-${PYSITELIB}/${EGG_NAME}/easy_install.py
-${PYSITELIB}/${EGG_NAME}/easy_install.pyc
-${PYSITELIB}/${EGG_NAME}/easy_install.pyo
-${PYSITELIB}/${EGG_NAME}/pkg_resources.py
-${PYSITELIB}/${EGG_NAME}/pkg_resources.pyc
-${PYSITELIB}/${EGG_NAME}/pkg_resources.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/__init__.py
-${PYSITELIB}/${EGG_NAME}/setuptools/__init__.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/__init__.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/archive_util.py
-${PYSITELIB}/${EGG_NAME}/setuptools/archive_util.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/archive_util.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/cli.exe
-${PYSITELIB}/${EGG_NAME}/setuptools/command/__init__.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/__init__.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/__init__.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/alias.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/alias.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/alias.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_egg.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_egg.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_egg.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_rpm.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_rpm.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_rpm.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_wininst.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_wininst.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/bdist_wininst.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/build_ext.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/build_ext.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/build_ext.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/build_py.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/build_py.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/build_py.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/develop.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/develop.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/develop.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/easy_install.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/easy_install.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/easy_install.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/egg_info.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/egg_info.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/egg_info.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_egg_info.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_egg_info.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_egg_info.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_lib.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_lib.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_lib.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_scripts.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_scripts.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/install_scripts.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/register.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/register.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/register.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/rotate.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/rotate.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/rotate.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/saveopts.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/saveopts.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/saveopts.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/sdist.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/sdist.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/sdist.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/setopt.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/setopt.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/setopt.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/test.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/test.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/test.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/command/upload.py
-${PYSITELIB}/${EGG_NAME}/setuptools/command/upload.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/command/upload.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/depends.py
-${PYSITELIB}/${EGG_NAME}/setuptools/depends.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/depends.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/dist.py
-${PYSITELIB}/${EGG_NAME}/setuptools/dist.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/dist.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/extension.py
-${PYSITELIB}/${EGG_NAME}/setuptools/extension.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/extension.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/gui.exe
-${PYSITELIB}/${EGG_NAME}/setuptools/package_index.py
-${PYSITELIB}/${EGG_NAME}/setuptools/package_index.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/package_index.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/sandbox.py
-${PYSITELIB}/${EGG_NAME}/setuptools/sandbox.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/sandbox.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/__init__.py
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/__init__.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/__init__.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/doctest.py
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/doctest.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/doctest.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/test_packageindex.py
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/test_packageindex.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/test_packageindex.pyo
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/test_resources.py
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/test_resources.pyc
-${PYSITELIB}/${EGG_NAME}/setuptools/tests/test_resources.pyo
-${PYSITELIB}/${EGG_NAME}/site.py
-${PYSITELIB}/${EGG_NAME}/site.pyc
-${PYSITELIB}/${EGG_NAME}/site.pyo
-${PYSITELIB}/setuptools.pth
+${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}/PKG-INFO
+${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
+${PYSITELIB}/setuptools/__init__.py
+${PYSITELIB}/setuptools/__init__.pyc
+${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
+${PYSITELIB}/setuptools/command/alias.py
+${PYSITELIB}/setuptools/command/alias.pyc
+${PYSITELIB}/setuptools/command/alias.pyo
+${PYSITELIB}/setuptools/command/bdist_egg.py
+${PYSITELIB}/setuptools/command/bdist_egg.pyc
+${PYSITELIB}/setuptools/command/bdist_egg.pyo
+${PYSITELIB}/setuptools/command/bdist_rpm.py
+${PYSITELIB}/setuptools/command/bdist_rpm.pyc
+${PYSITELIB}/setuptools/command/bdist_rpm.pyo
+${PYSITELIB}/setuptools/command/bdist_wininst.py
+${PYSITELIB}/setuptools/command/bdist_wininst.pyc
+${PYSITELIB}/setuptools/command/bdist_wininst.pyo
+${PYSITELIB}/setuptools/command/build_ext.py
+${PYSITELIB}/setuptools/command/build_ext.pyc
+${PYSITELIB}/setuptools/command/build_ext.pyo
+${PYSITELIB}/setuptools/command/build_py.py
+${PYSITELIB}/setuptools/command/build_py.pyc
+${PYSITELIB}/setuptools/command/build_py.pyo
+${PYSITELIB}/setuptools/command/develop.py
+${PYSITELIB}/setuptools/command/develop.pyc
+${PYSITELIB}/setuptools/command/develop.pyo
+${PYSITELIB}/setuptools/command/easy_install.py
+${PYSITELIB}/setuptools/command/easy_install.pyc
+${PYSITELIB}/setuptools/command/easy_install.pyo
+${PYSITELIB}/setuptools/command/egg_info.py
+${PYSITELIB}/setuptools/command/egg_info.pyc
+${PYSITELIB}/setuptools/command/egg_info.pyo
+${PYSITELIB}/setuptools/command/install.py
+${PYSITELIB}/setuptools/command/install.pyc
+${PYSITELIB}/setuptools/command/install.pyo
+${PYSITELIB}/setuptools/command/install_egg_info.py
+${PYSITELIB}/setuptools/command/install_egg_info.pyc
+${PYSITELIB}/setuptools/command/install_egg_info.pyo
+${PYSITELIB}/setuptools/command/install_lib.py
+${PYSITELIB}/setuptools/command/install_lib.pyc
+${PYSITELIB}/setuptools/command/install_lib.pyo
+${PYSITELIB}/setuptools/command/install_scripts.py
+${PYSITELIB}/setuptools/command/install_scripts.pyc
+${PYSITELIB}/setuptools/command/install_scripts.pyo
+${PYSITELIB}/setuptools/command/register.py
+${PYSITELIB}/setuptools/command/register.pyc
+${PYSITELIB}/setuptools/command/register.pyo
+${PYSITELIB}/setuptools/command/rotate.py
+${PYSITELIB}/setuptools/command/rotate.pyc
+${PYSITELIB}/setuptools/command/rotate.pyo
+${PYSITELIB}/setuptools/command/saveopts.py
+${PYSITELIB}/setuptools/command/saveopts.pyc
+${PYSITELIB}/setuptools/command/saveopts.pyo
+${PYSITELIB}/setuptools/command/sdist.py
+${PYSITELIB}/setuptools/command/sdist.pyc
+${PYSITELIB}/setuptools/command/sdist.pyo
+${PYSITELIB}/setuptools/command/setopt.py
+${PYSITELIB}/setuptools/command/setopt.pyc
+${PYSITELIB}/setuptools/command/setopt.pyo
+${PYSITELIB}/setuptools/command/test.py
+${PYSITELIB}/setuptools/command/test.pyc
+${PYSITELIB}/setuptools/command/test.pyo
+${PYSITELIB}/setuptools/command/upload.py
+${PYSITELIB}/setuptools/command/upload.pyc
+${PYSITELIB}/setuptools/command/upload.pyo
+${PYSITELIB}/setuptools/depends.py
+${PYSITELIB}/setuptools/depends.pyc
+${PYSITELIB}/setuptools/depends.pyo
+${PYSITELIB}/setuptools/dist.py
+${PYSITELIB}/setuptools/dist.pyc
+${PYSITELIB}/setuptools/dist.pyo
+${PYSITELIB}/setuptools/extension.py
+${PYSITELIB}/setuptools/extension.pyc
+${PYSITELIB}/setuptools/extension.pyo



Home | Main Index | Thread Index | Old Index