- switch to geoip2; drop obsolete options

[packages/bind.git] / bind-pmake.patch

diff --git a/bind-pmake.patch b/bind-pmake.patch
index d4ae7fa4eda55236fd1c4bb95ebb79b487a1e0df..189c009faf53027d4d8fab3159365c4bfd6e87f9 100644 (file)
--- a/bind-pmake.patch
+++ b/bind-pmake.patch
@@ -1,39 +1,22 @@
-diff -ur bind-9.3.0rc3.orig/lib/bind/make/rules.in bind-9.3.0rc3/lib/bind/make/rules.in
---- bind-9.3.0rc3.orig/lib/bind/make/rules.in  2004-03-15 02:02:44.000000000 +0100
-+++ bind-9.3.0rc3/lib/bind/make/rules.in       2004-09-01 10:51:31.568733488 +0200
-@@ -49,8 +49,10 @@
- ### Makefile may define:
+diff -ur bind-9.3.0rc3.orig/make/rules.in bind-9.3.0rc3/make/rules.in
+--- bind-9.3.0rc3.orig/make/rules.in   2004-03-15 02:02:44.000000000 +0100
++++ bind-9.3.0rc3/make/rules.in        2004-09-01 10:51:31.568733488 +0200
+@@ -47,7 +47,10 @@ top_builddir =      @BIND9_TOP_BUILDDIR@
+ ###   PREREQS
  ###   TARGETS
  
--all: subdirs ${TARGETS}
-+all: touchfile ${TARGETS}
- 
+-all: ${PREREQS} subdirs ${TARGETS} testdirs
++all: ${PREREQS} touchfile ${TARGETS} testdirs
++
 +touchfile: subdirs
 +      touch touchfile
+ 
  ###
  ### Subdirectories
- ###
-diff -ur bind-9.3.0rc3.orig/lib/bind/Makefile.in bind-9.3.0rc3/lib/bind/Makefile.in
---- bind-9.3.0rc3.orig/lib/bind/Makefile.in    2004-07-20 09:01:56.000000000 +0200
-+++ bind-9.3.0rc3/lib/bind/Makefile.in 2004-09-01 10:56:00.622831048 +0200
-@@ -94,11 +94,11 @@
- 
- @BIND9_MAKE_RULES@
- 
--libbind.@SA@: ${OBJS}
-+libbind.@SA@: touchfile ${OBJS}
-       ${AR} ${ARFLAGS} $@ ${OBJS}
-       ${RANLIB} $@
- 
--libbind.la: ${OBJS}
-+libbind.la: touchfile ${OBJS}
-       ${LIBTOOL_MODE_LINK} \
-       ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libbind.la -rpath ${libdir} \
-               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
 diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.in
 --- bind-9.3.0rc3.orig/lib/dns/Makefile.in     2004-07-20 09:01:57.000000000 +0200
 +++ bind-9.3.0rc3/lib/dns/Makefile.in  2004-09-01 10:54:21.089962344 +0200
-@@ -101,17 +101,17 @@
+@@ -135,11 +135,11 @@ version.@O@: version.c
                -DLIBAGE=${LIBAGE} \
                -c ${srcdir}/version.c
  
@@ -47,42 +30,31 @@ diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.i
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
                -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-               ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
- 
--timestamp: libdns.@A@
-+timestamp: include libdns.@A@
-       touch timestamp
- 
- installdirs:
-diff -ur bind-9.3.0rc3.orig/lib/isc/Makefile.in bind-9.3.0rc3/lib/isc/Makefile.in
---- bind-9.3.0rc3.orig/lib/isc/Makefile.in     2004-07-20 09:01:58.000000000 +0200
-+++ bind-9.3.0rc3/lib/isc/Makefile.in  2004-09-01 10:52:47.772148808 +0200
-@@ -88,11 +88,11 @@
+--- bind-9.7.0/lib/isc/Makefile.in~    2009-12-18 05:09:55.000000000 +0100
++++ bind-9.7.0/lib/isc/Makefile.in     2010-02-17 08:04:13.849211197 +0100
+@@ -94,21 +94,21 @@
                -DLIBAGE=${LIBAGE} \
                -c ${srcdir}/version.c
  
--libisc.@SA@: ${OBJS}
-+libisc.@SA@: touchfile ${OBJS}
+-libisc.@SA@: ${OBJS} ${SYMTBLOBJS}
++libisc.@SA@: touchfile ${OBJS} ${SYMTBLOBJS}
+       ${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS}
+       ${RANLIB} $@
+ 
+-libisc-nosymtbl.@SA@: ${OBJS}
++libisc-nosymtbl.@SA@: touchfile ${OBJS}
        ${AR} ${ARFLAGS} $@ ${OBJS}
        ${RANLIB} $@
  
--libisc.la: ${OBJS}
-+libisc.la: touchfile ${OBJS}
+-libisc.la: ${OBJS} ${SYMTBLOBJS}
++libisc.la: touchfile ${OBJS} ${SYMTBLOBJS}
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
                -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-diff -ur bind-9.3.0rc3.orig/make/rules.in bind-9.3.0rc3/make/rules.in
---- bind-9.3.0rc3.orig/make/rules.in   2004-07-20 09:02:00.000000000 +0200
-+++ bind-9.3.0rc3/make/rules.in        2004-09-01 10:51:31.574732576 +0200
-@@ -47,7 +47,10 @@
- ### Makefile may define:
- ###   TARGETS
+               ${OBJS} ${SYMTBLOBJS} ${LIBS}
  
--all: subdirs ${TARGETS}
-+all: touchfile ${TARGETS}
-+
-+touchfile: subdirs
-+      touch touchfile
- 
- ###
- ### Subdirectories
+-libisc-nosymtbl.la: ${OBJS}
++libisc-nosymtbl.la: touchfile ${OBJS}
+       ${LIBTOOL_MODE_LINK} \
+               ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
+               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \