For all:

Add an OPTION (on by default) to install the appropriate symlinks for
named.conf and rndc.key in /usr/local/etc and /var/named/usr/local/etc.

For bind9[456]:
Add OPTIONs (off by default) for the DLZ configure options, and their
corresponding ports knobs. [1] The basic infrastructure for this was
provided in the PR, but this version is slightly different in a few
details so responsibility for bugs is mine.

PR:		ports/122974 [1]
Submitted by:	Michael Schout <mschout@gkg.net> [1]

8 files changed, 199 insertions, 7 deletions

diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index 4c0878a520dc..5e0182d3362c 100644
--- a/dns/bind9/Makefile
+++ b/dns/bind9/Makefile
@@ -36,6 +36,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 CONFLICTS=	bind9*-9.[456].* bind9-sdb-* host-*
 
 OPTIONS=	SSL "Building without OpenSSL removes DNSSEC" on \
+		LINKS "Create conf file symlinks in ${PREFIX}" on \
 		REPLACE_BASE "Replace base BIND with this version" off \
 		THREADS	"Compile with thread support (NOT RECOMMENDED!)" off
 
@@ -51,6 +52,12 @@ CONFIGURE_ARGS+=	--disable-openssl-version-check
 CONFIGURE_ARGS+=	--without-openssl
 .endif
 
+.if !defined(WITHOUT_LINKS)
+PLIST_SUB+=	LINKS=""
+.else
+PLIST_SUB+=	LINKS="@comment "
+.endif
+
 # ISC staff has informed me that for 9.3.x, threads are always a bad idea.
 # Leave the affirmative option for those that want to experiment.
 .if defined(WITH_THREADS)
@@ -69,7 +76,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 BIND_DESTETC=	${PREFIX}/etc
 .endif
 
-PLIST_SUB=	BIND_DESTETC="${BIND_DESTETC}"
+PLIST_SUB+=	BIND_DESTETC="${BIND_DESTETC}"
 
 MAN1=	dig.1 host.1 nslookup.1 nsupdate.1
 MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
