Fixed mremap on NetBSD.

6 files changed, 51 insertions, 3 deletions

diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index 55a0db449ed..cc75bbe51b4 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2006/10/04 21:07:52 rillig Exp $
+$NetBSD: distinfo,v 1.26 2007/10/10 11:21:52 rillig Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 RMD160 (Python-2.1.3.tgz) = d7216480cf884507d97bf7932767871977fc1ccc
@@ -22,3 +22,4 @@ SHA1 (patch-bg) = 2e0733e66681582d36b1470dce50c8e8b43cd083
 SHA1 (patch-bh) = fa0d154bc5e1ccb1d59b2902aa61df8c91d52b2d
 SHA1 (patch-bi) = 19e9e7ecba296b6fd955087f0dad85c52dfee058
 SHA1 (patch-bj) = 6b860ee6fca483f7360930935d4759fe6c93bdee
+SHA1 (patch-na) = e849a4db264c51b89cf1d8f1491d993b4c335db3
diff --git a/lang/python21/patches/patch-na b/lang/python21/patches/patch-na
new file mode 100644
index 00000000000..658d3812a03
--- /dev/null
+++ b/lang/python21/patches/patch-na
@@ -0,0 +1,15 @@
+$NetBSD: patch-na,v 1.1 2007/10/10 11:21:53 rillig Exp $
+
+--- Modules/mmapmodule.c.orig	2001-07-16 17:45:20.000000000 +0200
++++ Modules/mmapmodule.c	2007-10-10 13:18:05.000000000 +0200
+@@ -394,6 +394,10 @@
+ } else {
+ 	void *newmap;
+ 
++#if defined(__NetBSD__)
++#  define mremap(a, b, c, d) (mremap)((a), (b), NULL, (c), (d))
++#endif
++
+ #ifdef MREMAP_MAYMOVE
+ 	newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
+ #else
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index 95cce391c27..1c0fe06c4f9 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2006/04/13 02:26:54 joerg Exp $
+$NetBSD: distinfo,v 1.21 2007/10/10 11:24:10 rillig Exp $
 
 SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
 RMD160 (Python-2.2.3.tgz) = 3590f813582d65194b467f4ab450e360e35eb40e
@@ -19,3 +19,4 @@ SHA1 (patch-bc) = 376e5560f9f951d22ac371a8a5ab16c48d72404b
 SHA1 (patch-ea) = babfed4a0e5ae599441423a06622d4820ab237b1
 SHA1 (patch-eb) = b72694d414b55d11e324cc76d6ed03b7c8e7630c
 SHA1 (patch-ec) = 3744382c5c58814129548f0529e3a5605c7ee0c8
+SHA1 (patch-na) = 33364795e278437b952c4ab96254e61823715e37
diff --git a/lang/python22/patches/patch-na b/lang/python22/patches/patch-na
new file mode 100644
index 00000000000..8aee908268a
--- /dev/null
+++ b/lang/python22/patches/patch-na
@@ -0,0 +1,15 @@
+$NetBSD: patch-na,v 1.1 2007/10/10 11:24:11 rillig Exp $
+
+--- Modules/mmapmodule.c.orig	2003-02-07 20:46:44.000000000 +0100
++++ Modules/mmapmodule.c	2007-10-10 13:19:54.000000000 +0200
+@@ -428,6 +428,10 @@ mmap_resize_method(mmap_object *self,
+ 	} else {
+ 		void *newmap;
+ 
++#if defined(__NetBSD__)
++#  define mremap(a, b, c, d) (mremap)((a), (b), NULL, (c), (d))
++#endif
++
+ #ifdef MREMAP_MAYMOVE
+ 		newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
+ #else
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index a6abf611e8e..e079c49ab18 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2006/10/07 07:57:58 rillig Exp $
+$NetBSD: distinfo,v 1.39 2007/10/10 11:15:13 rillig Exp $
 
 SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
 RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
@@ -24,3 +24,4 @@ SHA1 (patch-ea) = babfed4a0e5ae599441423a06622d4820ab237b1
 SHA1 (patch-eb) = b72694d414b55d11e324cc76d6ed03b7c8e7630c
 SHA1 (patch-ec) = 9bec8cc75868ca785810b92ffe60406117bdc3fd
 SHA1 (patch-ed) = 4e032197f21b16c99331b6d744c4d1d72e650d4d
+SHA1 (patch-na) = 0019127a9b5b5b3f9f0fe3ae8d6b03672dea51e0
diff --git a/lang/python23/patches/patch-na b/lang/python23/patches/patch-na
new file mode 100644
index 00000000000..6768b3f73e9
--- /dev/null
+++ b/lang/python23/patches/patch-na
@@ -0,0 +1,15 @@
+$NetBSD: patch-na,v 1.1 2007/10/10 11:15:13 rillig Exp $
+
+--- Modules/mmapmodule.c.orig	2004-06-01 13:00:16.000000000 +0000
++++ Modules/mmapmodule.c	2007-10-10 11:07:50.000000000 +0000
+@@ -428,6 +428,10 @@ mmap_resize_method(mmap_object *self,
+ 	} else {
+ 		void *newmap;
+ 
++#if defined(__NetBSD__)
++#  define mremap(a, b, c, d) (mremap)((a), (b), NULL, (c), (d))
++#endif
++
+ #ifdef MREMAP_MAYMOVE
+ 		newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
+ #else