Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Jan 2017 08:15:41 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r431233 - in head/dns: bind910 bind910/files bind911 bind911/files bind99 bind99/files
Message-ID:  <201701120815.v0C8Ff8i044732@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Jan 12 08:15:41 2017
New Revision: 431233
URL: https://svnweb.freebsd.org/changeset/ports/431233

Log:
  Commit the cleanups that should have gone in with the pervious update.
  
  Sponsored by:	Absolight

Deleted:
  head/dns/bind910/pkg-install
  head/dns/bind911/pkg-install
  head/dns/bind99/pkg-install
Modified:
  head/dns/bind910/Makefile   (contents, props changed)
  head/dns/bind910/files/pkg-message.in   (contents, props changed)
  head/dns/bind910/pkg-plist   (contents, props changed)
  head/dns/bind911/Makefile   (contents, props changed)
  head/dns/bind911/files/pkg-message.in   (contents, props changed)
  head/dns/bind911/pkg-plist   (contents, props changed)
  head/dns/bind99/Makefile   (contents, props changed)
  head/dns/bind99/files/extrapatch-bind-min-override-ttl   (contents, props changed)
  head/dns/bind99/files/pkg-message.in   (contents, props changed)
  head/dns/bind99/pkg-plist   (contents, props changed)

Modified: head/dns/bind910/Makefile
==============================================================================
--- head/dns/bind910/Makefile	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind910/Makefile	Thu Jan 12 08:15:41 2017	(r431233)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
+PORTREVISION=	1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	910
@@ -38,13 +39,13 @@ ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS+=	bind-tools bind99 bind911 bind9-devel
 
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message named.conf
 
 OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \
 			DLZ_FILESYSTEM RPZ_NSIP RPZ_NSDNAME
 OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \
-			LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+			RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
 			MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE \
 			START_LATE
 OPTIONS_RADIO=	CRYPTO GOSTDEF
@@ -77,7 +78,6 @@ PORTREVISION_DESC=	Show PORTREVISION in 
 FETCHLIMIT_DESC=	Enable the query quotas for resolvers
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 
-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
@@ -170,28 +170,13 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
 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 "
-USE_RC_SUBR+=	named
-SUB_FILES+=	named.conf
-.else
-PLIST_SUB+=	NOBASE="@comment " BASE=""
-SUB_LIST+=	NOBASE="@comment " BASE=""
-.endif
-
-PKGDEINSTALL=	${PKGINSTALL}
+USE_RC_SUBR=	named
 
 MAKE_JOBS_UNSAFE=	yes
 

Modified: head/dns/bind910/files/pkg-message.in
==============================================================================
--- head/dns/bind910/files/pkg-message.in	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind910/files/pkg-message.in	Thu Jan 12 08:15:41 2017	(r431233)
@@ -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.     *
 *                                                                    *
 **********************************************************************

Modified: head/dns/bind910/pkg-plist
==============================================================================
--- head/dns/bind910/pkg-plist	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind910/pkg-plist	Thu Jan 12 08:15:41 2017	(r431233)
@@ -5,6 +5,15 @@ bin/host
 bin/isc-config.sh
 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
@@ -372,13 +381,13 @@ man/man8/named-compilezone.8.gz
 man/man8/named-journalprint.8.gz
 man/man8/named.8.gz
 man/man8/nsec3hash.8.gz
-man/man8/tsig-keygen.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz
 man/man8/rndc-confgen.8.gz
 man/man8/rndc.8.gz
+man/man8/tsig-keygen.8.gz
 sbin/arpaname
 sbin/ddns-confgen
 %%PYTHON%%sbin/dnssec-checkds
@@ -408,16 +417,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

Modified: head/dns/bind911/Makefile
==============================================================================
--- head/dns/bind911/Makefile	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind911/Makefile	Thu Jan 12 08:15:41 2017	(r431233)
@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b
 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
 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/fs
 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=	*

Modified: head/dns/bind911/files/pkg-message.in
==============================================================================
--- head/dns/bind911/files/pkg-message.in	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind911/files/pkg-message.in	Thu Jan 12 08:15:41 2017	(r431233)
@@ -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.     *
 *                                                                    *
 **********************************************************************

Modified: head/dns/bind911/pkg-plist
==============================================================================
--- head/dns/bind911/pkg-plist	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind911/pkg-plist	Thu Jan 12 08:15:41 2017	(r431233)
@@ -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

Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind99/Makefile	Thu Jan 12 08:15:41 2017	(r431233)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
+PORTREVISION=	1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	99
@@ -38,13 +39,13 @@ ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS=	bind-tools bind9-devel bind910 bind911
 
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message named.conf
 
 OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL DLZ_FILESYSTEM \
 			RPZ_NSIP RPZ_NSDNAME
-OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \
+OPTIONS_DEFINE=		SSL IDN LARGE_FILE FIXED_RRSET SIGCHASE \
 			IPV6 THREADS FILTER_AAAA GOST PYTHON START_LATE MINCACHE \
