Add DragonFly support. Use PTHREAD_* variables to find pthread_create

and hope it doesn't break anything.

5 files changed, 97 insertions, 7 deletions

diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index b30b8dfbc1d..3da4a4fa639 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2005/11/01 21:49:31 adrianp Exp $
+$NetBSD: distinfo,v 1.21 2005/11/08 18:14:49 joerg Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 RMD160 (Python-2.1.3.tgz) = d7216480cf884507d97bf7932767871977fc1ccc
@@ -12,8 +12,10 @@ SHA1 (patch-af) = e17c20f83ba1219860a6aefd959364147c7963e1
 SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
 SHA1 (patch-ai) = 6420f2994109b8cce55674ea14d7a974f9e039c6
 SHA1 (patch-aj) = ca232f769b57f617496f5c8701a0a32fe55f1fd9
-SHA1 (patch-bb) = 81780dd270791238687e57fb2969abe3547ea79d
-SHA1 (patch-bc) = 6761f59c7403b76420970288dc89330c094f7b2c
+SHA1 (patch-bb) = b672598198b9a2ee030f811345313ee01ba23d65
+SHA1 (patch-bc) = 6566f6cc3394d597ea3d588459f5208f7439df0c
 SHA1 (patch-bd) = 1fcff14864fbd52f350f63bec57e2952a4715ca4
 SHA1 (patch-be) = e1e5675e8b1059bd7836f8f23382a8305382a91b
 SHA1 (patch-bf) = 5a4f05c563d46c66485780c8dd8badac624c4f49
+SHA1 (patch-bg) = 3acbd0551a1cc5ae527cc07560da94f31366d5f5
+SHA1 (patch-bh) = fa0d154bc5e1ccb1d59b2902aa61df8c91d52b2d
diff --git a/lang/python21/patches/patch-bb b/lang/python21/patches/patch-bb
index 5ed33ad1199..31729b520c8 100644
--- a/lang/python21/patches/patch-bb
+++ b/lang/python21/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.3 2005/05/29 11:07:49 minskim Exp $
+$NetBSD: patch-bb,v 1.4 2005/11/08 18:14:49 joerg Exp $
 
 --- Lib/test/test_fcntl.py.orig	2001-04-11 15:58:20.000000000 -0500
 +++ Lib/test/test_fcntl.py
@@ -7,7 +7,7 @@ $NetBSD: patch-bb,v 1.3 2005/05/29 11:07:49 minskim Exp $
      print 'Status from fnctl with O_NONBLOCK: ', rv
  
 -if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin1',
-+if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', 'Darwin1.2', 'darwin1',
++if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', 'Darwin1.2', 'darwin1','dragonfly1'
                      'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                      'bsdos2', 'bsdos3', 'bsdos4',
                      'openbsd', 'openbsd2'):
diff --git a/lang/python21/patches/patch-bc b/lang/python21/patches/patch-bc
index ab37efc704a..fabdbf37cca 100644
--- a/lang/python21/patches/patch-bc
+++ b/lang/python21/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.2 2005/05/29 11:07:49 minskim Exp $
+$NetBSD: patch-bc,v 1.3 2005/11/08 18:14:49 joerg Exp $
 
 --- Lib/posixfile.py.orig	2001-04-10 10:44:33.000000000 -0500
 +++ Lib/posixfile.py
@@ -7,7 +7,7 @@ $NetBSD: patch-bc,v 1.2 2005/05/29 11:07:49 minskim Exp $
          # additions for AIX by Vladimir.Marangozov@imag.fr
          import sys, os
 -        if sys.platform in ('netbsd1',
-+        if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
++        if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3','dragonfly1',
                              'openbsd2',
                              'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                              'bsdos2', 'bsdos3', 'bsdos4'):
diff --git a/lang/python21/patches/patch-bg b/lang/python21/patches/patch-bg
new file mode 100644
index 00000000000..a2eef90243c
--- /dev/null
+++ b/lang/python21/patches/patch-bg
@@ -0,0 +1,57 @@
+$NetBSD: patch-bg,v 1.1 2005/11/08 18:14:49 joerg Exp $
+
+--- configure.orig	2001-12-27 21:55:46.000000000 +0000
++++ configure
+@@ -2966,6 +2966,7 @@ then
+ 		else
+ 			LDSHARED="ld -Bshareable"
+ 		fi;;
++	DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
+ 	FreeBSD*)
+ 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
+ 		then
+@@ -3003,7 +3004,7 @@ then
+ 	Linux*) CCSHARED="-fPIC";;
+ 	BSD/OS*/4*) CCSHARED="-fpic";;
+ 	OpenBSD*) CCSHARED="-fpic";;
+-	FreeBSD*|NetBSD*) CCSHARED="-fPIC";;
++	FreeBSD*|NetBSD*|DragonFly*) CCSHARED="-fPIC";;
+ 	UnixWare*)
+ 		if test "$GCC" = "yes"
+ 		then CCSHARED="-fPIC"
+@@ -3042,7 +3043,7 @@ then
+ 	UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";;
+ 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
+ 	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
+-	FreeBSD*|NetBSD*) 
++	FreeBSD*|NetBSD*|DragonFly*) 
+ 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
+ 		then
+ 			LINKFORSHARED="-Wl,--export-dynamic"
+@@ -3523,14 +3524,14 @@ EOF
+ else
+   
+ 	echo "$ac_t""no" 1>&6
+-	echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:3528: checking for pthread_create in -lpthread" >&5
++	echo $ac_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}""... $ac_c" 1>&6
++echo "configure:3528: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3536 "configure"
+ #include "confdefs.h"
+@@ -3567,7 +3568,7 @@ EOF
+ EOF
+ 
+ 	posix_threads=yes
+-	LIBS="-lpthread $LIBS"
++	LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ 	LIBOBJS="$LIBOBJS thread.o"
+ else
+   echo "$ac_t""no" 1>&6
diff --git a/lang/python21/patches/patch-bh b/lang/python21/patches/patch-bh
new file mode 100644
index 00000000000..571c75d99b4
--- /dev/null
+++ b/lang/python21/patches/patch-bh
@@ -0,0 +1,31 @@
+$NetBSD: patch-bh,v 1.1 2005/11/08 18:14:49 joerg Exp $
+
+--- Modules/fpectlmodule.c.orig	2005-11-08 17:25:20.000000000 +0000
++++ Modules/fpectlmodule.c
+@@ -68,7 +68,7 @@ extern "C" {
+ #include "Python.h"
+ #include <signal.h>
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #  include <ieeefp.h>
+ #endif
+ 
+@@ -189,7 +189,7 @@ static void fpe_reset(Sigfunc *handler)
+     PyOS_setsig(SIGFPE, handler);
+ 
+ /*-- FreeBSD ----------------------------------------------------------------*/
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+     fpresetsticky(fpgetsticky());
+     fpsetmask(FP_X_INV | FP_X_DZ | FP_X_OFL);
+     PyOS_setsig(SIGFPE, handler);
+@@ -235,7 +235,7 @@ static void fpe_reset(Sigfunc *handler)
+ 
+ static PyObject *turnoff_sigfpe(PyObject *self,PyObject *args)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+     fpresetsticky(fpgetsticky());
+     fpsetmask(0);
+ #else