@@ -139,6 +146,14 @@ post-install:
 	${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
 		${WRKSRC}/README ${DOCSDIR}/
 .endif
+.if !defined(WITHOUT_LINKS)
+	${MKDIR} /var/named${PREFIX}/etc
+.for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc
+.for FILE in named.conf rndc.key
+	${LN} -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+.endfor
+.endfor
+.endif
 
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/dns/bind9/pkg-plist b/dns/bind9/pkg-plist
index b01032a9950b..0bef918435df 100644
--- a/dns/bind9/pkg-plist
+++ b/dns/bind9/pkg-plist
@@ -3,6 +3,8 @@ bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
+%%LINKS%%etc/named.conf
+%%LINKS%%etc/rndc.key
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
@@ -218,6 +220,10 @@ sbin/rndc-confgen
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/arm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%LINKS%%@unexec rm -f /var/named/%D/etc/named.conf
+%%LINKS%%@unexec rm -f /var/named/%D/etc/rndc.key
+%%LINKS%%@unexec rm -rf /var/named/%D
+%%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
 @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
 @dirrm include/bind9
 @dirrm include/dns
diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index 58a461d44bd8..006a38008fef 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -36,10 +36,17 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 CONFLICTS=	bind9*-9.[356].* bind9-sdb-* host-*
 
 OPTIONS=	SSL "Building without OpenSSL removes DNSSEC" on \
+		LINKS "Create conf file symlinks in ${PREFIX}" on \
 		REPLACE_BASE "Replace base BIND with this version" off \
 		LARGE_FILE "64-bit file support" off \
 		SIGCHASE "dig/host/nslookup will do DNSSEC validation" off \
-		IPV6 "IPv6 Support (autodetected by default)" off
+		IPV6 "IPv6 Support (autodetected by default)" off \
+		DLZ_POSTGRESQL "DLZ Postgres driver" off \
+		DLZ_MYSQL "DLZ MySQL driver (single-threaded BIND)" off \
+		DLZ_BDB "DLZ BDB driver" off \
+		DLZ_LDAP "DLZ LDAP driver" off \
+		DLZ_FILESYSTEM "DLZ filesystem driver" off \
+		DLZ_STUB "DLZ stub driver" off
 
 # Just in case
 USE_OPENSSL=	yes
@@ -60,6 +67,12 @@ CONFIGURE_ARGS+=	--disable-openssl-version-check
 CONFIGURE_ARGS+=	--without-openssl
 .endif
 
+.if !defined(WITHOUT_LINKS)
+PLIST_SUB+=	LINKS=""
+.else
+PLIST_SUB+=	LINKS="@comment "
+.endif
+
 .if defined(WITH_LARGE_FILE)
 CONFIGURE_ARGS+=	--enable-largefile
 .endif
@@ -72,6 +85,36 @@ CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
+.if defined(WITH_DLZ_POSTGRESQL)
+CONFIGURE_ARGS+=	--with-dlz-postgres=yes
+USE_PGSQL=		yes
+.endif
+
+.if defined(WITH_DLZ_MYSQL)
+CONFIGURE_ARGS+=	--with-dlz-mysql=yes
+USE_MYSQL=		yes
+WITHOUT_THREADS=	yes
+.endif
+
+.if defined(WITH_DLZ_BDB)
+CONFIGURE_ARGS+=	--with-dlz-bdb=yes
+USE_BDB=		yes
+.endif
+
+.if defined(WITH_DLZ_LDAP)
+CONFIGURE_ARGS+=	--with-dlz-ldap=yes
+USE_OPENLDAP=		yes
+.endif
+
+.if defined(WITH_DLZ_FILESYSTEM)
+CONFIGURE_ARGS+=	--with-dlz-filesystem=yes
+.endif
+
+.if defined(WITH_DLZ_STUB)
+CONFIGURE_ARGS+=	--with-dlz-stub=yes
+.endif
+
+# Has to be after the DLZ_MYSQL option
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 .else
@@ -108,7 +151,7 @@ EXTRA_PATCHES+=	${GEOIP_PATCH}
 CONFLICTS+=	bind94-geoip-9.4.*
 .endif
 
-PLIST_SUB=	BIND_DESTETC="${BIND_DESTETC}"
+PLIST_SUB+=	BIND_DESTETC="${BIND_DESTETC}"
 
 MAN1=	dig.1 host.1 nslookup.1 nsupdate.1
 MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
@@ -179,6 +222,14 @@ post-install:
 	${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
 		${WRKSRC}/README ${DOCSDIR}/
 .endif
+.if !defined(WITHOUT_LINKS)
+	${MKDIR} /var/named${PREFIX}/etc
+.for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc
+.for FILE in named.conf rndc.key
+	${LN} -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+.endfor
+.endfor
+.endif
 
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/dns/bind94/pkg-plist b/dns/bind94/pkg-plist
index 9ef535bc8b9b..e4eecce1d0b5 100644
--- a/dns/bind94/pkg-plist
+++ b/dns/bind94/pkg-plist
@@ -3,6 +3,8 @@ bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
+%%LINKS%%etc/named.conf
+%%LINKS%%etc/rndc.key
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
@@ -234,6 +236,10 @@ sbin/rndc-confgen
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/arm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%LINKS%%@unexec rm -f /var/named/%D/etc/named.conf
+%%LINKS%%@unexec rm -f /var/named/%D/etc/rndc.key
+%%LINKS%%@unexec rm -rf /var/named/%D
+%%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
 @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
 @dirrm include/bind9
 @dirrm include/dns
diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index 548f69e59846..013950add487 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -36,12 +36,19 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 CONFLICTS=	bind9*-9.[346].* bind9-sdb-* host-*
 
 OPTIONS=	SSL "Building without OpenSSL removes DNSSEC" on \
+		LINKS "Create conf file symlinks in ${PREFIX}" on \
 		XML "Support for xml statistics output" on \
 		IDN "Add IDN support to dig, host, etc." off \
 		REPLACE_BASE "Replace base BIND with this version" off \
 		LARGE_FILE "64-bit file support" off \
 		SIGCHASE "dig/host/nslookup will do DNSSEC validation" off \
-		IPV6 "IPv6 Support (autodetected by default)" off
+		IPV6 "IPv6 Support (autodetected by default)" off \
+		DLZ_POSTGRESQL "DLZ Postgres driver" off \
+		DLZ_MYSQL "DLZ MySQL driver (single-threaded BIND)" off \
+		DLZ_BDB "DLZ BDB driver" off \
+		DLZ_LDAP "DLZ LDAP driver" off \
+		DLZ_FILESYSTEM "DLZ filesystem driver" off \
+		DLZ_STUB "DLZ stub driver" off
 
 # Just in case
 USE_OPENSSL=	yes
@@ -81,6 +88,12 @@ LIB_DEPENDS+=		idnkit.1:${PORTSDIR}/dns/idnkit
 CONFIGURE_ARGS+=	--without-idn
 .endif
 
+.if !defined(WITHOUT_LINKS)
+PLIST_SUB+=	LINKS=""
+.else
+PLIST_SUB+=	LINKS="@comment "
+.endif
+
 .if defined(WITH_LARGE_FILE)
 CONFIGURE_ARGS+=	--enable-largefile
 .endif
@@ -93,6 +106,36 @@ CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
+.if defined(WITH_DLZ_POSTGRESQL)
+CONFIGURE_ARGS+=	--with-dlz-postgres=yes
+USE_PGSQL=		yes
+.endif
+
+.if defined(WITH_DLZ_MYSQL)
+CONFIGURE_ARGS+=	--with-dlz-mysql=yes
+USE_MYSQL=		yes
+WITHOUT_THREADS=	yes
+.endif
+
+.if defined(WITH_DLZ_BDB)
+CONFIGURE_ARGS+=	--with-dlz-bdb=yes
+USE_BDB=		yes
+.endif
+
+.if defined(WITH_DLZ_LDAP)
+CONFIGURE_ARGS+=	--with-dlz-ldap=yes
+USE_OPENLDAP=		yes
+.endif
+
+.if defined(WITH_DLZ_FILESYSTEM)
+CONFIGURE_ARGS+=	--with-dlz-filesystem=yes
+.endif
+
+.if defined(WITH_DLZ_STUB)
+CONFIGURE_ARGS+=	--with-dlz-stub=yes
+.endif
+
+# Has to be after the DLZ_MYSQL option
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 .else
@@ -109,7 +152,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 BIND_DESTETC=	${PREFIX}/etc
 .endif
 
-PLIST_SUB=	BIND_DESTETC="${BIND_DESTETC}"
+PLIST_SUB+=	BIND_DESTETC="${BIND_DESTETC}"
 
 MAN1=	dig.1 host.1 nslookup.1 nsupdate.1
 MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
@@ -174,6 +217,14 @@ post-install:
 	${WRKSRC}/README ${WRKSRC}/README.idnkit \
 	    ${DOCSDIR}/
 .endif
+.if !defined(WITHOUT_LINKS)
+	${MKDIR} /var/named${PREFIX}/etc
+.for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc
+.for FILE in named.conf rndc.key
+	${LN} -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+.endfor
+.endfor
+.endif
 
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/dns/bind95/pkg-plist b/dns/bind95/pkg-plist
index 9e61d80fe9b9..d2865eeb17ca 100644
--- a/dns/bind95/pkg-plist
+++ b/dns/bind95/pkg-plist
@@ -3,6 +3,8 @@ bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
+%%LINKS%%etc/named.conf
+%%LINKS%%etc/rndc.key
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
@@ -242,6 +244,10 @@ sbin/rndc-confgen
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/arm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%LINKS%%@unexec rm -f /var/named/%D/etc/named.conf
+%%LINKS%%@unexec rm -f /var/named/%D/etc/rndc.key
+%%LINKS%%@unexec rm -rf /var/named/%D
+%%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
 @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
 @dirrm include/bind9
 @dirrm include/dns
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index efdcd4998ca7..4f44bab43223 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -36,12 +36,19 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 CONFLICTS=	bind9*-9.[345].* bind9-sdb-* host-*
 
 OPTIONS=	SSL "Building without OpenSSL removes DNSSEC" on \
+		LINKS "Create conf file symlinks in ${PREFIX}" on \
 		XML "Support for xml statistics output" on \
 		IDN "Add IDN support to dig, host, etc." off \
 		REPLACE_BASE "Replace base BIND with this version" off \
 		LARGE_FILE "64-bit file support" off \
 		SIGCHASE "dig/host/nslookup will do DNSSEC validation" off \
-		IPV6 "IPv6 Support (autodetected by default)" off
+		IPV6 "IPv6 Support (autodetected by default)" off \
+		DLZ_POSTGRESQL "DLZ Postgres driver" off \
+		DLZ_MYSQL "DLZ MySQL driver (single-threaded BIND)" off \
+		DLZ_BDB "DLZ BDB driver" off \
+		DLZ_LDAP "DLZ LDAP driver" off \
+		DLZ_FILESYSTEM "DLZ filesystem driver" off \
+		DLZ_STUB "DLZ stub driver" off
 
 # Just in case
 USE_OPENSSL=	yes
@@ -80,6 +87,12 @@ LIB_DEPENDS+=		idnkit.1:${PORTSDIR}/dns/idnkit
 CONFIGURE_ARGS+=	--without-idn
 .endif
 
+.if !defined(WITHOUT_LINKS)
+PLIST_SUB+=	LINKS=""
+.else
+PLIST_SUB+=	LINKS="@comment "
+.endif
+
 .if defined(WITH_LARGE_FILE)
 CONFIGURE_ARGS+=	--enable-largefile
 .endif
@@ -92,6 +105,36 @@ CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
+.if defined(WITH_DLZ_POSTGRESQL)
+CONFIGURE_ARGS+=	--with-dlz-postgres=yes
+USE_PGSQL=		yes
+.endif
+
+.if defined(WITH_DLZ_MYSQL)
+CONFIGURE_ARGS+=	--with-dlz-mysql=yes
+USE_MYSQL=		yes
+WITHOUT_THREADS=	yes
+.endif
+
+.if defined(WITH_DLZ_BDB)
+CONFIGURE_ARGS+=	--with-dlz-bdb=yes
+USE_BDB=		yes
+.endif
+
+.if defined(WITH_DLZ_LDAP)
+CONFIGURE_ARGS+=	--with-dlz-ldap=yes
+USE_OPENLDAP=		yes
+.endif
+
+.if defined(WITH_DLZ_FILESYSTEM)
+CONFIGURE_ARGS+=	--with-dlz-filesystem=yes
+.endif
+
+.if defined(WITH_DLZ_STUB)
+CONFIGURE_ARGS+=	--with-dlz-stub=yes
+.endif
+
+# Has to be after the DLZ_MYSQL option
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 .else
@@ -108,7 +151,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 BIND_DESTETC=	${PREFIX}/etc
 .endif
 
-PLIST_SUB=	BIND_DESTETC="${BIND_DESTETC}"
+PLIST_SUB+=	BIND_DESTETC="${BIND_DESTETC}"
 
 MAN1=	dig.1 host.1 isc-config.sh.1 nslookup.1 nsupdate.1
 MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
@@ -175,6 +218,14 @@ post-install:
 	    ${WRKSRC}/README.pkcs11 \
 	    ${DOCSDIR}/
 .endif
+.if !defined(WITHOUT_LINKS)
+	${MKDIR} /var/named${PREFIX}/etc
+.for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc
+.for FILE in named.conf rndc.key
+	${LN} -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+.endfor
+.endfor
+.endif
 
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist
index fde68b4d7781..ba4690589a4c 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -3,6 +3,8 @@ bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
+%%LINKS%%etc/named.conf
+%%LINKS%%etc/rndc.key
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
@@ -250,6 +252,10 @@ sbin/rndc-confgen
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/arm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%LINKS%%@unexec rm -f /var/named/%D/etc/named.conf
+%%LINKS%%@unexec rm -f /var/named/%D/etc/rndc.key
+%%LINKS%%@unexec rm -rf /var/named/%D
+%%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
 @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
 @dirrm include/bind9
 @dirrm include/dns