-			LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS \
+			RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS \
 			PORTREVISION FETCHLIMIT QUERYTRACE
 OPTIONS_GROUP=		DLZ
 OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
@@ -55,7 +56,6 @@ OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAP
 OPTIONS_SUB=	yes
 
 SSL_DESC=		Build with OpenSSL (Required for DNSSEC)
-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
@@ -68,7 +68,6 @@ PORTREVISION_DESC=	Show PORTREVISION in 
 FETCHLIMIT_DESC=	Enable the query quotas for resolvers
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 
-LINKS_DESC=		Create conf file symlinks in ${PREFIX}
 NEWSTATS_DESC=		Enable alternate xml statistics channel format
 RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
 RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
@@ -158,32 +157,13 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
 
 .include <bsd.port.options.mk>
 
-.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 ${PORT_OPTIONS:MREPLACE_BASE}
-IGNORE=		REPLACE_BASE is no longer supported
-.endif # REPLACE_BASE
-
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100)
-PKGINSTALL=	${NONEXISTENT}
-PLIST_SUB+=	NOBASE="" BASE="@comment "
-SUB_LIST+=	NOBASE="" BASE="@comment "
-USE_RC_SUBR+=	named
-SUB_FILES+=	named.conf
-.else
-PLIST_SUB+=	NOBASE="@comment " BASE=""
-SUB_LIST+=	NOBASE="@comment " BASE=""
-.endif
-
-PKGDEINSTALL=	${PKGINSTALL}
+USE_RC_SUBR=	named
 
 MAKE_JOBS_UNSAFE=	yes
 

Modified: head/dns/bind99/files/extrapatch-bind-min-override-ttl
==============================================================================
--- head/dns/bind99/files/extrapatch-bind-min-override-ttl	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind99/files/extrapatch-bind-min-override-ttl	Thu Jan 12 08:15:41 2017	(r431233)
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2016-10-21 05:12:02 UTC
+--- bin/named/config.c.orig	2016-12-11 22:02:39 UTC
 +++ bin/named/config.c
 @@ -141,6 +141,8 @@ options {\n\
  	min-roots 2;\n\
@@ -9,9 +9,9 @@
  	max-cache-ttl 604800; /* 1 week */\n\
  	transfer-format many-answers;\n\
  	max-cache-size 0;\n\
---- bin/named/server.c.orig	2016-10-21 05:12:02 UTC
+--- bin/named/server.c.orig	2017-01-11 11:22:46 UTC
 +++ bin/named/server.c
-@@ -2559,6 +2559,16 @@ configure_view(dns_view_t *view, cfg_obj
+@@ -2683,6 +2683,16 @@ configure_view(dns_view_t *view, cfg_obj
  	}
  
  	obj = NULL;
@@ -28,7 +28,7 @@
  	result = ns_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig	2016-10-21 05:12:02 UTC
+--- lib/dns/include/dns/view.h.orig	2017-01-11 11:22:46 UTC
 +++ lib/dns/include/dns/view.h
 @@ -148,6 +148,8 @@ struct dns_view {
  	isc_boolean_t			provideixfr;
@@ -39,7 +39,7 @@
  	dns_ttl_t			maxncachettl;
  	in_port_t			dstport;
  	dns_aclenv_t			aclenv;
---- lib/dns/resolver.c.orig	2016-10-21 05:12:02 UTC
+--- lib/dns/resolver.c.orig	2016-12-11 22:02:39 UTC
 +++ lib/dns/resolver.c
 @@ -5116,6 +5116,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
@@ -60,9 +60,9 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2016-10-21 05:12:02 UTC
+--- lib/isccfg/namedconf.c.orig	2017-01-11 11:22:46 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1459,6 +1459,8 @@ view_clauses[] = {
+@@ -1464,6 +1464,8 @@ view_clauses[] = {
  	{ "lame-ttl", &cfg_type_uint32, 0 },
  	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
  	{ "max-cache-size", &cfg_type_sizenodefault, 0 },

Modified: head/dns/bind99/files/pkg-message.in
==============================================================================
--- head/dns/bind99/files/pkg-message.in	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind99/files/pkg-message.in	Thu Jan 12 08:15:41 2017	(r431233)
@@ -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.     *
 *                                                                    *
 **********************************************************************

Modified: head/dns/bind99/pkg-plist
==============================================================================
--- head/dns/bind99/pkg-plist	Thu Jan 12 08:15:35 2017	(r431232)
+++ head/dns/bind99/pkg-plist	Thu Jan 12 08:15:41 2017	(r431233)
@@ -4,6 +4,15 @@ bin/host
 bin/isc-config.sh
 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
@@ -375,16 +384,7 @@ sbin/named-journalprint
 sbin/nsec3hash
 sbin/rndc
 sbin/rndc-confgen
-%%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701120815.v0C8Ff8i044732>