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

Bump PKGREVISIONS accordingly.

4 files changed, 54 insertions, 3 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)