pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/py-paste Use egg.mk, cutting the Makefile in half ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d5d97f60c40
branches:  trunk
changeset: 546979:3d5d97f60c40
user:      epg <epg%pkgsrc.org@localhost>
date:      Wed Sep 10 16:34:51 2008 +0000

description:
Use egg.mk, cutting the Makefile in half (and fixing semi-automatic PLIST
generation, now that egg.mk does it).

diffstat:

 www/py-paste/Makefile |  15 +++------------
 www/py-paste/PLIST    |  22 +++++++++++-----------
 2 files changed, 14 insertions(+), 23 deletions(-)

diffs (63 lines):

diff -r 600862094081 -r 3d5d97f60c40 www/py-paste/Makefile
--- a/www/py-paste/Makefile     Wed Sep 10 16:33:38 2008 +0000
+++ b/www/py-paste/Makefile     Wed Sep 10 16:34:51 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/09/08 03:27:28 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/09/10 16:34:51 epg Exp $
 
 DISTNAME=      Paste-1.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+EGG_NAME=      ${DISTNAME}
 CATEGORIES=    www
 MASTER_SITES=  http://pypi.python.org/packages/source/P/Paste/
 
@@ -11,15 +12,5 @@
 
 PKG_DESTDIR_SUPPORT=           user-destdir
 
-DEPENDS+=      ${PYPKGPREFIX}-setuptools>=0.6c8:../../devel/py-setuptools
-
-PYTHON_VERSIONS_ACCEPTED=      25 24
-PYDISTUTILSPKG=        yes
-
-PLIST_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX}
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# XXX I think this can't work because of the 'next;' in pyversion.mk.
-PRINT_PLIST_AWK+=      { gsub(/py${PYVERSSUFFIX}/, "py$${PYVERSSUFFIX}") }
diff -r 600862094081 -r 3d5d97f60c40 www/py-paste/PLIST
--- a/www/py-paste/PLIST        Wed Sep 10 16:33:38 2008 +0000
+++ b/www/py-paste/PLIST        Wed Sep 10 16:34:51 2008 +0000
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2008/09/04 17:17:15 epg Exp $
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}-nspkg.pth
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}.egg-info/entry_points.txt
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}.egg-info/namespace_packages.txt
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}.egg-info/not-zip-safe
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/Paste-1.7.1-py${PYVERSSUFFIX}.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.3 2008/09/10 16:34:51 epg Exp $
+${PYSITELIB}/${EGG_NAME}-nspkg.pth
+${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}/namespace_packages.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/paste/auth/__init__.py
 ${PYSITELIB}/paste/auth/__init__.pyc
 ${PYSITELIB}/paste/auth/__init__.pyo
@@ -273,4 +273,4 @@
 @dirrm ${PYSITELIB}/paste/debug
 @dirrm ${PYSITELIB}/paste/auth
 @dirrm ${PYSITELIB}/paste
-@dirrm ${PYSITELIB}/Paste-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info
+@dirrm ${PYSITELIB}/${EGG_INFODIR}



Home | Main Index | Thread Index | Old Index