When using the included mit-pthreads, do not link against random

-lpthread found in library search path, use explicit path to library.
Noticed by hubertf.
When OPSYS == NetBSD, force use of included mit-pthreads.
Bumb version to "nb1".

4 files changed, 14 insertions, 9 deletions

diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index d43339669c1..218e3bd51bb 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2001/03/26 13:46:19 bad Exp $
+# $NetBSD: Makefile,v 1.19 2001/03/26 22:37:33 bad Exp $
 #
 
 DISTNAME=		mysql-3.23.35
-PKGNAME=		${DISTNAME:S/-/-server-/}
+PKGNAME=		${DISTNAME:S/-/-server-/}nb1
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.mysql.com/MySQL-3.23/ \
 			http://www.mysql.com/Downloads/MySQL-3.23/ \
@@ -29,6 +29,11 @@ CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR} \
 			--without-perl --without-debug --without-bench \
 			--without-docs --with-low-memory
 
+# hardwire use of included mit-pthreads on NetBSD
+.if (${OPSYS} == "NetBSD")
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
 CFLAGS+=		-Dunix
 
 # platforms on which included mit-pthreads is usable
diff --git a/databases/mysql-server/files/patch-sum b/databases/mysql-server/files/patch-sum
index ab6565b35dc..4b364bfec27 100644
--- a/databases/mysql-server/files/patch-sum
+++ b/databases/mysql-server/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.14 2001/03/26 13:46:20 bad Exp $
+$NetBSD: patch-sum,v 1.15 2001/03/26 22:37:34 bad Exp $
 
 SHA1 (patch-aa) = 05c56d81e17893dd267fcd5f68d8c378f024a06f
 SHA1 (patch-ab) = 4f10917780d73cb4a58127b27a5d8c1c9f63e0d3
 SHA1 (patch-ac) = 9ac4beb4f53cc4d4fc4ec52cf30716c8269face8
 SHA1 (patch-ad) = 1aecfee152d303b3d65f3866032d2a6d49538f46
-SHA1 (patch-ae) = c84c8b31971b6f8bcc27c7d771643a1f01d29008
-SHA1 (patch-af) = 3e637f62f681726c408f2fb6b30a1afa6aacfdc6
+SHA1 (patch-ae) = c77d019c8638a15ff40e9adb0e8e36762500cbd7
+SHA1 (patch-af) = 44449c93f2e12fb0e99dd02486e62c63555a07d8
diff --git a/databases/mysql-server/patches/patch-ae b/databases/mysql-server/patches/patch-ae
index 988f5ae65a2..f21cd97489b 100644
--- a/databases/mysql-server/patches/patch-ae
+++ b/databases/mysql-server/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2001/03/26 13:43:50 bad Exp $
+$NetBSD: patch-ae,v 1.3 2001/03/26 22:37:34 bad Exp $
 
 --- configure.in.orig	Fri Mar 16 01:51:51 2001
 +++ configure.in	Sat Mar 24 02:44:15 2001
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.2 2001/03/26 13:43:50 bad Exp $
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      AC_SUBST(MT_INCLUDES)
 -    MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
-+    MT_LD_ADD="-L\$(top_srcdir)/mit-pthreads/obj/ -lpthread"
++    MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
      AC_SUBST(MT_LD_ADD)
      LIBS="$MT_LD_ADD $LIBS"
      echo ""
diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af
index b3f00328a0e..1bee4321ea8 100644
--- a/databases/mysql-server/patches/patch-af
+++ b/databases/mysql-server/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2001/03/26 13:43:50 bad Exp $
+$NetBSD: patch-af,v 1.3 2001/03/26 22:37:34 bad Exp $
 
 --- configure.orig	Fri Mar 16 01:52:05 2001
 +++ configure	Sat Mar 24 02:42:32 2001
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.2 2001/03/26 13:43:50 bad Exp $
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      
 -    MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
-+    MT_LD_ADD="-L\$(top_srcdir)/mit-pthreads/obj/ -lpthread"
++    MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
      
      LIBS="$MT_LD_ADD $LIBS"
      echo ""