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, 14 insertions, 38 deletions

diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index 612e5ea03b8..dcc5de9c91e 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2012/03/09 12:34:04 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2012/04/08 19:08:46 wiz Exp $
 #
 
 DISTNAME=		gramps-1.0.11
@@ -21,7 +21,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		msgconv msgfmt pkg-config
 
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	25
 
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 79dd1071c84..764757145e1 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2012/03/09 12:34:04 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2012/04/08 19:08:46 wiz Exp $
 #
 
 DISTNAME=		gramps-2.2.10
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--disable-mime-install --enable-packager-mode
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 MAKE_JOBS_SAFE=		no
 # i18n support with other python versions appears to not work
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	25
 
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 GCONF_SCHEMAS+=	gramps.schemas
diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index 5f7c4fd3ff4..3c656b4c10d 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/03/09 12:34:04 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2012/04/08 19:08:46 wiz Exp $
 #
 
 DISTNAME=		gramps-3.2.6
@@ -19,8 +19,6 @@ USE_TOOLS+=		msgfmt pkg-config intltool msgconv
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 REPLACE_PYTHON=		src/DateHandler/_Date_fr.py
 REPLACE_PYTHON+=	src/plugins/quickview/Reporef.py
 REPLACE_PYTHON+=	src/plugins/rel/rel_fr.py
diff --git a/databases/py-bdb-xml/Makefile b/databases/py-bdb-xml/Makefile
index 4b14c3a05d3..f3bfcb9f151 100644
--- a/databases/py-bdb-xml/Makefile
+++ b/databases/py-bdb-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2011/10/02 15:31:22 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2012/04/08 19:08:46 wiz Exp $
 
 DISTNAME=	dbxml-2.5.16
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/db/bdb-/}
@@ -20,8 +20,6 @@ USE_LANGUAGES=		c c++
 NO_CONFIGURE=		yes
 PYDISTUTILSPKG=		yes
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 SUBST_CLASSES+=		fix-path
 SUBST_STAGE.fix-path=	pre-build
 SUBST_MESSAGE.fix-path=	Fixing library paths.
diff --git a/databases/py-cassa/Makefile b/databases/py-cassa/Makefile
index 8fdb37d19f8..70c61c2d59d 100644
--- a/databases/py-cassa/Makefile
+++ b/databases/py-cassa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/25 09:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:08:47 wiz Exp $
 
 DISTNAME=	pycassa-0.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -12,7 +12,6 @@ COMMENT=	Python client library for Cassandra
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
 PYDISTUTILSPKG=		yes
 
 .include "../../lang/python/extension.mk"
diff --git a/databases/py-ckanclient/Makefile b/databases/py-ckanclient/Makefile
index 168c3a9019b..330e39bd0cb 100644
--- a/databases/py-ckanclient/Makefile
+++ b/databases/py-ckanclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/14 05:08:53 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/08 19:08:47 wiz Exp $
 #
 
 DISTNAME=	ckanclient-0.9
@@ -15,8 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 .include "../../lang/python/pyversion.mk"
 
 .if defined(PYPKGPREFIX) && !empty(PYPKGPREFIX:Mpy25)
diff --git a/databases/py-datapkg/Makefile b/databases/py-datapkg/Makefile
index f5cc9238965..331a4bf1c3c 100644
--- a/databases/py-datapkg/Makefile
+++ b/databases/py-datapkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/14 04:48:57 dholland Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/08 19:08:47 wiz Exp $
 #
 
 DISTNAME=	datapkg-0.8
@@ -17,8 +17,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS=	datapkg-[0-9]*
 
-# because of py-ckanclient
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-elixir/Makefile b/databases/py-elixir/Makefile
index 7560df1e9c7..df2a20abdb3 100644
--- a/databases/py-elixir/Makefile
+++ b/databases/py-elixir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/25 09:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:08:47 wiz Exp $
 #
 
 DISTNAME=	Elixir-0.7.0
@@ -20,8 +20,6 @@ DEPENDS+=	${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2/
 DEPENDS+=	${PYPKGPREFIX}-amkCrypto-[0-9]*:../../security/py-amkCrypto
 
 # Python stuff
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
-
 PYDISTUTILSPKG=		yes
 
 .include "../../lang/python/egg.mk"
diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile
index f24dd3e230f..62348099319 100644
--- a/databases/py-pgnotify/Makefile
+++ b/databases/py-pgnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/08/29 21:15:18 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/08 19:08:47 wiz Exp $
 #
 
 DISTNAME=	pgnotify-0.1
@@ -14,8 +14,6 @@ COMMENT=	Python interface to PostgreSQL LISTEN/NOTIFY
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=		27 26 25 24
-
 DEPENDS+=	${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql
 
 MAKE_ENV+=		MANDIR=${PREFIX}/${PKGMANDIR}
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index ba6eb3c0058..6fa02a07a2e 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2012/02/24 02:19:05 darcy Exp $
+# $NetBSD: Makefile,v 1.62 2012/04/08 19:08:48 wiz Exp $
 
 DISTNAME=		PyGreSQL-4.0
 PKGNAME=		${PYPKGPREFIX}-postgresql-4.0
@@ -20,8 +20,6 @@ USE_TOOLS+=		gmake
 MAKE_FILE=		GNUmakefile
 MAKE_ENV+=		INSTALLED_LIBPQ=1
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25 24
-
 PY_PATCHPLIST=		yes
 PLIST_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX:Q}
 
diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile
index 3edd832d8bd..9e1009550e0 100644
--- a/databases/py-sqlite2/Makefile
+++ b/databases/py-sqlite2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/06/10 09:39:51 obache Exp $
+# $NetBSD: Makefile,v 1.25 2012/04/08 19:08:48 wiz Exp $
 
 DISTNAME=	pysqlite-2.6.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pysqlite/sqlite2/}
@@ -15,12 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../lang/python/distutils.mk"
 
-.if !defined(PYPACKAGE) || ${PYPACKAGE} != "python24"
-PLIST.python25=	yes
-.endif
-
-PLIST_VARS+=	python25
-
 do-postinstall-test: .PHONY
 	cd ${WRKDIR} && ${PYTHONBIN} -c "from pysqlite2 import test;test.test()"
 
diff --git a/databases/py-tokyocabinet/Makefile b/databases/py-tokyocabinet/Makefile
index 360f6c643d1..3a658ad1053 100644
--- a/databases/py-tokyocabinet/Makefile
+++ b/databases/py-tokyocabinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/05 08:26:17 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:08:48 wiz Exp $
 #
 
 VERSION=	0.5
@@ -14,8 +14,6 @@ LICENSE=	mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 .include "../../databases/tokyocabinet/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"