svn commit: r499024 - in head/dns: bind-tools bind912

[Mathieu Arnold]

Author: mat
Date: Mon Apr 15 13:16:27 2019
New Revision: 499024
URL: https://svnweb.freebsd.org/changeset/ports/499024

Log:
  Move bind-tools from 9.12 to 9.14.
  
  It was forgotten during the 9.14 release process.

Modified:
  head/dns/bind-tools/Makefile   (contents, props changed)
  head/dns/bind-tools/pkg-plist   (contents, props changed)
  head/dns/bind912/Makefile   (contents, props changed)

Modified: head/dns/bind-tools/Makefile
==============================================================================
--- head/dns/bind-tools/Makefile	Mon Apr 15 13:12:36 2019	(r499023)
+++ head/dns/bind-tools/Makefile	Mon Apr 15 13:16:27 2019	(r499024)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 # Define PORTREVISION in ${MASTERDIR}
-MASTERDIR=	${.CURDIR}/../../dns/bind912
+MASTERDIR=	${.CURDIR}/../../dns/bind914
 
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist

Modified: head/dns/bind-tools/pkg-plist
==============================================================================
--- head/dns/bind-tools/pkg-plist	Mon Apr 15 13:12:36 2019	(r499023)
+++ head/dns/bind-tools/pkg-plist	Mon Apr 15 13:16:27 2019	(r499024)
@@ -6,6 +6,7 @@ bin/mdig
 bin/named-rrchecker
 bin/nslookup
 bin/nsupdate
+ at comment lib/named/filter-aaaa.so
 man/man1/arpaname.1.gz
 man/man1/delv.1.gz
 man/man1/dig.1.gz
@@ -26,7 +27,7 @@ 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
+ at comment man/man8/filter-aaaa.8.gz
 man/man8/named-journalprint.8.gz
 man/man8/nsec3hash.8.gz
 sbin/dnssec-cds
@@ -41,6 +42,5 @@ sbin/dnssec-revoke
 sbin/dnssec-settime
 sbin/dnssec-signzone
 sbin/dnssec-verify
-sbin/genrandom
 sbin/named-journalprint
 sbin/nsec3hash

Modified: head/dns/bind912/Makefile
==============================================================================
--- head/dns/bind912/Makefile	Mon Apr 15 13:12:36 2019	(r499023)
+++ head/dns/bind912/Makefile	Mon Apr 15 13:16:27 2019	(r499024)
@@ -3,27 +3,14 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-.if defined(BIND_TOOLS_SLAVE)
-# dns/bind-tools here
 PORTREVISION=	0
-.else
-PORTREVISION=	0
-.endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
-.if defined(BIND_TOOLS_SLAVE)
-PKGNAMESUFFIX=	-tools
-.else
 PKGNAMESUFFIX=	912
-.endif
 DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	mat at FreeBSD.org
-.if defined(BIND_TOOLS_SLAVE)
-COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
-.else
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
-.endif
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
@@ -50,37 +37,29 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-c
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind911 bind913 bind914 bind9-devel
+CONFLICTS=	bind911 bind913 bind914 bind9-devel bind-tools
 
-.if defined(BIND_TOOLS_SLAVE)
-CONFIGURE_ARGS+=	--disable-shared
-CONFLICTS+=		bind912
-.else
 USE_RC_SUBR=	named
 SUB_FILES=	pkg-message named.conf
-CONFLICTS+=		bind-tools
 
 PORTDOCS=	*
-.endif	# BIND_TOOLS_SLAVE
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON \
+			DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
 OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
-			FIXED_RRSET SIGCHASE IPV6 THREADS
+			FIXED_RRSET SIGCHASE IPV6 THREADS \
+			RPZ_NSIP RPZ_NSDNAME DOCS \
+			MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
+			START_LATE TUNING_LARGE TCP_FASTOPEN
 
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	SSL NATIVE_PKCS11
 
-.if !defined(BIND_TOOLS_SLAVE)
-OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
-OPTIONS_DEFINE+=	RPZ_NSIP RPZ_NSDNAME DOCS \
-			MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
-			START_LATE TUNING_LARGE TCP_FASTOPEN
 OPTIONS_GROUP=		DLZ
 OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
 			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
-.endif	# BIND_TOOLS_SLAVE
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
@@ -229,16 +208,6 @@ SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
 .endif
 
 post-patch:
-.if defined(BIND_TOOLS_SLAVE)
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-		-e 's#isc-config.sh installdirs#installdirs#' \
-		-e 's#.*INSTALL.*isc-config.*##' \
-		-e 's#.*INSTALL.*bind.keys.*##' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \
-		-e 's#^	.*check confgen ##' \
-		${WRKSRC}/bin/Makefile.in
-.else
 .  for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
@@ -246,9 +215,7 @@ post-patch:
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
 .  endfor
-.endif
 
-.if !defined(BIND_TOOLS_SLAVE)
 .  if ${PORTREVISION:N0}
 post-patch-PORTREVISION-on:
 	@${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \
@@ -277,7 +244,6 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
 		${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif	# BIND_TOOLS_SLAVE
 
 # Can't use USE_PYTHON=autoplist
 post-install-PYTHON-on: