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.

31 files changed, 28 insertions, 342 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 77ad712e8ca..32c928d055c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1583 2012/03/29 07:34:56 wiz Exp $
+# $NetBSD: Makefile,v 1.1584 2012/04/08 19:08:49 wiz Exp $
 #
 
 COMMENT=	Development utilities
@@ -1263,7 +1263,6 @@ SUBDIR+=	py-checker
 SUBDIR+=	py-cheetah
 SUBDIR+=	py-compizconfig
 SUBDIR+=	py-coverage
-SUBDIR+=	py-ctypes
 SUBDIR+=	py-curses
 SUBDIR+=	py-cursespanel
 SUBDIR+=	py-cython
diff --git a/devel/boost-python/Makefile b/devel/boost-python/Makefile
index 562ed65005e..2de0975a876 100644
--- a/devel/boost-python/Makefile
+++ b/devel/boost-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/03/15 11:53:23 obache Exp $
+# $NetBSD: Makefile,v 1.21 2012/04/08 19:08:49 wiz Exp $
 
 BOOST_PACKAGE=		python
 PKGREVISION=		1
@@ -12,7 +12,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 BJAM_ARGS+=		--user-config=${WRKSRC}/user-config.jam
 BJAM_ARGS+=		--with-python
 MAKE_ENV+=		BOOST_BUILD_PATH=${WRKSRC}
-PYTHON_VERSIONS_ACCEPTED=	27 27 26 25
 
 .include "../../devel/boost-jam/bjam.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index e71f6fe2254..fb9f34d137e 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/03/15 11:53:23 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/08 19:08:49 wiz Exp $
 
 DISTNAME=	coccinelle-0.2.5
 PKGREVISION=	2
@@ -25,8 +25,6 @@ BUILD_TARGET=	all all.opt
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIG_SHELL=	${PERL5}
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25 24
-
 SUBST_CLASSES+=		man
 SUBST_FILES.man+=	configure
 SUBST_SED.man+=		-e "s,$${prefix}/man,$${prefix}/${PKGMANDIR},g"
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 5689b65739f..c0480012103 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/03/10 08:24:19 obache Exp $
+# $NetBSD: Makefile,v 1.19 2012/04/08 19:08:50 wiz Exp $
 #
 
 DISTNAME=	gobject-introspection-1.30.0
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=	--disable-tests
 
 PKGCONFIG_OVERRIDE+=	gobject-introspection-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	gobject-introspection-no-export-1.0.pc.in
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
 
 SUBST_CLASSES+=	timet
 SUBST_STAGE.timet=	pre-configure
diff --git a/devel/lettuce/Makefile b/devel/lettuce/Makefile
index edcf0797b9b..c32f186f316 100644
--- a/devel/lettuce/Makefile
+++ b/devel/lettuce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/10/21 12:35:30 reed Exp $
+# $NetBSD: Makefile,v 1.2 2012/04/08 19:08:50 wiz Exp $
 #
 
 DISTNAME=	lettuce-0.1.33
@@ -14,9 +14,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 
-# not ported yet
-PYTHON_VERSIONS_INCOMPATIBLE=	31
-
 .include "../../lang/python/egg.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index cc8b2f83b5a..a024d476edb 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/03/15 11:53:24 obache Exp $
+# $NetBSD: Makefile,v 1.31 2012/04/08 19:08:50 wiz Exp $
 #
 
 DISTNAME=		meld-1.5.3
