Strip the BIND code down to just building and installing dig, host and nslookup.

diff --git a/usr.sbin/bind/Makefile.bsd-wrapper b/usr.sbin/bind/Makefile.bsd-wrapper
index b1787e1..656589e 100644 (file)
--- a/usr.sbin/bind/Makefile.bsd-wrapper
+++ b/usr.sbin/bind/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.bsd-wrapper,v 1.13 2014/07/16 01:23:39 deraadt Exp $
+#      $OpenBSD: Makefile.bsd-wrapper,v 1.14 2014/08/22 19:28:25 brad Exp $
 
 .include <bsd.own.mk>
 
@@ -10,31 +10,13 @@ CONFIGURE_OPTS=     --prefix=/usr \
                --disable-threads \
                --disable-openssl-version-check
 
-PROG=  bin/check/named-checkconf \
-       bin/check/named-checkzone \
-       bin/dnssec/dnssec-keygen \
-       bin/dnssec/dnssec-signzone \
-       bin/dig/dig \
+PROG=  bin/dig/dig \
        bin/dig/host \
-       bin/dig/nslookup \
-       bin/named/named \
-       bin/nsupdate/nsupdate \
-       bin/rndc/rndc-confgen \
-       bin/rndc/rndc
-
-MAN=   bin/check/named-checkconf.8 \
-       bin/check/named-checkzone.8 \
-       bin/dnssec/dnssec-keygen.8 \
-       bin/dnssec/dnssec-signzone.8 \
-       bin/dig/dig.1 \
+       bin/dig/nslookup
+
+MAN=   bin/dig/dig.1 \
        bin/dig/host.1 \
-       bin/dig/nslookup.1 \
-       bin/named/named.8 \
-       bin/named/named.conf.5 \
-       bin/nsupdate/nsupdate.8 \
-       bin/rndc/rndc-confgen.8 \
-       bin/rndc/rndc.8 \
-       bin/rndc/rndc.conf.5
+       bin/dig/nslookup.1
 
 BINDIR=                /usr/sbin
 

diff --git a/usr.sbin/bind/Makefile.in b/usr.sbin/bind/Makefile.in
index 33c6850..cecca35 100644 (file)
--- a/usr.sbin/bind/Makefile.in
+++ b/usr.sbin/bind/Makefile.in
@@ -21,7 +21,7 @@ top_srcdir =  @top_srcdir@
 
 @BIND9_VERSION@
 
-SUBDIRS =      make lib bin doc @LIBBIND@
+SUBDIRS =      make lib bin
 TARGETS =
 
 @BIND9_MAKE_RULES@

diff --git a/usr.sbin/bind/bin/Makefile.in b/usr.sbin/bind/bin/Makefile.in
index b582c9a..f6c04ec 100644 (file)
--- a/usr.sbin/bind/bin/Makefile.in
+++ b/usr.sbin/bind/bin/Makefile.in
@@ -19,7 +19,7 @@ srcdir =      @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
-SUBDIRS =      named rndc dig dnssec nsupdate check
+SUBDIRS =      dig
 TARGETS =
 
 @BIND9_MAKE_RULES@

diff --git a/usr.sbin/bind/configure b/usr.sbin/bind/configure
index 6e280ad..e6142e8 100644 (file)
--- a/usr.sbin/bind/configure
+++ b/usr.sbin/bind/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1996-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $ISC: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $
+# $ISC: COPYRIGHT,v 1.9.18.4.10.1 2008/07/23 07:28:54 tbox Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.15 .
+# From configure.in Revision: 1.16 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -231,7 +231,7 @@ if as_func_ret_failure; then
   echo as_func_ret_failure succeeded.
 fi
 
-if (set x; as_func_ret_success y && test x = \"\$1\" ); then
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
   :
 else
   exitcode=1
@@ -435,7 +435,7 @@ if as_func_ret_failure; then
   echo as_func_ret_failure succeeded.
 fi
 
-if (set x; as_func_ret_success y && test x = \"\$1\" ); then
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
   :
 else
   exitcode=1
@@ -28031,7 +28031,7 @@ case "$host" in
        *-solaris2.[89])
                hack_shutup_pthreadonceinit=yes
                ;;
-       *-solaris2.1[0-9])
+       *-solaris2.10-9)
                hack_shutup_pthreadonceinit=yes
                ;;
 esac
