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.

6 files changed, 11 insertions, 14 deletions

diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk
index 2acfd360671..ce96905e195 100644
--- a/x11/modular-xorg-server/buildlink3.mk
+++ b/x11/modular-xorg-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/08/05 23:30:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/04/25 20:39:14 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 MODULAR_XORG_SERVER_BUILDLINK3_MK:=	${MODULAR_XORG_SERVER_BUILDLINK3_MK}+
@@ -12,13 +12,14 @@ BUILDLINK_PACKAGES+=	modular-xorg-server
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server
 
 .if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.modular-xorg-server+=	modular-xorg-server>=1.2.99
-BUILDLINK_PKGSRCDIR.modular-xorg-server?=	../../x11/modular-xorg-server
+BUILDLINK_API_DEPENDS.modular-xorg-server+=	modular-xorg-server>=1.4
+BUILDLINK_PKGSRCDIR.modular-xorg-server?=	../../x11/modular-xorg-server14
 .endif	# MODULAR_XORG_SERVER_BUILDLINK3_MK
 
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 30f9585e0fd..f393df444f4 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/04/15 18:02:48 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:14 joerg Exp $
 #
 
 DISTNAME=	gnome-python-desktop-2.22.0
@@ -20,7 +20,7 @@ DEPENDS+=	bug-buddy>=2.16:../../net/bug-buddy
 
 PKGCONFIG_OVERRIDE+=	gnome-python-desktop-2.0.pc.in
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 # XXX not yet, needs hal
 PLIST_VARS+=	nautilusburn
diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common
index 53fcf7ae01f..a31f4849321 100644
--- a/x11/py-qt3-base/Makefile.common
+++ b/x11/py-qt3-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/05/28 22:59:59 joerg Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/04/25 20:39:14 joerg Exp $
 #
 
 # XXX: when updating version, be sure to update distinfo for both
@@ -28,7 +28,6 @@ CONFIGURE_ARGS+=	-b ${PREFIX}/bin
 CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
 CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index b7cdebca1dd..194cc585b34 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/02/22 19:27:27 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2008/04/25 20:39:14 joerg Exp $
 #
 
 DISTNAME=	sip-4.3.2
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
 CONFIGURE_ARGS+=	-e ${PREFIX}/${PYINC}
 CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index 33944c1857b..e60490cfa74 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/13 11:59:33 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:14 joerg Exp $
 #
 
 DISTNAME=	wxPython-src-2.6.3.3
@@ -18,8 +18,6 @@ USE_TOOLS+=	gmake pkg-config
 # previous name of the package
 CONFLICTS+=	${PYPKGPREFIX}-wxWindows-[0-9]*
 
-PYTHON_VERSIONS_ACCEPTED=	24 23
-
 WXARG=	WXPORT=gtk2 \
 	WX_CONFIG=${BUILDLINK_PREFIX.wxGTK}/bin/wx-config \
 	CONTRIBS_INC="../contrib/include" \
diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile
index e5504420dea..80aa23af7cd 100644
--- a/x11/rox-session/Makefile
+++ b/x11/rox-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:44 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/25 20:39:14 joerg Exp $
 #
 
 DISTNAME=	rox-session-0.28
@@ -18,7 +18,7 @@ DIST_SUBDIR=	rox
 
 NO_BUILD=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_VERSIONS_ACCEPTED=	25 24
 PYTHON_PATCH_SCRIPTS=	AppRun tests/testutils.py
 
 INSTALLATION_DIRS=	share/rox/ROX-Session