@@ -16,8 +16,6 @@ DEPENDS+=		${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 USE_PKGLOCALEDIR=		YES
 USE_TOOLS+=			gmake msgfmt intltool
 MAKE_FLAGS+=			prefix=${PREFIX}
diff --git a/devel/py-Pyro/Makefile b/devel/py-Pyro/Makefile
index e9b5399aeb8..809116e0334 100644
--- a/devel/py-Pyro/Makefile
+++ b/devel/py-Pyro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/03/10 19:47:24 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/08 19:08:50 wiz Exp $
 #
 
 DISTNAME=		Pyro4-4.12
@@ -13,8 +13,6 @@ LICENSE=		mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 # only needed for test
 #DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 #DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
index a688c6dd323..09dde4f5639 100644
--- a/devel/py-at-spi/Makefile
+++ b/devel/py-at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/01/29 08:59:46 obache Exp $
+# $NetBSD: Makefile,v 1.24 2012/04/08 19:08:50 wiz Exp $
 #
 
 DISTNAME=		at-spi-1.32.0
@@ -22,7 +22,6 @@ USE_LANGUAGES=		#none
 
 NO_BUILD=	yes
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
 
 PYATSPIDIR=		${PREFIX}/${PYSITELIB}/pyatspi
 INSTALLATION_DIRS=	${PYATSPIDIR}
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 2ce99d45598..620981f278d 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/04/08 12:54:20 adam Exp $
+# $NetBSD: Makefile,v 1.13 2012/04/08 19:08:51 wiz Exp $
 
 DISTNAME=	Cheetah-2.4.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,8 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=	Cheetah-[0-9]*
 DEPENDS+=	${PYPKGPREFIX}-markdown>=2.0.1:../../textproc/py-markdown
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 USE_LANGUAGES=		c
 
 .include "../../lang/python/egg.mk"
diff --git a/devel/py-compizconfig/Makefile b/devel/py-compizconfig/Makefile
index 91ec5af8177..7dc0bacc427 100644
--- a/devel/py-compizconfig/Makefile
+++ b/devel/py-compizconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/03/03 00:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/04/08 19:08:51 wiz Exp $
 #
 
 PKGVER=			0.8.4
@@ -19,8 +19,6 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config gmake
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 PY_PATCHPLIST=		yes
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex
diff --git a/devel/py-ctypes/DESCR b/devel/py-ctypes/DESCR
deleted file mode 100644
index c24a42dc6ea..00000000000
--- a/devel/py-ctypes/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-ctypes is an advanced ffi (Foreign Function Interface) package for Python
-2.3 and higher.
-
-ctypes allows to call functions exposed from dlls/shared libraries and
-has extensive facilities to create, access and manipulate simple and
-complicated C data types in Python - in other words: wrap libraries in
-pure Python.  It is even possible to implement C callback functions in
-pure Python.
diff --git a/devel/py-ctypes/Makefile b/devel/py-ctypes/Makefile
deleted file mode 100644
index be721f69576..00000000000
--- a/devel/py-ctypes/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2012/01/28 09:12:03 obache Exp $
-
-DISTNAME=	ctypes-1.0.2
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
-CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ctypes/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://starship.python.net/crew/theller/ctypes/
-COMMENT=	Foreign Function Interface package for Python
-LICENSE=	mit
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-PYTHON_VERSIONS_ACCEPTED=	24
-
-do-test:
-	${PYTHONBIN} ${WRKSRC}/ctypes/test/runtests.py
-
-.include "../../devel/libffi/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-ctypes/PLIST b/devel/py-ctypes/PLIST
deleted file mode 100644
index 2f00068a08b..00000000000
--- a/devel/py-ctypes/PLIST
+++ /dev/null
@@ -1,172 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2011/10/15 11:40:00 obache Exp $
-${PYSITELIB}/_ctypes.so
-${PYSITELIB}/_ctypes_test.so
-${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}
-${PYSITELIB}/ctypes/__init__.py
-${PYSITELIB}/ctypes/__init__.pyc
-${PYSITELIB}/ctypes/__init__.pyo
-${PYSITELIB}/ctypes/_endian.py
-${PYSITELIB}/ctypes/_endian.pyc
-${PYSITELIB}/ctypes/_endian.pyo
-${PYSITELIB}/ctypes/macholib/__init__.py
-${PYSITELIB}/ctypes/macholib/__init__.pyc
-${PYSITELIB}/ctypes/macholib/__init__.pyo
-${PYSITELIB}/ctypes/macholib/dyld.py
-${PYSITELIB}/ctypes/macholib/dyld.pyc
-${PYSITELIB}/ctypes/macholib/dyld.pyo
-${PYSITELIB}/ctypes/macholib/dylib.py
-${PYSITELIB}/ctypes/macholib/dylib.pyc
-${PYSITELIB}/ctypes/macholib/dylib.pyo
-${PYSITELIB}/ctypes/macholib/framework.py
-${PYSITELIB}/ctypes/macholib/framework.pyc
-${PYSITELIB}/ctypes/macholib/framework.pyo
-${PYSITELIB}/ctypes/test/__init__.py
-${PYSITELIB}/ctypes/test/__init__.pyc
-${PYSITELIB}/ctypes/test/__init__.pyo
-${PYSITELIB}/ctypes/test/runtests.py
-${PYSITELIB}/ctypes/test/runtests.pyc
-${PYSITELIB}/ctypes/test/runtests.pyo
-${PYSITELIB}/ctypes/test/test_anon.py
-${PYSITELIB}/ctypes/test/test_anon.pyc
-${PYSITELIB}/ctypes/test/test_anon.pyo
-${PYSITELIB}/ctypes/test/test_array_in_pointer.py
-${PYSITELIB}/ctypes/test/test_array_in_pointer.pyc
-${PYSITELIB}/ctypes/test/test_array_in_pointer.pyo
-${PYSITELIB}/ctypes/test/test_arrays.py
-${PYSITELIB}/ctypes/test/test_arrays.pyc
-${PYSITELIB}/ctypes/test/test_arrays.pyo
-${PYSITELIB}/ctypes/test/test_as_parameter.py
-${PYSITELIB}/ctypes/test/test_as_parameter.pyc
-${PYSITELIB}/ctypes/test/test_as_parameter.pyo
-${PYSITELIB}/ctypes/test/test_bitfields.py
-${PYSITELIB}/ctypes/test/test_bitfields.pyc
-${PYSITELIB}/ctypes/test/test_bitfields.pyo
-${PYSITELIB}/ctypes/test/test_buffers.py
-${PYSITELIB}/ctypes/test/test_buffers.pyc
-${PYSITELIB}/ctypes/test/test_buffers.pyo
-${PYSITELIB}/ctypes/test/test_byteswap.py
-${PYSITELIB}/ctypes/test/test_byteswap.pyc
-${PYSITELIB}/ctypes/test/test_byteswap.pyo
-${PYSITELIB}/ctypes/test/test_callbacks.py
-${PYSITELIB}/ctypes/test/test_callbacks.pyc
-${PYSITELIB}/ctypes/test/test_callbacks.pyo
-${PYSITELIB}/ctypes/test/test_cast.py
-${PYSITELIB}/ctypes/test/test_cast.pyc
-${PYSITELIB}/ctypes/test/test_cast.pyo
-${PYSITELIB}/ctypes/test/test_cfuncs.py
-${PYSITELIB}/ctypes/test/test_cfuncs.pyc
-${PYSITELIB}/ctypes/test/test_cfuncs.pyo
-${PYSITELIB}/ctypes/test/test_checkretval.py
-${PYSITELIB}/ctypes/test/test_checkretval.pyc
-${PYSITELIB}/ctypes/test/test_checkretval.pyo
-${PYSITELIB}/ctypes/test/test_errcheck.py
-${PYSITELIB}/ctypes/test/test_errcheck.pyc
-${PYSITELIB}/ctypes/test/test_errcheck.pyo
-${PYSITELIB}/ctypes/test/test_find.py
-${PYSITELIB}/ctypes/test/test_find.pyc
-${PYSITELIB}/ctypes/test/test_find.pyo
-${PYSITELIB}/ctypes/test/test_funcptr.py
-${PYSITELIB}/ctypes/test/test_funcptr.pyc
-${PYSITELIB}/ctypes/test/test_funcptr.pyo
-${PYSITELIB}/ctypes/test/test_functions.py
-${PYSITELIB}/ctypes/test/test_functions.pyc
-${PYSITELIB}/ctypes/test/test_functions.pyo
-${PYSITELIB}/ctypes/test/test_incomplete.py
-${PYSITELIB}/ctypes/test/test_incomplete.pyc
-${PYSITELIB}/ctypes/test/test_incomplete.pyo
-${PYSITELIB}/ctypes/test/test_init.py
-${PYSITELIB}/ctypes/test/test_init.pyc
-${PYSITELIB}/ctypes/test/test_init.pyo
-${PYSITELIB}/ctypes/test/test_integers.py
-${PYSITELIB}/ctypes/test/test_integers.pyc
-${PYSITELIB}/ctypes/test/test_integers.pyo
-${PYSITELIB}/ctypes/test/test_internals.py
-${PYSITELIB}/ctypes/test/test_internals.pyc
-${PYSITELIB}/ctypes/test/test_internals.pyo
-${PYSITELIB}/ctypes/test/test_keeprefs.py
-${PYSITELIB}/ctypes/test/test_keeprefs.pyc
-${PYSITELIB}/ctypes/test/test_keeprefs.pyo
-${PYSITELIB}/ctypes/test/test_libc.py
-${PYSITELIB}/ctypes/test/test_libc.pyc
-${PYSITELIB}/ctypes/test/test_libc.pyo
-${PYSITELIB}/ctypes/test/test_loading.py
-${PYSITELIB}/ctypes/test/test_loading.pyc
-${PYSITELIB}/ctypes/test/test_loading.pyo
-${PYSITELIB}/ctypes/test/test_macholib.py
-${PYSITELIB}/ctypes/test/test_macholib.pyc
-${PYSITELIB}/ctypes/test/test_macholib.pyo
-${PYSITELIB}/ctypes/test/test_memfunctions.py
-${PYSITELIB}/ctypes/test/test_memfunctions.pyc
-${PYSITELIB}/ctypes/test/test_memfunctions.pyo
-${PYSITELIB}/ctypes/test/test_numbers.py
-${PYSITELIB}/ctypes/test/test_numbers.pyc
-${PYSITELIB}/ctypes/test/test_numbers.pyo
-${PYSITELIB}/ctypes/test/test_objects.py
-${PYSITELIB}/ctypes/test/test_objects.pyc
-${PYSITELIB}/ctypes/test/test_objects.pyo
-${PYSITELIB}/ctypes/test/test_parameters.py
-${PYSITELIB}/ctypes/test/test_parameters.pyc
-${PYSITELIB}/ctypes/test/test_parameters.pyo
-${PYSITELIB}/ctypes/test/test_pointers.py
-${PYSITELIB}/ctypes/test/test_pointers.pyc
-${PYSITELIB}/ctypes/test/test_pointers.pyo
-${PYSITELIB}/ctypes/test/test_prototypes.py
-${PYSITELIB}/ctypes/test/test_prototypes.pyc
-${PYSITELIB}/ctypes/test/test_prototypes.pyo
-${PYSITELIB}/ctypes/test/test_python_api.py
-${PYSITELIB}/ctypes/test/test_python_api.pyc
-${PYSITELIB}/ctypes/test/test_python_api.pyo
-${PYSITELIB}/ctypes/test/test_random_things.py
-${PYSITELIB}/ctypes/test/test_random_things.pyc
-${PYSITELIB}/ctypes/test/test_random_things.pyo
-${PYSITELIB}/ctypes/test/test_refcounts.py
-${PYSITELIB}/ctypes/test/test_refcounts.pyc
-${PYSITELIB}/ctypes/test/test_refcounts.pyo
-${PYSITELIB}/ctypes/test/test_repr.py
-${PYSITELIB}/ctypes/test/test_repr.pyc
-${PYSITELIB}/ctypes/test/test_repr.pyo
-${PYSITELIB}/ctypes/test/test_returnfuncptrs.py
-${PYSITELIB}/ctypes/test/test_returnfuncptrs.pyc
-${PYSITELIB}/ctypes/test/test_returnfuncptrs.pyo
-${PYSITELIB}/ctypes/test/test_simplesubclasses.py
-${PYSITELIB}/ctypes/test/test_simplesubclasses.pyc
-${PYSITELIB}/ctypes/test/test_simplesubclasses.pyo
-${PYSITELIB}/ctypes/test/test_sizes.py
-${PYSITELIB}/ctypes/test/test_sizes.pyc
-${PYSITELIB}/ctypes/test/test_sizes.pyo
-${PYSITELIB}/ctypes/test/test_slicing.py
-${PYSITELIB}/ctypes/test/test_slicing.pyc
-${PYSITELIB}/ctypes/test/test_slicing.pyo
-${PYSITELIB}/ctypes/test/test_stringptr.py
-${PYSITELIB}/ctypes/test/test_stringptr.pyc
-${PYSITELIB}/ctypes/test/test_stringptr.pyo
-${PYSITELIB}/ctypes/test/test_strings.py
-${PYSITELIB}/ctypes/test/test_strings.pyc
-${PYSITELIB}/ctypes/test/test_strings.pyo
-${PYSITELIB}/ctypes/test/test_struct_fields.py
-${PYSITELIB}/ctypes/test/test_struct_fields.pyc
-${PYSITELIB}/ctypes/test/test_struct_fields.pyo
-${PYSITELIB}/ctypes/test/test_structures.py
-${PYSITELIB}/ctypes/test/test_structures.pyc
-${PYSITELIB}/ctypes/test/test_structures.pyo
-${PYSITELIB}/ctypes/test/test_unaligned_structures.py
-${PYSITELIB}/ctypes/test/test_unaligned_structures.pyc
-${PYSITELIB}/ctypes/test/test_unaligned_structures.pyo
-${PYSITELIB}/ctypes/test/test_unicode.py
-${PYSITELIB}/ctypes/test/test_unicode.pyc
-${PYSITELIB}/ctypes/test/test_unicode.pyo
-${PYSITELIB}/ctypes/test/test_values.py
-${PYSITELIB}/ctypes/test/test_values.pyc
-${PYSITELIB}/ctypes/test/test_values.pyo
-${PYSITELIB}/ctypes/test/test_varsize_struct.py
-${PYSITELIB}/ctypes/test/test_varsize_struct.pyc
-${PYSITELIB}/ctypes/test/test_varsize_struct.pyo
-${PYSITELIB}/ctypes/test/test_win32.py
-${PYSITELIB}/ctypes/test/test_win32.pyc
-${PYSITELIB}/ctypes/test/test_win32.pyo
-${PYSITELIB}/ctypes/util.py
-${PYSITELIB}/ctypes/util.pyc
-${PYSITELIB}/ctypes/util.pyo
-${PYSITELIB}/ctypes/wintypes.py
-${PYSITELIB}/ctypes/wintypes.pyc
-${PYSITELIB}/ctypes/wintypes.pyo
diff --git a/devel/py-ctypes/distinfo b/devel/py-ctypes/distinfo
deleted file mode 100644
index 83c0a56c3a9..00000000000
--- a/devel/py-ctypes/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2009/03/20 17:52:53 joerg Exp $
-
-SHA1 (ctypes-1.0.2.tar.gz) = 7f77f2b507a50f292297831ee50e310037398e14
-RMD160 (ctypes-1.0.2.tar.gz) = f8b74c2f9b5646edc916565dd22c51d8819cd6b8
-Size (ctypes-1.0.2.tar.gz) = 385155 bytes
-SHA1 (patch-ac) = 5c20e3645eef184991426c8975a2fe726ecbf517
-SHA1 (patch-ad) = d5e9729d21bdd692535467e7208aca46d27ab8e1
diff --git a/devel/py-ctypes/patches/patch-ac b/devel/py-ctypes/patches/patch-ac
deleted file mode 100644
index 322051f0f8e..00000000000
--- a/devel/py-ctypes/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/09/17 16:20:21 joerg Exp $
-
---- setup.py.orig	2007-05-15 19:53:16.000000000 +0200
-+++ setup.py
-@@ -35,8 +35,7 @@ from distutils.cygwinccompiler import Mi
- ################################################################
- # Manipulate the environment for the build process.
- #
--if get_platform() in ["solaris-2.9-sun4u", "linux-x86_64"]:
--    os.environ["CFLAGS"] = "-fPIC"
-+os.environ["CFLAGS"] = "-fPIC"
- 
- if sys.platform == "win32" and "64 bit (AMD64)" in sys.version:
-     os.environ["DISTUTILS_USE_SDK"] = "1"
-@@ -125,8 +124,6 @@ class my_build_ext(build_ext.build_ext):
- 
-     # First configure a libffi library, then build the _ctypes extension.
-     def build_extensions(self):
--        self.configure_libffi()
--
-         # Add .S (preprocessed assembly) to C compiler source extensions.
-         self.compiler.src_extensions.append('.S')
-         if sys.platform == "win32":
-@@ -321,6 +318,7 @@ else:
-         extra_link_args.extend(['-mimpure-text'])
- 
-     extensions = [Extension("_ctypes",
-+			    libraries = ["ffi"],
-                             include_dirs=include_dirs,
-                             library_dirs=library_dirs,
-                             extra_link_args=extra_link_args,
diff --git a/devel/py-ctypes/patches/patch-ad b/devel/py-ctypes/patches/patch-ad
deleted file mode 100644
index 1744bebdba1..00000000000
--- a/devel/py-ctypes/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/09/17 16:20:21 joerg Exp $
-
---- ctypes/test/test_python_api.py.orig	2008-09-17 16:57:53.000000000 +0200
-+++ ctypes/test/test_python_api.py
-@@ -66,12 +66,15 @@ class PythonAPITestCase(unittest.TestCas
- 
-     def test_PyOS_snprintf(self):
-         PyOS_snprintf = pythonapi.PyOS_snprintf
--        PyOS_snprintf.argtypes = POINTER(c_char), c_int, c_char_p
-+        PyOS_snprintf.argtypes = POINTER(c_char), c_size_t, c_char_p
- 
-         buf = c_buffer(256)
-         PyOS_snprintf(buf, sizeof(buf), "Hello from %s", "ctypes")
-         self.failUnlessEqual(buf.value, "Hello from ctypes")
- 
-+	return
-+	# XXX no idea why this is failing
-+
-         PyOS_snprintf(buf, sizeof(buf), "Hello from %s", "ctypes", 1, 2, 3)
-         self.failUnlessEqual(buf.value, "Hello from ctypes")
- 
diff --git a/devel/py-cython/Makefile b/devel/py-cython/Makefile
index 30e940be609..50c7fc9a331 100644
--- a/devel/py-cython/Makefile
+++ b/devel/py-cython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/25 09:47:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:08:52 wiz Exp $
 #
 
 DISTNAME=	Cython-0.13
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=	c
 PYDISTUTILSPKG= yes
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-extract:
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 091ad2d440b..a7bb988525d 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2012/03/03 00:11:56 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2012/04/08 19:08:53 wiz Exp $
 #
 
 PKGNAME=		${PYPKGPREFIX}-gobject-2.28.6
@@ -8,8 +8,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-
 SUBST_CLASSES+=		codegen
 SUBST_STAGE.codegen=	pre-configure
 SUBST_FILES.codegen=	dsextras.py
diff --git a/devel/py-logilab-astng/Makefile b/devel/py-logilab-astng/Makefile
index 1924d000e81..6d9d059c2ec 100644
--- a/devel/py-logilab-astng/Makefile
+++ b/devel/py-logilab-astng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/25 09:47:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:08:53 wiz Exp $
 #
 
 VERSION=	0.21.0
@@ -17,8 +17,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25 24
-
 do-test:
 	cd ${WRKSRC} && ${SH} test/fulltest.sh ${PYVERSSUFFIX}
 
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index bb055e9f0ce..3405f5cce8f 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/25 09:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:08:53 wiz Exp $
 #
 
 VERS=			0.53.0
@@ -15,8 +15,6 @@ LICENSE=		gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=			user-destdir
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25 24
-
 #comment this out to avoid problems to find the binary by other programs
 PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}
 
diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile
index 02198fd4743..c718cc33f7e 100644
--- a/devel/py-msgpack/Makefile
+++ b/devel/py-msgpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/12/03 00:02:15 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2012/04/08 19:08:53 wiz Exp $
 #
 
 DISTNAME=	msgpack-python-0.1.10
@@ -17,8 +17,6 @@ PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 EGG_NAME=	${DISTNAME:S/-/_/}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 .include "../../devel/msgpack/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-multiprocessing/Makefile b/devel/py-multiprocessing/Makefile
index 50d8b1bf489..3142ea73b2a 100644
--- a/devel/py-multiprocessing/Makefile
+++ b/devel/py-multiprocessing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/10/03 00:02:46 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:08:53 wiz Exp $
 #
 
 DISTNAME=	multiprocessing-2.6.2.1
@@ -15,13 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# Does not like netbsd's mremap()
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-.endif
-
 do-test:
 	${PYTHONBIN} -c "from multiprocessing import tests;tests.test_main()"
 
diff --git a/devel/py-pysvn/Makefile b/devel/py-pysvn/Makefile
index 01dd822550a..9df06cc0a96 100644
--- a/devel/py-pysvn/Makefile
+++ b/devel/py-pysvn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/28 12:39:47 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2012/04/08 19:08:53 wiz Exp $
 #
 
 VERS=			1.7.5
@@ -37,7 +37,7 @@ BUILDLINK_TRANSFORM+=	rm:-lresolv
 .include "../../lang/python/pyversion.mk"
 
 do-configure:
-.if ${PYVERSSUFFIX} == "2.5" || ${PYVERSSUFFIX} == "2.4"
+.if ${PYVERSSUFFIX} == "2.5"
 	cd ${WRKSRC}/${PSVNSRC} && ${PYTHONBIN} ${PYSETUP} backport
 .endif
 	cd ${WRKSRC}/${PSVNSRC} && \
diff --git a/devel/py-pytemplate/Makefile b/devel/py-pytemplate/Makefile
index 25454465e48..1a086d1d2aa 100644
--- a/devel/py-pytemplate/Makefile
+++ b/devel/py-pytemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/10/14 06:27:42 obache Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/08 19:08:54 wiz Exp $
 #
 
 DISTNAME=	pytemplate-1.5.1
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=		user-destdir
 
 USE_LANGUAGES=			# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	31
 REPLACE_PYTHON=			${WRKSRC}/*.py
 
 EGDIR=				${PREFIX}/share/examples/${PYPKGPREFIX}-pytemplate
diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile
index 1ddf558bd6b..3256e9b66cf 100644
--- a/devel/py-readline/Makefile
+++ b/devel/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/12/03 00:02:15 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2012/04/08 19:08:54 wiz Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-readline-0
@@ -30,7 +30,6 @@ do-patch:
 	${PATCH} --batch <$$f || true; \
 	done)
 
-BUILDLINK_API_DEPENDS.python24+=	python24>=2.4.5nb1
 BUILDLINK_API_DEPENDS.python25+=	python25>=2.5.2nb2
 
 .include "../../devel/readline/buildlink3.mk"
diff --git a/devel/py-rope/Makefile b/devel/py-rope/Makefile
index 8f42d2e6841..d926da18e8b 100644
--- a/devel/py-rope/Makefile
+++ b/devel/py-rope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/25 09:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:08:54 wiz Exp $
 #
 
 VERS=		0.9.3
@@ -14,8 +14,6 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
-
 # XXX tests in contrib.codeassisttest fail
 do-test:
 	cd ${WRKSRC} && ${PYTHONBIN} setup.py test
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 70f7f8c3731..a58e3bc936a 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/09/04 15:57:16 tron Exp $
+# $NetBSD: Makefile,v 1.19 2012/04/08 19:08:54 wiz Exp $
 
 EGG_VERSION=		0.6c11
 DISTNAME=		setuptools-${EGG_VERSION}
@@ -36,16 +36,7 @@ PYSETUPINSTALLARGS+=	--root=/
 FILES_SUBST+=	PYSITELIB=${PREFIX}/${PYSITELIB}
 FILES_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-PLIST_VARS+=	py24 py25
-
-.if ${PYPKGPREFIX} == "py24"
-PLIST.py24=		yes
-.else
-PLIST.py25=		yes
-.endif
-
-.if ${OPSYS} == "Darwin" && \
-    (${PYPKGPREFIX} != "py24" && ${PYPKGPREFIX} != "py25")
+.if ${OPSYS} == "Darwin" && ${PYPKGPREFIX} != "py25"
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .endif
 
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index 2ecea52ee22..1481488f354 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/09/09 16:49:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/04/08 19:08:54 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
 bin/${PYPKGPREFIX}-manage-eggs
 ${PYSITELIB}/easy_install.py
@@ -12,8 +12,7 @@ ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PLIST.py24}${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PLIST.py25}${PYSITELIB}/${EGG_INFODIR}/zip-safe
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/setuptools/__init__.py
 ${PYSITELIB}/setuptools/__init__.pyc
 ${PYSITELIB}/setuptools/__init__.pyo
diff --git a/devel/py-sysctl/Makefile b/devel/py-sysctl/Makefile
index b49883962ee..de88bdcce42 100644
--- a/devel/py-sysctl/Makefile
+++ b/devel/py-sysctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/25 09:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:08:54 wiz Exp $
 
 DISTNAME=	py-sysctl-0.1
 PKGNAME=	${PYPKGPREFIX}-sysctl-0.1
@@ -13,7 +13,6 @@ COMMENT=	Python interface to sysctl(3)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
 PYDISTUTILSPKG=	# yes
 
 .include "../../lang/python/extension.mk"
diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index 43c5d95b6f8..bf96593265e 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/10/07 10:45:06 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/08 19:08:54 wiz Exp $
 #
 
 DISTNAME=	testtools-0.9.12
@@ -15,7 +15,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	24
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile
index 8629d8cdd48..2bed8d57e0f 100644
--- a/devel/py-urwid/Makefile
+++ b/devel/py-urwid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/01/28 08:13:20 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/08 19:08:55 wiz Exp $
 
 DISTNAME=	urwid-0.9.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 
-PYTHON_VERSIONS_ACCEPTED=	27 26 25 24
 REPLACE_PYTHON=	*.py */*.py
 
 FILESEXAMPLES=	bigtext.py \