Build Python with thread support by default and turn the existing

python*-pth packages into meta-packages which will install the non-pth
packages. Bump PKGREVISIONs on the non-pth versions to propagate the
thread change, but leave the *-pth versions untouched to not affect
existing installations.
Sync all PYTHON_VERSIONS_AFFECTED lines in package Makefiles.

17 files changed, 21 insertions, 458 deletions

diff --git a/lang/python21-pth/Makefile b/lang/python21-pth/Makefile
index 70ec9dcfb51..27531a5cb4f 100644
--- a/lang/python21-pth/Makefile
+++ b/lang/python21-pth/Makefile
@@ -1,15 +1,26 @@
-# $NetBSD: Makefile,v 1.14 2004/08/29 10:44:19 recht Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/23 20:41:46 recht Exp $
 #
 
+DISTNAME=	Python-2.1.3
 PKGNAME=	python21-pth-2.1.3
 PKGREVISION=	6
+CATEGORIES=	lang python
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
-PTHREAD_OPTS=	require
-.include "../../mk/pthread.buildlink3.mk"
-.if ${PTHREAD_TYPE} == "pth"
-CONFIGURE_ARGS+=	--with-pth
-.endif
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.python.org/
+COMMENT=	Interpreted, interactive, object-oriented programming language
 
-PY_VER_SUFFIX=	2p1
+DEPENDS+=	python21>=2.1.3:../../lang/python21
 
