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.

16 files changed, 23 insertions, 32 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 718966f4879..249d77a7af4 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/04/11 23:15:48 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:12 joerg Exp $
 #
 
 DISTNAME=		asciidoc-8.2.5
@@ -16,7 +16,6 @@ DEPENDS+=		getopt-[0-9]*:../../misc/getopt
 
 REPLACE_BASH+=		a2x
 USE_TOOLS+=		bash:run
-PYTHON_VERSIONS_INCOMPATIBLE=	15 20 21 22
 PYTHON_PATCH_SCRIPTS=	asciidoc.py filters/code-filter.py filters/music2png.py
 
 NO_BUILD=		yes
diff --git a/textproc/doclifter/Makefile b/textproc/doclifter/Makefile
index bf2e048d8b5..396a30fea30 100644
--- a/textproc/doclifter/Makefile
+++ b/textproc/doclifter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/15 23:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/04/25 20:39:12 joerg Exp $
 #
 
 DISTNAME=	doclifter-2.3
@@ -12,7 +12,6 @@ COMMENT=	Translates documents written in troff macros to DocBook
 NO_BUILD=	yes
 
 PYTHON_PATCH_SCRIPTS=		doclifter manlifter
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 SUBST_CLASSES+=		bin-path
 SUBST_STAGE.bin-path=	pre-configure
diff --git a/textproc/py-FourSuite/Makefile b/textproc/py-FourSuite/Makefile
index 1956927a22b..c3af4f3b50d 100644
--- a/textproc/py-FourSuite/Makefile
+++ b/textproc/py-FourSuite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/06/29 12:47:19 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:12 joerg Exp $
 #
 
 DISTNAME=	4Suite-0.12.0a3
@@ -15,7 +15,7 @@ CONFLICTS+=	${PYPKGPREFIX}-4Suite-*
 
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 
 #pyxml is needed at runtime to get pyexpat
 #.include "../../textproc/py-xml/buildlink3.mk"
diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile
index 9e7ac7c9a83..3ce3ca638b3 100644
--- a/textproc/py-HappyDoc/Makefile
+++ b/textproc/py-HappyDoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/09/30 17:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:12 joerg Exp $
 
 DISTNAME=	HappyDoc_r2_1
 PKGNAME=	${PYPKGPREFIX}-HappyDoc-2.1
@@ -12,7 +12,7 @@ COMMENT=	Python tool to generate Python API documents
 
 WRKSRC=		${WRKDIR}/HappyDoc-r2_1
 PYDISTUTILSPKG=	# defined
-PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 post-extract:
diff --git a/textproc/py-SimpleParse/Makefile b/textproc/py-SimpleParse/Makefile
index 531d11cc853..06081082995 100644
--- a/textproc/py-SimpleParse/Makefile
+++ b/textproc/py-SimpleParse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:16 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:12 joerg Exp $
 #
 
 DISTNAME=		SimpleParse-2.0.0
@@ -13,7 +13,7 @@ HOMEPAGE=		http://simpleparse.sourceforge.net/
 COMMENT=		Simple parser generator for mxTextTools text-tagging engine
 
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_ACCEPTED=	23 22
+PYTHON_VERSIONS_ACCEPTED=	23
 
 .include "../../lang/python/extension.mk"
 .include "../../time/py-mxDateTime/buildlink3.mk"
diff --git a/textproc/py-X/Makefile b/textproc/py-X/Makefile
index 814689cdac6..358e87154b6 100644
--- a/textproc/py-X/Makefile
+++ b/textproc/py-X/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/11/08 23:47:03 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:12 joerg Exp $
 #
 
 DISTNAME=	PyX-0.9
@@ -9,7 +9,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyx/}
 
 DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX3-bin
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
 PYBINMODULE=	yes
 PYDISTUTILSPKG=	yes
 
diff --git a/textproc/py-csv/Makefile b/textproc/py-csv/Makefile
index 6da6b096808..06a80cb4931 100644
--- a/textproc/py-csv/Makefile
+++ b/textproc/py-csv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:12 joerg Exp $
 #
 
 DISTNAME=	csv-1.0
