Prepare for libtool-2.2: use --tag=CC when calling gcc instead of cc.

3 files changed, 34 insertions, 10 deletions

diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index 4851250f2bf..cd80ddba4dd 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.44 2009/07/28 20:39:45 reed Exp $
+$NetBSD: distinfo,v 1.45 2009/11/25 22:29:34 joerg Exp $
 
 SHA1 (bind-9.4.3-P3.tar.gz) = 165b3ee52309ae4a483901db6992a979f6382ba7
 RMD160 (bind-9.4.3-P3.tar.gz) = 1e59f48f538141bb5c36fa58607ac4689cb6a161
 Size (bind-9.4.3-P3.tar.gz) = 6544968 bytes
 SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
 SHA1 (patch-ac) = d862218c833dbb129b5104ad26872cd4bf3e7c5f
-SHA1 (patch-ad) = 0851864c896c2f0eb63cb58da39e12cfa89f1b7c
+SHA1 (patch-ad) = c788eae58f42ef94eed3f1c5ae09816c280a6a2e
 SHA1 (patch-af) = b21bb5195cdb4deec00e5abd39f5bf2137549c3f
 SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e
-SHA1 (patch-ai) = 4375ae44c83050fd576c0ccb5b267fbc23761a63
+SHA1 (patch-ai) = d6c31e8082aa4fe31faa3805f0e380b08fbc93ff
 SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
diff --git a/net/bind9/patches/patch-ad b/net/bind9/patches/patch-ad
index 81897f7ff3e..c5ad3f66b1e 100644
--- a/net/bind9/patches/patch-ad
+++ b/net/bind9/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2008/07/10 21:05:30 adrianp Exp $
+$NetBSD: patch-ad,v 1.9 2009/11/25 22:29:34 joerg Exp $
 
---- configure.orig	2007-09-14 05:27:29.000000000 +0100
+--- configure.orig	2008-10-21 04:47:25.000000000 +0200
 +++ configure
-@@ -6165,6 +6165,8 @@ case $host in
+@@ -6598,6 +6598,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.8 2008/07/10 21:05:30 adrianp Exp $
  *-bsdi234*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -6253,7 +6255,7 @@ echo "$as_me: WARNING: linking with PTL2
+@@ -6686,7 +6688,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.8 2008/07/10 21:05:30 adrianp Exp $
  				then
  					{ echo "$as_me:$LINENO: result: none" >&5
  echo "${ECHO_T}none" >&6; }
-@@ -6264,14 +6266,23 @@ echo "$as_me: error: \"could not find th
+@@ -6697,14 +6699,23 @@ echo "$as_me: error: \"could not find th
  
  				if $use_threads
  				then
@@ -50,3 +50,15 @@ $NetBSD: patch-ad,v 1.8 2008/07/10 21:05:30 adrianp Exp $
  				fi
  			fi
  		fi
+@@ -24444,9 +24455,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/bind9/patches/patch-ai b/net/bind9/patches/patch-ai
index e0b7c7cf4dd..1378b6eb9f5 100644
--- a/net/bind9/patches/patch-ai
+++ b/net/bind9/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.10 2009/01/04 00:16:03 adrianp Exp $
+$NetBSD: patch-ai,v 1.11 2009/11/25 22:29:34 joerg Exp $
 
---- lib/bind/configure.orig	2008-08-26 15:49:33.000000000 +0100
+--- lib/bind/configure.orig	2008-08-26 16:49:33.000000000 +0200
 +++ lib/bind/configure
 @@ -2600,12 +2600,7 @@ done
  #
@@ -77,6 +77,18 @@ $NetBSD: patch-ai,v 1.10 2009/01/04 00:16:03 adrianp Exp $
  		*-openbsd*)
  			CC="$CC -pthread"
  			CCOPT="$CCOPT -pthread"
+@@ -23974,9 +23985,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 +24741,7 @@ case "$host" in
  	*-bsdi2345*)	have_minimum_ifreq=yes;;
  	*-darwin*)	have_minimum_ifreq=yes;;