Not MAKE_JOBS_SAFE. Prepare for libtool-2.2.

4 files changed, 36 insertions, 11 deletions

diff --git a/net/bind95/Makefile b/net/bind95/Makefile
index 2bfa197002d..ae6edb5fb42 100644
--- a/net/bind95/Makefile
+++ b/net/bind95/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/07/29 00:24:03 reed Exp $
+# $NetBSD: Makefile,v 1.12 2009/11/25 23:25:44 joerg Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
@@ -14,6 +14,7 @@ CONFLICTS+=	bind<9.5.0
 CONFLICTS+=	bind>=9.6.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+MAKE_JOBS_SAFE=	no
 
 BIND_VERSION=	9.5.1-P3
 
diff --git a/net/bind95/distinfo b/net/bind95/distinfo
index 61901d20e2f..49bfb78ec05 100644
--- a/net/bind95/distinfo
+++ b/net/bind95/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.9 2009/07/29 00:24:03 reed Exp $
+$NetBSD: distinfo,v 1.10 2009/11/25 23:25:44 joerg Exp $
 
 SHA1 (bind-9.5.1-P3.tar.gz) = fa17c60a1e0e95c67b2680f091e46c5677dcb805
 RMD160 (bind-9.5.1-P3.tar.gz) = 6a929a8860b4e0f4394783023eef8b488ad58af8
 Size (bind-9.5.1-P3.tar.gz) = 6690806 bytes
 SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
 SHA1 (patch-ac) = 71a379fcb128013bfbacd87002c27dd90c1844b1
-SHA1 (patch-ad) = 9a46d8de9d84e708ac64df8e4da504176dba05d4
+SHA1 (patch-ad) = d4c602a6cde7f2e33b127df609c4e89e6845824a
 SHA1 (patch-af) = b21bb5195cdb4deec00e5abd39f5bf2137549c3f
 SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e
-SHA1 (patch-ai) = 88e6d90b67fccaab26c3a3a1b5539c374d51e417
+SHA1 (patch-ai) = ffc3fcaf1ed200ba40106920d694daf4fd5c000b
 SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
diff --git a/net/bind95/patches/patch-ad b/net/bind95/patches/patch-ad
index b4e81f0d5b2..30b76694764 100644
--- a/net/bind95/patches/patch-ad
+++ b/net/bind95/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-ad,v 1.2 2009/11/25 23:25:44 joerg Exp $
 
---- configure.orig	2008-05-06 02:33:33.000000000 +0100
+--- configure.orig	2008-10-29 23:05:42.000000000 +0100
 +++ configure
-@@ -6550,6 +6550,8 @@ case $host in
+@@ -6922,6 +6922,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  *-bsdi234*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -6638,7 +6640,7 @@ echo "$as_me: WARNING: linking with PTL2
+@@ -7010,7 +7012,7 @@ echo "$as_me: WARNING: linking with PTL2
  echo "${ECHO_T}native" >&6; }
  				LIBS="-lpthread $LIBS"
  			else
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  				then
  					{ echo "$as_me:$LINENO: result: none" >&5
  echo "${ECHO_T}none" >&6; }
-@@ -6649,14 +6651,23 @@ echo "$as_me: error: \"could not find th
+@@ -7021,14 +7023,23 @@ echo "$as_me: error: \"could not find th
  
  				if $use_threads
  				then
@@ -51,3 +51,15 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  				fi
  			fi
  		fi
+@@ -24822,9 +24833,9 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+ 		O=lo
+ 		A=la
+ 		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
+-		LIBTOOL_MODE_COMPILE='--mode=compile'
++		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
+ 		LIBTOOL_MODE_INSTALL='--mode=install'
+-		LIBTOOL_MODE_LINK='--mode=link'
++		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
+ 		case "$host" in
+ 		*) LIBTOOL_ALLOW_UNDEFINED= ;;
+ 		esac
diff --git a/net/bind95/patches/patch-ai b/net/bind95/patches/patch-ai
index 31de744747d..dfc4412223a 100644
--- a/net/bind95/patches/patch-ai
+++ b/net/bind95/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-ai,v 1.2 2009/11/25 23:25:44 joerg Exp $
 
---- lib/bind/configure.orig	2008-04-29 00:51:46.000000000 +0100
+--- lib/bind/configure.orig	2008-08-26 16:51:07.000000000 +0200
 +++ lib/bind/configure
 @@ -2600,12 +2600,7 @@ done
  #
@@ -76,6 +76,18 @@ $NetBSD: patch-ai,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  		*-openbsd*)
  			CC="$CC -pthread"
  			CCOPT="$CCOPT -pthread"
+@@ -23974,9 +23984,9 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+ 		O=lo
+ 		A=la
+ 		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
+-		LIBTOOL_MODE_COMPILE='--mode=compile'
++		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
+ 		LIBTOOL_MODE_INSTALL='--mode=install'
+-		LIBTOOL_MODE_LINK='--mode=link'
++		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
+ 		;;
+ 	*)
+ 		O=o
 @@ -24730,6 +24740,7 @@ case "$host" in
  	*-bsdi2345*)	have_minimum_ifreq=yes;;
  	*-darwin*)	have_minimum_ifreq=yes;;