Extend some checks to also test for netbsd2 as sys.platform.

Bump PKGREVISIONS accordingly.

20 files changed, 242 insertions, 35 deletions

diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 6bbc132c474..3dfe6267a47 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2004/08/27 06:29:08 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/08/29 10:44:19 recht Exp $
 #
 
 DISTNAME=	Python-2.0.1
 PKGNAME=	python20-2.0.1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://ftp.python.org/pub/python/2.0.1/
 EXTRACT_SUFX=	.tgz
diff --git a/lang/python20/distinfo b/lang/python20/distinfo
index 5ae71721dfa..0e94aa43135 100644
--- a/lang/python20/distinfo
+++ b/lang/python20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/08/18 09:14:16 drochner Exp $
+$NetBSD: distinfo,v 1.6 2004/08/29 10:44:19 recht Exp $
 
 SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab
 Size (python/Python-2.0.1.tgz) = 4097453 bytes
@@ -6,4 +6,6 @@ SHA1 (patch-aa) = 2db263ea719733692536bb4a9990659099583351
 SHA1 (patch-ab) = 670cd69d67566bf61d152e3433161c0f146be1b3
 SHA1 (patch-ac) = 74ff40fc338e8209d91e5da11fdbed497462dd83
 SHA1 (patch-ad) = 08096aea74ab4871309124cd28a3b98d83cb322f
+SHA1 (patch-bb) = 8d3c18ea43843dda48d60461a5a216a5237cc5f2
+SHA1 (patch-bc) = fdd18d0fab171364d4733975351fbc60c81d0a4a
 SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc
diff --git a/lang/python20/patches/patch-bb b/lang/python20/patches/patch-bb
new file mode 100644
index 00000000000..d4701552bea
--- /dev/null
+++ b/lang/python20/patches/patch-bb
@@ -0,0 +1,18 @@
+$NetBSD: patch-bb,v 1.1 2004/08/29 10:44:19 recht Exp $
+
+--- Lib/test/test_fcntl.py.orig	2004-08-28 19:24:26.000000000 +0200
++++ Lib/test/test_fcntl.py	2004-08-28 19:25:18.000000000 +0200
+@@ -16,11 +16,11 @@
+ if verbose:
+     print 'Status from fnctl with O_NONBLOCK: ', rv
+     
+-if sys.platform in ('netbsd1', 'Darwin1.2',
++if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2',
+                     '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']:
+     lockdata = struct.pack('hhlllii', FCNTL.F_WRLCK, 0, 0, 0, 0, 0, 0)
+ else:
diff --git a/lang/python20/patches/patch-bc b/lang/python20/patches/patch-bc
new file mode 100644
index 00000000000..6bcea585894
--- /dev/null
+++ b/lang/python20/patches/patch-bc
@@ -0,0 +1,31 @@
+$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
+
+--- Lib/posixfile.py.orig	2004-08-28 19:23:13.000000000 +0200
++++ Lib/posixfile.py	2004-08-29 12:21:02.000000000 +0200
+@@ -172,10 +172,11 @@
+         # additions for AIX by Vladimir.Marangozov@imag.fr
+         import sys, os
+         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', \
+@@ -188,11 +189,12 @@
+ 
+         if '?' in how:
+             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)
diff --git a/lang/python21-pth/Makefile b/lang/python21-pth/Makefile
index c147cc5140a..70ec9dcfb51 100644
--- a/lang/python21-pth/Makefile
+++ b/lang/python21-pth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/08/02 16:59:22 recht Exp $
+# $NetBSD: Makefile,v 1.14 2004/08/29 10:44:19 recht Exp $
 #
 
 PKGNAME=	python21-pth-2.1.3
-PKGREVISION=	5
+PKGREVISION=	6
 
 PTHREAD_OPTS=	require
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/lang/python21-pth/distinfo b/lang/python21-pth/distinfo
index 2af6ddb4b83..f2e810aaa11 100644
--- a/lang/python21-pth/distinfo
+++ b/lang/python21-pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/05/16 20:01:59 minskim Exp $
+$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
@@ -13,4 +13,5 @@ SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
 SHA1 (patch-ai) = 6420f2994109b8cce55674ea14d7a974f9e039c6
 SHA1 (patch-aj) = ca232f769b57f617496f5c8701a0a32fe55f1fd9
 SHA1 (patch-ba) = 5e47b2e75ea40682216e42fbf8b971432836afdc
