7 files changed, 43 insertions, 43 deletions

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index 4902ad275ef8..c7399f89b78f 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -9,15 +9,15 @@ bin/nsupdate
 %%MANPAGES%%man/man1/arpaname.1.gz
 %%MANPAGES%%man/man1/delv.1.gz
 %%MANPAGES%%man/man1/dig.1.gz
-%%MANPAGES%%@comment man/man1/dnstap-read.1.gz
+@comment man/man1/dnstap-read.1.gz
 %%MANPAGES%%man/man1/host.1.gz
 %%MANPAGES%%man/man1/mdig.1.gz
 %%MANPAGES%%man/man1/named-rrchecker.1.gz
 %%MANPAGES%%man/man1/nslookup.1.gz
 %%MANPAGES%%man/man1/nsupdate.1.gz
-%%MANPAGES%%@comment man/man5/named.conf.5.gz
-%%MANPAGES%%@comment man/man5/rndc.conf.5.gz
-%%MANPAGES%%@comment man/man8/ddns-confgen.8.gz
+@comment man/man5/named.conf.5.gz
+@comment man/man5/rndc.conf.5.gz
+@comment man/man8/ddns-confgen.8.gz
 %%MANPAGES%%man/man8/dnssec-cds.8.gz
 %%MANPAGES%%%%PYTHON%%man/man8/dnssec-checkds.8.gz
 %%MANPAGES%%%%PYTHON%%man/man8/dnssec-coverage.8.gz
@@ -30,17 +30,17 @@ bin/nsupdate
 %%MANPAGES%%man/man8/dnssec-settime.8.gz
 %%MANPAGES%%man/man8/dnssec-signzone.8.gz
 %%MANPAGES%%man/man8/dnssec-verify.8.gz
-%%MANPAGES%%@comment man/man8/filter-aaaa.8.gz
-%%MANPAGES%%@comment man/man8/named-checkconf.8.gz
-%%MANPAGES%%@comment man/man8/named-checkzone.8.gz
-%%MANPAGES%%@comment man/man8/named-compilezone.8.gz
+@comment man/man8/filter-aaaa.8.gz
+@comment man/man8/named-checkconf.8.gz
+@comment man/man8/named-checkzone.8.gz
+@comment man/man8/named-compilezone.8.gz
 %%MANPAGES%%man/man8/named-journalprint.8.gz
-%%MANPAGES%%@comment man/man8/named-nzd2nzf.8.gz
-%%MANPAGES%%@comment man/man8/named.8.gz
+@comment man/man8/named-nzd2nzf.8.gz
+@comment man/man8/named.8.gz
 %%MANPAGES%%man/man8/nsec3hash.8.gz
-%%MANPAGES%%@comment man/man8/rndc-confgen.8.gz
-%%MANPAGES%%@comment man/man8/rndc.8.gz
-%%MANPAGES%%@comment man/man8/tsig-keygen.8.gz
+@comment man/man8/rndc-confgen.8.gz
+@comment man/man8/rndc.8.gz
+@comment man/man8/tsig-keygen.8.gz
 sbin/dnssec-cds
 %%PYTHON%%sbin/dnssec-checkds
 %%PYTHON%%sbin/dnssec-coverage
diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 45c98c57e6e8..778df0306f19 100644
--- a/dns/bind-tools/pkg-plist-devel
+++ b/dns/bind-tools/pkg-plist-devel
@@ -49,7 +49,7 @@ man/man1/dnssec-revoke.1.gz
 man/man1/dnssec-settime.1.gz
 man/man1/dnssec-signzone.1.gz
 man/man1/dnssec-verify.1.gz
-man/man1/dnstap-read.1.gz
+@comment man/man1/dnstap-read.1.gz
 man/man1/host.1.gz
 man/man1/mdig.1.gz
 @comment man/man1/named-checkconf.1.gz
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index d65a47382e4a..cef6b535158c 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -9,7 +9,7 @@ PORTREVISION=	0
 .else
 # XXX: correct version
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 # XXX: put the ISC master_site
@@ -91,7 +91,7 @@ CONFLICTS=	bind911 bind912 bind913 bind914 bind916
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFAULT=	DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB MANPAGES \
-			SIGCHASE TCP_FASTOPEN
+			SIGCHASE TCP_FASTOPEN DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
 			MANPAGES OVERRIDECACHE PORTREVISION QUERYTRACE \
 			SIGCHASE START_LATE TCP_FASTOPEN
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index ed61b8f3e5a5..a83d194a4350 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -297,7 +297,7 @@ lib/libns.so.1703.0.1
 @comment man/man1/dnssec-settime.1.gz
 @comment man/man1/dnssec-signzone.1.gz
 @comment man/man1/dnssec-verify.1.gz
