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.

18 files changed, 26 insertions, 38 deletions

diff --git a/databases/gourmet/Makefile b/databases/gourmet/Makefile
index 31a79569eb0..a53c0a19db2 100644
--- a/databases/gourmet/Makefile
+++ b/databases/gourmet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:06 joerg Exp $
 #
 
 DISTNAME=		gourmet-0.8.5.14
@@ -13,7 +13,6 @@ COMMENT=		Recipe database
 USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	yes
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_ACCEPTED= 23 24
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index e19ab024302..03add757878 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/03/06 14:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=		gramps-1.0.11
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		msgconv msgfmt pkg-config
 
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 410cbaaa93c..903f97cd00f 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/03/06 14:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=		gramps-2.2.10
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--disable-mime-install --enable-packager-mode
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 MAKE_JOBS_SAFE=		no
 # i18n support with other python versions appears to not work
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 GCONF_SCHEMAS+=	gramps.schemas
diff --git a/databases/py-IndexedCatalog/Makefile b/databases/py-IndexedCatalog/Makefile
index cd4fd569163..829206505c8 100644
--- a/databases/py-IndexedCatalog/Makefile
+++ b/databases/py-IndexedCatalog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/05/28 14:26:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=		IndexedCatalog-0.6.0
@@ -11,7 +11,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://async.com.br/projects/IndexedCatalog/
 COMMENT=		Indexed Catalog extension for standalone ZODB
 
-PYTHON_VERSIONS_ACCEPTED=	23 22
+PYTHON_VERSIONS_ACCEPTED=	23
 
 PYDISTUTILSPKG=		yes
 PYBINMODULE=		yes
diff --git a/databases/py-PgSQL/Makefile b/databases/py-PgSQL/Makefile
index 1f1a7da417e..8c59822a568 100644
--- a/databases/py-PgSQL/Makefile
+++ b/databases/py-PgSQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=	pyPgSQL-2.4
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/pypgsql
 PYDISTUTILSPKG=	YES
 PYBINMODULE=	YES
 PY_PATCHPLIST=	YES
-PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
diff --git a/databases/py-ZODB/Makefile b/databases/py-ZODB/Makefile
index 39657773458..eceb9789667 100644
--- a/databases/py-ZODB/Makefile
+++ b/databases/py-ZODB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:10 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=		ZODB3-3.2.1
@@ -14,7 +14,7 @@ COMMENT=		Standalone distro of Zope Object Database
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 
-PYTHON_VERSIONS_ACCEPTED=	23 22
+PYTHON_VERSIONS_ACCEPTED=	23
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-bdb-xml/Makefile b/databases/py-bdb-xml/Makefile
index 5f3de734f1b..54a52cbbb32 100644
--- a/databases/py-bdb-xml/Makefile
+++ b/databases/py-bdb-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/12 11:36:31 adam Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/25 20:39:07 joerg Exp $
 
 DISTNAME=	dbxml-1.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/db/bdb-/}
@@ -18,8 +18,6 @@ NO_CONFIGURE=	YES
 
 USE_LANGUAGES=	c c++
 
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
-
 .include "../../lang/python/extension.mk"
 PYSETUPBUILDARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4} \
 			--with-xerces=${BUILDLINK_PREFIX.xerces-c} \
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index fcdda7ff112..38b868385f6 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/04/21 20:11:58 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=	bsddb3-4.6.3
@@ -20,7 +20,7 @@ PYBINMODULE=	yes
 
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-PYTHON_VERSIONS_INCOMPATIBLE=	15 20 21
+PYTHON_VERSIONS_INCOMPATIBLE=	15 21
 .endif
 
 do-test:
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index c624aa486a7..877d11a9a25 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/01/18 05:06:31 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2008/04/25 20:39:07 joerg Exp $
 
 DISTNAME=	python-ldap-2.3.1
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -10,7 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/python-ldap/
 COMMENT=	LDAP client API for Python
 
-PYTHON_VERSIONS_ACCEPTED=	23 24
 PYDISTUTILSPKG=			yes
 
 PY_LDAP_LIBRARY_DIRS=		${BUILDLINK_PREFIX.openldap-client}/lib
diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile
index 59929622e3a..f0607fcf76c 100644
--- a/databases/py-mssql/Makefile
+++ b/databases/py-mssql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/06/15 16:08:39 obache Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=		pymssql-0.8.0
@@ -12,7 +12,7 @@ COMMENT=		Python interface to MS SQL
 
 BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 PYBINMODULE=		yes
 PYDISTUTILSPKG=		yes
 
diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile
index d4804b8f082..c4872bf1800 100644
--- a/databases/py-pgnotify/Makefile
+++ b/databases/py-pgnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/01/06 03:38:36 darcy Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=	pgnotify-0.1
@@ -20,7 +20,6 @@ USE_TOOLS+=		gmake
 
 PYDISTUTILSPKG=	yes
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index c6c8171d512..4633c54fd2c 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2008/04/25 20:39:07 joerg Exp $
 
 DISTNAME=		PyGreSQL-3.8.1
 PKGNAME=		${PYPKGPREFIX}-postgresql-3.8.1
@@ -20,7 +20,6 @@ MAKE_ENV+=		INSTALLED_LIBPQ=1
 
 PY_PATCHPLIST=		yes
 PLIST_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX:Q}
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 PYDISTUTILSPKG=		yes
 PYBINMODULE=		yes
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index 6f54b6fe834..73c1533bd21 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2008/04/25 20:39:07 joerg Exp $
 #
 
 DISTNAME=	psycopg-1.1.21
@@ -18,7 +18,6 @@ CONFIGURE_ARGS+= \
  --with-postgres-libraries=${PGSQL_PREFIX}/lib
 BUILD_TARGET=	default
 
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
 PY_PATCHPLIST=	yes
 
 .include "../../lang/python/extension.mk"
diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index a6eba67fdf9..5614cbd3858 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=	psycopg2-2.0.5.1
@@ -14,7 +14,6 @@ COMMENT=	PostgreSQL database adapter for Python
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_ACCEPTED= 24 23
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/pgsql.buildlink3.mk"
diff --git a/databases/py-sqlite/Makefile b/databases/py-sqlite/Makefile
index 4ede8944a55..62fb840b0e2 100644
--- a/databases/py-sqlite/Makefile
+++ b/databases/py-sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:08 joerg Exp $
 
 DISTNAME=	pysqlite-1.0.1
 PKGNAME=	${PYPKGPREFIX}-sqlite-1.0.1
@@ -12,7 +12,7 @@ COMMENT=	SQLite database adapter for Python
 
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 WRKSRC=		${WRKDIR}/pysqlite
 
 .include "../../databases/sqlite/buildlink3.mk"
diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile
index 7a03e4dd8f5..e6b73dafb61 100644
--- a/databases/py-sqlite2/Makefile
+++ b/databases/py-sqlite2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/04/11 15:27:22 abs Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:08 joerg Exp $
 
 DISTNAME=	pysqlite-2.3.5
 PKGNAME=	${PYPKGPREFIX}-sqlite2-2.3.5
@@ -10,7 +10,6 @@ HOMEPAGE=	http://initd.org/tracker/pysqlite
 COMMENT=	SQLite database adapter for Python
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	15 20 21 22
 
 do-postinstall-test: .PHONY
 	${PYTHONBIN} -c "from pysqlite2 import test;test.test()"
diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index aad42105c04..e20732ef0e0 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/16 10:58:23 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=	sybase-0.36
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.object-craft.com.au/projects/sybase/
 COMMENT=	Sybase interface for Python using FreeTDS
 
-PYTHON_VERSIONS_ACCEPTED=	21 22 23 24
-
 PYSETUPBUILDARGS=	build_ext -D HAVE_FREETDS=61 -U WANT_BULKCOPY
 PYDISTUTILSPKG=		yes
 
diff --git a/databases/py-table/Makefile b/databases/py-table/Makefile
index 71d8826f382..173c77e40ae 100644
--- a/databases/py-table/Makefile
+++ b/databases/py-table/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=	pytable-0.8.3a
@@ -18,7 +18,6 @@ MAKE_ENV+=		BINDIR=${PREFIX}/bin
 USE_TOOLS+=		gmake
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX:Q}
 
 .include "../../lang/python/extension.mk"