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.

14 files changed, 15 insertions, 51 deletions

diff --git a/www/loggerhead/Makefile b/www/loggerhead/Makefile
index b1a75a3d061..e4fa9fbbc94 100644
--- a/www/loggerhead/Makefile
+++ b/www/loggerhead/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/15 11:53:44 obache Exp $
+# $NetBSD: Makefile,v 1.10 2012/04/08 19:09:15 wiz Exp $
 
 DISTNAME=	loggerhead-${VER}
 PKGREVISION=	1
@@ -15,19 +15,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	bzr>=1.17:../../devel/bzr
 DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.0:../../converters/py-simplejson
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-Paste>=1.2:../../www/py-paste
 DEPENDS+=	${PYPKGPREFIX}-PasteDeploy>=1.3:../../www/py-PasteDeploy
 DEPENDS+=	${PYPKGPREFIX}-SimpleTAL>=4.1:../../www/py-simpletal
 DEPENDS+=	${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
 
 .include "../../lang/python/pyversion.mk"
-
-.if defined(PYPACKAGE) && ${PYPACKAGE} == "python24"
-DEPENDS+=	${PYPKGPREFIX}-sqlite2>=2:../../databases/py-sqlite2
-.else
-DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-.endif
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-blosxom/Makefile b/www/py-blosxom/Makefile
index d5816bce6a7..b915db761cc 100644
--- a/www/py-blosxom/Makefile
+++ b/www/py-blosxom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/01/27 07:04:52 obache Exp $
+# $NetBSD: Makefile,v 1.10 2012/04/08 19:09:15 wiz Exp $
 #
 
 PYBLOXSOMVERS=	1.5.2
@@ -15,8 +15,6 @@ LICENSE=	mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 DIST_SUBDIR=	${DISTNAME}	# upstream reissued tarball with no changes
 
 USE_LANGUAGES=	#none
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index fc16eef5fc8..4487a1aa1e2 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/24 21:06:38 gls Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/08 19:09:15 wiz Exp $
 
 DISTNAME=	CherryPy-3.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -18,8 +18,6 @@ EGG_NAME=		${DISTNAME}
 REPLACE_PYTHON=		cherrypy/cherryd
 REPLACE_PYTHON+=	cherrypy/test/sessiondemo.py
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile
index aaa98910473..ca8d17e3208 100644
--- a/www/py-django-classy-tags/Makefile
+++ b/www/py-django-classy-tags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/01/08 07:54:09 adam Exp $
+# $NetBSD: Makefile,v 1.5 2012/04/08 19:09:15 wiz Exp $
 
 DISTNAME=	django-classy-tags-0.3.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 EGG_NAME=		${DISTNAME:S/-/_/:S/-/_/}
 USE_LANGUAGES=		# empty
 
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index d0613b1e599..f8c234a1220 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/01/08 07:56:58 adam Exp $
+# $NetBSD: Makefile,v 1.8 2012/04/08 19:09:16 wiz Exp $
 
 DISTNAME=	django-cms-2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 EGG_NAME=		${DISTNAME:S/-/_/}
 USE_LANGUAGES=		# empty
 
diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index ba59eeef870..0b8e8608d34 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/10 19:49:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:09:16 wiz Exp $
 
 DISTNAME=	django-sekizai-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 USE_LANGUAGES=		# empty
 EGG_NAME=		${DISTNAME:S/-/_/}
 
diff --git a/www/py-djangorestframework/Makefile b/www/py-djangorestframework/Makefile
index 25ae7559be9..212414e3fc3 100644
--- a/www/py-djangorestframework/Makefile
+++ b/www/py-djangorestframework/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/09/12 08:21:29 adam Exp $
+# $NetBSD: Makefile,v 1.2 2012/04/08 19:09:16 wiz Exp $
 
 DISTNAME=	djangorestframework-0.2.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 EGG_NAME=		${DISTNAME}
 USE_LANGUAGES=		# empty
 
diff --git a/www/py-gdata/Makefile b/www/py-gdata/Makefile
index 7f2175c323a..923352c43cb 100644
--- a/www/py-gdata/Makefile
+++ b/www/py-gdata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/01/27 06:30:21 obache Exp $
+# $NetBSD: Makefile,v 1.10 2012/04/08 19:09:16 wiz Exp $
 
 DISTNAME=	gdata-2.0.16
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -126,8 +126,6 @@ REPLACE_PYTHON+=	src/gdata/youtube/client.py
 REPLACE_PYTHON+=	src/gdata/youtube/data.py
 REPLACE_PYTHON+=	src/gdata/youtube/service.py
 
-# 2.0.16 introduced a neologism
-PYTHON_VERSIONS_INCOMPATIBLE=	24
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile
index cca5ebaec10..e3f3b86758c 100644
--- a/www/py-mechanize/Makefile
+++ b/www/py-mechanize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/11/26 09:18:25 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/04/08 19:09:16 wiz Exp $
 #
 
 DISTNAME=	mechanize-0.2.5
@@ -15,8 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25 24
-
 do-test:
 	${RUN}cd ${WRKSRC}; ${PYTHONBIN} test.py
 
diff --git a/www/py-moin/Makefile b/www/py-moin/Makefile
index e0a7bf3dd30..eabd03a513d 100644
--- a/www/py-moin/Makefile
+++ b/www/py-moin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/01/27 05:52:40 obache Exp $
+# $NetBSD: Makefile,v 1.18 2012/04/08 19:09:17 wiz Exp $
 #
 
 VER=		1.9.3
@@ -15,13 +15,8 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-#Only for Python 2.4, which isn't recommended anyway
-#DEPENDS+=	${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml
-
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25 24
-
 REPLACE_PYTHON=	MoinMoin/i18n/tools/markup15to16.py \
 		MoinMoin/i18n/tools/po2wiki.py \
 		MoinMoin/i18n/tools/prepend.py \
diff --git a/www/py-pendrell/Makefile b/www/py-pendrell/Makefile
index 3001ab29e51..c2b25c30143 100644
--- a/www/py-pendrell/Makefile
+++ b/www/py-pendrell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/25 09:47:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:09:17 wiz Exp $
 #
 
 DISTNAME=	pendrell-0.2.3
@@ -12,7 +12,6 @@ COMMENT=	HTTP/1.1 User Agent for the Programmable Web
 LICENSE=	mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile
index 2033f22ed16..e95b40ecbcf 100644
--- a/www/py-uwsgi/Makefile
+++ b/www/py-uwsgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/01/09 07:08:25 sbd Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/08 19:09:17 wiz Exp $
 
 DISTNAME=	uwsgi-0.9.8.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,8 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.6c9:../../devel/py-setuptools
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 USE_LANGUAGES=		c
 PYDISTUTILSPKG=		yes
 
diff --git a/www/py-webpy/Makefile b/www/py-webpy/Makefile
index e5644ddf045..e5c1660f897 100644
--- a/www/py-webpy/Makefile
+++ b/www/py-webpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/01/26 09:14:09 obache Exp $
+# $NetBSD: Makefile,v 1.10 2012/04/08 19:09:17 wiz Exp $
 #
 
 DISTNAME=		web.py-0.36
@@ -16,7 +16,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		#none
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/trac/Makefile b/www/trac/Makefile
index df86157bdb2..2645067ef02 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2012/03/15 11:53:44 obache Exp $
+# $NetBSD: Makefile,v 1.57 2012/04/08 19:09:17 wiz Exp $
 #
 
 DISTNAME=	Trac-0.12.3
@@ -57,12 +57,8 @@ PYTHON_PATCH_SCRIPTS+=	trac/tests/functional/*.py
 .include "../../lang/python/application.mk"
 
 .if !empty(PKG_OPTIONS:Msqlite)
-.if defined(PYPACKAGE) && ${PYPACKAGE} == "python24"
-DEPENDS+=	${PYPKGPREFIX}-sqlite2>=2:../../databases/py-sqlite2
-.else
 DEPENDS+=	${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
 .endif
-.endif
 # trac 0.12 dropped support for py-PgSQL.  Switching to py-psycopg2 with
 # an existing database that used to be accessed by py-PgSQL worked.
 .if !empty(PKG_OPTIONS:Mpsycopg2)