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.

9 files changed, 12 insertions, 19 deletions

diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index c99213f5b06..62200446a3e 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/08/23 10:38:01 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/25 20:39:06 joerg Exp $
 
 DISTNAME=	moss-0.1.13
 PKGREVISION=	3
@@ -12,7 +12,6 @@ COMMENT=	MP3/OGG Streaming Server
 DEPENDS+=	${PYPKGPREFIX}-ogg>=1.3:../../audio/py-ogg
 DEPENDS+=	${PYPKGPREFIX}-vorbis>=1.3:../../audio/py-vorbis
 
-PYTHON_VERSIONS_INCOMPATIBLE=	20 15
 PYTHON_PATCH_SCRIPTS=	${WRKSRC}/*.py
 
 RCD_SCRIPTS=	moss
diff --git a/audio/py-daap/Makefile b/audio/py-daap/Makefile
index ca716512713..5b6a66a9ea3 100644
--- a/audio/py-daap/Makefile
+++ b/audio/py-daap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/06/11 17:38:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:06 joerg Exp $
 #
 
 DISTNAME=	PythonDaap-0.7
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jerakeen.org/PythonDaap/
 COMMENT=	Python binding for DAAP
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
-
 PYSETUP=		setup.py
 PLIST_SUBST+=		PYSITELIB=${PYSITELIB:Q}
 
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 7ba3c366ed1..e1f62078dae 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/11/26 22:44:53 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:06 joerg Exp $
 #
 
 DISTNAME=	pykaraoke-0.5.1
@@ -15,7 +15,7 @@ COMMENT=	Free Python-based karaoke player
 #DEPENDS+=	timidity-[0-9]*:../../audio/timidity
 
 USE_DIRS+=	xdg-1.4
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 PYDISTUTILSPKG=	yes
 
 # supposedly needed, but I couldn't find out why
diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile
index b52e2483911..74da624e8b6 100644
--- a/audio/py-musicbrainz/Makefile
+++ b/audio/py-musicbrainz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/12/07 14:37:28 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 20:39:06 joerg Exp $
 
 DISTNAME=	python-musicbrainz2-0.4.0
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -9,7 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://musicbrainz.org/doc/PythonMusicBrainz2
 COMMENT=	Python interface to the MusicBrainz XML web service
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
 PYDISTUTILSPKG=	yes
 
 DEPENDS+=	${PYPKGPREFIX}-ctypes>=1.0.0:../../devel/py-ctypes
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index a91e8d46f5f..0d8843650af 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/03/15 16:50:42 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:06 joerg Exp $
 #
 
 DISTNAME=	pymusique-0.5
@@ -23,7 +23,7 @@ DEPENDS+=	${PYPKGPREFIX}-mcrypt-[0-9]*:../../security/py-mcrypt
 DEPENDS+=	${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 PYDISTUTILSPKG= yes
 
diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index d4871147d6d..5e645ff808f 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/01/25 23:33:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:06 joerg Exp $
 #
 
 DISTNAME=	mutagen-1.10
@@ -12,7 +12,6 @@ COMMENT=	Audio metadata handling for Python
 
 USE_LANGUAGES=	# none
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_ACCEPTED=	24 23
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index aa2dc0594fa..5c7fb36e68f 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/25 20:39:06 joerg Exp $
 
 DISTNAME=	pyxmms-2.02
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,7 +11,6 @@ HOMEPAGE=	http://people.via.ecp.fr/~flo/index.en.xhtml\#PyXMMS_and_PyXMMS-remote
 COMMENT=	Python interface to XMMS
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
 NO_CONFIGURE=	yes
 
 SUBST_CLASSES+=		paths
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index bd837b2f8fb..ab517f3a6d1 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/25 20:39:06 joerg Exp $
 #
 
 DISTNAME=		solfege-3.8.0
@@ -25,7 +25,6 @@ USE_TOOLS+=		gmake gm4 makeinfo pkg-config msgfmt bash:run
 
 REPLACE_BASH=		lesson-files/bin/csound-play-harmonic-interval.sh
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
 PYTHON_PATCH_SCRIPTS=	*.py *.py.in */*.py */*.py.in
 PYCOMPILEALL=		${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index b23a73ae703..a3f2fb3fed5 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/14 14:24:22 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:06 joerg Exp $
 #
 
 DISTNAME=	sonata-1.4.2
@@ -12,7 +12,7 @@ COMMENT=	Elegant GTK2 client for the Music Player Daemon
 
 DEPENDS+=	musicpd>0:../../audio/musicpd
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
 USE_DIRS+=	xdg-1.4