-.include "../../lang/python21/Makefile.common"
+EXTRACT_ONLY=	# empty
+NO_CHECKSUM=	yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
+NO_BUILDLINK=	yes
+NO_MTREE=	yes
+
+do-install:	# empty
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python21-pth/PLIST b/lang/python21-pth/PLIST
new file mode 100644
index 00000000000..db0b189f5e1
--- /dev/null
+++ b/lang/python21-pth/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.4 2005/01/23 20:41:46 recht Exp $
+@comment this plist intentionally left empty
diff --git a/lang/python21-pth/buildlink3.mk b/lang/python21-pth/buildlink3.mk
deleted file mode 100644
index 0daeadc96e9..00000000000
--- a/lang/python21-pth/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYTHON21_PTH_BUILDLINK3_MK:=	${PYTHON21_PTH_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	python21-pth
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython21-pth}
-BUILDLINK_PACKAGES+=	python21-pth
-
-.if !empty(PYTHON21_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python21-pth+=	python21-pth>=2.1.3nb2
-BUILDLINK_PKGSRCDIR.python21-pth?=	../../lang/python21-pth
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python21pth?=	${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_INCDIRS.python21-pth+=	include/python2p1
-BUILDLINK_LIBDIRS.python21-pth+=	lib/python2p1/config
-BUILDLINK_TRANSFORM+=			l:python:python2p1
-
-.endif	# PYTHON21_PTH_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python21-pth/distinfo b/lang/python21-pth/distinfo
deleted file mode 100644
index f2e810aaa11..00000000000
--- a/lang/python21-pth/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.9 2004/08/29 10:44:19 recht Exp $
-
-SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
-Size (Python-2.1.3.tgz) = 6194432 bytes
-SHA1 (patch-aa) = d87aebf7b89a559e83c13a039fbdb98b39835211
-SHA1 (patch-ab) = e39bbe1e46bfc535dc887eeb9059e0c500c393db
-SHA1 (patch-ac) = 4da78f997fb45365eee6d266c73bc129fe865d12
-SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414
-SHA1 (patch-ae) = 079cd208ba57755a7e0f3ac03b6ba59d622be5db
-SHA1 (patch-af) = 4e446bd88334dbee441f6a8dc41e7eaeb771e773
-SHA1 (patch-ag) = fa9a5f13072d9137182675394f04cd9b163d3a5c
-SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
-SHA1 (patch-ai) = 6420f2994109b8cce55674ea14d7a974f9e039c6
-SHA1 (patch-aj) = ca232f769b57f617496f5c8701a0a32fe55f1fd9
-SHA1 (patch-ba) = 5e47b2e75ea40682216e42fbf8b971432836afdc
-SHA1 (patch-bb) = dea4f69c7b5152c02b903b08e1cf505e5f0fdc6b
-SHA1 (patch-bc) = d1a9b636c736a625c920fb013b07a1a41e824720
diff --git a/lang/python21-pth/patches/patch-aa b/lang/python21-pth/patches/patch-aa
deleted file mode 100644
index eb3c0208577..00000000000
--- a/lang/python21-pth/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/09/04 14:25:18 drochner Exp $
-
---- Misc/Makefile.pre.in.orig	Thu Aug 22 15:36:50 2002
-+++ Misc/Makefile.pre.in	Thu Aug 22 15:36:55 2002
-@@ -92,10 +92,10 @@
- TARGET=		python
- 
- # Installed python binary (used only by boot target)
--PYTHON=		python
-+PYTHON=		python2p1
- 
- # Add more -I and -D options here
--CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
-+CFLAGS+=	$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
- 
- # These two variables can be set in Setup to merge extensions.
- # See example[23].
diff --git a/lang/python21-pth/patches/patch-ab b/lang/python21-pth/patches/patch-ab
deleted file mode 100644
index f9d81388f5b..00000000000
--- a/lang/python21-pth/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $
-
---- Tools/scripts/pydoc2p1.orig	Tue Aug 20 20:49:53 2002
-+++ Tools/scripts/pydoc2p1	Tue Aug 20 20:50:25 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2p1
- 
- import pydoc
- pydoc.cli()
diff --git a/lang/python21-pth/patches/patch-ac b/lang/python21-pth/patches/patch-ac
deleted file mode 100644
index 6f252fb856e..00000000000
--- a/lang/python21-pth/patches/patch-ac
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/05/16 20:01:59 minskim Exp $
-
---- setup.py.orig	2001-12-27 15:51:02.000000000 -0600
-+++ setup.py
-@@ -145,12 +145,6 @@ class PyBuildExt(build_ext):
-         return platform
- 
-     def detect_modules(self):
--        # Ensure that /usr/local is always used
--        if '/usr/local/lib' not in self.compiler.library_dirs:
--            self.compiler.library_dirs.insert(0, '/usr/local/lib')
--        if '/usr/local/include' not in self.compiler.include_dirs:
--            self.compiler.include_dirs.insert(0, '/usr/local/include' )
--
-         # lib_dirs and inc_dirs are used to search for files;
-         # if a file is found in one of those directories, it can
-         # be assumed that no additional -I,-L directives are needed.
-@@ -265,13 +259,13 @@ class PyBuildExt(build_ext):
-         # These represent audio samples or images as strings:
- 
-         # Disabled on 64-bit platforms
--        if sys.maxint != 9223372036854775807L:
-+#        if sys.maxint != 9223372036854775807L:
-             # Operations on audio samples
--            exts.append( Extension('audioop', ['audioop.c']) )
-+#            exts.append( Extension('audioop', ['audioop.c']) )
-             # Operations on images
--            exts.append( Extension('imageop', ['imageop.c']) )
-+#            exts.append( Extension('imageop', ['imageop.c']) )
-             # Read SGI RGB image files (but coded portably)
--            exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
-+#            exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
- 
-         # readline
-         if self.compiler.find_library_file(lib_dirs, 'readline'):
-@@ -296,14 +290,10 @@ class PyBuildExt(build_ext):
-         # socket(2)
-         # Detect SSL support for the socket module
-         ssl_incs = find_file('openssl/ssl.h', inc_dirs,
--                             ['/usr/local/ssl/include',
--                              '/usr/contrib/ssl/include/'
--                             ]
-+                             []
-                              )
-         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
--                                     ['/usr/local/ssl/lib',
--                                      '/usr/contrib/ssl/lib/'
--                                     ] )
-+                                     [] )
- 
-         if (ssl_incs is not None and
-             ssl_libs is not None):
-@@ -408,8 +398,8 @@ class PyBuildExt(build_ext):
- 
-         if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
-             curses_libs = ['ncurses']
--            exts.append( Extension('_curses', ['_cursesmodule.c'],
--                                   libraries = curses_libs) )
-+#            exts.append( Extension('_curses', ['_cursesmodule.c'],
-+#                                   libraries = curses_libs) )
-         elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform[:6] != 'darwin':
-         	# OSX has an old Berkeley curses, not good enough for the _curses module.
-             if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-@@ -417,8 +407,8 @@ class PyBuildExt(build_ext):
-             else:
-                 curses_libs = ['curses', 'termcap']
- 
--            exts.append( Extension('_curses', ['_cursesmodule.c'],
--                                   libraries = curses_libs) )
-+#            exts.append( Extension('_curses', ['_cursesmodule.c'],
-+#                                   libraries = curses_libs) )
- 
-         # If the curses module is enabled, check for the panel module
-         if (os.path.exists('Modules/_curses_panel.c') and
-@@ -451,23 +441,7 @@ class PyBuildExt(build_ext):
-         # Andrew Kuchling's zlib module.
-         # This require zlib 1.1.3 (or later).
-         # See http://www.cdrom.com/pub/infozip/zlib/
--        zlib_inc = find_file('zlib.h', [], inc_dirs)
--        if zlib_inc is not None:
--            zlib_h = zlib_inc[0] + '/zlib.h'
--            version = '"0.0.0"'
--            version_req = '"1.1.3"'
--            fp = open(zlib_h)
--            while 1:
--                line = fp.readline()
--                if not line:
--                    break
--                if line.find('#define ZLIB_VERSION', 0) == 0:
--                    version = line.split()[2]
--                    break
--            if version >= version_req:
--                if (self.compiler.find_library_file(lib_dirs, 'z')):
--                    exts.append( Extension('zlib', ['zlibmodule.c'],
--                                           libraries = ['z']) )
-+        exts.append(Extension('zlib', ['zlibmodule.c'], libraries = ['z']))
- 
-         # Interface to the Expat XML parser
-         #
-@@ -609,7 +583,7 @@ def main():
-           ext_modules=[Extension('struct', ['structmodule.c'])],
- 
-           # Scripts to install
--          scripts = ['Tools/scripts/pydoc']
-+          scripts = ['Tools/scripts/pydoc2p1']
-         )
- 
- # --install-platlib
diff --git a/lang/python21-pth/patches/patch-ad b/lang/python21-pth/patches/patch-ad
deleted file mode 100644
index 1cb554c8981..00000000000
--- a/lang/python21-pth/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $
-
---- Lib/distutils/command/build_ext.py.orig	Sat Mar 17 15:15:41 2001
-+++ Lib/distutils/command/build_ext.py
-@@ -461,8 +461,18 @@
-         # that go into the mix.
-         if ext.extra_objects:
-             objects.extend(ext.extra_objects)
-+
-+        # Two possible sources for extra linker arguments:
-+        #   - 'extra_link_args' in Extension object
-+        #   - LDFLAGS environment variable
-+        # The environment variable should take precedence, and
-+        # any sensible compiler will give precedence to later
-+        # command line args.  Hence we combine them in order:
-         extra_args = ext.extra_link_args or []
- 
-+
-+        if os.environ.has_key('LDFLAGS'):
-+            extra_args.extend(string.split(os.environ['LDFLAGS']))
- 
-         self.compiler.link_shared_object(
-             objects, ext_filename, 
diff --git a/lang/python21-pth/patches/patch-ae b/lang/python21-pth/patches/patch-ae
deleted file mode 100644
index d1826b0d782..00000000000
--- a/lang/python21-pth/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/09/04 14:25:18 drochner Exp $
-
---- configure.orig	Thu Dec 27 22:55:46 2001
-+++ configure	Tue Aug 20 20:12:59 2002
-@@ -569,7 +569,7 @@
- 
- # Set VERSION so we only need to edit in one place (i.e., here)
- 
--VERSION=2.1
-+VERSION=2p1
- 
- # Arguments passed to configure.
- 
diff --git a/lang/python21-pth/patches/patch-af b/lang/python21-pth/patches/patch-af
deleted file mode 100644
index bbfb868e892..00000000000
--- a/lang/python21-pth/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/06/06 18:14:12 drochner Exp $
-
---- Makefile.pre.in.orig	2001-07-19 15:21:05.000000000 +0200
-+++ Makefile.pre.in	2003-06-06 19:35:30.000000000 +0200
-@@ -55,7 +55,7 @@
- # Compiler options
- OPT=		@OPT@
- DEFS=		@DEFS@
--CFLAGS=		$(OPT) -I. -I$(srcdir)/Include $(DEFS)
-+CFLAGS=		@CFLAGS@ $(OPT) -I. -I$(srcdir)/Include $(DEFS)
- LDFLAGS=	@LDFLAGS@
- LDLAST=		@LDLAST@
- SGI_ABI=	@SGI_ABI@
-@@ -274,7 +274,7 @@
- $(PYTHON):	Modules/$(MAINOBJ) $(LDLIBRARY)
- 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
- 			Modules/$(MAINOBJ) \
--			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-+			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
- 
- platform: $(PYTHON)
- 	./$(PYTHON) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -386,7 +386,7 @@
- 		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- 
- $(PGEN):	$(PGENOBJS)
--		$(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
-+		$(CC) $(LDFLAGS) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
- 
- Parser/grammar.o:	$(srcdir)/Parser/grammar.c \
- 				$(srcdir)/Parser/assert.h \
diff --git a/lang/python21-pth/patches/patch-ag b/lang/python21-pth/patches/patch-ag
deleted file mode 100644
index 87feda9e327..00000000000
--- a/lang/python21-pth/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $
-
---- Include/patchlevel.h.orig	Tue Aug 20 19:53:31 2002
-+++ Include/patchlevel.h	Tue Aug 20 19:54:05 2002
-@@ -26,7 +26,7 @@
- #define PY_RELEASE_SERIAL	0
- 
- /* Version as a string */
--#define PY_VERSION		"2.1.3"
-+#define PY_VERSION		"2p1.3"
- 
- /* Historic */
- #define PATCHLEVEL		"2.1.3"
diff --git a/lang/python21-pth/patches/patch-ah b/lang/python21-pth/patches/patch-ah
deleted file mode 100644
index 8b34ad969e4..00000000000
--- a/lang/python21-pth/patches/patch-ah
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/01/22 17:05:34 drochner Exp $
-
---- Lib/os.py.orig	Wed Jan 22 17:27:56 2003
-+++ Lib/os.py	Wed Jan 22 17:30:02 2003
-@@ -291,7 +291,7 @@
-     _execvpe(file, args)
- 
- def execvpe(file, args, env):
--    """execv(file, args, env)
-+    """execvpe(file, args, env)
- 
-     Execute the executable file (which is searched for along $PATH)
-     with argument list args and environment env , replacing the
-@@ -301,8 +301,9 @@
- 
- __all__.extend(["execl","execle","execlp","execlpe","execvp","execvpe"])
- 
--_notfound = None
- def _execvpe(file, args, env=None):
-+    from errno import ENOENT, ENOTDIR
-+
-     if env is not None:
-         func = execve
-         argrest = (args, env)
-@@ -310,7 +311,7 @@
-         func = execv
-         argrest = (args,)
-         env = environ
--    global _notfound
-+
-     head, tail = path.split(file)
-     if head:
-         apply(func, (file,) + argrest)
-@@ -320,30 +321,21 @@
-     else:
-         envpath = defpath
-     PATH = envpath.split(pathsep)
--    if not _notfound:
--        if sys.platform[:4] == 'beos':
--            #  Process handling (fork, wait) under BeOS (up to 5.0)
--            #  doesn't interoperate reliably with the thread interlocking
--            #  that happens during an import.  The actual error we need
--            #  is the same on BeOS for posix.open() et al., ENOENT.
--            try: unlink('/_#.# ## #.#')
--            except error, _notfound: pass
--        else:
--            import tempfile
--            t = tempfile.mktemp()
--            # Exec a file that is guaranteed not to exist
--            try: execv(t, ('blah',))
--            except error, _notfound: pass
--    exc, arg = error, _notfound
-+    saved_exc = None
-+    saved_tb = None
-     for dir in PATH:
-         fullname = path.join(dir, file)
-         try:
-             apply(func, (fullname,) + argrest)
--        except error, (errno, msg):
--            if errno != arg[0]:
--                exc, arg = error, (errno, msg)
--    raise exc, arg
--
-+        except error, e:
-+            tb = sys.exc_info()[2]
-+            if (e.errno != ENOENT and e.errno != ENOTDIR
-+                and saved_exc is None):
-+                saved_exc = e
-+                saved_tb = tb
-+    if saved_exc:
-+        raise error, saved_exc, saved_tb
-+    raise error, e, tb
- 
- # Change environ to automatically call putenv() if it exists
- try:
diff --git a/lang/python21-pth/patches/patch-ai b/lang/python21-pth/patches/patch-ai
deleted file mode 100644
index 1cd11d1786c..00000000000
--- a/lang/python21-pth/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/01/22 17:05:34 drochner Exp $
-
---- Modules/Setup.dist.orig	Wed Jan 22 17:37:38 2003
-+++ Modules/Setup.dist	Wed Jan 22 17:39:03 2003
-@@ -97,6 +97,7 @@
- # setup.py script in the root of the Python source tree.
- 
- posix posixmodule.c		# posix (UNIX) system calls
-+errno errnomodule.c		# posix (UNIX) errno values
- _sre _sre.c			# Fredrik Lundh's new regular expressions
- 
- # The rest of the modules listed in this file are all commented out by
-@@ -162,7 +163,6 @@
- #fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
- #pwd pwdmodule.c		# pwd(3) 
- #grp grpmodule.c		# grp(3)
--#errno errnomodule.c	# posix (UNIX) errno values
- #select selectmodule.c	# select(2); not on ancient System V
- 
- # Memory-mapped files (also works on Win32).
diff --git a/lang/python21-pth/patches/patch-aj b/lang/python21-pth/patches/patch-aj
deleted file mode 100644
index 05c6b6fbb72..00000000000
--- a/lang/python21-pth/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/02/11 17:52:51 drochner Exp $
-
---- Lib/test/test_popen.py.orig	Tue Feb 11 17:23:42 2003
-+++ Lib/test/test_popen.py	Tue Feb 11 17:26:22 2003
-@@ -15,7 +15,7 @@
- # This results in Python being spawned and printing the sys.argv list.
- # We can then eval() the result of this, and see what each argv was.
- def _do_test_commandline(cmdline, expected):
--    cmd = 'python -c "import sys;print sys.argv" %s' % (cmdline,)
-+    cmd = '%s -c "import sys;print sys.argv" %s' % (sys.executable,cmdline)
-     data = popen(cmd).read()
-     got = eval(data)[1:] # strip off argv[0]
-     if got != expected:
diff --git a/lang/python21-pth/patches/patch-ba b/lang/python21-pth/patches/patch-ba
deleted file mode 100644
index a5e7941b3a5..00000000000
--- a/lang/python21-pth/patches/patch-ba
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2002/09/06 17:01:08 drochner Exp $
-
---- Python/thread_pth.h.orig	Thu Oct 12 22:58:32 2000
-+++ Python/thread_pth.h	Fri Sep  6 18:34:12 2002
-@@ -30,6 +30,8 @@
- 
- #define CHECK_STATUS(name)  if (status == -1) { printf("%d ", status); perror(name); error = 1; }
- 
-+pth_attr_t PyThread_attr;
-+
- /*
-  * Initialization.
-  */
-@@ -37,6 +39,9 @@
- static void PyThread__init_thread(void)
- {
- 	pth_init();
-+	PyThread_attr = pth_attr_new();
-+	pth_attr_set(PyThread_attr, PTH_ATTR_STACK_SIZE, 1<<18);
-+	pth_attr_set(PyThread_attr, PTH_ATTR_JOINABLE, FALSE);
- }
- 
- /*
-@@ -51,7 +56,7 @@
- 	if (!initialized)
- 		PyThread_init_thread();
- 
--	th = pth_spawn(PTH_ATTR_DEFAULT,
-+	th = pth_spawn(PyThread_attr,
- 				 (void* (*)(void *))func,
- 				 (void *)arg
- 				 );
diff --git a/lang/python21-pth/patches/patch-bb b/lang/python21-pth/patches/patch-bb
deleted file mode 100644
index 7d973f185bd..00000000000
--- a/lang/python21-pth/patches/patch-bb
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2004/08/29 10:44:19 recht Exp $
-
---- Lib/test/test_fcntl.py.orig	2001-04-11 22:58:20.000000000 +0200
-+++ Lib/test/test_fcntl.py	2004-08-28 12:12:17.000000000 +0200
-@@ -16,11 +16,11 @@
- if verbose:
-     print 'Status from fnctl with O_NONBLOCK: ', rv
- 
--if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin1',
-+if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin1',
-                     'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                     'bsdos2', 'bsdos3', 'bsdos4',
-                     'openbsd', 'openbsd2'):
--    lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, FCNTL.F_WRLCK, 0)
-+    lockdata = struct.pack('ixxxxixxxxihh', 0, 0, 0, FCNTL.F_WRLCK, 0)
- elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
-     lockdata = struct.pack('hhlllii', FCNTL.F_WRLCK, 0, 0, 0, 0, 0, 0)
- else:
diff --git a/lang/python21-pth/patches/patch-bc b/lang/python21-pth/patches/patch-bc
deleted file mode 100644
index 502596ebdd9..00000000000
--- a/lang/python21-pth/patches/patch-bc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
-
---- Lib/posixfile.py.orig	2001-04-10 17:44:33.000000000 +0200
-+++ Lib/posixfile.py	2004-08-28 12:10:29.000000000 +0200
-@@ -171,11 +171,11 @@
-         # Hack by davem@magnet.com to get locking to go on freebsd;
-         # additions for AIX by Vladimir.Marangozov@imag.fr
-         import sys, os
--        if sys.platform in ('netbsd1',
-+        if sys.platform in ('netbsd1', 'netbsd2',
-                             'openbsd2',
-                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                             'bsdos2', 'bsdos3', 'bsdos4'):
--            flock = struct.pack('lxxxxlxxxxlhh', \
-+            flock = struct.pack('qqihh', \
-                   l_start, l_len, os.getpid(), l_type, l_whence)
-         elif sys.platform in ['aix3', 'aix4']:
-             flock = struct.pack('hhlllii', \
-@@ -187,12 +187,12 @@
-         flock = fcntl.fcntl(self._file_.fileno(), cmd, flock)
- 
-         if '?' in how:
--            if sys.platform in ('netbsd1',
-+            if sys.platform in ('netbsd1', 'netbsd2'
-                                 'openbsd2',
-                                 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                                 'bsdos2', 'bsdos3', 'bsdos4'):
-                 l_start, l_len, l_pid, l_type, l_whence = \
--                    struct.unpack('lxxxxlxxxxlhh', flock)
-+                    struct.unpack('qqihh', flock)
-             elif sys.platform in ['aix3', 'aix4']:
-                 l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \
-                     struct.unpack('hhlllii', flock)