-SHA1 (patch-bb) = d70f1c25051d121d33934fa8715332c1d1caff04
+SHA1 (patch-bb) = dea4f69c7b5152c02b903b08e1cf505e5f0fdc6b
+SHA1 (patch-bc) = d1a9b636c736a625c920fb013b07a1a41e824720
diff --git a/lang/python21-pth/patches/patch-bb b/lang/python21-pth/patches/patch-bb
index abc7a589fc6..7d973f185bd 100644
--- a/lang/python21-pth/patches/patch-bb
+++ b/lang/python21-pth/patches/patch-bb
@@ -1,8 +1,13 @@
-$NetBSD: patch-bb,v 1.1 2003/04/15 16:52:29 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2004/08/29 10:44:19 recht Exp $
 
---- Lib/test/test_fcntl.py.orig	2003-04-15 15:46:49.000000000 +0200
-+++ Lib/test/test_fcntl.py	2003-04-15 15:48:42.000000000 +0200
-@@ -20,7 +20,7 @@
+--- 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'):
diff --git a/lang/python21-pth/patches/patch-bc b/lang/python21-pth/patches/patch-bc
new file mode 100644
index 00000000000..502596ebdd9
--- /dev/null
+++ b/lang/python21-pth/patches/patch-bc
@@ -0,0 +1,33 @@
+$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)
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 2e62fb9d35e..ba5f95871c2 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/08/02 16:59:22 recht Exp $
+# $NetBSD: Makefile,v 1.16 2004/08/29 10:44:19 recht Exp $
 #
 
 PKGNAME=	python21-2.1.3
-PKGREVISION=	3
+PKGREVISION=	4
 
 CONFIGURE_ARGS+=	--without-threads
 
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index 727c3b0c88e..a9f49ae6f18 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2004/05/16 20:01:59 minskim Exp $
+$NetBSD: distinfo,v 1.13 2004/08/29 10:44:19 recht Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 Size (Python-2.1.3.tgz) = 6194432 bytes
@@ -10,4 +10,5 @@ SHA1 (patch-af) = e17c20f83ba1219860a6aefd959364147c7963e1
 SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
 SHA1 (patch-ai) = 6420f2994109b8cce55674ea14d7a974f9e039c6
 SHA1 (patch-aj) = ca232f769b57f617496f5c8701a0a32fe55f1fd9
-SHA1 (patch-bb) = d70f1c25051d121d33934fa8715332c1d1caff04
+SHA1 (patch-bb) = dea4f69c7b5152c02b903b08e1cf505e5f0fdc6b
+SHA1 (patch-bc) = d1a9b636c736a625c920fb013b07a1a41e824720
diff --git a/lang/python21/patches/patch-bb b/lang/python21/patches/patch-bb
index f23f603c229..7d973f185bd 100644
--- a/lang/python21/patches/patch-bb
+++ b/lang/python21/patches/patch-bb
@@ -1,8 +1,13 @@
-$NetBSD: patch-bb,v 1.1 2003/04/15 16:52:28 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2004/08/29 10:44:19 recht Exp $
 
---- Lib/test/test_fcntl.py.orig	2003-04-15 15:46:49.000000000 +0200
-+++ Lib/test/test_fcntl.py	2003-04-15 15:48:42.000000000 +0200
-@@ -20,7 +20,7 @@
+--- 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'):
diff --git a/lang/python21/patches/patch-bc b/lang/python21/patches/patch-bc
new file mode 100644
index 00000000000..502596ebdd9
--- /dev/null
+++ b/lang/python21/patches/patch-bc
@@ -0,0 +1,33 @@
+$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)
diff --git a/lang/python22-pth/Makefile b/lang/python22-pth/Makefile
index cc03bb78b5a..009527bcdd7 100644
--- a/lang/python22-pth/Makefile
+++ b/lang/python22-pth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/04/23 01:25:09 danw Exp $
+# $NetBSD: Makefile,v 1.14 2004/08/29 10:44:19 recht Exp $
 #
 
 PKGNAME=	python22-pth-2.2.3
-PKGREVISION=	2
+PKGREVISION=	3
 
 PTHREAD_OPTS=	require
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/lang/python22-pth/distinfo b/lang/python22-pth/distinfo
index e76f0030758..58d7cb6588d 100644
--- a/lang/python22-pth/distinfo
+++ b/lang/python22-pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/05/16 20:01:59 minskim Exp $
+$NetBSD: distinfo,v 1.6 2004/08/29 10:44:19 recht Exp $
 
 SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
 Size (Python-2.2.3.tgz) = 6709556 bytes
@@ -11,4 +11,5 @@ SHA1 (patch-ah) = b1ef2e68cc8037f38e46007c6c65389e91a429fd
 SHA1 (patch-ai) = ae1d8a7886604f9e973f4430f9c673a575452170
 SHA1 (patch-aj) = ccf82a79c38f848d31f5193b561be5a44481fedc
 SHA1 (patch-ba) = 5e47b2e75ea40682216e42fbf8b971432836afdc
