dns/bind918: move dnstap-read to bind-tools

PR: 279050 Reported by: freebsd rail eu org
freebsd · May 18, 2024 · 0663811 · 0663811
1 parent 3ac6651
commit 0663811
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git 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
@@ -4,10 +4,10 @@ PORTNAME=	bind
 DISTVERSION=	9.18.27
 .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
@@ -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
@@ -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.27.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