1. Add much finer granularity to the NO_BIND knobs with the addition of:

NO_BIND_DNSSEC, NO_BIND_ETC, NO_BIND_NAMED, and NO_BIND_UTILS.

2. Make creation of directories in /usr/include that are only needed
in the WITH_BIND_LIBS case conditional.

Reviewed by:	ru, des

2 files changed, 34 insertions, 2 deletions

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index ab2e837..4a52626 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -146,7 +146,11 @@
 # Variables to control whether parts of the base BIND are built.
 # Defining NO_BIND makes all of the following BIND variables obsolete.
 #NO_BIND=		true	# Do not build any part of BIND
+#NO_BIND_DNSSEC=	true	# Do not build dnssec-keygen, dnssec-signzone
+#NO_BIND_ETC=		true	# Do not install files to /etc/namedb
 #NO_BIND_LIBS_LWRES=	true	# Do not install the lwres library
+#NO_BIND_NAMED=		true	# Do not build named, rndc, lwresd, etc.
+#NO_BIND_UTILS=		true	# Do not build dig, host, nslookup, nsupdate
 #WITH_BIND_LIBS=	true	# Install the BIND libs and include files
 #
 # To build sys/modules when building the world (our old way of doing things)
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index c03876f..7834436 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 25, 2004
+.Dd September 27, 2004
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -603,11 +603,39 @@ subdir.
 .Pq Vt bool
 Setting this variable will prevent any part of BIND from being built,
 regardless of the presence of any of the other *_BIND_* variables below.
+.It Va NO_BIND_DNSSEC
+.Pq Vt bool
+Set to avoid building or installing the DNSSEC related binaries,
+.Xr dnssec-keygen 8
+and
+.Xr dnssec-signzone 8 .
+.It Va NO_BIND_ETC
+.Pq Vt bool
+Set to avoid installing the default files to
+.Pa /etc/namedb .
 .It Va NO_BIND_LIBS_LWRES
 .Pq Vt bool
-Set to avoid installing the lwres library in
+Set to avoid installing the lightweight resolver library in
 .Pa /usr/lib .
 The library that is private to the build system may still be built as needed.
+.It Va NO_BIND_NAMED
+.Pq Vt bool
+Set to avoid building or installing
+.Xr named 8 ,
+.Xr named.reload 8 ,
+.Xr named-checkconf 8 ,
+.Xr named-checkzone 8 ,
+.Xr rndc 8 ,
+and
+.Xr rndc-confgen 8 .
+.It Va NO_BIND_UTILS
+.Pq Vt bool
+Set to avoid building or installing the BIND userland utilities,
+.Xr dig 1 ,
+.Xr host 1 ,
+.Xr nslookup 1 ,
+and
+.Xr nsupdate 8 .
 .It Va WITH_BIND_LIBS
 .Pq Vt bool
 Set to install BIND libraries and include files.