@@ -29784,7 +29784,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files Makefile make/Makefile make/mkdep lib/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/nls/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile bin/Makefile bin/check/Makefile bin/named/Makefile bin/named/unix/Makefile bin/rndc/Makefile bin/rndc/unix/Makefile bin/dig/Makefile bin/nsupdate/Makefile bin/dnssec/Makefile doc/Makefile doc/arm/Makefile doc/misc/Makefile isc-config.sh doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-docbook-latex.xsl doc/xsl/isc-manpage.xsl"
+ac_config_files="$ac_config_files Makefile make/Makefile make/mkdep lib/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/nls/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile bin/Makefile bin/dig/Makefile isc-config.sh"
 
 
 #
@@ -30394,23 +30394,8 @@ do
     "lib/lwres/unix/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/include/Makefile" ;;
     "lib/lwres/unix/include/lwres/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/include/lwres/Makefile" ;;
     "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
-    "bin/check/Makefile") CONFIG_FILES="$CONFIG_FILES bin/check/Makefile" ;;
-    "bin/named/Makefile") CONFIG_FILES="$CONFIG_FILES bin/named/Makefile" ;;
-    "bin/named/unix/Makefile") CONFIG_FILES="$CONFIG_FILES bin/named/unix/Makefile" ;;
-    "bin/rndc/Makefile") CONFIG_FILES="$CONFIG_FILES bin/rndc/Makefile" ;;
-    "bin/rndc/unix/Makefile") CONFIG_FILES="$CONFIG_FILES bin/rndc/unix/Makefile" ;;
     "bin/dig/Makefile") CONFIG_FILES="$CONFIG_FILES bin/dig/Makefile" ;;
-    "bin/nsupdate/Makefile") CONFIG_FILES="$CONFIG_FILES bin/nsupdate/Makefile" ;;
-    "bin/dnssec/Makefile") CONFIG_FILES="$CONFIG_FILES bin/dnssec/Makefile" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "doc/arm/Makefile") CONFIG_FILES="$CONFIG_FILES doc/arm/Makefile" ;;
-    "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;;
     "isc-config.sh") CONFIG_FILES="$CONFIG_FILES isc-config.sh" ;;
-    "doc/xsl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/xsl/Makefile" ;;
-    "doc/xsl/isc-docbook-chunk.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-docbook-chunk.xsl" ;;
-    "doc/xsl/isc-docbook-html.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-docbook-html.xsl" ;;
-    "doc/xsl/isc-docbook-latex.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-docbook-latex.xsl" ;;
-    "doc/xsl/isc-manpage.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-manpage.xsl" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

diff --git a/usr.sbin/bind/configure.in b/usr.sbin/bind/configure.in
index 9119334..aff1b75 100644 (file)
--- a/usr.sbin/bind/configure.in
+++ b/usr.sbin/bind/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.16 $)
+AC_REVISION($Revision: 1.17 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -2472,23 +2472,8 @@ AC_CONFIG_FILES([
        lib/lwres/unix/include/Makefile
        lib/lwres/unix/include/lwres/Makefile
        bin/Makefile
-       bin/check/Makefile
-       bin/named/Makefile
-       bin/named/unix/Makefile
-       bin/rndc/Makefile
-       bin/rndc/unix/Makefile
        bin/dig/Makefile
-       bin/nsupdate/Makefile
-       bin/dnssec/Makefile
-       doc/Makefile
-       doc/arm/Makefile
-       doc/misc/Makefile
        isc-config.sh
-       doc/xsl/Makefile
-       doc/xsl/isc-docbook-chunk.xsl
-       doc/xsl/isc-docbook-html.xsl
-       doc/xsl/isc-docbook-latex.xsl
-       doc/xsl/isc-manpage.xsl
 ])
 
 #