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, 24 insertions, 37 deletions

diff --git a/net/bittornado/Makefile.common b/net/bittornado/Makefile.common
index a03b5b30837..fb1ca339ca8 100644
--- a/net/bittornado/Makefile.common
+++ b/net/bittornado/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2008/02/04 14:42:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2008/04/25 20:39:10 joerg Exp $
 #
 
 DISTNAME=		BitTornado-0.3.18
@@ -13,5 +13,3 @@ DISTINFO_FILE=		${.CURDIR}/../../net/bittornado/distinfo
 PATCHDIR=		${.CURDIR}/../../net/bittornado/patches
 
 WRKSRC=			${WRKDIR}/BitTornado-CVS
-
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
diff --git a/net/bittorrent/Makefile.common b/net/bittorrent/Makefile.common
index b504303dc91..d34089fbbd5 100644
--- a/net/bittorrent/Makefile.common
+++ b/net/bittorrent/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2006/02/26 22:43:33 tron Exp $
+# $NetBSD: Makefile.common,v 1.18 2008/04/25 20:39:11 joerg Exp $
 
 DISTNAME=	BitTorrent-4.4.0
 CATEGORIES=	net
@@ -11,5 +11,3 @@ COMMENT=	File sharing tool
 DISTINFO_FILE=	${.CURDIR}/../../net/bittorrent/distinfo
 FILESDIR=	${.CURDIR}/../../net/bittorrent/files
 PATCHDIR=	${.CURDIR}/../../net/bittorrent/patches
-
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
diff --git a/net/clive/Makefile b/net/clive/Makefile
index 3b2f2ca19a0..2fda6344134 100644
--- a/net/clive/Makefile
+++ b/net/clive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/04/22 23:05:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	clive-0.4.10
@@ -13,7 +13,6 @@ COMMENT=	Command line video extraction tool for user-uploaded video hosts
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	# none
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 PY_PATCHPLIST=			yes
 
 REPLACE_INTERPRETER+=	env_python
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 84b4f0d507d..bef8c960273 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/03/15 16:52:34 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	nicotine-1.0.8
@@ -13,7 +13,7 @@ COMMENT=	Client for soulseek, a peer-to-peer network for music
 
 USE_PKGLOCALEDIR=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
 
diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile
index a02f85c20a5..3930be36e48 100644
--- a/net/py-boto/Makefile
+++ b/net/py-boto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/06 07:08:11 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	boto-1.0a
@@ -14,7 +14,7 @@ COMMENT=	Python interface to Amazon web services
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG= 	yes
-PYTHON_VERSIONS_ACCEPTED= 24
+PYTHON_VERSIONS_ACCEPTED= 25 24
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-dns/Makefile b/net/py-dns/Makefile
index 48ce5de8cb6..d70d7827467 100644
--- a/net/py-dns/Makefile
+++ b/net/py-dns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/04/25 19:32:44 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/25 20:39:11 joerg Exp $
 
 DISTNAME=	dnspython-1.6.0
 PKGNAME=	${PYPKGPREFIX}-dns-1.6.0
@@ -13,7 +13,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	25 24 23
-
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index 4ca205c489d..1bb5e0d7741 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/02/22 19:26:59 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	pygoogle-0.6
@@ -13,8 +13,6 @@ COMMENT=	Call the Google web API from Python
 
 PYDISTUTILSPKG=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
-
 .include "../../lang/python/extension.mk"
 .include "../../net/py-soappy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-kenosis/Makefile b/net/py-kenosis/Makefile
index 63c1a86eddd..a2db8103076 100644
--- a/net/py-kenosis/Makefile
+++ b/net/py-kenosis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/07 12:53:48 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=		kenosis-0.941
@@ -11,7 +11,6 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://kenosis.sourceforge.net/
 COMMENT=		P2P RPC system
 
