Author: des
Date: Mon Sep 30 17:23:45 2013
New Revision: 255949
URL: http://svnweb.freebsd.org/changeset/base/255949
Log:
Remove BIND.
Approved by: re (gjb)
Deleted:
head/contrib/bind9/
head/etc/mtree/BIND.chroot.dist
head/etc/mtree/BIND.include.dist
head/lib/bind/
head/share/doc/bind9/
head/tools/build/options/WITHOUT_BIND_DNSSEC
head/tools/build/options/WITHOUT_BIND_ETC
head/tools/build/options/WITHOUT_BIND_LIBS_LWRES
head/tools/build/options/WITHOUT_BIND_MTREE
head/tools/build/options/WITHOUT_BIND_NAMED
head/tools/build/options/WITHOUT_BIND_UTILS
head/tools/build/options/WITH_BIND
head/tools/build/options/WITH_BIND_IDN
head/tools/build/options/WITH_BIND_LARGE_FILE
head/tools/build/options/WITH_BIND_LIBS
head/tools/build/options/WITH_BIND_SIGCHASE
head/tools/build/options/WITH_BIND_XML
head/usr.bin/nslookup/
head/usr.bin/nsupdate/
head/usr.sbin/arpaname/
head/usr.sbin/ddns-confgen/
head/usr.sbin/dnssec-dsfromkey/
head/usr.sbin/dnssec-keyfromlabel/
head/usr.sbin/dnssec-keygen/
head/usr.sbin/dnssec-revoke/
head/usr.sbin/dnssec-settime/
head/usr.sbin/dnssec-signzone/
head/usr.sbin/dnssec-verify/
head/usr.sbin/genrandom/
head/usr.sbin/isc-hmac-fixup/
head/usr.sbin/named/
head/usr.sbin/named-checkconf/
head/usr.sbin/named-checkzone/
head/usr.sbin/named-journalprint/
head/usr.sbin/nsec3hash/
head/usr.sbin/rndc/
head/usr.sbin/rndc-confgen/
Modified:
head/Makefile.inc1
head/ObsoleteFiles.inc
head/etc/Makefile
head/etc/mtree/BSD.var.dist
head/include/Makefile
head/lib/Makefile
head/release/Makefile
head/share/doc/Makefile
head/share/mk/bsd.libnames.mk
head/share/mk/bsd.own.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/Makefile
head/usr.bin/host/Makefile
head/usr.sbin/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Mon Sep 30 09:21:17 2013 (r255948)
+++ head/Makefile.inc1 Mon Sep 30 17:23:45 2013 (r255949)
@@ -395,7 +395,7 @@ LIB32WMAKEFLAGS+= \
-DNO_LINT
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
- -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
+ -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
${IMAKE_INSTALL}
.endif
@@ -485,10 +485,6 @@ _worldtmp:
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
-p ${WORLDTMP}/usr/lib >/dev/null
.endif
-.if ${MK_BIND_LIBS} != "no"
- mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
- -p ${WORLDTMP}/usr/include >/dev/null
-.endif
.for _mtree in ${LOCAL_MTREE}
mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
.endfor
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Mon Sep 30 09:21:17 2013 (r255948)
+++ head/ObsoleteFiles.inc Mon Sep 30 17:23:45 2013 (r255949)
@@ -38,6 +38,235 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20130930: BIND removed from base
+OLD_FILES+=etc/namedb
+OLD_FILES+=etc/periodic/daily/470.status-named
+OLD_FILES+=usr/bin/dig
+OLD_FILES+=usr/bin/nslookup
+OLD_FILES+=usr/bin/nsupdate
+OLD_DIRS+=usr/include/lwres
+OLD_FILES+=usr/include/lwres/context.h
+OLD_FILES+=usr/include/lwres/int.h
+OLD_FILES+=usr/include/lwres/ipv6.h
+OLD_FILES+=usr/include/lwres/lang.h
+OLD_FILES+=usr/include/lwres/list.h
+OLD_FILES+=usr/include/lwres/lwbuffer.h
+OLD_FILES+=usr/include/lwres/lwpacket.h
+OLD_FILES+=usr/include/lwres/lwres.h
+OLD_FILES+=usr/include/lwres/net.h
+OLD_FILES+=usr/include/lwres/netdb.h
+OLD_FILES+=usr/include/lwres/platform.h
+OLD_FILES+=usr/include/lwres/result.h
+OLD_FILES+=usr/include/lwres/version.h
+OLD_FILES+=usr/lib/liblwres.a
+OLD_FILES+=usr/lib/liblwres.so
+OLD_LIBS+=usr/lib/liblwres.so.50
+OLD_FILES+=usr/lib/liblwres_p.a
+OLD_FILES+=usr/sbin/arpaname
+OLD_FILES+=usr/sbin/ddns-confgen
+OLD_FILES+=usr/sbin/dnssec-dsfromkey
+OLD_FILES+=usr/sbin/dnssec-keyfromlabel
+OLD_FILES+=usr/sbin/dnssec-keygen
+OLD_FILES+=usr/sbin/dnssec-revoke
+OLD_FILES+=usr/sbin/dnssec-settime
+OLD_FILES+=usr/sbin/dnssec-signzone
+OLD_FILES+=usr/sbin/genrandom
+OLD_FILES+=usr/sbin/isc-hmac-fixup
+OLD_FILES+=usr/sbin/lwresd
+OLD_FILES+=usr/sbin/named
+OLD_FILES+=usr/sbin/named-checkconf
+OLD_FILES+=usr/sbin/named-checkzone
+OLD_FILES+=usr/sbin/named-compilezone
+OLD_FILES+=usr/sbin/named-journalprint
+OLD_FILES+=usr/sbin/named.reconfig
+OLD_FILES+=usr/sbin/named.reload
+OLD_FILES+=usr/sbin/nsec3hash
+OLD_FILES+=usr/sbin/rndc
+OLD_FILES+=usr/sbin/rndc-confgen
+OLD_DIRS+=usr/share/doc/bind9
+OLD_FILES+=usr/share/doc/bind9/CHANGES
+OLD_FILES+=usr/share/doc/bind9/COPYRIGHT
+OLD_FILES+=usr/share/doc/bind9/FAQ
+OLD_FILES+=usr/share/doc/bind9/HISTORY
+OLD_FILES+=usr/share/doc/bind9/README
+OLD_DIRS+=usr/share/doc/bind9/arm
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf
+OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.host.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.named.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html
+OLD_DIRS+=usr/share/doc/bind9/misc
+OLD_FILES+=usr/share/doc/bind9/misc/dnssec
+OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl
+OLD_FILES+=usr/share/doc/bind9/misc/ipv6
+OLD_FILES+=usr/share/doc/bind9/misc/migration
+OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9
+OLD_FILES+=usr/share/doc/bind9/misc/options
+OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance
+OLD_FILES+=usr/share/doc/bind9/misc/roadmap
+OLD_FILES+=usr/share/doc/bind9/misc/sdb
+OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl
+OLD_FILES+=usr/share/man/man1/arpaname.1.gz
+OLD_FILES+=usr/share/man/man1/dig.1.gz
+OLD_FILES+=usr/share/man/man1/nslookup.1.gz
+OLD_FILES+=usr/share/man/man1/nsupdate.1.gz
+OLD_FILES+=usr/share/man/man3/lwres.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_config.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz
+OLD_FILES+=usr/share/man/man5/named.conf.5.gz
+OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz
+OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
+OLD_FILES+=usr/share/man/man8/genrandom.8.gz
+OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
+OLD_FILES+=usr/share/man/man8/lwresd.8.gz
+OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz
+OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz
+OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz
+OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz
+OLD_FILES+=usr/share/man/man8/named.8.gz
+OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
+OLD_FILES+=usr/share/man/man8/named.reload.8.gz
+OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz
+OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz
+OLD_FILES+=usr/share/man/man8/rndc.8.gz
+OLD_DIRS+=var/named/dev
+OLD_DIRS+=var/named/etc
+OLD_DIRS+=var/named/etc/namedb
+OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev
+OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev
+OLD_DIRS+=var/named/etc/namedb/dynamic
+OLD_FILES+=var/named/etc/namedb/make-localhost
+OLD_DIRS+=var/named/etc/namedb/master
+OLD_FILES+=var/named/etc/namedb/master/empty.db
+OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db
+OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db
+#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out
+OLD_FILES+=var/named/etc/namedb/named.root
+OLD_DIRS+=var/named/etc/namedb/slave
+OLD_DIRS+=var/named/var
+OLD_DIRS+=var/named/var/dump
+OLD_DIRS+=var/named/var/log
+OLD_DIRS+=var/named/var/run
+OLD_DIRS+=var/named/var/run/named
+OLD_DIRS+=var/named/var/stats
+OLD_DIRS+=var/run/named
# 20130908: libssh becomes private
OLD_FILES+=usr/lib/libssh.a
OLD_FILES+=usr/lib/libssh.so
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Mon Sep 30 09:21:17 2013 (r255948)
+++ head/etc/Makefile Mon Sep 30 17:23:45 2013 (r255949)
@@ -142,12 +142,6 @@ MTREE= BSD.include.dist BSD.root.dist BS
.if ${MK_SENDMAIL} != "no"
MTREE+= BSD.sendmail.dist
.endif
-.if ${MK_BIND} != "no"
-MTREE+= BIND.chroot.dist
-.if ${MK_BIND_LIBS} != "no"
-MTREE+= BIND.include.dist
-.endif
-.endif
.if ${MK_DEBUG_FILES} != "no"
MTREE+= BSD.debug.dist
.endif
@@ -242,14 +236,6 @@ distribution:
${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
-.if ${MK_BIND_MTREE} != "no"
- if [ ! -e ${DESTDIR}/etc/namedb ]; then \
- ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
- fi
-.endif
-.if ${MK_BIND_ETC} != "no"
- ${_+_}cd ${.CURDIR}/namedb; ${MAKE} install
-.endif
.if ${MK_UNBOUND} != "no"
if [ ! -e ${DESTDIR}/etc/unbound ]; then \
${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
@@ -328,12 +314,6 @@ MTREES= mtree/BSD.root.dist /
\
.if ${MK_DEBUG_FILES} != "no"
MTREES+= mtree/BSD.debug.dist /usr/lib
.endif
-.if ${MK_BIND_LIBS} != "no"
-MTREES+= mtree/BIND.include.dist /usr/include
-.endif
-.if ${MK_BIND_MTREE} != "no"
-MTREES+= mtree/BIND.chroot.dist /var/named
-.endif
.if ${MK_GROFF} != "no"
MTREES+= mtree/BSD.groff.dist /usr
.endif
Modified: head/etc/mtree/BSD.var.dist
==============================================================================
--- head/etc/mtree/BSD.var.dist Mon Sep 30 09:21:17 2013 (r255948)
+++ head/etc/mtree/BSD.var.dist Mon Sep 30 17:23:45 2013 (r255949)
@@ -63,13 +63,9 @@
..
msgs uname=daemon
..
- named
- ..
preserve
..
run
- named uname=bind gname=bind
- ..
ppp gname=network mode=0770
..
wpa_supplicant
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Mon Sep 30 09:21:17 2013 (r255948)
+++ head/include/Makefile Mon Sep 30 17:23:45 2013 (r255949)
@@ -149,11 +149,6 @@ compat:
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
-f ${.CURDIR}/../etc/mtree/BSD.include.dist \
-p ${DESTDIR}${INCLUDEDIR}
-.if ${MK_BIND_LIBS} != "no"
- mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
- -f ${.CURDIR}/../etc/mtree/BIND.include.dist \
- -p ${DESTDIR}${INCLUDEDIR}
-.endif
copies:
.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Mon Sep 30 09:21:17 2013 (r255948)
+++ head/lib/Makefile Mon Sep 30 17:23:45 2013 (r255949)
@@ -127,7 +127,6 @@ SUBDIR= ${SUBDIR_ORDERED} \
libyaml \
libz \
${_atf} \
- ${_bind} \
${_clang}
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
@@ -150,10 +149,6 @@ _atf= atf
_libngatm= libngatm
.endif
-.if ${MK_BIND} != "no"
-_bind= bind
-.endif
-
.if ${MK_BLUETOOTH} != "no"
_libbluetooth= libbluetooth
_libsdp= libsdp
Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile Mon Sep 30 09:21:17 2013 (r255948)
+++ head/release/Makefile Mon Sep 30 17:23:45 2013 (r255949)
@@ -142,8 +142,7 @@ bootonly: packagesystem
mkdir -p bootonly
cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
DESTDIR=${.OBJDIR}/bootonly WITHOUT_AMD=1 WITHOUT_AT=1 \
- WITHOUT_BIND_DNSSEC=1 WITHOUT_BIND_ETC=1 WITHOUT_BIND_MTREE=1 \
- WITHOUT_BIND_NAMED=1 WITHOUT_GAMES=1 WITHOUT_GROFF=1 \
+ WITHOUT_GAMES=1 WITHOUT_GROFF=1 \
WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \
WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \
WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \
Modified: head/share/doc/Makefile
==============================================================================
--- head/share/doc/Makefile Mon Sep 30 09:21:17 2013 (r255948)
+++ head/share/doc/Makefile Mon Sep 30 17:23:45 2013 (r255949)
@@ -5,7 +5,6 @@
SUBDIR= ${_IPv6} \
${_atf} \
- ${_bind9} \
legal \
${_llvm} \
${_roffdocs}
@@ -14,10 +13,6 @@ SUBDIR= ${_IPv6} \
_atf= atf
.endif
-.if ${MK_BIND} != "no"
-_bind9= bind9
-.endif
-
.if ${MK_CLANG} != "no"
_llvm= llvm
.endif
Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk Mon Sep 30 09:21:17 2013
(r255948)
+++ head/share/mk/bsd.libnames.mk Mon Sep 30 17:23:45 2013
(r255949)
@@ -19,10 +19,6 @@ LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a
LIBAUDITD?= ${DESTDIR}${LIBDIR}/libauditd.a
LIBAVL?= ${DESTDIR}${LIBDIR}/libavl.a
LIBBEGEMOT?= ${DESTDIR}${LIBDIR}/libbegemot.a
-.if ${MK_BIND_LIBS} != "no"
-LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a
-LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a
-.endif
LIBBLUETOOTH?= ${DESTDIR}${LIBDIR}/libbluetooth.a
LIBBSDXML?= ${DESTDIR}${LIBDIR}/libbsdxml.a
LIBBSDYML?= ${DESTDIR}${LIBDIR}/libbsdyml.a
@@ -74,11 +70,6 @@ LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.
.if ${MK_IPX} != "no"
LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a
.endif
-.if ${MK_BIND_LIBS} != "no"
-LIBISC?= ${DESTDIR}${LIBDIR}/libisc.a
-LIBISCCC?= ${DESTDIR}${LIBDIR}/libisccc.a
-LIBISCCFG?= ${DESTDIR}${LIBDIR}/libisccfg.a
-.endif
LIBJAIL?= ${DESTDIR}${LIBDIR}/libjail.a
LIBKADM5CLNT?= ${DESTDIR}${LIBDIR}/libkadm5clnt.a
LIBKADM5SRV?= ${DESTDIR}${LIBDIR}/libkadm5srv.a
@@ -93,9 +84,6 @@ LIBL?= ${DESTDIR}${LIBDIR}/libl.a
LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a
.endif
LIBLN?= "don't use LIBLN, use LIBL"
-.if ${MK_BIND} != "no"
-LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
-.endif
LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a
LIBM?= ${DESTDIR}${LIBDIR}/libm.a
LIBMAGIC?= ${DESTDIR}${LIBDIR}/libmagic.a
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Mon Sep 30 09:21:17 2013 (r255948)
+++ head/share/mk/bsd.own.mk Mon Sep 30 17:23:45 2013 (r255949)
@@ -255,12 +255,6 @@ __DEFAULT_YES_OPTIONS = \
ATM \
AUDIT \
AUTHPF \
- BIND_DNSSEC \
- BIND_ETC \
- BIND_LIBS_LWRES \
- BIND_MTREE \
- BIND_NAMED \
- BIND_UTILS \
BINUTILS \
BLUETOOTH \
BMAKE \
@@ -367,12 +361,6 @@ __DEFAULT_YES_OPTIONS = \
ZONEINFO
__DEFAULT_NO_OPTIONS = \
- BIND \
- BIND_IDN \
- BIND_LARGE_FILE \
- BIND_LIBS \
- BIND_SIGCHASE \
- BIND_XML \
BSD_GREP \
CLANG_EXTRAS \
CTF \
@@ -503,20 +491,6 @@ MK_${var}:= no
MK_LIBTHR:= no
.endif
-.if ${MK_LIBTHR} == "no"
-MK_BIND:= no
-.endif
-
-.if ${MK_BIND} == "no"
-MK_BIND_DNSSEC:= no
-MK_BIND_ETC:= no
-MK_BIND_LIBS:= no
-MK_BIND_LIBS_LWRES:= no
-MK_BIND_MTREE:= no
-MK_BIND_NAMED:= no
-MK_BIND_UTILS:= no
-.endif
-
.if ${MK_ICONV} == "no"
MK_LIBICONV_COMPAT:= no
.endif
@@ -526,14 +500,6 @@ MK_LDNS_UTILS:= no
MK_UNBOUND:= no
.endif
-.if ${MK_LDNS_UTILS} != "no"
-MK_BIND_UTILS:= no
-.endif
-
-.if ${MK_BIND_MTREE} == "no"
-MK_BIND_ETC:= no
-.endif
-
.if ${MK_SOURCELESS} == "no"
MK_SOURCELESS_HOST:= no
MK_SOURCELESS_UCODE:= no
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Sep 30 09:21:17
2013 (r255948)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Sep 30 17:23:45
2013 (r255949)
@@ -211,254 +211,6 @@ OLD_FILES+=usr/share/man/man8/authpf.8.g
OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz
.endif
-.if ${MK_BIND} == no
-OLD_FILES+=etc/periodic/daily/470.status-named
-OLD_FILES+=usr/bin/dig
-OLD_FILES+=usr/bin/nslookup
-OLD_FILES+=usr/bin/nsupdate
-OLD_FILES+=usr/include/lwres/context.h
-OLD_FILES+=usr/include/lwres/int.h
-OLD_FILES+=usr/include/lwres/ipv6.h
-OLD_FILES+=usr/include/lwres/lang.h
-OLD_FILES+=usr/include/lwres/list.h
-OLD_FILES+=usr/include/lwres/lwbuffer.h
-OLD_FILES+=usr/include/lwres/lwpacket.h
-OLD_FILES+=usr/include/lwres/lwres.h
-OLD_FILES+=usr/include/lwres/result.h
-OLD_FILES+=usr/include/lwres/version.h
-OLD_FILES+=usr/include/lwres/net.h
-OLD_FILES+=usr/include/lwres/netdb.h
-OLD_FILES+=usr/include/lwres/platform.h
-OLD_DIRS+=usr/include/lwres
-OLD_FILES+=usr/lib/liblwres.a
-OLD_FILES+=usr/lib/liblwres_p.a
-OLD_LIBS+=usr/lib/liblwres.so.50
-OLD_FILES+=usr/lib/liblwres.so
-OLD_FILES+=usr/sbin/arpaname
-OLD_FILES+=usr/sbin/ddns-confgen
-OLD_FILES+=usr/sbin/genrandom
-OLD_FILES+=usr/sbin/isc-hmac-fixup
-OLD_FILES+=usr/sbin/nsec3hash
-OLD_FILES+=usr/sbin/named
-OLD_FILES+=usr/sbin/lwresd
-OLD_FILES+=usr/sbin/named-checkconf
-OLD_FILES+=usr/sbin/named-checkzone
-OLD_FILES+=usr/sbin/named-compilezone
-OLD_FILES+=usr/sbin/named-journalprint
-OLD_FILES+=usr/sbin/named.reload
-OLD_FILES+=usr/sbin/named.reconfig
-OLD_FILES+=usr/sbin/rndc
-OLD_FILES+=usr/sbin/rndc-confgen
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html
-OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf
-OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.host.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.named.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html
-OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html
-OLD_DIRS+=usr/share/doc/bind9/arm
-OLD_FILES+=usr/share/doc/bind9/misc
-OLD_FILES+=usr/share/doc/bind9/misc/dnssec
-OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl
-OLD_FILES+=usr/share/doc/bind9/misc/ipv6
-OLD_FILES+=usr/share/doc/bind9/misc/migration
-OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9
-OLD_FILES+=usr/share/doc/bind9/misc/options
-OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance
-OLD_FILES+=usr/share/doc/bind9/misc/roadmap
-OLD_FILES+=usr/share/doc/bind9/misc/sdb
-OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl
-OLD_DIRS+=usr/share/doc/bind9/misc
-OLD_DIRS+=usr/share/doc/bind9
-OLD_FILES+=usr/share/doc/bind9/CHANGES
-OLD_FILES+=usr/share/doc/bind9/COPYRIGHT
-OLD_FILES+=usr/share/doc/bind9/FAQ
-OLD_FILES+=usr/share/doc/bind9/HISTORY
-OLD_FILES+=usr/share/doc/bind9/README
-OLD_FILES+=usr/share/man/man1/arpaname.1.gz
-OLD_FILES+=usr/share/man/man1/dig.1.gz
-OLD_FILES+=usr/share/man/man1/nslookup.1.gz
-OLD_FILES+=usr/share/man/man1/nsupdate.1.gz
-OLD_FILES+=usr/share/man/man3/lwres.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_config.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_context.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz
-OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz
-OLD_FILES+=usr/share/man/man5/named.conf.5.gz
-OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz
-OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz
-OLD_FILES+=usr/share/man/man8/genrandom.8.gz
-OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
-OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz
-OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz
-OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz
-OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz
-OLD_FILES+=usr/share/man/man8/named.reload.8.gz
-OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
-OLD_FILES+=usr/share/man/man8/named.8.gz
-OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz
-OLD_FILES+=usr/share/man/man8/lwresd.8.gz
-OLD_FILES+=usr/share/man/man8/rndc.8.gz
-OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz
-OLD_DIRS+=var/named/dev
-OLD_DIRS+=var/named/var/stats
-OLD_DIRS+=var/named/var/run/named
-OLD_DIRS+=var/named/var/run
-OLD_DIRS+=var/named/var/log
-OLD_DIRS+=var/named/var/dump
-OLD_DIRS+=var/named/var
-.endif
-
-.if ${MK_BIND_DNSSEC} == no || ${MK_BIND} == no
-OLD_FILES+=usr/sbin/dnssec-dsfromkey
-OLD_FILES+=usr/sbin/dnssec-keyfromlabel
-OLD_FILES+=usr/sbin/dnssec-keygen
-OLD_FILES+=usr/sbin/dnssec-revoke
-OLD_FILES+=usr/sbin/dnssec-settime
-OLD_FILES+=usr/sbin/dnssec-signzone
-OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz
-OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz
-OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
-OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
-OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
-OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
-.endif
-
-.if ${MK_BIND_ETC} == no || ${MK_BIND} == no
-OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev
-OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev
-OLD_FILES+=var/named/etc/namedb/make-localhost
-#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out
-OLD_FILES+=var/named/etc/namedb/named.root
-OLD_FILES+=var/named/etc/namedb/master/empty.db
-OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db
-OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db
-OLD_DIRS+=var/named/etc/namedb/slave
-OLD_DIRS+=var/named/etc/namedb/master
-OLD_DIRS+=var/named/etc/namedb/dynamic
-#OLD_DIRS+=var/named/etc/namedb
-#OLD_DIRS+=var/named/etc
-.endif
-
-#.if ${MK_BIND_LIBS} == no || ${MK_BIND} == no
-# to be filled in and removed above
-#.endif
-
-#.if ${MK_BIND_LIBS_LWRES} == no || ${MK_BIND} == no
-# to be filled in and removed above
-#.endif
-
-#.if ${MK_BIND_NAMED} == no || ${MK_BIND} == no
-# to be filled in and removed above
-#.endif
-
.if ${MK_BLUETOOTH} == no
OLD_FILES+=etc/bluetooth/hcsecd.conf
OLD_FILES+=etc/bluetooth/hosts
@@ -3452,11 +3204,9 @@ OLD_FILES+=usr/lib32/private/libldns_p.a
.if ${MK_LDNS_UTILS} == no
OLD_FILES+=usr/bin/drill
OLD_FILES+=usr/share/man/man1/drill.1.gz
-.if ${MK_BIND} == no
OLD_FILES+=usr/bin/host
OLD_FILES+=usr/share/man/man1/host.1.gz
.endif
-.endif
#.if ${MK_LIB32} == no
# to be filled in
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Mon Sep 30 09:21:17 2013 (r255948)
+++ head/usr.bin/Makefile Mon Sep 30 17:23:45 2013 (r255949)
@@ -218,13 +218,6 @@ _atf= atf
SUBDIR+= atm
.endif
-.if ${MK_BIND_UTILS} != "no"
-SUBDIR+= dig
-SUBDIR+= host
-SUBDIR+= nslookup
-SUBDIR+= nsupdate
-.endif
-
.if ${MK_BLUETOOTH} != "no"
SUBDIR+= bluetooth
.endif
Modified: head/usr.bin/host/Makefile
==============================================================================
--- head/usr.bin/host/Makefile Mon Sep 30 09:21:17 2013 (r255948)
+++ head/usr.bin/host/Makefile Mon Sep 30 17:23:45 2013 (r255949)
@@ -1,9 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-.if ${MK_LDNS_UTILS} != "no"
-
LDNSDIR= ${.CURDIR}/../../contrib/ldns
LDNSHOSTDIR= ${.CURDIR}/../../contrib/ldns-host
@@ -22,28 +18,4 @@ DPADD+= ${LIBLDNS} ${LIBCRYPTO}
LDADD+= -lldns -lcrypto
USEPRIVATELIB= ldns
-.else
-
-BIND_DIR= ${.CURDIR}/../../contrib/bind9
-LIB_BIND_REL= ../../lib/bind
-LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
-SRCDIR= ${BIND_DIR}/bin/dig
-
-.include "${LIB_BIND_DIR}/config.mk"
-
-PROG= host
-
-.PATH: ${SRCDIR}
-SRCS+= dighost.c host.c
-
-CFLAGS+= -I${SRCDIR}/include
-CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
-
-WARNS?= 0
-
-DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
-LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
-
-.endif
-
.include <bsd.prog.mk>
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Mon Sep 30 09:21:17 2013 (r255948)
+++ head/usr.sbin/Makefile Mon Sep 30 17:23:45 2013 (r255949)
@@ -124,29 +124,6 @@ SUBDIR+= praudit
SUBDIR+= authpf
.endif
-.if ${MK_BIND_DNSSEC} != "no" && ${MK_OPENSSL} != "no"
-SUBDIR+= dnssec-dsfromkey
-SUBDIR+= dnssec-keyfromlabel
-SUBDIR+= dnssec-keygen
-SUBDIR+= dnssec-revoke
-SUBDIR+= dnssec-settime
-SUBDIR+= dnssec-signzone
-SUBDIR+= dnssec-verify
-.endif
-.if ${MK_BIND_NAMED} != "no"
-SUBDIR+= arpaname
-SUBDIR+= ddns-confgen
-SUBDIR+= genrandom
-SUBDIR+= isc-hmac-fixup
-SUBDIR+= named
-SUBDIR+= named-checkconf
-SUBDIR+= named-checkzone
-SUBDIR+= named-journalprint
-SUBDIR+= nsec3hash
-SUBDIR+= rndc
-SUBDIR+= rndc-confgen
-.endif
-
.if ${MK_BLUETOOTH} != "no"
SUBDIR+= bluetooth
.endif
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