@@ -14,7 +14,7 @@ COMMENT=	CSV reading module for Python
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	22 21 20
+PYTHON_VERSIONS_ACCEPTED=	21
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-elementtree/Makefile b/textproc/py-elementtree/Makefile
index c7b3d3d646c..daf7226f0d3 100644
--- a/textproc/py-elementtree/Makefile
+++ b/textproc/py-elementtree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/04/30 11:12:35 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:12 joerg Exp $
 #
 
 DISTNAME=		elementtree-1.2.6-20050316
@@ -17,7 +17,7 @@ DEPENDS+=		${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml
 
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 
 USE_LANGUAGES=		# empty
 
diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile
index d3f6f52556e..81afe348380 100644
--- a/textproc/py-feedparser/Makefile
+++ b/textproc/py-feedparser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:06 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/25 20:39:12 joerg Exp $
 #
 
 DISTNAME=		feedparser-4.1
@@ -15,7 +15,6 @@ COMMENT=		Parse RSS and Atom feeds in Python
 WRKSRC=			${WRKDIR}
 
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_ACCEPTED?=	24 23 22 21
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-gdick/Makefile b/textproc/py-gdick/Makefile
index 1898f534f1a..92fb28c6615 100644
--- a/textproc/py-gdick/Makefile
+++ b/textproc/py-gdick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:23 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:12 joerg Exp $
 
 DISTNAME=	gdick-0.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://gdick.sourceforge.net/
 COMMENT=	English-Korean Dictionary Client for GNOME2
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 PYDISTUTILSPKG=	yes
 NO_CONFIGURE=	yes
diff --git a/textproc/py-gnosis-utils/Makefile b/textproc/py-gnosis-utils/Makefile
index 0c83ff765eb..465802e5994 100644
--- a/textproc/py-gnosis-utils/Makefile
+++ b/textproc/py-gnosis-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/07 12:46:31 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=	Gnosis_Utils-1.1.1
@@ -13,7 +13,6 @@ COMMENT=	Classes for working with XML
 
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 .include "../../lang/python/extension.mk"
 .include "../../textproc/py-xml/buildlink3.mk"
diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile
index 03bed8428fa..5b0ab110532 100644
--- a/textproc/py-html2text/Makefile
+++ b/textproc/py-html2text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/02/19 10:31:53 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=		html2text-2.29
@@ -15,7 +15,7 @@ WRKSRC=			${WRKDIR}
 
 USE_TOOLS+=		tr
 NO_BUILD=		yes
-PYTHON_VERSIONS_ACCEPTED?=	24 23 22 21
+PYTHON_VERSIONS_ACCEPTED?=	25 24 23 21
 
 INSTALLATION_DIRS=	share/html2text
 
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index 37d9e5a70c7..6fe74235229 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/04/21 19:44:14 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2008/04/25 20:39:13 joerg Exp $
 
 DISTNAME=	libxslt-1.1.23
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=	${PYPKGPREFIX}-libxml2>=2.6.8:../../textproc/py-libxml2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/python
-PYTHON_VERSIONS_ACCEPTED=	25 24 23
 PYDISTUTILSPKG=	YES
 PYBINMODULE=	YES
 NO_CONFIGURE=	YES
diff --git a/textproc/py-textile/Makefile b/textproc/py-textile/Makefile
index f8e5f11291d..f17c70942d5 100644
--- a/textproc/py-textile/Makefile
+++ b/textproc/py-textile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/08/09 13:29:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=		textile-2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=		yes
 NO_CONFIGURE=		yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile
index 4bfc55db754..f8c6efa9e8a 100644
--- a/textproc/py-yaml/Makefile
+++ b/textproc/py-yaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/07/01 00:06:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=	PyYAML-3.05
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.pyyaml.org/
 COMMENT=	Collection of libraries to process YAML with Python
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_ACCEPTED=	24 23
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index c120d04c0d1..428476d1920 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/10 03:21:40 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:13 joerg Exp $
 #
 
 DISTNAME=		rubber-1.1
@@ -15,7 +15,6 @@ USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
 INFO_FILES=		# PLIST
 TEXINFO_REQD=		4.6
-PYTHON_VERSIONS_ACCEPTED=	24 23
 TEX_ACCEPTED=		teTeX3
 
 CONFIGURE_ARGS+=	--python=${PYTHONBIN:Q}