git: 06600764e9a7 - 2024Q2 - dns/bind918: move dnstap-read to bind-tools

The branch 2024Q2 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=06600764e9a7829721ee3d90cdb6327ffc4d9fa1

commit 06600764e9a7829721ee3d90cdb6327ffc4d9fa1
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2024-05-18 09:02:40 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2024-05-18 11:09:12 +0000

    dns/bind918: move dnstap-read to bind-tools
    
    PR:             279050
    Reported by:    freebsd rail eu org
    
    (cherry picked from commit 0663811732c939b0a68a3caee3d9a9fe4bf8bf3a)
---
 dns/bind-tools/pkg-plist                   |  3 ++-
 dns/bind918/Makefile                       |  6 +++---
 dns/bind918/files/extrapatch-no-bind-tools | 22 ++++++++++++++++++++++
 dns/bind918/pkg-plist                      |  3 +--
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index ac953e9d63f3..a0c701233113 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -10,6 +10,7 @@ bin/dnssec-revoke
 bin/dnssec-settime
 bin/dnssec-signzone
 bin/dnssec-verify
+%%DNSTAP%%bin/dnstap-read
 bin/host
 bin/mdig
 bin/named-rrchecker
@@ -42,7 +43,7 @@ share/man/man1/dnssec-revoke.1.gz
 share/man/man1/dnssec-settime.1.gz
 share/man/man1/dnssec-signzone.1.gz
 share/man/man1/dnssec-verify.1.gz
-@comment share/man/man1/dnstap-read.1.gz
+%%DNSTAP%%share/man/man1/dnstap-read.1.gz
 share/man/man1/host.1.gz
 share/man/man1/mdig.1.gz
 @comment share/man/man1/named-checkconf.1.gz
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index d093babefdc6..85755f92817e 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -4,10 +4,10 @@ PORTNAME=	bind
 DISTVERSION=	9.18.26
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	0
+PORTREVISION=	1
 .else
 # dns/bind918 here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
@@ -87,7 +87,7 @@ OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
 .if defined(BIND_TOOLS_SLAVE)
-OPTIONS_EXCLUDE=	DNSTAP DOCS GEOIP LMDB \
+OPTIONS_EXCLUDE=	DOCS GEOIP LMDB \
 			OVERRIDECACHE QUERYTRACE START_LATE \
 			TCP_FASTOPEN
 .endif	# BIND_TOOLS_SLAVE
diff --git a/dns/bind918/files/extrapatch-no-bind-tools b/dns/bind918/files/extrapatch-no-bind-tools
index d53088bec0f4..a79c4832e4de 100644
--- a/dns/bind918/files/extrapatch-no-bind-tools
+++ b/dns/bind918/files/extrapatch-no-bind-tools
@@ -20,3 +20,25 @@ Exclude the "tools" from building and installing.
  
  arpaname_LDADD =		\
  	$(LIBISC_LIBS)
+@@ -27,21 +23,6 @@
+ 	$(LIBISCCFG_LIBS)	\
+ 	$(LIBDNS_LIBS)		\
+ 	$(LIBISC_LIBS)
+-
+-if HAVE_DNSTAP
+-bin_PROGRAMS +=			\
+-	dnstap-read
+-
+-dnstap_read_CPPFLAGS =		\
+-	$(AM_CPPFLAGS)		\
+-	$(DNSTAP_CFLAGS)	\
+-	-I$(top_builddir)/lib/dns
+-
+-dnstap_read_LDADD =		\
+-	$(LIBDNS_LIBS)		\
+-	$(LIBISC_LIBS)		\
+-	$(DNSTAP_LIBS)
+-endif
+ 
+ if HAVE_LMDB
+ bin_PROGRAMS +=			\
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index 21deb99a906d..34e29aa1c516 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -1,4 +1,3 @@
-%%DNSTAP%%bin/dnstap-read
 bin/named-checkconf
 bin/named-checkzone
 bin/named-compilezone
@@ -266,7 +265,7 @@ lib/libns-9.18.26.so
 @comment share/man/man1/dnssec-settime.1.gz
 @comment share/man/man1/dnssec-signzone.1.gz
 @comment share/man/man1/dnssec-verify.1.gz
-%%DNSTAP%%share/man/man1/dnstap-read.1.gz
+@comment share/man/man1/dnstap-read.1.gz
 @comment share/man/man1/host.1.gz
 @comment share/man/man1/mdig.1.gz
 share/man/man1/named-checkconf.1.gz