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.

25 files changed, 33 insertions, 56 deletions

diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index 10356c54b25..7bf8690ccb6 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/22 09:22:07 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:08 joerg Exp $
 
 DISTNAME=	ExmanIDE-0.9.4
 PKGREVISION=	4
@@ -15,8 +15,6 @@ WRKSRC=		${WRKDIR}/${PKGBASE}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-PYTHON_VERSIONS_ACCEPTED?=	24 23
-
 SUBST_CLASSES+=		mod
 SUBST_MESSAGE.mod=	Fixing deprecated module names.
 SUBST_STAGE.mod=	post-patch
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 779f315d61f..f1220665cda 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:08 joerg Exp $
 #
 
 VERSION=		0.4.4
@@ -15,7 +15,6 @@ COMMENT=		Python IDE
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 EXTRACT_OPTS_ZIP=	-aqo
-PYTHON_VERSIONS_ACCEPTED=	23 24
 
 BOADIR=	${PREFIX}/share/boa-constructor-${VERSION}
 
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index a3b6c047b8b..f2364461d05 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/04/16 14:44:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		bzr-1.3.1
@@ -18,7 +18,7 @@ PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 TEST_TARGET=		check
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 PYTHON_PATCH_SCRIPTS=		bzr bzrlib/weave.py
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 04cb1cb9083..1910152443d 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/01/12 11:36:31 adam Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/25 20:39:08 joerg Exp $
 
 DISTNAME=	Codeville-0.1.16
 PKGNAME=	codeville-0.1.16
@@ -12,9 +12,6 @@ COMMENT=	Distributed revision control system
 
 PYDISTUTILSPKG=		yes
 
-# XXX we don't need threads, but db3 is linked against libpthread
-PYTHON_VERSIONS_ACCEPTED= 23 24
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../databases/py-bsddb3/buildlink3.mk"
diff --git a/devel/eric3/Makefile b/devel/eric3/Makefile
index f96f6bd9171..8c637551c7a 100644
--- a/devel/eric3/Makefile
+++ b/devel/eric3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:17 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=	eric-3.8.1
@@ -16,7 +16,6 @@ NO_BUILD=		yes
 USE_LANGUAGES=
 
 PY_PATCHPLIST=		yes
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 CONFIGURE_ARGS+=	-b ${PREFIX:Q}/bin
 CONFIGURE_ARGS+=	-d ${PREFIX:Q}/${PYSITELIB:Q}
diff --git a/devel/ko-po-check/Makefile b/devel/ko-po-check/Makefile
index 8ba57ae136c..bf5be53e28a 100644
--- a/devel/ko-po-check/Makefile
+++ b/devel/ko-po-check/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/06/10 21:54:07 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:08 joerg Exp $
 
 DISTNAME=	ko-po-check-0.8
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	Korean .po file checker
 
 GNU_CONFIGURE=	yes
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	23 22 21 20 15
+PYTHON_VERSIONS_ACCEPTED=	25 24
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 
 PYTHON_PATCH_SCRIPTS=	${WRKSRC}/scripts/ko-po-check.in
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 27b63938dc3..7a0d34c6d11 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/16 12:34:13 abs Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		meld-1.1.5.1
@@ -14,7 +14,6 @@ MAINTAINER=		dieter.NetBSD@pandora.be
 HOMEPAGE=		http://meld.sourceforge.net/
 COMMENT=		Visual diff and merge tool
 
-PYTHON_VERSIONS_ACCEPTED=	25 24 23
 USE_DIRS+=			xdg-1.3
 USE_DIRS+=			gnome2-1.6
 USE_PKGLOCALEDIR=		YES
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 431e1663ff4..26281a0f177 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/04/10 23:34:51 bjs Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=	mercurial-1.0
@@ -18,8 +18,6 @@ PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
 USE_TOOLS+=	gmake
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 MAKE_ENV+=	PYTHONBIN=${PYTHONBIN:Q}
diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile
index 4a536374d40..f262d189b61 100644
--- a/devel/py-InlineEgg/Makefile
+++ b/devel/py-InlineEgg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:27 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		InlineEgg-1.08
@@ -16,7 +16,7 @@ LICENSE=		inlineegg-license
 PY_PATCHPLIST=		YES
 PYDISTUTILSPKG=		YES
 
-PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 PYTHON_PATCH_SCRIPTS=		examples/example1.py examples/example2.py \
 				examples/example3.py examples/example4.py \
 				examples/example5.py examples/example6.py \
diff --git a/devel/py-Pyro/Makefile b/devel/py-Pyro/Makefile
index b96d0bb083d..a12f14b445a 100644
--- a/devel/py-Pyro/Makefile
+++ b/devel/py-Pyro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/17 21:01:29 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		Pyro-3.4
@@ -13,7 +13,6 @@ COMMENT=		Distributed Object Technology system in Python
 
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
 PLIST_SUBST+=		PYVERSSUFFIX="-${PYVERSSUFFIX}"
 MAKE_ENV+=		PKGSRC="1"
 MAKE_ENV+=		PYVERSSUFFIX="-${PYVERSSUFFIX}"
diff --git a/devel/py-TPG/Makefile b/devel/py-TPG/Makefile
index 956226ebce9..13629b9930e 100644
--- a/devel/py-TPG/Makefile
+++ b/devel/py-TPG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 21:36:00 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		TPG-2.1.6
@@ -10,7 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://christophe.delord.free.fr/en/tpg/
 COMMENT=		ToyParserGenerator for Python
 
-PYTHON_VERSIONS_ACCEPTED=	23 22
+PYTHON_VERSIONS_ACCEPTED=	23
 PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
diff --git a/devel/py-ZopeInterface/Makefile b/devel/py-ZopeInterface/Makefile
index 2030900b41f..cc639922010 100644
--- a/devel/py-ZopeInterface/Makefile
+++ b/devel/py-ZopeInterface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/08/26 16:42:25 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		ZopeInterface-3.0.1
@@ -13,7 +13,6 @@ HOMEPAGE=		http://www.zope.org/
 COMMENT=		The zope.interface package used in Zope 3 and Twisted
 
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
 
 pre-build:
 	${RM} ${WRKSRC}/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/*.orig
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
index bebe270599b..444f0367400 100644
--- a/devel/py-at-spi/Makefile
+++ b/devel/py-at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/04/21 20:05:24 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		at-spi-1.22.1
@@ -13,7 +13,7 @@ COMMENT=		Assistive Technology Service Provider Interface
 
 NO_BUILD=	yes
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 PYATSPIDIR=	${PREFIX}/${PYSITELIB}/pyatspi
 do-install:
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 6eaa71b3c23..fbb615ce0be 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/10/31 23:15:54 shannonjr Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		Cheetah-2.0
@@ -15,7 +15,6 @@ COMMENT=		Python-powered template engine and code-generator
 PYDISTUTILSPKG=		yes
 PYBINMODULE=		yes
 PYSETUP=		setup.py
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-ctypes/Makefile b/devel/py-ctypes/Makefile
index b916bb70599..4cadb88ff09 100644
--- a/devel/py-ctypes/Makefile
+++ b/devel/py-ctypes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/07/13 14:58:38 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:08 joerg Exp $
 
 DISTNAME=	ctypes-1.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -9,7 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://starship.python.net/crew/theller/ctypes/
 COMMENT=	Foreign Function Interface package for Python
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
 PYDISTUTILSPKG=	yes
 
 do-test:
diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index 0fa05f8f8d5..1752225d0d6 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/25 20:39:08 joerg Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-cursespanel-0
@@ -17,7 +17,7 @@ EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_curses_panel.c
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
 
 PY_SETUP_SUBST=	NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
 
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 3bb26bad468..fbc5a3e1c98 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/12 16:28:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:08 joerg Exp $
 #
 
 DISTNAME=		pygame-1.7.1release
@@ -14,8 +14,6 @@ COMMENT=		Set of Python modules designed for writing games
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
-
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common
index 594ed020f59..4aa7db65bfa 100644
--- a/devel/py-gobject/Makefile.common
+++ b/devel/py-gobject/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2008/04/16 12:24:50 abs Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/04/25 20:39:09 joerg Exp $
 #
 
 DISTNAME=		pygobject-2.14.1
@@ -19,6 +19,5 @@ PATCHDIR=		${.CURDIR}/../../devel/py-gobject/patches
 DISTINFO_FILE=		${.CURDIR}/../../devel/py-gobject/distinfo
 
 PKGCONFIG_OVERRIDE+=	pygobject-2.0.pc.in
-PYTHON_VERSIONS_ACCEPTED= 25 24 23
 PY_PATCHPLIST=		yes
 CONFLICTS+=		${PYPKGPREFIX}-gtk2<2.8.4
diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile
index 170495f304b..a1d107e67ed 100644
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 17:29:30 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:09 joerg Exp $
 
 DISTNAME=	py-kqueue-2.0
 PKGNAME=	${PYPKGPREFIX}-kqueue-2.0
@@ -10,7 +10,6 @@ MAINTAINER=	jdolecek@NetBSD.org
 COMMENT=	Python interface to kqueue(2) and kevent(2) system calls
 
 PYDISTUTILSPKG= # defined
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
 
 # need to get definition of PKG_HAVE_KQUEUE
 .include "../../mk/bsd.prefs.mk"
diff --git a/devel/py-pexpect/Makefile b/devel/py-pexpect/Makefile
index 860a0ed5e13..cbdbe672096 100644
--- a/devel/py-pexpect/Makefile
+++ b/devel/py-pexpect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/04/25 20:31:10 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:09 joerg Exp $
 
 DISTNAME=	pexpect-2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ COMMENT=	Pure Python Expect-like module
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED=	25 24 23
 NO_CONFIGURE=	yes
 
 .include "../../lang/python/extension.mk"
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index f8b880ef186..3091bacd35b 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/08/09 13:22:14 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:09 joerg Exp $
 #
 
 EGG_VERSION=		0.6c6
@@ -14,7 +14,7 @@ COMMENT=		New Python packaging system
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
 USE_TOOLS+=		unzip
 
 PY_PATCHPLIST=	yes
diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile
index a194e435818..e932a7e247d 100644
--- a/devel/py-urwid/Makefile
+++ b/devel/py-urwid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/12/22 00:18:08 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:09 joerg Exp $
 
 DISTNAME=	urwid-0.9.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Curses-based Python user interface library
 DEPENDS+=	${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 REPLACE_PYTHON=	*.py */*.py
 
 .include "../../lang/python/application.mk"
diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile
index 331c4fa1489..1eae94b8f97 100644
--- a/devel/roundup/Makefile
+++ b/devel/roundup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/01/07 09:13:51 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2008/04/25 20:39:09 joerg Exp $
 
 DISTNAME=	roundup-1.1.2
 CATEGORIES=	devel
@@ -12,8 +12,6 @@ PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 USE_LANGUAGES=
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
-
 PYTHON_PATCH_SCRIPTS+=	cgi-bin/roundup.cgi demo.py roundup/admin.py
 PYTHON_PATCH_SCRIPTS+=	roundup/backends/locking.py
 PYTHON_PATCH_SCRIPTS+=	roundup/cgi/TAL/talgettext.py
diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile
index 44cfcd171d1..d6dd011af8b 100644
--- a/devel/stgit/Makefile
+++ b/devel/stgit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/04/10 12:12:24 bjs Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:09 joerg Exp $
 
 DISTNAME=	stgit-0.14.2
 CATEGORIES=	devel
@@ -20,7 +20,6 @@ USE_TOOLS+= 	bash:run perl gmake
 REPLACE_PERL=	Documentation/build-docdep.perl
 REPLACE_BASH= 	contrib/stg-*
 
-PYTHON_VERSIONS_ACCEPTED?=24 23
 PYTHON_PATCH_SCRIPTS=	*.py stgit/*.py stg
 PYDISTUTILSPKG=		yes
 PYSETUPINSTALLARGS=	--prefix=${PREFIX}
diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile
index 5cff760fc04..603e209d392 100644
--- a/devel/tailor/Makefile
+++ b/devel/tailor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/04/16 08:47:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:09 joerg Exp $
 #
 
 DISTNAME=		tailor-0.9.31
@@ -11,7 +11,6 @@ COMMENT=		Tool to migrate changesets between various version control systems
 
 #LICENSE=		GPLv3
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_ACCEPTED=	24 23
 
 PYTHON_PATCH_SCRIPTS=	tailor