Remove python24 and all traces of it from pkgsrc.

Remove devel/py-ctypes (only needed by and supporting python24).
Remove PYTHON_VERSIONS_ACCEPTED and PYTHON_VERSIONS_INCOMPATIBLE
lines that just mirror defaults now.
Miscellaneous cleanup while editing all these files.

12 files changed, 12 insertions, 36 deletions

diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index 2ff57c81881..561deaf75ba 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/03/09 12:34:09 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2012/04/08 19:08:56 wiz Exp $
 #
 
 DISTNAME=		comix-4.0.4
@@ -15,11 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		unrar-[0-9]*:../../archivers/unrar
 .include "../../lang/python/extension.mk"
-.if ${PYPKGPREFIX} == "py24"
-.include "../../databases/py-sqlite2/buildlink3.mk"
-.else
 DEPENDS+=		${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-.endif
 
 MANCOMPRESSED=		yes
 
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 15a4fd50ba8..efcf28cab1f 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/03/09 12:34:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/04/08 19:08:56 wiz Exp $
 #
 
 DISTNAME=	mypaint-1.0.0
@@ -14,7 +14,6 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
 USE_LANGUAGES=	c++
 
 USE_TOOLS+=	bash:run msgfmt pkg-config
diff --git a/graphics/py-OpenGL/Makefile b/graphics/py-OpenGL/Makefile
index aec114800b0..428850d8604 100644
--- a/graphics/py-OpenGL/Makefile
+++ b/graphics/py-OpenGL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/06/14 11:17:56 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/04/08 19:08:57 wiz Exp $
 #
 
 DISTNAME=	PyOpenGL-3.0.1
@@ -15,15 +15,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PYDISTUTILSPKG=	yes
 #PY_PATCHPLIST=	YES
 
-# XXX devel/py-ctypes doesn't work, Python>=2.5's builtin ctypes is OK
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
-
 #.include "../../lang/python/egg.mk"
 .include "../../lang/python/extension.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../x11/py-Tk/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
-# XXX see above
-#.include "../../devel/py-ctypes/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 4e913795053..f42c21581f6 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2011/11/01 06:01:43 sbd Exp $
+# $NetBSD: Makefile,v 1.32 2012/04/08 19:08:57 wiz Exp $
 #
 
 DISTNAME=		py2cairo-1.8.10
@@ -23,7 +23,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 
 PKGCONFIG_OVERRIDE+=	pycairo.pc.in
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
 PY_PATCHPLIST=		yes
 
 .include "../../mk/compiler.mk"
diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile
index aaf08e849b3..6500355cc58 100644
--- a/graphics/py-clutter-gtk/Makefile
+++ b/graphics/py-clutter-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/03/03 00:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/08 19:08:58 wiz Exp $
 #
 
 DISTNAME=	pyclutter-gtk-0.10.0
@@ -13,7 +13,6 @@ COMMENT=	Python modules for Clutter-Gtk
 LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index 83fb94625aa..b8d7264b99a 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/03/03 00:12:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2012/04/08 19:08:57 wiz Exp $
 #
 
 DISTNAME=	pyclutter-1.0.2
@@ -13,7 +13,6 @@ COMMENT=	Python modules for Clutter toolkit
 LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
 
 PREV_PKGPATH=	graphics/py-pyclutter
 SUPERSEDES=	${PYPKGPREFIX}-pyclutter-[0-9]*
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index 4a4d50e2a7d..2af1ab8df3e 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2011/11/29 16:26:57 darcy Exp $
+# $NetBSD: Makefile,v 1.38 2012/04/08 19:08:58 wiz Exp $
 
 DISTNAME=	gdmodule.c
 PKGNAME=	${PYPKGPREFIX}-gd-1.3
@@ -13,7 +13,6 @@ COMMENT=	Python interface to gd graphics library
 LICENSE=	original-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PYTHON_VERSIONS_ACCEPTED=   27 26 25
 
 WRKSRC=		${WRKDIR}
 BUILD_TARGET=	default
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index 0eaf6b9158e..13402bf4f3a 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/03/03 00:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2012/04/08 19:08:58 wiz Exp $
 #
 
 DISTNAME=	pygoocanvas-0.14.1
@@ -24,10 +24,6 @@ CONFIGURE_ARGS+=	--disable-docs
 
 PY_PATCHPLIST=	yes
 
-# This restriction came from py-gtk2 and py-cairo,
-# pygoocanvas itself just require >=22.
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
-
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.10.0
diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile
index 2944a8e3716..b2b7027b0d2 100644
--- a/graphics/py-gtkglext/Makefile
+++ b/graphics/py-gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/03/03 00:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2012/04/08 19:08:58 wiz Exp $
 #
 
 DISTNAME=	pygtkglext-1.1.0
@@ -20,8 +20,6 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 PYDISTUTILSPKG=	yes
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
-
 PKGCONFIG_OVERRIDE+=	pygtkglext.pc.in
 
 .include "../../lang/python/extension.mk"
diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index 1b77708e24b..b5a3b0ab4a8 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/03/03 00:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2012/04/08 19:08:58 wiz Exp $
 #
 
 DISTNAME=		matplotlib-1.0.1
@@ -18,8 +18,6 @@ PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 USE_LANGUAGES=		c c++
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 post-patch:
 	( echo "[directories]"; \
 	echo "basedirlist=/usr"; \
diff --git a/graphics/py-sk1libs/Makefile b/graphics/py-sk1libs/Makefile
index b57d318da22..1a81fe356b8 100644
--- a/graphics/py-sk1libs/Makefile
+++ b/graphics/py-sk1libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/11/01 06:01:44 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:08:58 wiz Exp $
 
 DISTNAME=	sk1libs-0.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
 USE_LANGUAGES=		c
 PYDISTUTILSPKG=		yes
 
diff --git a/graphics/py-uniconvertor/Makefile b/graphics/py-uniconvertor/Makefile
index 6fd9cdddb68..451343fa251 100644
--- a/graphics/py-uniconvertor/Makefile
+++ b/graphics/py-uniconvertor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/03/28 18:01:40 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:08:59 wiz Exp $
 
 DISTNAME=	uniconvertor-1.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=	gnu-lgpl-v2 AND gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
 USE_LANGUAGES=		c
 PYDISTUTILSPKG=		yes