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.

10 files changed, 14 insertions, 31 deletions

diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile
index d5797fbd693..5f9d6961b2a 100644
--- a/net/Radicale/Makefile
+++ b/net/Radicale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/03/16 04:31:14 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:09:08 wiz Exp $
 #
 
 DISTNAME=	Radicale-0.6.4
@@ -17,7 +17,7 @@ USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=			yes
 PYTHON_VERSIONS_INCLUDE_3X=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	24 25
+PYTHON_VERSIONS_INCOMPATIBLE=	25
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile
index 2d58c60e676..3a4cea51e9e 100644
--- a/net/bittorrent/Makefile
+++ b/net/bittorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2012/03/15 11:53:35 obache Exp $
+# $NetBSD: Makefile,v 1.44 2012/04/08 19:09:08 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -14,12 +14,6 @@ DEPENDS+=	${PYPKGPREFIX}-cursespanel-[0-9]*:../../devel/py-cursespanel
 
 USE_TOOLS+=	msgfmt xgettext msgmerge
 
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
-
-.if ${PYVERSSUFFIX} != "2.4"
 SUBST_CLASSES+=         sha
 SUBST_MESSAGE.sha=	Fixing references to deprecated sha module.
 SUBST_STAGE.sha=	pre-configure
@@ -35,6 +29,7 @@ SUBST_FILES.sha+=	khashmir/khashmir.py
 SUBST_FILES.sha+=	khashmir/utkhashmir.py
 SUBST_FILES.sha+=	torrentinfo-console.py
 SUBST_SED.sha=		-e "s/^from sha import .*/from hashlib import sha1 as sha/"
-.endif
 
+.include "../../lang/python/application.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/calypso/Makefile b/net/calypso/Makefile
index 3c5378a58ac..2b7764f76a7 100644
--- a/net/calypso/Makefile
+++ b/net/calypso/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/15 11:53:35 obache Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:09:09 wiz Exp $
 
 DISTNAME=	calypso-1.0
 PKGREVISION=	1
@@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=			yes
 PYTHON_VERSIONS_INCLUDE_3X=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	24 25
+PYTHON_VERSIONS_INCOMPATIBLE=	25
 
 INSTALLATION_DIRS=	share/examples/calypso
 
diff --git a/net/nmap/options.mk b/net/nmap/options.mk
index 8097532013a..523e523b403 100644
--- a/net/nmap/options.mk
+++ b/net/nmap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2011/11/22 12:18:08 pettai Exp $
+# $NetBSD: options.mk,v 1.7 2012/04/08 19:09:09 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nmap
 
@@ -20,7 +20,6 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .if !empty(PKG_OPTIONS:Mzenmap)
 CONFIGURE_ARGS+=		--with-zenmap
 PLIST_SRC+=			${PKGDIR}/PLIST.zenmap
-PYTHON_VERSIONS_ACCEPTED=	27 26 25 24
 PY_PATCHPLIST=			yes
 REPLACE_PYTHON=			zenmap/zenmapCore/*.py
 REPLACE_PYTHON+=		zenmap/zenmapGUI/*.py
@@ -38,7 +37,6 @@ CONFIGURE_ARGS+=	--without-zenmap
 .if !empty(PKG_OPTIONS:Mndiff)
 CONFIGURE_ARGS+=		--with-ndiff
 PLIST_SRC+=			${PKGDIR}/PLIST.ndiff
-PYTHON_VERSIONS_ACCEPTED=	27 26 25 24
 .else
 CONFIGURE_ARGS+=		--without-ndiff
 .endif
diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile
index 8bf0cbd4200..bc5f958a8b4 100644
--- a/net/py-IP/Makefile
+++ b/net/py-IP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/12/03 00:02:15 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2012/04/08 19:09:09 wiz Exp $
 
 DISTNAME=	IPy-0.75
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/IPy/IP/}
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYTHON_VERSIONS_INCLUDE_3X=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	24
 
 do-test:
 	${RUN}cd ${WRKSRC}/test; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test_IPy.py
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index 3bf9b77d7e6..a7634cfbbe5 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2012/03/03 00:12:27 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2012/04/08 19:09:09 wiz Exp $
 #
 
 DISTNAME=	pyorbit-2.24.0
@@ -24,7 +24,6 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 
 BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4
 BUILDLINK_API_DEPENDS.python25+= python25>=2.5.4nb2
-BUILDLINK_API_DEPENDS.python24+= python24>=2.4.5nb4
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "SunOS"
diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile
index f08f4fb1f30..ec8e5810cee 100644
--- a/net/py-boto/Makefile
+++ b/net/py-boto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/01/24 20:43:37 gson Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/08 19:09:09 wiz Exp $
 #
 
 DISTNAME=	boto-1.9b
@@ -14,8 +14,6 @@ LICENSE=	mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
-
 REPLACE_PYTHON+=	boto/*/*.py
 
 .include "../../lang/python/application.mk"
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index a273b60c761..64ac796b42c 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/02/06 00:25:42 jakllsch Exp $
+# $NetBSD: Makefile,v 1.7 2012/04/08 19:09:10 wiz Exp $
 
 DISTNAME=	s3cmd-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,9 +17,6 @@ MAKE_ENV+=		S3CMD_INSTPATH_MAN=${PKGMANDIR}
 .include "../../lang/python/pyversion.mk"
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.if ${PYPKGPREFIX} == "py24"
-DEPENDS+=	${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree
-.endif
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/net/py-zmq/Makefile b/net/py-zmq/Makefile
index 0eb481f0c55..e16abcbfb2e 100644
--- a/net/py-zmq/Makefile
+++ b/net/py-zmq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/03/05 08:12:38 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:09:10 wiz Exp $
 #
 
 DISTNAME=	pyzmq-2.1.10
@@ -14,8 +14,6 @@ LICENSE=	gnu-lgpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 .include "../../lang/python/distutils.mk"
 .include "../../net/zeromq/buildlink3.mk"
 
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index ef52f38a8ef..65e17126595 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/03/15 11:53:36 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/04/08 19:09:10 wiz Exp $
 #
 
 DISTNAME=		scapy-2.1.1
@@ -17,7 +17,6 @@ DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BUILD=			yes
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
 
 .include "options.mk"