-make this build with NetBSD's version of mremap(2)

 (reused joerg's patch to python24)
-fix some misbehaviour of distutils - the interpreter path of scripts
 was messed up under some circumstances

3 files changed, 34 insertions, 1 deletions

diff --git a/lang/python20/distinfo b/lang/python20/distinfo
index 3574fc0c224..da3946cd2d5 100644
--- a/lang/python20/distinfo
+++ b/lang/python20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/04/13 02:26:54 joerg Exp $
+$NetBSD: distinfo,v 1.13 2007/07/24 16:53:20 drochner Exp $
 
 SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab
 RMD160 (python/Python-2.0.1.tgz) = fe663234ff4a8b363f10f6e5589acf1d8b00573f
@@ -12,6 +12,8 @@ SHA1 (patch-af) = 9ed51b6868c3c7e24d92b52f0dc260e9c30d99bc
 SHA1 (patch-ag) = 4b1b561832d6a044c6be0372f9f915b09fab4c3c
 SHA1 (patch-ah) = c48beff9fe4d4f61e21c0952f4a7547cae28c0bb
 SHA1 (patch-ai) = 87b430f97ec258d423f7841bf369970223323a6b
+SHA1 (patch-aj) = 56e34352284a0b71fecb9b4abef8825ce4edf6d7
+SHA1 (patch-ak) = 0603b4731413bb098991f34df00c627f0b64e6df
 SHA1 (patch-bb) = adab8436d470acdc07149fdd6eed09c20ebf965e
 SHA1 (patch-bc) = fdd18d0fab171364d4733975351fbc60c81d0a4a
 SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc
diff --git a/lang/python20/patches/patch-aj b/lang/python20/patches/patch-aj
new file mode 100644
index 00000000000..a7532b6db98
--- /dev/null
+++ b/lang/python20/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2007/07/24 16:53:20 drochner Exp $
+
+--- Lib/distutils/command/build_scripts.py.orig	2007-07-23 16:04:02.000000000 +0200
++++ Lib/distutils/command/build_scripts.py
+@@ -78,7 +78,7 @@ class build_scripts (Command):
+                 match = first_line_re.match(first_line)
+                 if match:
+                     adjust = 1
+-                    post_interp = match.group(1)
++                    post_interp = match.group(1) or ''
+ 
+             if adjust:
+                 self.announce("copying and adjusting %s -> %s" %
diff --git a/lang/python20/patches/patch-ak b/lang/python20/patches/patch-ak
new file mode 100644
index 00000000000..9ab3054c843
--- /dev/null
+++ b/lang/python20/patches/patch-ak
@@ -0,0 +1,18 @@
+$NetBSD: patch-ak,v 1.1 2007/07/24 16:53:20 drochner Exp $
+
+--- Modules/mmapmodule.c.orig	2001-03-31 15:23:19.000000000 +0200
++++ Modules/mmapmodule.c
+@@ -390,10 +390,12 @@ mmap_resize_method(mmap_object *self,
+ 
+ #ifdef MREMAP_MAYMOVE
+ 	newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
++#elif defined(__NetBSD__)
++	newmap = mremap(self->data, self->size, self->data, new_size, 0);
+ #else
+ 	newmap = mremap(self->data, self->size, new_size, 0);
+ #endif
+-	if (newmap == (void *)-1) 
++	if (newmap == MAP_FAILED) 
+ 	{
+ 		PyErr_SetFromErrno(mmap_module_error);
+ 		return NULL;