-add a patch from Marc Recht vie pkgsrc-wip which meddes with these

 XOPEN/POSIX/NetBSD_SOURCE definitions so that it builds on 1.6.x
-pull in some GNU-pth related fixes from Python-2.2-pth

6 files changed, 134 insertions, 2 deletions

diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo
index aba7a09c274..30b97ecb12b 100644
--- a/lang/python23-pth/distinfo
+++ b/lang/python23-pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/08/06 11:05:27 drochner Exp $
+$NetBSD: distinfo,v 1.3 2003/08/06 11:38:11 drochner Exp $
 
 SHA1 (Python-2.3.tgz) = ce5fbde09be17ea5dddd4baa62d2b90e06e7e5c1
 Size (Python-2.3.tgz) = 8436880 bytes
@@ -8,4 +8,7 @@ SHA1 (patch-ag) = c11f521d3bd3172289b67224ad4b07d861d8fe18
 SHA1 (patch-ah) = 9bc1b5bf1ee0e76fc19bd582299bf70ee3a10535
 SHA1 (patch-ai) = 75d30db64343afcf2f0bcfe8e73dc9948acb237e
 SHA1 (patch-aj) = e2291bde6a59fc0441bc7c87c0946b7f5601aa5c
+SHA1 (patch-ak) = 341e7dd750e46463f6174676e06fd3a847efd311
+SHA1 (patch-al) = 5429c1c50e1b58495ad93477d19a82b81a713076
+SHA1 (patch-ba) = 9be4490e38c895dfc5041af1889ca7ab1c6d8bd9
 SHA1 (patch-bb) = 1390c5f0bcd75f5f3f1b9949921b555e1021954f
diff --git a/lang/python23-pth/patches/patch-ak b/lang/python23-pth/patches/patch-ak
new file mode 100644
index 00000000000..af3c5caeced
--- /dev/null
+++ b/lang/python23-pth/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2003/08/06 11:38:11 drochner Exp $
+
+--- Python/thread.c.orig	2003-04-19 17:41:53.000000000 +0200
++++ Python/thread.c	2003-07-30 20:27:45.000000000 +0200
+@@ -98,6 +98,7 @@
+ 
+ #ifdef HAVE_PTH
+ #include "thread_pth.h"
++#undef _POSIX_THREADS
+ #endif
+ 
+ #ifdef _POSIX_THREADS
diff --git a/lang/python23-pth/patches/patch-al b/lang/python23-pth/patches/patch-al
new file mode 100644
index 00000000000..69fc703d48b
--- /dev/null
+++ b/lang/python23-pth/patches/patch-al
@@ -0,0 +1,42 @@
+$NetBSD: patch-al,v 1.1 2003/08/06 11:38:11 drochner Exp $
+
+--- pyconfig.h.in.orig	2003-07-22 17:20:49.000000000 +0200
++++ pyconfig.h.in	2003-08-02 15:50:34.000000000 +0200
+@@ -835,6 +835,10 @@
+ /* Define _OSF_SOURCE to get the makedev macro. */
+ #undef _OSF_SOURCE
+ 
++/* These defines disable needed library functions on NetBSD < 1.6T */
++/* ( _NETBSD_SOURCE doesn't exist prior to 1.6T ) */
++#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106200000)
++
+ /* Define to 2 if the system does not provide POSIX.1 features except with
+    this defined. */
+ #undef _POSIX_1_SOURCE
+@@ -845,18 +849,26 @@
+ /* Define to 1 if you need to in order for `stat' and other things to work. */
+ #undef _POSIX_SOURCE
+ 
++#endif
++
+ /* Define if you have POSIX threads, and your system does not define that. */
+ #undef _POSIX_THREADS
+ 
+ /* Define to force use of thread-safe errno, h_errno, and other functions */
+ #undef _REENTRANT
+ 
++/* These defines disable needed library functions on NetBSD < 1.6T */
++/* ( _NETBSD_SOURCE doesn't exists prior to 1.6T ) */
++#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106200000)
++
+ /* Define to the level of X/Open that your system supports */
+ #undef _XOPEN_SOURCE
+ 
+ /* Define to activate Unix95-and-earlier features */
+ #undef _XOPEN_SOURCE_EXTENDED
+ 
++#endif
++
+ /* Define on FreeBSD to activate all library features */
+ #undef __BSD_VISIBLE
+ 
diff --git a/lang/python23-pth/patches/patch-ba b/lang/python23-pth/patches/patch-ba
new file mode 100644
index 00000000000..8b4b3c6f6b7
--- /dev/null
+++ b/lang/python23-pth/patches/patch-ba
@@ -0,0 +1,32 @@
+$NetBSD: patch-ba,v 1.1 2003/08/06 11:38:11 drochner Exp $
+
+--- Python/thread_pth.h.orig	2002-01-19 23:02:55.000000000 +0100
++++ Python/thread_pth.h	2003-08-02 15:26:12.000000000 +0200
+@@ -30,6 +30,8 @@
+ 
+ #define CHECK_STATUS(name)  if (status == -1) { printf("%d ", status); perror(name); error = 1; }
+ 
++pth_attr_t PyThread_attr;
++
+ /*
+  * Initialization.
+  */
+@@ -37,6 +39,9 @@
+ static void PyThread__init_thread(void)
+ {
+ 	pth_init();
++	PyThread_attr = pth_attr_new();
++	pth_attr_set(PyThread_attr, PTH_ATTR_STACK_SIZE, 1<<18);
++	pth_attr_set(PyThread_attr, PTH_ATTR_JOINABLE, FALSE);
+ }
+ 
+ /*
+@@ -51,7 +56,7 @@
+ 	if (!initialized)
+ 		PyThread_init_thread();
+ 
+-	th = pth_spawn(PTH_ATTR_DEFAULT,
++	th = pth_spawn(PyThread_attr,
+ 				 (void* (*)(void *))func,
+ 				 (void *)arg
+ 				 );
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index b10c596cee6..6fcf3e84ca3 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/08/06 11:05:27 drochner Exp $
+$NetBSD: distinfo,v 1.3 2003/08/06 11:38:10 drochner Exp $
 
 SHA1 (Python-2.3.tgz) = ce5fbde09be17ea5dddd4baa62d2b90e06e7e5c1
 Size (Python-2.3.tgz) = 8436880 bytes
@@ -6,4 +6,5 @@ SHA1 (patch-aa) = cf9b037bdd2c7db5ebee79d6327d1961d519cd31
 SHA1 (patch-ae) = ff045dc1b42ce8a4fe5e64fde72469e1be8dab28
 SHA1 (patch-ai) = 75d30db64343afcf2f0bcfe8e73dc9948acb237e
 SHA1 (patch-aj) = 1e3ce4072e90cb7be6d0a5539ec213b56518dcc7
+SHA1 (patch-al) = 5429c1c50e1b58495ad93477d19a82b81a713076
 SHA1 (patch-bb) = 1390c5f0bcd75f5f3f1b9949921b555e1021954f
diff --git a/lang/python23/patches/patch-al b/lang/python23/patches/patch-al
new file mode 100644
index 00000000000..fa5272eb73c
--- /dev/null
+++ b/lang/python23/patches/patch-al
@@ -0,0 +1,42 @@
+$NetBSD: patch-al,v 1.1 2003/08/06 11:38:10 drochner Exp $
+
+--- pyconfig.h.in.orig	2003-07-22 17:20:49.000000000 +0200
++++ pyconfig.h.in	2003-08-02 15:50:34.000000000 +0200
+@@ -835,6 +835,10 @@
+ /* Define _OSF_SOURCE to get the makedev macro. */
+ #undef _OSF_SOURCE
+ 
++/* These defines disable needed library functions on NetBSD < 1.6T */
++/* ( _NETBSD_SOURCE doesn't exist prior to 1.6T ) */
++#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106200000)
++
+ /* Define to 2 if the system does not provide POSIX.1 features except with
+    this defined. */
+ #undef _POSIX_1_SOURCE
+@@ -845,18 +849,26 @@
+ /* Define to 1 if you need to in order for `stat' and other things to work. */
+ #undef _POSIX_SOURCE
+ 
++#endif
++
+ /* Define if you have POSIX threads, and your system does not define that. */
+ #undef _POSIX_THREADS
+ 
+ /* Define to force use of thread-safe errno, h_errno, and other functions */
+ #undef _REENTRANT
+ 
++/* These defines disable needed library functions on NetBSD < 1.6T */
++/* ( _NETBSD_SOURCE doesn't exists prior to 1.6T ) */
++#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106200000)
++
+ /* Define to the level of X/Open that your system supports */
+ #undef _XOPEN_SOURCE
+ 
+ /* Define to activate Unix95-and-earlier features */
+ #undef _XOPEN_SOURCE_EXTENDED
+ 
++#endif
++
+ /* Define on FreeBSD to activate all library features */
+ #undef __BSD_VISIBLE
+