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

Bump PKGREVISIONS accordingly.

4 files changed, 47 insertions, 8 deletions

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)