From 0663812b214b33288c7dfeab2a9e1b03d9d27454 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Sat, 18 May 2024 11:03:24 +0200
Subject: dns/bind9-devel: move dnstap-read to bind-tools

PR:		279050
Reported by:	freebsd rail eu org
---
 dns/bind-tools/pkg-plist-devel                 |  2 ++
 dns/bind9-devel/Makefile                       |  6 +++---
 dns/bind9-devel/files/extrapatch-no-bind-tools | 24 +++++++++++++++++++++---
 dns/bind9-devel/pkg-plist                      |  3 +--
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index f1a5056105bb..97364a9ada9b 100644
--- a/dns/bind-tools/pkg-plist-devel
+++ b/dns/bind-tools/pkg-plist-devel
@@ -11,6 +11,7 @@ bin/dnssec-revoke
 bin/dnssec-settime
 bin/dnssec-signzone
 bin/dnssec-verify
+%%DNSTAP%%bin/dnstap-read
 bin/host
 bin/mdig
 bin/named-rrchecker
@@ -40,6 +41,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
+%%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/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 455fee803961..8ad053470db7 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -4,11 +4,11 @@ PORTNAME=	bind
 DISTVERSION=	9.19.24
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	0
+PORTREVISION=	1
 .else
 # XXX: correct version
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
@@ -90,7 +90,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/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools
index d53088bec0f4..9a168202eb50 100644
--- a/dns/bind9-devel/files/extrapatch-no-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-no-bind-tools
@@ -1,13 +1,13 @@
 Exclude the "tools" from building and installing.
 
---- bin/Makefile.am.orig	2021-09-17 07:10:48 UTC
+--- bin/Makefile.am.orig	2024-05-03 07:23:28 UTC
 +++ bin/Makefile.am
 @@ -1 +1 @@
 -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
 +SUBDIRS = named rndc tools check confgen tests plugins
---- bin/tools/Makefile.am.orig	2021-09-17 07:10:48 UTC
+--- bin/tools/Makefile.am.orig	2024-05-03 07:23:29 UTC
 +++ bin/tools/Makefile.am
-@@ -9,11 +9,7 @@ LDADD +=			\
+@@ -9,29 +9,10 @@ LDADD +=			\
  	$(LIBISC_LIBS)
  
  bin_PROGRAMS =			\
@@ -20,3 +20,21 @@ Exclude the "tools" from building and installing.
  
  arpaname_LDADD =		\
  	$(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/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index ed2f52232b8a..b4fc3d1d90e6 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -1,4 +1,3 @@
-%%DNSTAP%%bin/dnstap-read
 bin/named-checkconf
 bin/named-checkzone
 bin/named-compilezone
@@ -262,7 +261,7 @@ lib/libns.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
-- 
cgit v1.2.3