git: 06418283d6bc - main - dns/bind918: remove option as the man pages no longer need sphinx

The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=06418283d6bc34e29a8065a666feb124c71e687c

commit 06418283d6bc34e29a8065a666feb124c71e687c
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2023-12-01 21:03:14 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2023-12-01 21:04:55 +0000

    dns/bind918: remove option as the man pages no longer need sphinx
---
 dns/bind-tools/pkg-plist | 24 ++++++++++++------------
 dns/bind918/Makefile     | 13 +++++--------
 dns/bind918/pkg-plist    | 30 +++++++++++++++---------------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index c8a844302ae4..6421fa7b83e5 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -30,18 +30,18 @@ lib/bind-tools/libisccfg.so
 lib/bind-tools/libisccfg-9.18.20.so
 lib/bind-tools/libns.so
 lib/bind-tools/libns-9.18.20.so
-%%MANPAGES%%man/man1/arpaname.1.gz
-%%MANPAGES%%man/man1/delv.1.gz
-%%MANPAGES%%man/man1/dig.1.gz
-%%MANPAGES%%man/man1/dnssec-cds.1.gz
-%%MANPAGES%%man/man1/dnssec-dsfromkey.1.gz
-%%MANPAGES%%man/man1/dnssec-importkey.1.gz
-%%MANPAGES%%man/man1/dnssec-keyfromlabel.1.gz
-%%MANPAGES%%man/man1/dnssec-keygen.1.gz
-%%MANPAGES%%man/man1/dnssec-revoke.1.gz
-%%MANPAGES%%man/man1/dnssec-settime.1.gz
-%%MANPAGES%%man/man1/dnssec-signzone.1.gz
-%%MANPAGES%%man/man1/dnssec-verify.1.gz
+man/man1/arpaname.1.gz
+man/man1/delv.1.gz
+man/man1/dig.1.gz
+man/man1/dnssec-cds.1.gz
+man/man1/dnssec-dsfromkey.1.gz
+man/man1/dnssec-importkey.1.gz
+man/man1/dnssec-keyfromlabel.1.gz
+man/man1/dnssec-keygen.1.gz
+man/man1/dnssec-revoke.1.gz
+man/man1/dnssec-settime.1.gz
+man/man1/dnssec-signzone.1.gz
+man/man1/dnssec-verify.1.gz
 @comment man/man1/dnstap-read.1.gz
 man/man1/host.1.gz
 man/man1/mdig.1.gz
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index fb451e1cc4d0..b4384690fe4f 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -4,10 +4,10 @@ PORTNAME=	bind
 DISTVERSION=	9.18.20
 .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}
@@ -76,10 +76,10 @@ CONFLICTS=	bind911 bind916 bind9-devel
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB MANPAGES \
+OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
 			TCP_FASTOPEN DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
-			MANPAGES OVERRIDECACHE QUERYTRACE \
+			OVERRIDECACHE QUERYTRACE \
 			START_LATE TCP_FASTOPEN
 
 OPTIONS_SINGLE=		GSSAPI
@@ -150,9 +150,6 @@ LARGE_FILE_CONFIGURE_ENABLE=	largefile
 LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
-MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
-MANPAGES_USES=	gmake
-
 OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 
 QUERYTRACE_CONFIGURE_ENABLE=	querytrace
@@ -174,7 +171,7 @@ USE_PERL5=		build
 BUILD_DEPENDS+=		cmocka>0:sysutils/cmocka
 .endif
 
-.if !${PORT_OPTIONS:MMANPAGES} && !${PORT_OPTIONS:MDOCS}
+.if !${PORT_OPTIONS:MDOCS}
 CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
 .endif
 
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index 83e48f9a2b45..f505be4dccdf 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -266,27 +266,27 @@ lib/libns-9.18.20.so
 @comment man/man1/dnssec-settime.1.gz
 @comment man/man1/dnssec-signzone.1.gz
 @comment man/man1/dnssec-verify.1.gz
-%%MANPAGES%%%%DNSTAP%%man/man1/dnstap-read.1.gz
+%%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
-%%MANPAGES%%man/man1/named-checkzone.1.gz
-%%MANPAGES%%man/man1/named-compilezone.1.gz
-%%MANPAGES%%man/man1/named-journalprint.1.gz
-%%MANPAGES%%%%LMDB%%man/man1/named-nzd2nzf.1.gz
+man/man1/named-checkconf.1.gz
+man/man1/named-checkzone.1.gz
+man/man1/named-compilezone.1.gz
+man/man1/named-journalprint.1.gz
+%%LMDB%%man/man1/named-nzd2nzf.1.gz
 @comment man/man1/named-rrchecker.1.gz
 @comment man/man1/nsec3hash.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%%man/man8/filter-a.8.gz
-%%MANPAGES%%man/man8/filter-aaaa.8.gz
-%%MANPAGES%%man/man8/named.8.gz
-%%MANPAGES%%man/man8/rndc-confgen.8.gz
-%%MANPAGES%%man/man8/rndc.8.gz
-%%MANPAGES%%man/man8/tsig-keygen.8.gz
+man/man5/named.conf.5.gz
+man/man5/rndc.conf.5.gz
+man/man8/ddns-confgen.8.gz
+man/man8/filter-a.8.gz
+man/man8/filter-aaaa.8.gz
+man/man8/named.8.gz
+man/man8/rndc-confgen.8.gz
+man/man8/rndc.8.gz
+man/man8/tsig-keygen.8.gz
 sbin/ddns-confgen
 sbin/named
 sbin/rndc