-PYTHON_VERSIONS_ACCEPTED= 23 24
 PYDISTUTILSPKG=		yes
 PYSETUP=		kenosis_setup.py
 
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index 189ee42bd56..8344c1d4f72 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/07 17:35:39 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	libdnet-1.12
@@ -14,7 +14,6 @@ COMMENT=	Python wrapper for libdnet
 GNU_CONFIGURE=	yes
 PYDISTUTILSPKG=	yes
 PYSETUPSUBDIR=	python
-PYTHON_VERSIONS_ACCEPTED=	24 23
 
 .include "../../lang/python/extension.mk"
 .include "../../net/libdnet/buildlink3.mk"
diff --git a/net/py-mimelib/Makefile b/net/py-mimelib/Makefile
index 09680dd928e..4bb39571db7 100644
--- a/net/py-mimelib/Makefile
+++ b/net/py-mimelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/04/17 12:22:00 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	email-2.5
@@ -14,7 +14,7 @@ COMMENT=	Email package for Python
 PYDISTUTILSPKG=	yes
 # This pkg (or an older version of it) comes with 2.2 and later;
 # 2.1 is the primary target (particulary for Zope).
-PYTHON_VERSIONS_ACCEPTED= 21 22 23
+PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 
 .include "../../lang/python/extension.mk"
 
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index c8ab2f759d1..5d61e0338e8 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/06/07 12:52:24 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	SOAPpy-0.11.4
@@ -14,8 +14,6 @@ COMMENT=	SOAP implementation
 PYDISTUTILSPKG=	YES
 PY_PATCHPLIST=	YES
 
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
-
 .include "../../lang/python/extension.mk"
 .include "../../math/py-fpconst/buildlink3.mk"
 .include "../../textproc/py-xml/buildlink3.mk"
diff --git a/net/py-spreadmodule/Makefile b/net/py-spreadmodule/Makefile
index 736b1395550..13ec4ea5a43 100644
--- a/net/py-spreadmodule/Makefile
+++ b/net/py-spreadmodule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	SpreadModule-1.4
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for the Spread messaging service
 
 PYDISTUTILSPKG=	YES
 
-PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
 
 SUBST_CLASSES+=		setup
 SUBST_STAGE.setup=	post-patch
diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index b015c3e0ea6..3019fbcc68e 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=		${TWISTED_DISTNAME}
@@ -16,7 +16,7 @@ PYDISTUTILSPKG=		yes
 PLIST_SUBST+=		PYVERSSUFFIX="-${PYVERSSUFFIX}"
 MAKE_ENV+=		PKGSRC="1" PYVERSSUFFIX="-${PYVERSSUFFIX}"
 
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
+PYTHON_VERSIONS_ACCEPTED=	25 24 23
 
 .include "../../net/py-twisted/Makefile.common"
 .include "../../lang/python/extension.mk"
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 4707e37b4e1..06ce972bf11 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/07/04 20:54:52 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	pygopherd_2.0.9
@@ -44,7 +44,7 @@ PYTHON_PATCH_SCRIPTS+=	pygopherd/gopherentryTest.py
 PYTHON_PATCH_SCRIPTS+=	pygopherd/initializationTest.py
 PYTHON_PATCH_SCRIPTS+=	pygopherd/testutil.py
 
-PYTHON_VERSIONS_ACCEPTED=	23 22
+PYTHON_VERSIONS_ACCEPTED=	23
 
 SUBST_CLASSES+=		man
 SUBST_STAGE.man=	post-patch
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index a9b90354e10..1f61d92a924 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/03 15:02:51 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=		scapy-1.0.5
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.secdev.org/projects/scapy/
 COMMENT=		Interactive packet manipulation program
 
 NO_BUILD=			yes
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 PYTHON_PATCH_SCRIPTS=		scapy.py
 
 .include "options.mk"
diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile
index 1df5bae6717..e64764dd115 100644
--- a/net/youtube-dl/Makefile
+++ b/net/youtube-dl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/09 22:38:19 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/25 20:39:11 joerg Exp $
 #
 
 DISTNAME=	youtube-dl
@@ -15,7 +15,7 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=			# none
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 WRKSRC=				${WRKDIR}
 
 INSTALLATION_DIRS=	bin