Wed Nov 25 22:15:25 2009 UTC ()
Use libtool --tag explicitly if calling gcc instead of cc in preparation
for libtool 2.2.


(joerg)
diff -r1.6 -r1.7 pkgsrc/net/bind96/distinfo
diff -r1.2 -r1.3 pkgsrc/net/bind96/patches/patch-ad
cvs diff -r1.6 -r1.7 pkgsrc/net/bind96/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/bind96/Attic/distinfo 2009/11/25 09:50:06 1.6
+++ pkgsrc/net/bind96/Attic/distinfo 2009/11/25 22:15:25 1.7
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.6 2009/11/25 09:50:06 taca Exp $ 1$NetBSD: distinfo,v 1.7 2009/11/25 22:15:25 joerg Exp $
2 2
3SHA1 (bind-9.6.1-P2.tar.gz) = 0169c7898790b72ee3b5a1e090c2bdf68792b952 3SHA1 (bind-9.6.1-P2.tar.gz) = 0169c7898790b72ee3b5a1e090c2bdf68792b952
4RMD160 (bind-9.6.1-P2.tar.gz) = 7842404116ec75cd11a73276e9d534bd9ff8c171 4RMD160 (bind-9.6.1-P2.tar.gz) = 7842404116ec75cd11a73276e9d534bd9ff8c171
5Size (bind-9.6.1-P2.tar.gz) = 6601674 bytes 5Size (bind-9.6.1-P2.tar.gz) = 6601674 bytes
6SHA1 (patch-ab) = 6cec876c8caa7082f97365863f3f88c4f168da48 6SHA1 (patch-ab) = 6cec876c8caa7082f97365863f3f88c4f168da48
7SHA1 (patch-ac) = 074649e1514870a3154c623a5f6d1507b72b5b05 7SHA1 (patch-ac) = 074649e1514870a3154c623a5f6d1507b72b5b05
8SHA1 (patch-ad) = c916e594fd959d3a003cb7916fdf5cf89b6e5c45 8SHA1 (patch-ad) = fe651b18361f28c3cf8b4a9e72f85135f8e8f12b
9SHA1 (patch-ag) = 52c656fa2ebbdb07ee1602b7b36a6aa38ddce4d0 9SHA1 (patch-ag) = 52c656fa2ebbdb07ee1602b7b36a6aa38ddce4d0
10SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed 10SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
cvs diff -r1.2 -r1.3 pkgsrc/net/bind96/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/bind96/patches/Attic/patch-ad 2009/07/26 09:07:58 1.2
+++ pkgsrc/net/bind96/patches/Attic/patch-ad 2009/11/25 22:15:25 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ad,v 1.2 2009/07/26 09:07:58 obache Exp $ 1$NetBSD: patch-ad,v 1.3 2009/11/25 22:15:25 joerg Exp $
2 2
3--- configure.orig 2009-03-13 05:35:43.000000000 +0000 3--- configure.orig 2009-03-13 06:35:43.000000000 +0100
4+++ configure 4+++ configure
5@@ -23751,6 +23751,8 @@ case $host in 5@@ -23751,6 +23751,8 @@ case $host in
6 use_threads=false ;; 6 use_threads=false ;;
7 *-freebsd*) 7 *-freebsd*)
8 use_threads=false ;; 8 use_threads=false ;;
9+*-dragonfly*) 9+*-dragonfly*)
10+ use_threads=false ;; 10+ use_threads=false ;;
11 *-bsdi234*) 11 *-bsdi234*)
12 # Thread signals do not work reliably on some versions of BSD/OS. 12 # Thread signals do not work reliably on some versions of BSD/OS.
13 use_threads=false ;; 13 use_threads=false ;;
14@@ -23839,7 +23841,7 @@ $as_echo "$as_me: WARNING: linking with  14@@ -23839,7 +23841,7 @@ $as_echo "$as_me: WARNING: linking with
15 $as_echo "native" >&6; } 15 $as_echo "native" >&6; }
16 LIBS="-lpthread $LIBS" 16 LIBS="-lpthread $LIBS"
@@ -41,22 +41,34 @@ $NetBSD: patch-ad,v 1.2 2009/07/26 09:07 @@ -41,22 +41,34 @@ $NetBSD: patch-ad,v 1.2 2009/07/26 09:07
41- LIBS="$lib1 $lib2 $LIBS" 41- LIBS="$lib1 $lib2 $LIBS"
42- CPPFLAGS="$CPPFLAGS -I$pkg/include" 42- CPPFLAGS="$CPPFLAGS -I$pkg/include"
43- STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include" 43- STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
44+ pkg="$LOCALBASE/pthreads" 44+ pkg="$LOCALBASE/pthreads"
45+ lib1="-L$pkg/lib -Wl,-R$pkg/lib" 45+ lib1="-L$pkg/lib -Wl,-R$pkg/lib"
46+ lib2="-lpthread -lm -lgcc -lpthread" 46+ lib2="-lpthread -lm -lgcc -lpthread"
47+ LIBS="$lib1 $lib2 $LIBS" 47+ LIBS="$lib1 $lib2 $LIBS"
48+ CPPFLAGS="$CPPFLAGS -I$pkg/include" 48+ CPPFLAGS="$CPPFLAGS -I$pkg/include"
49+ STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include" 49+ STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
50+ fi 50+ fi
51 fi 51 fi
52 fi 52 fi
53 fi 53 fi
 54@@ -26386,9 +26397,9 @@ case $use_libtool in
 55 O=lo
 56 A=la
 57 LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
 58- LIBTOOL_MODE_COMPILE='--mode=compile'
 59+ LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
 60 LIBTOOL_MODE_INSTALL='--mode=install'
 61- LIBTOOL_MODE_LINK='--mode=link'
 62+ LIBTOOL_MODE_LINK='--mode=link --tag=CC'
 63 case "$host" in
 64 *) LIBTOOL_ALLOW_UNDEFINED= ;;
 65 esac
54@@ -32836,7 +32847,7 @@ $as_echo "no" >&6; } 66@@ -32836,7 +32847,7 @@ $as_echo "no" >&6; }
55 fi 67 fi
56 if test -n "-L$use_dlz_postgres_lib -lpq" 68 if test -n "-L$use_dlz_postgres_lib -lpq"
57 then 69 then
58- DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq" 70- DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq"
59+ DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq" 71+ DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq"
60 fi 72 fi
61  73
62  74