-@comment man/man1/dnstap-read.1.gz
+%%MANPAGES%%%%DNSTAP%%man/man1/dnstap-read.1.gz
 @comment man/man1/host.1.gz
 @comment man/man1/mdig.1.gz
 %%MANPAGES%%man/man1/named-checkconf.1.gz
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index f3d0f7a19883..0359930e4c4e 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	911
@@ -54,7 +54,7 @@ PORTDOCS=	*
 
 OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \
 			DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN \
-			FILTER_AAAA
+			FILTER_AAAA DNSTAP
 OPTIONS_DEFINE=		IDN LARGE_FILE JSON GEOIP \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \
 			RPZ_NSIP RPZ_NSDNAME DOCS \
diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index 1276968f845d..a9687bcce62f 100644
--- a/dns/bind916/Makefile
+++ b/dns/bind916/Makefile
@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind916 here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -75,7 +75,7 @@ CONFLICTS=	bind911 bind912 bind913 bind914 bind9-devel
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFAULT=	DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB PYTHON \
-			SIGCHASE TCP_FASTOPEN MANPAGES
+			SIGCHASE TCP_FASTOPEN MANPAGES DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
 			OVERRIDECACHE PORTREVISION PYTHON QUERYTRACE SIGCHASE \
 			START_LATE TCP_FASTOPEN MANPAGES
diff --git a/dns/bind916/pkg-plist b/dns/bind916/pkg-plist
index 1d23175959d0..b7465ea352c4 100644
--- a/dns/bind916/pkg-plist
+++ b/dns/bind916/pkg-plist
@@ -273,38 +273,38 @@ lib/libisccc.a
 lib/libisccfg.a
 lib/libns.a
 lib/named/filter-aaaa.so
-%%MANPAGES%%@comment man/man1/arpaname.1.gz
-%%MANPAGES%%@comment man/man1/delv.1.gz
-%%MANPAGES%%@comment man/man1/dig.1.gz
+@comment man/man1/arpaname.1.gz
+@comment man/man1/delv.1.gz
+@comment man/man1/dig.1.gz
 %%MANPAGES%%%%DNSTAP%%man/man1/dnstap-read.1.gz
-%%MANPAGES%%@comment man/man1/host.1.gz
-%%MANPAGES%%@comment man/man1/mdig.1.gz
-%%MANPAGES%%@comment man/man1/named-rrchecker.1.gz
-%%MANPAGES%%@comment man/man1/nslookup.1.gz
-%%MANPAGES%%@comment man/man1/nsupdate.1.gz
+@comment man/man1/host.1.gz
+@comment man/man1/mdig.1.gz
+@comment man/man1/named-rrchecker.1.gz
+@comment man/man1/nslookup.1.gz
+@comment man/man1/nsupdate.1.gz
 %%MANPAGES%%man/man5/named.conf.5.gz
 %%MANPAGES%%man/man5/rndc.conf.5.gz
 %%MANPAGES%%man/man8/ddns-confgen.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-cds.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-checkds.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-coverage.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-dsfromkey.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-importkey.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-keyfromlabel.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-keygen.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-keymgr.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-revoke.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-settime.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-signzone.8.gz
-%%MANPAGES%%@comment man/man8/dnssec-verify.8.gz
+@comment man/man8/dnssec-cds.8.gz
+@comment man/man8/dnssec-checkds.8.gz
+@comment man/man8/dnssec-coverage.8.gz
+@comment man/man8/dnssec-dsfromkey.8.gz
+@comment man/man8/dnssec-importkey.8.gz
+@comment man/man8/dnssec-keyfromlabel.8.gz
+@comment man/man8/dnssec-keygen.8.gz
+@comment man/man8/dnssec-keymgr.8.gz
+@comment man/man8/dnssec-revoke.8.gz
+@comment man/man8/dnssec-settime.8.gz
+@comment man/man8/dnssec-signzone.8.gz
+@comment man/man8/dnssec-verify.8.gz
 %%MANPAGES%%man/man8/filter-aaaa.8.gz
 %%MANPAGES%%man/man8/named-checkconf.8.gz
 %%MANPAGES%%man/man8/named-checkzone.8.gz
 %%MANPAGES%%man/man8/named-compilezone.8.gz
-%%MANPAGES%%@comment man/man8/named-journalprint.8.gz
+@comment man/man8/named-journalprint.8.gz
 %%MANPAGES%%%%LMDB%%man/man8/named-nzd2nzf.8.gz
 %%MANPAGES%%man/man8/named.8.gz
-%%MANPAGES%%@comment man/man8/nsec3hash.8.gz
+@comment man/man8/nsec3hash.8.gz
 %%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
 %%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz
 %%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz