Retire REPLACE_BASE option.

While there, reduce changes from bind99 and bind910 ports.

Sponsored by:	Absolight

4 files changed, 156 insertions, 173 deletions

diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 0ef1b33b38d8..65f1bad05be7 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	99
@@ -37,7 +37,9 @@ ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
 
-OPTIONS_DEFAULT=	IPV6 SSL THREADS GSSAPI_NONE RRL
+SUB_FILES=	pkg-message
+
+OPTIONS_DEFAULT=	IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL
 OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \
 			IPV6 THREADS FILTER_AAAA GOST PYTHON \
 			LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS
@@ -50,7 +52,7 @@ OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SUB=	yes
 
 SSL_DESC=		Build with OpenSSL (Required for DNSSEC)
-REPLACE_BASE_DESC=	Replace base BIND (FreeBSD 9.x and earlier)
+REPLACE_BASE_DESC=	EOL, no longer supported
 LARGE_FILE_DESC=	64-bit file support
 FIXED_RRSET_DESC=	Enable fixed rrset ordering
 SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
@@ -140,7 +142,7 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
 .include <bsd.port.options.mk>
 
-.if !${PORT_OPTIONS:MLINKS} || ${PORT_OPTIONS:MREPLACE_BASE}
+.if !${PORT_OPTIONS:MLINKS}
 PKGINSTALL=${NONEXISTENT}
 .endif
 
@@ -151,56 +153,39 @@ CONFIGURE_ARGS+=	--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MREPLACE_BASE}
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
-IGNORE=		REPLACE_BASE option is not supported on this release
-.else # >= 10.0
-# Move to BROKEN after expiration.
-DEPRECATED=		REPLACE_BASE option will be removed.  There is no real need for foot-shooting.
-EXPIRATION_DATE=	2015-01-01
-.endif # >= 10.0
-PKGNAMESUFFIX=	-base
-PREFIX=		/usr
-PLIST_SUB+=	SHARE_MAN="share/"
-NO_MTREE=	yes
-BIND_DESTETC=	/etc/namedb
-.else # REPLACE_BASE
-PLIST_SUB+=	SHARE_MAN=""
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
-BIND_DESTETC=	${PREFIX}/etc/namedb
-PKGINSTALL=	${NONEXISTENT}
-.else # >= 10.0
-BIND_DESTETC=	${PREFIX}/etc
-.endif # >= 10.0
+IGNORE=		REPLACE_BASE is no longer supported
 .endif # REPLACE_BASE
 
-PKGDEINSTALL=	${PKGINSTALL}
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--sysconfdir=${BIND_DESTETC}
-SUB_LIST+=	BIND_DESTETC="${BIND_DESTETC}"
-PLIST_SUB+=	BIND_DESTETC="${BIND_DESTETC}"
-
-PORTDOCS=	*
-
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
+PKGINSTALL=	${NONEXISTENT}
 PLIST_SUB+=	NOBASE="" BASE="@comment "
+SUB_LIST+=	NOBASE="" BASE="@comment "
 USE_RC_SUBR+=	named
 SUB_FILES+=	named.conf
 .if ${PORT_OPTIONS:MGOST}
 WITH_OPENSSL_PORT=yes
 .endif
 .else
+ETCDIR=		${PREFIX}/etc
 PLIST_SUB+=	NOBASE="@comment " BASE=""
+SUB_LIST+=	NOBASE="@comment " BASE=""
 .if ${PORT_OPTIONS:MSSL}
 WITH_OPENSSL_PORT=	yes
 .endif
 .endif
 
+PKGDEINSTALL=	${PKGINSTALL}
+
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+			--sysconfdir=${ETCDIR}
+
+PORTDOCS=	*
+
 post-patch:
 .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
-	@${REINPLACE_CMD} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \
-		-e 's#/etc/rndc.conf#${BIND_DESTETC}/rndc.conf#g' \
+	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
+		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
 .endfor
@@ -227,7 +212,8 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master
 	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master
 	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master
-	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf ${STAGEDIR}${ETCDIR}/rndc.conf.sample
 .endif
+	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
+		${STAGEDIR}${ETCDIR}/rndc.conf.sample
 
 .include <bsd.port.mk>
