Recognize native threads.

Addresses PR 20641 by Kimmo Suominen <kim@tac.nyc.ny.us>

5 files changed, 181 insertions, 1 deletions

diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index b6ab95502f1..e814863a77a 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.8 2003/03/05 05:40:45 hubertf Exp $
+$NetBSD: distinfo,v 1.9 2003/03/10 02:47:37 hubertf Exp $
 
 SHA1 (bind/9.2.2/bind-9.2.2.tar.gz) = 30c740c0c9a29f35adcd4aadda1350d677f6ae76
 Size (bind/9.2.2/bind-9.2.2.tar.gz) = 5054652 bytes
+SHA1 (patch-aa) = 11690be2281bbf088f9ea2aa91863f5c1579054c
 SHA1 (patch-ab) = 1d3d82e3e01ac38e8a1b1d98e018849e8fe071bf
 SHA1 (patch-ac) = 1696adfab7392e0f150d34931b808e51ad017938
+SHA1 (patch-ad) = 3d566cc585f996ce36dbed4e8efdb2b6226aa58c
+SHA1 (patch-ae) = 089d51ae714447e9177aa49673223be29790f814
+SHA1 (patch-af) = 4a4cd41c2d5acee9428892f4bf7eb9ea7c6e4131
 SHA1 (patch-ai) = 916d2cdadd420b34e908f3c128e864bf271ebb6a