-SHA1 (patch-bb) = 238f713b049fe2d9cd7e1142dfd0d8c32a53982e
+SHA1 (patch-bb) = 389c439e8031257ca997455e10c8bd327b14638a
+SHA1 (patch-bc) = 9fbe77ff35519a290ef1f70fcaa72a60009a36a1
diff --git a/lang/python22-pth/patches/patch-bb b/lang/python22-pth/patches/patch-bb
index 5bf77cd556d..23b069f7509 100644
--- a/lang/python22-pth/patches/patch-bb
+++ b/lang/python22-pth/patches/patch-bb
@@ -1,8 +1,13 @@
-$NetBSD: patch-bb,v 1.1 2003/04/08 18:32:59 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2004/08/29 10:44:19 recht Exp $
 
---- Lib/test/test_fcntl.py.orig	Tue Apr  8 16:07:57 2003
-+++ Lib/test/test_fcntl.py	Tue Apr  8 16:08:04 2003
-@@ -20,7 +20,7 @@
+--- Lib/test/test_fcntl.py.orig	2002-08-23 18:06:46.000000000 +0200
++++ Lib/test/test_fcntl.py	2004-08-28 12:01:15.000000000 +0200
+@@ -16,11 +16,11 @@
+ else:
+     start_len = "qq"
+ 
+-if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin',
++if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin',
                      'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                      'bsdos2', 'bsdos3', 'bsdos4',
                      'openbsd', 'openbsd2', 'openbsd3'):
diff --git a/lang/python22-pth/patches/patch-bc b/lang/python22-pth/patches/patch-bc
new file mode 100644
index 00000000000..2f292e310a4
--- /dev/null
+++ b/lang/python22-pth/patches/patch-bc
@@ -0,0 +1,33 @@
+$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
+
+--- Lib/posixfile.py.orig	2001-10-25 00:03:35.000000000 +0200
++++ Lib/posixfile.py	2004-08-28 12:02:35.000000000 +0200
+@@ -182,11 +182,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', \
+@@ -198,12 +198,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)
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index cd8fe39a1ba..678e1ffe4a4 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/01/27 18:55:30 abs Exp $
+# $NetBSD: Makefile,v 1.22 2004/08/29 10:44:19 recht Exp $
 #
 
 PKGNAME=	python22-2.2.3
-PKGREVISION=	1
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--without-threads
 
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index 07ad7d59c64..7cbee90ecec 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/05/16 20:01:59 minskim Exp $
+$NetBSD: distinfo,v 1.12 2004/08/29 10:44:19 recht Exp $
 
 SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
 Size (Python-2.2.3.tgz) = 6709556 bytes
@@ -7,4 +7,5 @@ SHA1 (patch-ab) = aa06824d9f595a24aaddc96c83f31646f522ab09
 SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e
 SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52
 SHA1 (patch-ai) = 02f530a08fd8b61a696ae43ddabd7e86e4af7727
-SHA1 (patch-bb) = 238f713b049fe2d9cd7e1142dfd0d8c32a53982e
+SHA1 (patch-bb) = 389c439e8031257ca997455e10c8bd327b14638a
+SHA1 (patch-bc) = 9fbe77ff35519a290ef1f70fcaa72a60009a36a1
diff --git a/lang/python22/patches/patch-bb b/lang/python22/patches/patch-bb
index 5bf77cd556d..23b069f7509 100644
--- a/lang/python22/patches/patch-bb
+++ b/lang/python22/patches/patch-bb
@@ -1,8 +1,13 @@
-$NetBSD: patch-bb,v 1.1 2003/04/08 18:32:59 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2004/08/29 10:44:19 recht Exp $
 
---- Lib/test/test_fcntl.py.orig	Tue Apr  8 16:07:57 2003
-+++ Lib/test/test_fcntl.py	Tue Apr  8 16:08:04 2003
-@@ -20,7 +20,7 @@
+--- Lib/test/test_fcntl.py.orig	2002-08-23 18:06:46.000000000 +0200
++++ Lib/test/test_fcntl.py	2004-08-28 12:01:15.000000000 +0200
+@@ -16,11 +16,11 @@
+ else:
+     start_len = "qq"
+ 
+-if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin',
++if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin',
                      'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                      'bsdos2', 'bsdos3', 'bsdos4',
                      'openbsd', 'openbsd2', 'openbsd3'):
diff --git a/lang/python22/patches/patch-bc b/lang/python22/patches/patch-bc
new file mode 100644
index 00000000000..2f292e310a4
--- /dev/null
+++ b/lang/python22/patches/patch-bc
@@ -0,0 +1,33 @@
+$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
+
+--- Lib/posixfile.py.orig	2001-10-25 00:03:35.000000000 +0200
++++ Lib/posixfile.py	2004-08-28 12:02:35.000000000 +0200
+@@ -182,11 +182,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', \
+@@ -198,12 +198,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)