Commit the cleanups that should have gone in with the pervious update.

Sponsored by:	Absolight

4 files changed, 17 insertions, 71 deletions

diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index cddf9416eb45..af6d8986b2c1 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -69,7 +69,7 @@ OPTIONS_RADIO_GOSTDEF=	GOST GOST_ASN1
 
 .if !defined(BIND_TOOLS_SLAVE)
 OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP
-OPTIONS_DEFINE+=	LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+OPTIONS_DEFINE+=	RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
 			MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
 			START_LATE
 OPTIONS_GROUP=		DLZ
@@ -100,7 +100,6 @@ QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 LMDB_DESC=		Use LMDB for zone management
 DNSTAP_DESC=		Provides fast passive logging of DNS messages
 
-LINKS_DESC=		Create conf file symlinks in ${PREFIX}
 RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
 RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
 DLZ_DESC=		Dynamically Loadable Zones
@@ -209,31 +208,17 @@ DNSTAP_LIB_DEPENDS=	libfstrm.so:devel/fstrm \
 CONFIGURE_ARGS+=	--without-gost
 .endif
 
-.if !${PORT_OPTIONS:MLINKS}
-PKGINSTALL=${NONEXISTENT}
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL}
 CONFIGURE_ARGS+=	--enable-threads
 .else
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100)
-PKGINSTALL=	${NONEXISTENT}
-PLIST_SUB+=	NOBASE="" BASE="@comment "
-SUB_LIST+=	NOBASE="" BASE="@comment "
 .if !defined(BIND_TOOLS_SLAVE)
 USE_RC_SUBR+=	named
 SUB_FILES+=	named.conf
-.endif # !defined(BIND_TOOLS_SLAVE)
-.else
-PLIST_SUB+=	NOBASE="@comment " BASE=""
-SUB_LIST+=	NOBASE="@comment " BASE=""
 .endif
 
-PKGDEINSTALL=	${PKGINSTALL}
-
 MAKE_JOBS_UNSAFE=	yes
 
 PORTDOCS=	*
diff --git a/dns/bind911/files/pkg-message.in b/dns/bind911/files/pkg-message.in
index 8a62d5c244a3..eb26dbbe1413 100644
--- a/dns/bind911/files/pkg-message.in
+++ b/dns/bind911/files/pkg-message.in
@@ -10,13 +10,6 @@
 *   'rndc-confgen -a' to generate the proper conf file, with a new   *
 *            random key, and appropriate file permissions.           *
 *                                                                    *
-%%NOBASE%%*     The %%PREFIX%%/etc/rc.d/named script will do that for you.     *
-%%BASE%%*    The /etc/rc.d/named script in the base will do that for you.    *
-%%BASE%%*                                                                    *
-%%BASE%%*   You will need to make sure that you have the following line      *
-%%BASE%%*   in your /etc/rc.conf in order to have the startup script         *
-%%BASE%%*   run the named version from the port:                             *
-%%BASE%%*                                                                    *
-%%BASE%%*   named_program="%%PREFIX%%/sbin/named"                            *
+*     The %%PREFIX%%/etc/rc.d/named script will do that for you.     *
 *                                                                    *
 **********************************************************************
diff --git a/dns/bind911/pkg-install b/dns/bind911/pkg-install
deleted file mode 100644
index 12b2f98aaf25..000000000000
--- a/dns/bind911/pkg-install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# ex:sw=8 sts=8
-
-if [ "$2" = 'POST-INSTALL' ]
-then
-	/bin/mkdir -p /var/named${PKG_PREFIX}/etc/namedb
-fi
-
-for DIR in ${PKG_PREFIX}/etc/namedb /var/named${PKG_PREFIX}/etc/namedb; do
-	for FILE in named.conf rndc.conf rndc.key; do
-		if [ "$2" = 'POST-INSTALL' ]
-		then
-			if [ -e ${PKG_PREFIX}/etc/${FILE} ]
-			then
-				/bin/cp -a ${PKG_PREFIX}/etc/${FILE} ${DIR}/${FILE}
-			else
-				/bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE}
-			fi
-		fi
-		if [ "$2" = 'POST-DEINSTALL' ]
-		then
-			[ -L ${DIR}/${FILE} ] && rm -f ${DIR}/${FILE}
-		fi
-	done
-done
-
-if [ "$2" = 'POST-DEINSTALL' ]
-then
-	cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc/namedb > /dev/null  2>&1 || :
-fi
-
-exit 0
diff --git a/dns/bind911/pkg-plist b/dns/bind911/pkg-plist
index 8d76c2a73e6b..a0afb373b8dc 100644
--- a/dns/bind911/pkg-plist
+++ b/dns/bind911/pkg-plist
@@ -9,6 +9,15 @@ bin/mdig
 bin/named-rrchecker
 bin/nslookup
 bin/nsupdate
+etc/mtree/BIND.chroot.dist
+etc/mtree/BIND.chroot.local.dist
+%%ETCDIR%%/bind.keys
+%%ETCDIR%%/master/empty.db
+%%ETCDIR%%/master/localhost-forward.db
+%%ETCDIR%%/master/localhost-reverse.db
+@sample %%ETCDIR%%/named.conf.sample
+%%ETCDIR%%/named.root
+%%ETCDIR%%/rndc.conf.sample
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
@@ -232,7 +241,6 @@ include/isccc/sexpr.h
 include/isccc/symtab.h
 include/isccc/symtype.h
 include/isccc/types.h
-include/pk11/site.h
 include/isccc/util.h
 include/isccc/version.h
 include/isccfg/aclconf.h
@@ -261,6 +269,7 @@ include/pk11/constants.h
 include/pk11/internal.h
 include/pk11/pk11.h
 include/pk11/result.h
+include/pk11/site.h
 include/pkcs11/cryptoki.h
 include/pkcs11/pkcs11.h
 include/pkcs11/pkcs11f.h
@@ -428,16 +437,7 @@ sbin/nsec3hash
 sbin/rndc
 sbin/rndc-confgen
 sbin/tsig-keygen
-%%ETCDIR%%/rndc.conf.sample
-%%ETCDIR%%/bind.keys
-%%NOBASE%%etc/mtree/BIND.chroot.dist
-%%NOBASE%%etc/mtree/BIND.chroot.local.dist
-%%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%%@dir(bind,bind,) %%ETCDIR%%/dynamic
-%%NOBASE%%@dir %%ETCDIR%%/master
-%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave
-%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working
+@dir(bind,bind,) %%ETCDIR%%/dynamic
+@dir %%ETCDIR%%/master
+@dir(bind,bind,) %%ETCDIR%%/slave
+@dir(bind,bind,) %%ETCDIR%%/working