summaryrefslogtreecommitdiff
path: root/lang/python21
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2004-08-29 10:44:19 +0000
committerrecht <recht@pkgsrc.org>2004-08-29 10:44:19 +0000
commitf0fceda56b4bead7717fb5f3bbe34a9bf8ef6f75 (patch)
treeca8119df8aa952b5ba6c2beffb947f3f55c66466 /lang/python21
parentf20066751687a0630c69c068b563f652c033f5c0 (diff)
downloadpkgsrc-f0fceda56b4bead7717fb5f3bbe34a9bf8ef6f75.tar.gz
Extend some checks to also test for netbsd2 as sys.platform.
Bump PKGREVISIONS accordingly.
Diffstat (limited to 'lang/python21')
-rw-r--r--lang/python21/Makefile4
-rw-r--r--lang/python21/distinfo5
-rw-r--r--lang/python21/patches/patch-bb13
-rw-r--r--lang/python21/patches/patch-bc33
4 files changed, 47 insertions, 8 deletions
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)