diff --git a/net/bind9/patches/patch-aa b/net/bind9/patches/patch-aa
new file mode 100644
index 00000000000..abfb4a01ac0
--- /dev/null
+++ b/net/bind9/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.7 2003/03/10 02:47:37 hubertf Exp $
+
+--- configure.in.orig	2003-03-10 00:19:25.000000000 +0000
++++ configure.in
+@@ -586,7 +586,8 @@ then
+ [linking with PTL2 is highly experimental and not expected to work])
+ 			CC=ptlgcc
+ 		else
+-			if test ! -d $LOCALBASE/pthreads
++			if test ! -d $LOCALBASE/pthreads \
++				-a ! -f /usr/include/pthread.h
+ 			then
+ 				AC_MSG_RESULT(none)
+ 				AC_MSG_ERROR("could not find thread libraries")
+@@ -594,13 +595,21 @@ then
+ 
+ 			if $use_threads
+ 			then
+-				AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
+-				pkg="$LOCALBASE/pthreads"
+-				lib1="-L$pkg/lib -Wl,-R$pkg/lib"
+-				lib2="-lpthread -lm -lgcc -lpthread"
+-				LIBS="$lib1 $lib2 $LIBS"
+-				CPPFLAGS="$CPPFLAGS -I$pkg/include"
+-				STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++				if test -f /usr/include/pthread.h
++				then
++					AC_MSG_RESULT(native pthreads)
++					LIBS="-lpthread $LIBS"
++					CPPFLAGS="$CPPFLAGS -I/usr/include"
++					STD_CINCLUDES="$STD_CINCLUDES -I/usr/include"
++				else
++					AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
++					pkg="$LOCALBASE/pthreads"
++					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
++					lib2="-lpthread -lm -lgcc -lpthread"
++					LIBS="$lib1 $lib2 $LIBS"
++					CPPFLAGS="$CPPFLAGS -I$pkg/include"
++					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++				fi
+ 			fi
+ 		fi
+ 		;;
diff --git a/net/bind9/patches/patch-ad b/net/bind9/patches/patch-ad
new file mode 100644
index 00000000000..b0f460ea2d2
--- /dev/null
+++ b/net/bind9/patches/patch-ad
@@ -0,0 +1,45 @@
+$NetBSD: patch-ad,v 1.3 2003/03/10 02:47:38 hubertf Exp $
+
+--- configure.orig	2003-02-18 04:16:23.000000000 +0000
++++ configure
+@@ -4739,7 +4924,8 @@ echo "${ECHO_T}PTL2" >&6
+ echo "$as_me: WARNING: linking with PTL2 is highly experimental and not expected to work" >&2;}
+ 			CC=ptlgcc
+ 		else
+-			if test ! -d $LOCALBASE/pthreads
++			if test ! -d $LOCALBASE/pthreads \
++				-a ! -f /usr/include/pthread.h
+ 			then
+ 				echo "$as_me:$LINENO: result: none" >&5
+ echo "${ECHO_T}none" >&6
+@@ -4750,14 +4936,23 @@ echo "$as_me: error: \"could not find th
+ 
+ 			if $use_threads
+ 			then
+-				echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
++				if test -f /usr/include/pthread.h
++				then
++					echo "$as_me:$LINENO: result: native pthreads" >&5
++echo "${ECHO_T}native pthreads" >&6
++					LIBS="-lpthread $LIBS"
++					CPPFLAGS="$CPPFLAGS -I/usr/include"
++					STD_CINCLUDES="$STD_CINCLUDES -I/usr/include"
++				else
++					echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
+ echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6
+-				pkg="$LOCALBASE/pthreads"
+-				lib1="-L$pkg/lib -Wl,-R$pkg/lib"
+-				lib2="-lpthread -lm -lgcc -lpthread"
+-				LIBS="$lib1 $lib2 $LIBS"
+-				CPPFLAGS="$CPPFLAGS -I$pkg/include"
+-				STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++					pkg="$LOCALBASE/pthreads"
++					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
++					lib2="-lpthread -lm -lgcc -lpthread"
++					LIBS="$lib1 $lib2 $LIBS"
++					CPPFLAGS="$CPPFLAGS -I$pkg/include"
++					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++				fi
+ 			fi
+ 		fi
+ 		;;
diff --git a/net/bind9/patches/patch-ae b/net/bind9/patches/patch-ae
new file mode 100644
index 00000000000..c892ef414ca
--- /dev/null
+++ b/net/bind9/patches/patch-ae
@@ -0,0 +1,45 @@
+$NetBSD: patch-ae,v 1.3 2003/03/10 02:47:38 hubertf Exp $
+
+--- lib/bind/configure.orig	2003-03-10 01:09:39.000000000 +0000
++++ lib/bind/configure
+@@ -4076,7 +4076,8 @@ echo "${ECHO_T}PTL2" >&6
+ echo "$as_me: WARNING: linking with PTL2 is highly experimental and not expected to work" >&2;}
+ 			CC=ptlgcc
+ 		else
+-			if test ! -d $LOCALBASE/pthreads
++			if test ! -d $LOCALBASE/pthreads \
++				-a ! -f /usr/include/pthread.h
+ 			then
+ 				echo "$as_me:$LINENO: result: none" >&5
+ echo "${ECHO_T}none" >&6
+@@ -4085,14 +4086,23 @@ echo "${ECHO_T}none" >&6
+ 
+ 			if $use_threads
+ 			then
+-				echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
++				if test -f /usr/include/pthread.h
++				then
++					echo "$as_me:$LINENO: result: native pthreads" >&5
++echo "${ECHO_T}native pthreads" >&6
++					LIBS="-lpthread $LIBS"
++					CPPFLAGS="$CPPFLAGS -I/usr/include"
++					STD_CINCLUDES="$STD_CINCLUDES -I/usr/include"
++				else
++					echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
+ echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6
+-				pkg="$LOCALBASE/pthreads"
+-				lib1="-L$pkg/lib -Wl,-R$pkg/lib"
+-				lib2="-lpthread -lm -lgcc -lpthread"
+-				LIBS="$lib1 $lib2 $LIBS"
+-				CPPFLAGS="$CPPFLAGS -I$pkg/include"
+-				STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++					pkg="$LOCALBASE/pthreads"
++					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
++					lib2="-lpthread -lm -lgcc -lpthread"
++					LIBS="$lib1 $lib2 $LIBS"
++					CPPFLAGS="$CPPFLAGS -I$pkg/include"
++					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++				fi
+ 			fi
+ 		fi
+ 		;;
diff --git a/net/bind9/patches/patch-af b/net/bind9/patches/patch-af
new file mode 100644
index 00000000000..22186601f33
--- /dev/null
+++ b/net/bind9/patches/patch-af
@@ -0,0 +1,43 @@
+$NetBSD: patch-af,v 1.4 2003/03/10 02:47:38 hubertf Exp $
+
+--- lib/bind/configure.in.orig	2003-03-10 01:09:39.000000000 +0000
++++ lib/bind/configure.in
+@@ -367,7 +367,8 @@ then
+ [linking with PTL2 is highly experimental and not expected to work])
+ 			CC=ptlgcc
+ 		else
+-			if test ! -d $LOCALBASE/pthreads
++			if test ! -d $LOCALBASE/pthreads \
++				-a ! -f /usr/include/pthread.h
+ 			then
+ 				AC_MSG_RESULT(none)
+ 				use_threads=false
+@@ -375,13 +376,21 @@ then
+ 
+ 			if $use_threads
+ 			then
+-				AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
+-				pkg="$LOCALBASE/pthreads"
+-				lib1="-L$pkg/lib -Wl,-R$pkg/lib"
+-				lib2="-lpthread -lm -lgcc -lpthread"
+-				LIBS="$lib1 $lib2 $LIBS"
+-				CPPFLAGS="$CPPFLAGS -I$pkg/include"
+-				STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++				if test -f /usr/include/pthread.h
++				then
++					AC_MSG_RESULT(native pthreads)
++					LIBS="-lpthread $LIBS"
++					CPPFLAGS="$CPPFLAGS -I/usr/include"
++					STD_CINCLUDES="$STD_CINCLUDES -I/usr/include"
++				else
++					AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
++					pkg="$LOCALBASE/pthreads"
++					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
++					lib2="-lpthread -lm -lgcc -lpthread"
++					LIBS="$lib1 $lib2 $LIBS"
++					CPPFLAGS="$CPPFLAGS -I$pkg/include"
++					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++				fi
+ 			fi
+ 		fi
+ 		;;