diff --git a/dns/bind99/files/pkg-message.in b/dns/bind99/files/pkg-message.in
new file mode 100644
index 000000000000..d428cb4738cf
--- /dev/null
+++ b/dns/bind99/files/pkg-message.in
@@ -0,0 +1,16 @@
+**********************************************************************
+*            _  _____ _____ _____ _   _ _____ ___ ___  _   _         *
+*           / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |        *
+*          / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |        *
+*         / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |        *
+*        /_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|        *
+*                                                                    *
+*   BIND requires configuration of rndc, including a "secret" key.   *
+*    The easiest, and most secure way to configure rndc is to run    *
+*   'rndc-confgen -a' to generate the proper conf file, with a new   *
+*            random key, and appropriate file permissions.           *
+*                                                                    *
+%%BASE%%*    The /etc/rc.d/named script in the base will do that for you.    *
+%%NOBASE%%*     The %%PREFIX%%/etc/rc.d/named script will do that for you.     *
+*                                                                    *
+**********************************************************************
diff --git a/dns/bind99/pkg-message b/dns/bind99/pkg-message
deleted file mode 100644
index bb713abdd1d3..000000000000
--- a/dns/bind99/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
-*************************************************************************
-*           _  _____ _____ _____ _   _ _____ ___ ___  _   _ 		*
-*	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |		*
-*	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |		*
-*	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |		*
-*	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|		*
-*									*
-*	If you are running BIND 9 in a chroot environment, make		*
-*	sure that there is a /dev/random device	in the chroot.		*
-*									*
-*	BIND 9 also requires configuration of rndc, including a		*
-*	"secret" key.  The easiest, and most secure way to configure	*
-*	rndc is to run 'rndc-confgen -a' to generate the proper	conf	*
-*	file, with a new random key, and appropriate file permissions.	*
-*									*
-*	The /etc/rc.d/named script in the base will do both for you.    *
-*									*
-*************************************************************************
diff --git a/dns/bind99/pkg-plist b/dns/bind99/pkg-plist
index aae7c56fa1ed..e0cf839f45b3 100644
--- a/dns/bind99/pkg-plist
+++ b/dns/bind99/pkg-plist
@@ -236,122 +236,122 @@ lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
 lib/liblwres.a
