NetBSD 2.0 changes sys.platform to netbsd2 -- catch up with this

patch by drochner@ in private mail

bump PKGREVISION to 1

8 files changed, 94 insertions, 10 deletions

diff --git a/lang/python23-pth/Makefile b/lang/python23-pth/Makefile
index 402979317db..ce58be449f9 100644
--- a/lang/python23-pth/Makefile
+++ b/lang/python23-pth/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/06/02 12:29:28 recht Exp $
+# $NetBSD: Makefile,v 1.25 2004/06/10 10:13:06 recht Exp $
 #
 
 PKGNAME=	python23-pth-2.3.4
+PKGREVISION=	1
 
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo
index e520d63f602..cd22dc7efe7 100644
--- a/lang/python23-pth/distinfo
+++ b/lang/python23-pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2004/06/02 12:29:28 recht Exp $
+$NetBSD: distinfo,v 1.17 2004/06/10 10:13:06 recht Exp $
 
 SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3
 Size (Python-2.3.4.tgz) = 8502738 bytes
@@ -6,8 +6,9 @@ SHA1 (patch-aa) = a0fcef6a91ec4724f0aed0fdebce55ba139d3700
 SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
 SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 35d27825ea4f3930cce651761e192a7302696eba
-SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14
+SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
 SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575
 SHA1 (patch-al) = 903b42991a83fe5f5f4f3a20f88abb4937174f26
 SHA1 (patch-am) = eda4c6161b4237e1281cc6b82b26c5195444dcff
 SHA1 (patch-ba) = dd8f89952d7f40c9a979e362758775f093e047bc
+SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
diff --git a/lang/python23-pth/patches/patch-af b/lang/python23-pth/patches/patch-af
index 8401fc8422e..f37eb2a88cc 100644
--- a/lang/python23-pth/patches/patch-af
+++ b/lang/python23-pth/patches/patch-af
@@ -1,8 +1,13 @@
-$NetBSD: patch-af,v 1.1 2003/12/08 21:13:56 recht Exp $
+$NetBSD: patch-af,v 1.2 2004/06/10 10:13:06 recht Exp $
 
 --- Lib/test/test_fcntl.py.orig	2002-07-23 21:03:51.000000000 +0200
 +++ Lib/test/test_fcntl.py
-@@ -24,7 +24,7 @@ if sys.platform in ('netbsd1', 'Darwin1.
+@@ -20,11 +20,11 @@ else:
+ if sys.platform.startswith('atheos'):
+     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'):
@@ -11,3 +16,4 @@ $NetBSD: patch-af,v 1.1 2003/12/08 21:13:56 recht Exp $
  elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
      lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
  elif sys.platform in ['os2emx']:
+
diff --git a/lang/python23-pth/patches/patch-bb b/lang/python23-pth/patches/patch-bb
new file mode 100644
index 00000000000..6f620c14436
--- /dev/null
+++ b/lang/python23-pth/patches/patch-bb
@@ -0,0 +1,34 @@
+$NetBSD: patch-bb,v 1.3 2004/06/10 10:13:06 recht Exp $
+
+--- Lib/posixfile.py.orig	2004-06-07 16:19:35.000000000 +0200
++++ Lib/posixfile.py
+@@ -182,11 +182,11 @@ class _posixfile_:
+         # 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 @@ class _posixfile_:
+         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/python23/Makefile b/lang/python23/Makefile
index c5e2069f7c3..837d23a3409 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/06/02 12:29:28 recht Exp $
+# $NetBSD: Makefile,v 1.21 2004/06/10 10:13:06 recht Exp $
 #
 
 PKGNAME=	python23-2.3.4
+PKGREVISION=	1
 
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index 08b848d5498..d0647b47ca4 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2004/06/02 12:29:28 recht Exp $
+$NetBSD: distinfo,v 1.18 2004/06/10 10:13:06 recht Exp $
 
 SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3
 Size (Python-2.3.4.tgz) = 8502738 bytes
@@ -6,7 +6,8 @@ SHA1 (patch-aa) = dd8f89952d7f40c9a979e362758775f093e047bc
 SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
 SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
-SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14
+SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
 SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575
 SHA1 (patch-al) = 9708d043b6dff795de5450c88ffb05c65a159942
 SHA1 (patch-am) = df5c858b32a9a5aa118c84f6742f9d3547c0c7f3
+SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
diff --git a/lang/python23/patches/patch-af b/lang/python23/patches/patch-af
index 8401fc8422e..f37eb2a88cc 100644
--- a/lang/python23/patches/patch-af
+++ b/lang/python23/patches/patch-af
@@ -1,8 +1,13 @@
-$NetBSD: patch-af,v 1.1 2003/12/08 21:13:56 recht Exp $
+$NetBSD: patch-af,v 1.2 2004/06/10 10:13:06 recht Exp $
 
 --- Lib/test/test_fcntl.py.orig	2002-07-23 21:03:51.000000000 +0200
 +++ Lib/test/test_fcntl.py
-@@ -24,7 +24,7 @@ if sys.platform in ('netbsd1', 'Darwin1.
+@@ -20,11 +20,11 @@ else:
+ if sys.platform.startswith('atheos'):
+     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'):
@@ -11,3 +16,4 @@ $NetBSD: patch-af,v 1.1 2003/12/08 21:13:56 recht Exp $
  elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
      lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
  elif sys.platform in ['os2emx']:
+
diff --git a/lang/python23/patches/patch-bb b/lang/python23/patches/patch-bb
new file mode 100644
index 00000000000..6f620c14436
--- /dev/null
+++ b/lang/python23/patches/patch-bb
@@ -0,0 +1,34 @@
+$NetBSD: patch-bb,v 1.3 2004/06/10 10:13:06 recht Exp $
+
+--- Lib/posixfile.py.orig	2004-06-07 16:19:35.000000000 +0200
++++ Lib/posixfile.py
+@@ -182,11 +182,11 @@ class _posixfile_:
+         # 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 @@ class _posixfile_:
+         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)
+