[pkgsrc/trunk]: pkgsrc/www/py-paste Oops, this doesn't require 2.5; DEPEND on...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/912843ec191f
branches:  trunk
changeset: 546556:912843ec191f
user:      epg <epg%pkgsrc.org@localhost>
date:      Thu Sep 04 17:17:15 2008 +0000

description:
Oops, this doesn't require 2.5; DEPEND on setuptools and drop
PYTHON_VERSIONS_ACCEPTED (should work with any).

diffstat:

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

diffs (60 lines):

diff -r f3b9c26662cd -r 912843ec191f www/py-paste/Makefile
--- a/www/py-paste/Makefile     Thu Sep 04 16:53:58 2008 +0000
+++ b/www/py-paste/Makefile     Thu Sep 04 17:17:15 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/04 16:49:17 epg Exp $
+# $NetBSD: Makefile,v 1.2 2008/09/04 17:17:15 epg Exp $
 
 DISTNAME=      Paste-1.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,14 @@
 
 PKG_DESTDIR_SUPPORT=           user-destdir
 
-PYDISTUTILSPKG=                        yes
-# Requires setuptools; if adding other versions, fix PLIST, too.
-PYTHON_VERSIONS_ACCEPTED=      25
+DEPENDS+=      ${PYPKGPREFIX}-setuptools>=0.6c8:../../devel/py-setuptools
+
+PYDISTUTILSPKG=        yes
+
+PLIST_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "../../lang/python/extension.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 f3b9c26662cd -r 912843ec191f www/py-paste/PLIST
--- a/www/py-paste/PLIST        Thu Sep 04 16:53:58 2008 +0000
+++ b/www/py-paste/PLIST        Thu Sep 04 17:17:15 2008 +0000
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/04 16:49:17 epg Exp $
-${PYSITELIB}/Paste-1.7.1-py2.5-nspkg.pth
-${PYSITELIB}/Paste-1.7.1-py2.5.egg-info/PKG-INFO
-${PYSITELIB}/Paste-1.7.1-py2.5.egg-info/SOURCES.txt
-${PYSITELIB}/Paste-1.7.1-py2.5.egg-info/dependency_links.txt
-${PYSITELIB}/Paste-1.7.1-py2.5.egg-info/entry_points.txt
-${PYSITELIB}/Paste-1.7.1-py2.5.egg-info/namespace_packages.txt
-${PYSITELIB}/Paste-1.7.1-py2.5.egg-info/not-zip-safe
-${PYSITELIB}/Paste-1.7.1-py2.5.egg-info/requires.txt
-${PYSITELIB}/Paste-1.7.1-py2.5.egg-info/top_level.txt
+@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
 ${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}-py2.5.egg-info
+@dirrm ${PYSITELIB}/Paste-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info