- updated

Changed files:
    bind-autoconf.patch -> 1.2
    bind-includedir-libbind.patch -> 1.2
    bind-link.patch -> 1.5
    bind-pmake.patch -> 1.5

diff --git a/bind-autoconf.patch b/bind-autoconf.patch
index 8c6cca2ffb70ca3bbab217288cbf9f5e26bc310e..b74ee80ba56afb15c092119d2a166e167a87a2f0 100644 (file)
--- a/bind-autoconf.patch
+++ b/bind-autoconf.patch
@@ -9,15 +9,4 @@ diff -Naur bind-9.2.0/configure.in bind-9.2.0-p/configure.in
 +AC_PROG_LIBTOOL
  AC_PROG_INSTALL
  
- AC_SUBST(STD_CINCLUDES)
---- bind-9.2.0-p/lib/bind/configure.in Sun Nov 25 02:49:32 2001
-+++ bind-9.2.0/lib/bind/configure.in   Tue Nov 27 12:42:13 2001
-@@ -28,7 +28,7 @@
- AC_CANONICAL_HOST
- 
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_INSTALL
- 
  AC_SUBST(STD_CINCLUDES)

diff --git a/bind-includedir-libbind.patch b/bind-includedir-libbind.patch
index 7a145224cd0e4043e93fd0976701e41735353733..5b1ea230a6345dda39e981a0019096247539478d 100644 (file)
--- a/bind-includedir-libbind.patch
+++ b/bind-includedir-libbind.patch
@@ -1,6 +1,6 @@
-diff -urN bind-9.2.1.org/lib/bind/include/Makefile.in bind-9.2.1/lib/bind/include/Makefile.in
---- bind-9.2.1.org/lib/bind/include/Makefile.in        Sun Sep 29 00:00:18 2002
-+++ bind-9.2.1/lib/bind/include/Makefile.in    Sun Sep 29 00:01:05 2002
+diff -urN bind-9.2.1.org/lib/bind9/include/Makefile.in bind-9.2.1/lib/bind9/include/Makefile.in
+--- bind-9.2.1.org/lib/bind9/include/Makefile.in       Sun Sep 29 00:00:18 2002
++++ bind-9.2.1/lib/bind9/include/Makefile.in   Sun Sep 29 00:01:05 2002
 @@ -31,17 +31,17 @@
  @BIND9_MAKE_RULES@
  
@@ -24,25 +24,4 @@ diff -urN bind-9.2.1.org/lib/bind/include/Makefile.in bind-9.2.1/lib/bind/includ
 +              ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind/arpa; \
        done
  
-diff -urN bind-9.2.1.org/lib/bind/port/linux/include/Makefile.in bind-9.2.1/lib/bind/port/linux/include/Makefile.in
---- bind-9.2.1.org/lib/bind/port/linux/include/Makefile.in     Sun Sep 29 00:00:18 2002
-+++ bind-9.2.1/lib/bind/port/linux/include/Makefile.in Sun Sep 29 00:23:32 2002
-@@ -27,13 +27,13 @@
- @BIND9_MAKE_RULES@
- 
- installdirs:
--      $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/net \
--      ${DESTDIR}${includedir}/sys 
-+      $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/bind/net \
-+      ${DESTDIR}${includedir}/bind/sys 
- 
- install:: installdirs
-       for i in ${NHEADERS}; do \
--              ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/net; \
-+              ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind/net; \
-       done
-       for i in ${SHEADERS}; do \
--              ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/sys; \
-+              ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind/sys; \
-       done
 

diff --git a/bind-link.patch b/bind-link.patch
index f121cb894206a3dadfd5cee80434b4c61f774c00..5dd766248bfd5e1e9b9c97b18e462cfeb65cb192 100644 (file)
--- a/bind-link.patch
+++ b/bind-link.patch
@@ -12,45 +12,6 @@ diff -Nur bind-9.3.2.orig/configure.in bind-9.3.2.link/configure.in
                ;;
  esac
  
-diff -Nur bind-9.3.2.orig/lib/bind/configure.in bind-9.3.2.link/lib/bind/configure.in
---- bind-9.3.2.orig/lib/bind/configure.in      2006-08-05 01:45:48.000000000 +0200
-+++ bind-9.3.2.link/lib/bind/configure.in      2006-08-05 01:45:55.000000000 +0200
-@@ -599,9 +599,9 @@
-               AC_CHECK_LIB(nsl, inet_ntoa)
-               ;;
-       *)
--              AC_CHECK_LIB(d4r, gethostbyname_r)
--              AC_CHECK_LIB(socket, socket)
--              AC_CHECK_LIB(nsl, inet_ntoa)
-+              AC_SEARCH_LIBS(gethostbyname_r, d4r)
-+              AC_SEARCH_LIBS(socket, socket)
-+              AC_SEARCH_LIBS(inet_ntoa, nsl)
-               ;;
- esac
- 
-diff -Nur bind-9.3.2.orig/lib/bind/make/rules.in bind-9.3.2.link/lib/bind/make/rules.in
---- bind-9.3.2.orig/lib/bind/make/rules.in     2004-10-20 02:14:47.000000000 +0200
-+++ bind-9.3.2.link/lib/bind/make/rules.in     2006-08-05 01:49:13.000000000 +0200
-@@ -95,6 +95,7 @@
- 
- CC =          @CC@
- CFLAGS =      @CFLAGS@
-+LDFLAGS =     @LDFLAGS@
- STD_CINCLUDES =       @STD_CINCLUDES@
- STD_CDEFINES =        @STD_CDEFINES@
- STD_CWARNINGS =       @STD_CWARNINGS@
-diff -Nur bind-9.3.2.orig/lib/bind/Makefile.in bind-9.3.2.link/lib/bind/Makefile.in
---- bind-9.3.2.orig/lib/bind/Makefile.in       2005-07-29 02:13:08.000000000 +0200
-+++ bind-9.3.2.link/lib/bind/Makefile.in       2006-08-05 01:45:55.000000000 +0200
-@@ -23,6 +23,8 @@
- .NOTPARALLEL:
- .NO_PARALLEL:
- 
-+LIBS = @LIBS@
-+
- @LIBBIND_API@
- 
- LIBS =                @LIBS@
 diff -Nur bind-9.3.2.orig/lib/dns/Makefile.in bind-9.3.2.link/lib/dns/Makefile.in
 --- bind-9.3.2.orig/lib/dns/Makefile.in        2004-12-09 05:07:15.000000000 +0100
 +++ bind-9.3.2.link/lib/dns/Makefile.in        2006-08-05 01:45:55.000000000 +0200

diff --git a/bind-pmake.patch b/bind-pmake.patch
index d4ae7fa4eda55236fd1c4bb95ebb79b487a1e0df..d994b5a36de51198eebdf9b9fe5f40dde62b0a78 100644 (file)
--- a/bind-pmake.patch
+++ b/bind-pmake.patch
@@ -1,6 +1,6 @@
-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
+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
 @@ -49,8 +49,10 @@
  ### Makefile may define:
  ###   TARGETS
@@ -13,23 +13,6 @@ diff -ur bind-9.3.0rc3.orig/lib/bind/make/rules.in bind-9.3.0rc3/lib/bind/make/r
  ###
  ### 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
@@ -71,18 +54,3 @@ diff -ur bind-9.3.0rc3.orig/lib/isc/Makefile.in bind-9.3.0rc3/lib/isc/Makefile.i
        ${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
- 
--all: subdirs ${TARGETS}
-+all: touchfile ${TARGETS}
-+
-+touchfile: subdirs
-+      touch touchfile
- 
- ###
- ### Subdirectories