Update PYTHON_VERSIONS_COMPATIBLE

- assume that Python 2.4 and 2.5 are compatible and allow checking for
fallout.
- remove PYTHON_VERSIONS_COMPATIBLE that are obsoleted by the 2.3+
default. Modify the others to deal with the removals.

13 files changed, 17 insertions, 28 deletions

diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
index d74224fe488..51d34deb36d 100644
--- a/www/ap-python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=		mod_python-2.7.10
@@ -18,7 +18,7 @@ PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON_BIN=${PYTHONBIN:Q}
 MAKE_ENV+=		PYTHONBIN=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED=	23 22 21 20
+PYTHON_VERSIONS_ACCEPTED=	23 21
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ap-mod_python
diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile
index 20362c11ac1..717a93343ce 100644
--- a/www/ap2-python/Makefile
+++ b/www/ap2-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/04/16 13:42:40 abs Exp $
+# $NetBSD: Makefile,v 1.24 2008/04/25 20:39:13 joerg Exp $
 
 DISTNAME=	mod_python-${VERSION}
 PKGNAME=	${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-python-${VERSION}
@@ -20,7 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-apxs=${APXS:Q}
 CONFIGURE_ARGS+=--with-python=${PYTHONBIN:Q}
 
-PYTHON_VERSIONS_ACCEPTED=	25 24 23
 PY_PATCHPLIST=	YES
 
 PKG_APACHE_ACCEPTED=	apache2 apache22
diff --git a/www/ap2-wsgi/Makefile b/www/ap2-wsgi/Makefile
index f1d0b5f7dc2..5d371a0b519 100644
--- a/www/ap2-wsgi/Makefile
+++ b/www/ap2-wsgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/12/18 01:00:13 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=	mod_wsgi-${VERSION}
@@ -18,8 +18,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-apxs=${APXS:Q}
 CONFIGURE_ARGS+=--with-python=${PYTHONBIN:Q}
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
-
 PKG_APACHE_ACCEPTED=	apache2 apache22
 
 .include "../../lang/python/extension.mk"
diff --git a/www/ja-trac/Makefile b/www/ja-trac/Makefile
index 0bac540f471..775bb033b58 100644
--- a/www/ja-trac/Makefile
+++ b/www/ja-trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/12/21 03:38:06 taca Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=	trac-0.10.4-ja-1
@@ -40,7 +40,6 @@ DEPENDS+=	${PYPKGPREFIX}-psycopg>=1.1.14:../../databases/py-psycopg2
 PYDISTUTILSPKG=	YES
 PY_PATCHPLIST=	YES
 PYTHON_PATCH_SCRIPTS=	contrib/*.py contrib/*-hook
-PYTHON_VERSIONS_ACCEPTED=	24 23
 
 OWN_DIRS+=	${PREFIX}/share/trac
 OWN_DIRS+=	${PREFIX}/share/trac/conf
diff --git a/www/py-clearsilver/Makefile b/www/py-clearsilver/Makefile
index b4624ad0d0e..52a114ccb1b 100644
--- a/www/py-clearsilver/Makefile
+++ b/www/py-clearsilver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/04/11 15:27:22 abs Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:13 joerg Exp $
 
 PKGNAME=			${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=			1
@@ -15,7 +15,6 @@ INSTALL_DIRS=			${WRKSRC}/python
 
 PY_PATCHPLIST=			YES
 PYBINMODULE=			YES
-PYTHON_VERSIONS_INCOMPATIBLE=	15 20
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index a12060b3ac2..ae090a0c4d5 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/01/18 05:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2008/04/25 20:39:13 joerg Exp $
 
 DISTNAME=	pycurl-7.16.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -14,7 +14,6 @@ BROKEN_IN=		pkgsrc-2006Q4
 
 PYDISTUTILSPKG=	# defined
 PYBINMODULE=	# defined
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 BUILDLINK_API_DEPENDS.curl+=        curl>=7.16.1
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 2277ff21a10..83c879a253e 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/11/01 21:24:02 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:13 joerg Exp $
 
 DISTNAME=	Django-0.96.1
 PKGNAME=	${PYPKGPREFIX}-django-0.96.1
@@ -11,7 +11,7 @@ COMMENT=	Django, a high-level Python Web framework
 
 PYDISTUTILSPKG=	# yes
 PYBINMODULE=	# yes
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/py-jonpy/Makefile b/www/py-jonpy/Makefile
index b8d10e08c40..12e6abdadf5 100644
--- a/www/py-jonpy/Makefile
+++ b/www/py-jonpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/04/10 13:35:53 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=	jonpy-0.06
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-moin/Makefile b/www/py-moin/Makefile
index 2c264b9f741..55c6cd02acf 100644
--- a/www/py-moin/Makefile
+++ b/www/py-moin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/15 18:16:51 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=	moin-1.6.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 PYDISTUTILSPKG=	# empty
-PYTHON_VERSIONS_ACCEPTED=	24 23
 
 REPLACE_INTERPRETER+=	env_python
 REPLACE.env_python.old=	/usr/bin/env python
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 326b8199dc1..1cc8f8e91b0 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=		nevow-0.3
@@ -14,8 +14,6 @@ COMMENT=		Next-generation web application templating system
 DEPENDS+=		${PYPKGPREFIX}-twisted>=1.3.0:../../net/py-twisted
 DEPENDS+=		${PYPKGPREFIX}-xml>=0.8.3:../../textproc/py-xml
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
-
 WRKSRC=			${WRKDIR}/${DISTNAME}
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
diff --git a/www/py-webpy/Makefile b/www/py-webpy/Makefile
index 9492da0fde9..ef7e3529d04 100644
--- a/www/py-webpy/Makefile
+++ b/www/py-webpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/01/11 11:30:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=		web.py-0.2
@@ -11,7 +11,7 @@ MAINTAINER=		darcy@NetBSD.org
 HOMEPAGE=		http://webpy.org/
 COMMENT=		Simple, public domain web publishing system
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 #PY_PATCHPLIST=		yes
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 2b5dbc9eaf9..afd2b9b91ee 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/04/11 15:27:22 abs Exp $
+# $NetBSD: Makefile,v 1.31 2008/04/25 20:39:14 joerg Exp $
 #
 
 DISTNAME=	trac-0.10.4
@@ -35,7 +35,6 @@ DEPENDS+=	${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
 PYDISTUTILSPKG=	YES
 PY_PATCHPLIST=	YES
 PYTHON_PATCH_SCRIPTS=	contrib/*.py contrib/*-hook
-PYTHON_VERSIONS_INCOMPATIBLE=	15 20 21 22
 
 EGDIR=		${PREFIX}/share/examples/trac
 
diff --git a/www/zopeedit/Makefile b/www/zopeedit/Makefile
index 653235b1ace..d3af1abc0ff 100644
--- a/www/zopeedit/Makefile
+++ b/www/zopeedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/01/31 13:43:34 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:14 joerg Exp $
 #
 
 DISTNAME=	zopeedit-0.7-src
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/Caseman/ExternalEditor
 COMMENT=	Helper client application for Zope's ExternalEditor
 
-PYTHON_VERSIONS_INCOMPATIBLE=	15 20 21
+PYTHON_VERSIONS_ACCEPTED=	25 24 23
 PYDISTUTILSPKG=	yes
 
 post-install: