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.

7 files changed, 8 insertions, 19 deletions

diff --git a/textproc/py-FourSuite/Makefile b/textproc/py-FourSuite/Makefile
index 10736afb92e..6ca716cc92a 100644
--- a/textproc/py-FourSuite/Makefile
+++ b/textproc/py-FourSuite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2011/07/04 01:13:30 jym Exp $
+# $NetBSD: Makefile,v 1.20 2012/04/08 19:09:12 wiz Exp $
 #
 
 DISTNAME=	4Suite-0.12.0a3
@@ -17,7 +17,7 @@ CONFLICTS+=	${PYPKGPREFIX}-4Suite-*
 
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	25
 
 REPLACE_PYTHON+=	Ft/Lib/DistExt/Tools/*.py
 REPLACE_PYTHON+=	Ft/Ods/*.py
diff --git a/textproc/py-Whoosh/Makefile b/textproc/py-Whoosh/Makefile
index 54161accff2..0b3725228fa 100644
--- a/textproc/py-Whoosh/Makefile
+++ b/textproc/py-Whoosh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/02/05 13:23:54 obache Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:09:13 wiz Exp $
 #
 
 DISTNAME=	Whoosh-0.1.13
@@ -14,7 +14,6 @@ LICENSE=	apache-2.0
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# none
-PYTHON_VERSIONS_INCOMPATIBLE=	24
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-cElementTree/Makefile b/textproc/py-cElementTree/Makefile
index 5d0622e1ff9..c6137f6b47f 100644
--- a/textproc/py-cElementTree/Makefile
+++ b/textproc/py-cElementTree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/12/03 00:02:16 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2012/04/08 19:09:13 wiz Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-cElementTree-0
@@ -21,7 +21,6 @@ PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR}
 PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
-PYTHON_VERSIONS_INCOMPATIBLE=	24
 
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
diff --git a/textproc/py-cssutils/Makefile b/textproc/py-cssutils/Makefile
index 5e8187e2f90..73b8157c92d 100644
--- a/textproc/py-cssutils/Makefile
+++ b/textproc/py-cssutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/02/06 11:14:13 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:09:13 wiz Exp $
 #
 
 DISTNAME=	cssutils-0.9.7
@@ -17,8 +17,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	#none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 # all files are group/others writable.
 post-extract:
 	chmod -R go-w ${WRKSRC}
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 6ce7711279c..8d90ef3579b 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/12/16 17:22:08 marino Exp $
+# $NetBSD: Makefile,v 1.8 2012/04/08 19:09:13 wiz Exp $
 #
 
 DISTNAME=	pyenchant-1.6.5
@@ -15,9 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../lang/python/pyversion.mk"
 
-.if ${PYPACKAGE} && ${PYPACKAGE} == "python24"
-DEPENDS+=	${PYPKGPREFIX}-ctypes-[0-9]*:../../devel/py-ctypes
-.endif
 DEPENDS+=	enchant-[0-9]*:../../textproc/enchant
 
 USE_LANGUAGES=	# empty
diff --git a/textproc/py-jsonlib/Makefile b/textproc/py-jsonlib/Makefile
index 1f7ad8214d5..7cada3ce081 100644
--- a/textproc/py-jsonlib/Makefile
+++ b/textproc/py-jsonlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/25 09:47:28 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:09:14 wiz Exp $
 #
 
 DISTNAME=	jsonlib-1.6.1
@@ -15,7 +15,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index 82695d70c80..579605b0b68 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/02/04 12:42:09 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/08 19:09:14 wiz Exp $
 
 DISTNAME=	Sphinx-1.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.8.1:../../textproc/py-docutils
 DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.2:../../textproc/py-jinja2
 DEPENDS+=	${PYPKGPREFIX}-pygments>=0.8:../../textproc/py-pygments