-%%SHARE_MAN%%man/man1/arpaname.1.gz
-%%SHARE_MAN%%man/man1/bind9-config.1.gz
-%%SHARE_MAN%%man/man1/dig.1.gz
-%%SHARE_MAN%%man/man1/host.1.gz
-%%SHARE_MAN%%man/man1/isc-config.sh.1.gz
-%%SHARE_MAN%%man/man1/nslookup.1.gz
-%%SHARE_MAN%%man/man1/nsupdate.1.gz
-%%SHARE_MAN%%man/man3/lwres.3.gz
-%%SHARE_MAN%%man/man3/lwres_addr_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_add.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_back.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_clear.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_first.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_forward.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_getmem.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_getuint16.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_getuint32.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_getuint8.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_init.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_invalidate.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_putmem.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_putuint16.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_putuint32.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_putuint8.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_subtract.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_clear.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_get.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_init.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_print.3.gz
-%%SHARE_MAN%%man/man3/lwres_config.3.gz
-%%SHARE_MAN%%man/man3/lwres_context.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_allocmem.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_create.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_destroy.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_freemem.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_initserial.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_nextserial.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_sendrecv.3.gz
-%%SHARE_MAN%%man/man3/lwres_endhostent.3.gz
-%%SHARE_MAN%%man/man3/lwres_endhostent_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_freeaddrinfo.3.gz
-%%SHARE_MAN%%man/man3/lwres_freehostent.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabn.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnrequest_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnrequest_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnrequest_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnresponse_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnresponse_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnresponse_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_gai_strerror.3.gz
-%%SHARE_MAN%%man/man3/lwres_getaddrinfo.3.gz
-%%SHARE_MAN%%man/man3/lwres_getaddrsbyname.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyaddr.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyaddr_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyname.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyname2.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyname_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostent.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostent_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_getipnode.3.gz
-%%SHARE_MAN%%man/man3/lwres_getipnodebyaddr.3.gz
-%%SHARE_MAN%%man/man3/lwres_getipnodebyname.3.gz
-%%SHARE_MAN%%man/man3/lwres_getnamebyaddr.3.gz
-%%SHARE_MAN%%man/man3/lwres_getnameinfo.3.gz
-%%SHARE_MAN%%man/man3/lwres_getrrsetbyname.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnba.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbarequest_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbarequest_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbarequest_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbaresponse_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbaresponse_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbaresponse_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_herror.3.gz
-%%SHARE_MAN%%man/man3/lwres_hstrerror.3.gz
-%%SHARE_MAN%%man/man3/lwres_inetntop.3.gz
-%%SHARE_MAN%%man/man3/lwres_lwpacket_parseheader.3.gz
-%%SHARE_MAN%%man/man3/lwres_lwpacket_renderheader.3.gz
-%%SHARE_MAN%%man/man3/lwres_net_ntop.3.gz
-%%SHARE_MAN%%man/man3/lwres_noop.3.gz
-%%SHARE_MAN%%man/man3/lwres_nooprequest_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_nooprequest_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_nooprequest_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_noopresponse_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_noopresponse_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_noopresponse_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_packet.3.gz
-%%SHARE_MAN%%man/man3/lwres_resutil.3.gz
-%%SHARE_MAN%%man/man3/lwres_sethostent.3.gz
-%%SHARE_MAN%%man/man3/lwres_sethostent_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_string_parse.3.gz
-%%SHARE_MAN%%man/man5/named.conf.5.gz
-%%SHARE_MAN%%man/man5/rndc.conf.5.gz
-%%SHARE_MAN%%man/man8/ddns-confgen.8.gz
-%%PYTHON%%%%SHARE_MAN%%man/man8/dnssec-checkds.8.gz
-%%PYTHON%%%%SHARE_MAN%%man/man8/dnssec-coverage.8.gz
-%%SHARE_MAN%%man/man8/dnssec-dsfromkey.8.gz
-%%SHARE_MAN%%man/man8/dnssec-importkey.8.gz
-%%SHARE_MAN%%man/man8/dnssec-keyfromlabel.8.gz
-%%SHARE_MAN%%man/man8/dnssec-keygen.8.gz
-%%SHARE_MAN%%man/man8/dnssec-revoke.8.gz
-%%SHARE_MAN%%man/man8/dnssec-settime.8.gz
-%%SHARE_MAN%%man/man8/dnssec-signzone.8.gz
-%%SHARE_MAN%%man/man8/dnssec-verify.8.gz
-%%SHARE_MAN%%man/man8/genrandom.8.gz
-%%SHARE_MAN%%man/man8/isc-hmac-fixup.8.gz
-%%SHARE_MAN%%man/man8/lwresd.8.gz
-%%SHARE_MAN%%man/man8/named-checkconf.8.gz
-%%SHARE_MAN%%man/man8/named-checkzone.8.gz
-%%SHARE_MAN%%man/man8/named-compilezone.8.gz
-%%SHARE_MAN%%man/man8/named-journalprint.8.gz
-%%SHARE_MAN%%man/man8/named.8.gz
-%%SHARE_MAN%%man/man8/nsec3hash.8.gz
-%%SHARE_MAN%%man/man8/rndc-confgen.8.gz
-%%SHARE_MAN%%man/man8/rndc.8.gz
+man/man1/arpaname.1.gz
+man/man1/bind9-config.1.gz
+man/man1/dig.1.gz
+man/man1/host.1.gz
+man/man1/isc-config.sh.1.gz
+man/man1/nslookup.1.gz
+man/man1/nsupdate.1.gz
+man/man3/lwres.3.gz
+man/man3/lwres_addr_parse.3.gz
+man/man3/lwres_buffer.3.gz
+man/man3/lwres_buffer_add.3.gz
+man/man3/lwres_buffer_back.3.gz
+man/man3/lwres_buffer_clear.3.gz
+man/man3/lwres_buffer_first.3.gz
+man/man3/lwres_buffer_forward.3.gz
+man/man3/lwres_buffer_getmem.3.gz
+man/man3/lwres_buffer_getuint16.3.gz
+man/man3/lwres_buffer_getuint32.3.gz
+man/man3/lwres_buffer_getuint8.3.gz
+man/man3/lwres_buffer_init.3.gz
+man/man3/lwres_buffer_invalidate.3.gz
+man/man3/lwres_buffer_putmem.3.gz
+man/man3/lwres_buffer_putuint16.3.gz
+man/man3/lwres_buffer_putuint32.3.gz
+man/man3/lwres_buffer_putuint8.3.gz
+man/man3/lwres_buffer_subtract.3.gz
+man/man3/lwres_conf_clear.3.gz
+man/man3/lwres_conf_get.3.gz
+man/man3/lwres_conf_init.3.gz
+man/man3/lwres_conf_parse.3.gz
+man/man3/lwres_conf_print.3.gz
+man/man3/lwres_config.3.gz
+man/man3/lwres_context.3.gz
+man/man3/lwres_context_allocmem.3.gz
+man/man3/lwres_context_create.3.gz
+man/man3/lwres_context_destroy.3.gz
+man/man3/lwres_context_freemem.3.gz
+man/man3/lwres_context_initserial.3.gz
+man/man3/lwres_context_nextserial.3.gz
+man/man3/lwres_context_sendrecv.3.gz
+man/man3/lwres_endhostent.3.gz
+man/man3/lwres_endhostent_r.3.gz
+man/man3/lwres_freeaddrinfo.3.gz
+man/man3/lwres_freehostent.3.gz
+man/man3/lwres_gabn.3.gz
+man/man3/lwres_gabnrequest_free.3.gz
+man/man3/lwres_gabnrequest_parse.3.gz
+man/man3/lwres_gabnrequest_render.3.gz
+man/man3/lwres_gabnresponse_free.3.gz
+man/man3/lwres_gabnresponse_parse.3.gz
+man/man3/lwres_gabnresponse_render.3.gz
+man/man3/lwres_gai_strerror.3.gz
+man/man3/lwres_getaddrinfo.3.gz
+man/man3/lwres_getaddrsbyname.3.gz
+man/man3/lwres_gethostbyaddr.3.gz
+man/man3/lwres_gethostbyaddr_r.3.gz
+man/man3/lwres_gethostbyname.3.gz
+man/man3/lwres_gethostbyname2.3.gz
+man/man3/lwres_gethostbyname_r.3.gz
+man/man3/lwres_gethostent.3.gz
+man/man3/lwres_gethostent_r.3.gz
+man/man3/lwres_getipnode.3.gz
+man/man3/lwres_getipnodebyaddr.3.gz
+man/man3/lwres_getipnodebyname.3.gz
+man/man3/lwres_getnamebyaddr.3.gz
+man/man3/lwres_getnameinfo.3.gz
+man/man3/lwres_getrrsetbyname.3.gz
+man/man3/lwres_gnba.3.gz
+man/man3/lwres_gnbarequest_free.3.gz
+man/man3/lwres_gnbarequest_parse.3.gz
+man/man3/lwres_gnbarequest_render.3.gz
+man/man3/lwres_gnbaresponse_free.3.gz
+man/man3/lwres_gnbaresponse_parse.3.gz
+man/man3/lwres_gnbaresponse_render.3.gz
+man/man3/lwres_herror.3.gz
+man/man3/lwres_hstrerror.3.gz
+man/man3/lwres_inetntop.3.gz
+man/man3/lwres_lwpacket_parseheader.3.gz
+man/man3/lwres_lwpacket_renderheader.3.gz
+man/man3/lwres_net_ntop.3.gz
+man/man3/lwres_noop.3.gz
+man/man3/lwres_nooprequest_free.3.gz
+man/man3/lwres_nooprequest_parse.3.gz
+man/man3/lwres_nooprequest_render.3.gz
+man/man3/lwres_noopresponse_free.3.gz
+man/man3/lwres_noopresponse_parse.3.gz
+man/man3/lwres_noopresponse_render.3.gz
+man/man3/lwres_packet.3.gz
+man/man3/lwres_resutil.3.gz
+man/man3/lwres_sethostent.3.gz
+man/man3/lwres_sethostent_r.3.gz
+man/man3/lwres_string_parse.3.gz
+man/man5/named.conf.5.gz
+man/man5/rndc.conf.5.gz
+man/man8/ddns-confgen.8.gz
+%%PYTHON%%man/man8/dnssec-checkds.8.gz
+%%PYTHON%%man/man8/dnssec-coverage.8.gz
+man/man8/dnssec-dsfromkey.8.gz
+man/man8/dnssec-importkey.8.gz
+man/man8/dnssec-keyfromlabel.8.gz
+man/man8/dnssec-keygen.8.gz
+man/man8/dnssec-revoke.8.gz
+man/man8/dnssec-settime.8.gz
+man/man8/dnssec-signzone.8.gz
+man/man8/dnssec-verify.8.gz
+man/man8/genrandom.8.gz
+man/man8/isc-hmac-fixup.8.gz
+man/man8/lwresd.8.gz
+man/man8/named-checkconf.8.gz
+man/man8/named-checkzone.8.gz
+man/man8/named-compilezone.8.gz
+man/man8/named-journalprint.8.gz
+man/man8/named.8.gz
+man/man8/nsec3hash.8.gz
+man/man8/rndc-confgen.8.gz
+man/man8/rndc.8.gz
 sbin/arpaname
 sbin/ddns-confgen
 %%PYTHON%%sbin/dnssec-checkds
@@ -375,14 +375,13 @@ sbin/named-journalprint
 sbin/nsec3hash
 sbin/rndc
 sbin/rndc-confgen
-%%BASE%%%%BIND_DESTETC%%/bind.keys
-%%NOBASE%%%%ETCDIR%%/bind.keys
+%%ETCDIR%%/rndc.conf.sample
+%%ETCDIR%%/bind.keys
 %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample
 %%NOBASE%%%%ETCDIR%%/named.root
 %%NOBASE%%%%ETCDIR%%/master/empty.db
 %%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
 %%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
-%%NOBASE%%%%ETCDIR%%/rndc.conf.sample
 %%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic
 %%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/master
 %%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave