git: 0710533b66db - main - dns/bind9*: pet portfmt and portclippy

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Sun, 22 Jun 2025 13:34:34 UTC 
The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0710533b66db236fc384287c268655f6ac6683b9

commit 0710533b66db236fc384287c268655f6ac6683b9
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2025-06-22 12:37:04 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2025-06-22 13:34:06 +0000

    dns/bind9*: pet portfmt and portclippy
---
 dns/bind9-devel/Makefile | 82 +++++++++++++++++++++++++-----------------------
 dns/bind918/Makefile     | 69 ++++++++++++++++++++--------------------
 dns/bind920/Makefile     | 79 ++++++++++++++++++++++++----------------------
 3 files changed, 119 insertions(+), 111 deletions(-)

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index ecd0df1c85cc..220861c3003f 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -20,12 +20,12 @@ PKGNAMESUFFIX=	9-devel
 .endif
 
 MAINTAINER=	mat@FreeBSD.org
-WWW=		https://www.isc.org/bind/
 .if defined(BIND_TOOLS_SLAVE)
 COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
 .else
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 .endif
+WWW=		https://www.isc.org/bind/
 
 # Uncomment when bind9xx comes of age. +3 years if ESV, +1year otherwise, see
 # https://kb.isc.org/docs/aa-00896
@@ -35,15 +35,16 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libuv.so:devel/libuv \
-		libnghttp2.so:www/libnghttp2 \
-		liburcu.so:sysutils/liburcu
+LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
+		liburcu.so:sysutils/liburcu \
+		libuv.so:devel/libuv
 
 .if !defined(BIND_TOOLS_SLAVE)
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 .endif
 
-USES=		autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl tar:xz
+USES=		autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl \
+		tar:xz
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${DISTVERSION:C/-.*//}
@@ -52,12 +53,24 @@ CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 .endif
 USE_GNOME=	libxml2
 
+.if !defined(BIND_TOOLS_SLAVE)
+USE_RC_SUBR=	named
+.endif # !BIND_TOOLS_SLAVE
+
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-libxml2 \
 		--with-openssl=${OPENSSLBASE}
+
+MAKE_JOBS_UNSAFE=	yes
+
+.if !defined(BIND_TOOLS_SLAVE)
+# XXX: Add -devel
+CONFLICTS=	bind9[0-9][0-9]
+.endif # !BIND_TOOLS_SLAVE
+
 ETCDIR=		${PREFIX}/etc/namedb
 
 # FIXME: figure out why build fails if enabled
@@ -67,33 +80,24 @@ CONFIGURE_ARGS+=	--disable-tracing
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-bind-tools
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/bind-tools
 .else
-USE_RC_SUBR=		named
 # XXX: remove the big warning about it being a development version from pkg-message
 SUB_FILES=		named.conf pkg-message
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-no-bind-tools
 
 PORTDOCS=	*
+.endif # BIND_TOOLS_SLAVE
 
-# XXX: Add -devel
-CONFLICTS=	bind9[0-9][0-9]
-.endif	# BIND_TOOLS_SLAVE
-
-MAKE_JOBS_UNSAFE=	yes
-
-OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
-			TCP_FASTOPEN DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS GEOIP IDN JSON LARGE_FILE LMDB \
-			OVERRIDECACHE QUERYTRACE \
-			START_LATE TCP_FASTOPEN
+			OVERRIDECACHE QUERYTRACE START_LATE TCP_FASTOPEN
+OPTIONS_DEFAULT=	DNSTAP GSSAPI_NONE IDN JSON LMDB TCP_FASTOPEN
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
 .if defined(BIND_TOOLS_SLAVE)
-OPTIONS_EXCLUDE=	DOCS GEOIP LMDB \
-			OVERRIDECACHE QUERYTRACE START_LATE \
+OPTIONS_EXCLUDE=	DOCS GEOIP LMDB OVERRIDECACHE QUERYTRACE START_LATE \
 			TCP_FASTOPEN
-.endif	# BIND_TOOLS_SLAVE
+.endif # BIND_TOOLS_SLAVE
 
 OPTIONS_SUB=	yes
 
@@ -109,47 +113,47 @@ QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
 
-DOCS_ALL_TARGET=	all html
-DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
-			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
-DOCS_USES=	gmake python:env
-
-DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
+DNSTAP_CONFIGURE_ENABLE=	dnstap
+
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+			sphinx-build:textproc/py-sphinx
+DOCS_USES=		gmake python:env
+DOCS_ALL_TARGET=	all html
 
+GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 GEOIP_CONFIGURE_ENABLE=	geoip
 GEOIP_CONFIGURE_WITH=	maxminddb
-GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
-GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_USES=		gssapi
+GSSAPI_BASE_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
-GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
-GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=		gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
-IDN_CONFIGURE_OFF=	--without-libidn2
-IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
-			--with-libidn2=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 IDN_USES=		iconv
+IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
+			--with-libidn2=${LOCALBASE}
+IDN_CONFIGURE_OFF=	--without-libidn2
 
-JSON_CONFIGURE_WITH=	json-c
 JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
+JSON_CONFIGURE_WITH=	json-c
 JSON_LDFLAGS=		-L${LOCALBASE}/lib -ljson-c
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
-LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 
 OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 
@@ -172,7 +176,7 @@ BUILD_DEPENDS+=		cmocka>0:sysutils/cmocka
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
-CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
+CONFIGURE_ENV+=	ac_cv_path_SPHINX_BUILD=
 .endif
 
 .include <bsd.port.pre.mk>
@@ -219,6 +223,6 @@ do-install:
 	done
 	@${RM} -r ${STAGEDIR}${PREFIX}/include
 
-.endif	# BIND_TOOLS_SLAVE
+.endif # BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index 8253a8129744..3b5528d84f3b 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	ISC/bind9/${DISTVERSION}
 PKGNAMESUFFIX=	918
 
 MAINTAINER=	mat@FreeBSD.org
-WWW=		https://www.isc.org/bind/
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
+WWW=		https://www.isc.org/bind/
 
 # Uncomment when bind920 comes of age. +3 years if ESV, +1year otherwise, see
 # https://kb.isc.org/docs/aa-00896
@@ -19,14 +19,13 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libuv.so:devel/libuv \
-		libnghttp2.so:www/libnghttp2
+LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
+		libuv.so:devel/libuv
 
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
 USES=		autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl \
 		tar:xz
-USE_GNOME=	libxml2
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${DISTVERSION:C/-.*//}
@@ -34,33 +33,35 @@ CPE_VERSION=	${DISTVERSION:C/-.*//}
 CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 .endif
 
+USE_GNOME=	libxml2
+
+USE_RC_SUBR=	named
+
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-linux-caps \
+		--enable-dnsrps \
 		--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-dlopen=yes \
 		--with-libxml2 \
 		--with-openssl=${OPENSSLBASE} \
-		--enable-dnsrps \
 		--with-readline=libedit
 CONFIGURE_ENV=	READLINE_CFLAGS="-L${LOCALBASE}/lib"
-ETCDIR=		${PREFIX}/etc/namedb
 
-USE_RC_SUBR=		named
-SUB_FILES=		named.conf pkg-message
+MAKE_JOBS_UNSAFE=	yes
 
-PORTDOCS=	*
+CONFLICTS=	bind9-devel bind920
 
-CONFLICTS=	bind920 bind9-devel
+ETCDIR=		${PREFIX}/etc/namedb
 
-MAKE_JOBS_UNSAFE=	yes
+SUB_FILES=	named.conf pkg-message
+
+PORTDOCS=	*
 
-OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
-			TCP_FASTOPEN DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
-			OVERRIDECACHE QUERYTRACE \
-			START_LATE TCP_FASTOPEN
+			OVERRIDECACHE QUERYTRACE START_LATE TCP_FASTOPEN
+OPTIONS_DEFAULT=	DNSTAP GSSAPI_NONE IDN JSON LMDB TCP_FASTOPEN
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
@@ -80,49 +81,49 @@ QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
 
-DOCS_ALL_TARGET=	all html
-DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
-			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
-DOCS_USES=	gmake python:env
-
-DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
+DNSTAP_CONFIGURE_ENABLE=	dnstap
+
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+			sphinx-build:textproc/py-sphinx
+DOCS_USES=		gmake python:env
+DOCS_ALL_TARGET=	all html
 
 FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
 
+GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 GEOIP_CONFIGURE_ENABLE=	geoip
 GEOIP_CONFIGURE_WITH=	maxminddb
-GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
-GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_USES=		gssapi
+GSSAPI_BASE_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
-GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
-GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=		gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
-IDN_CONFIGURE_OFF=	--without-libidn2
-IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
-			--with-libidn2=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 IDN_USES=		iconv
+IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
+			--with-libidn2=${LOCALBASE}
+IDN_CONFIGURE_OFF=	--without-libidn2
 
-JSON_CONFIGURE_WITH=	json-c
 JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
+JSON_CONFIGURE_WITH=	json-c
 JSON_LDFLAGS=		-L${LOCALBASE}/lib -ljson-c
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
-LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 
 OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 
@@ -146,7 +147,7 @@ BUILD_DEPENDS+=		cmocka>0:sysutils/cmocka
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
-CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
+CONFIGURE_ENV+=	ac_cv_path_SPHINX_BUILD=
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/dns/bind920/Makefile b/dns/bind920/Makefile
index cca7769848ef..29689e34fece 100644
--- a/dns/bind920/Makefile
+++ b/dns/bind920/Makefile
@@ -19,12 +19,12 @@ PKGNAMESUFFIX=	920
 .endif
 
 MAINTAINER=	mat@FreeBSD.org
-WWW=		https://www.isc.org/bind/
 .if defined(BIND_TOOLS_SLAVE)
 COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
 .else
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 .endif
+WWW=		https://www.isc.org/bind/
 
 # Uncomment when bind922 comes of age. +3 years if ESV, +1year otherwise, see
 # https://kb.isc.org/docs/aa-00896
@@ -34,9 +34,9 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libuv.so:devel/libuv \
-		libnghttp2.so:www/libnghttp2 \
+LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 		liburcu.so:sysutils/liburcu \
+		libuv.so:devel/libuv \
 		libxml2.so:textproc/libxml2
 
 .if !defined(BIND_TOOLS_SLAVE)
@@ -53,14 +53,25 @@ CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 .endif
 USE_GNOME=	libxml2
 
+.if !defined(BIND_TOOLS_SLAVE)
+USE_RC_SUBR=	named
+.endif # !BIND_TOOLS_SLAVE
+
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CONFIGURE_ARGS=	--localstatedir=/var \
+CONFIGURE_ARGS=	--enable-dnsrps \
+		--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-libxml2 \
 		--with-openssl=${OPENSSLBASE} \
-		--enable-dnsrps \
 		--with-readline=libedit
+
+MAKE_JOBS_UNSAFE=	yes
+
+.if !defined(BIND_TOOLS_SLAVE)
+CONFLICTS=	bind9-devel bind918
+.endif # !BIND_TOOLS_SLAVE
+
 ETCDIR=		${PREFIX}/etc/namedb
 
 # FIXME: figure out why build fails if enabled
@@ -70,31 +81,23 @@ CONFIGURE_ARGS+=	--disable-tracing
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-bind-tools
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/bind-tools
 .else
-USE_RC_SUBR=		named
 SUB_FILES=		named.conf pkg-message
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-no-bind-tools
 
 PORTDOCS=	*
+.endif # BIND_TOOLS_SLAVE
 
-CONFLICTS=	bind918 bind9-devel
-.endif	# BIND_TOOLS_SLAVE
-
-MAKE_JOBS_UNSAFE=	yes
-
-OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
-			TCP_FASTOPEN DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
-			OVERRIDECACHE QUERYTRACE \
-			START_LATE TCP_FASTOPEN
+			OVERRIDECACHE QUERYTRACE START_LATE TCP_FASTOPEN
+OPTIONS_DEFAULT=	DNSTAP GSSAPI_NONE IDN JSON LMDB TCP_FASTOPEN
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
 .if defined(BIND_TOOLS_SLAVE)
-OPTIONS_EXCLUDE=	DOCS GEOIP LMDB \
-			OVERRIDECACHE QUERYTRACE START_LATE \
+OPTIONS_EXCLUDE=	DOCS GEOIP LMDB OVERRIDECACHE QUERYTRACE START_LATE \
 			TCP_FASTOPEN
-.endif	# BIND_TOOLS_SLAVE
+.endif # BIND_TOOLS_SLAVE
 
 OPTIONS_SUB=	yes
 
@@ -111,49 +114,49 @@ QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
 
-DOCS_ALL_TARGET=	all html
-DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
-			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
-DOCS_USES=	gmake python:env
-
-DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
+DNSTAP_CONFIGURE_ENABLE=	dnstap
+
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+			sphinx-build:textproc/py-sphinx
+DOCS_USES=		gmake python:env
+DOCS_ALL_TARGET=	all html
 
 FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
 
+GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 GEOIP_CONFIGURE_ENABLE=	geoip
 GEOIP_CONFIGURE_WITH=	maxminddb
-GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
-GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_USES=		gssapi
+GSSAPI_BASE_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
-GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
-GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
-				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=		gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-gssapi="${KRB5CONFIG}"
 
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
-IDN_CONFIGURE_OFF=	--without-libidn2
-IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
-			--with-libidn2=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 IDN_USES=		iconv
+IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
+			--with-libidn2=${LOCALBASE}
+IDN_CONFIGURE_OFF=	--without-libidn2
 
-JSON_CONFIGURE_WITH=	json-c
 JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
+JSON_CONFIGURE_WITH=	json-c
 JSON_LDFLAGS=		-L${LOCALBASE}/lib -ljson-c
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
-LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 
 OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 
@@ -176,7 +179,7 @@ BUILD_DEPENDS+=		cmocka>0:sysutils/cmocka
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
-CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
+CONFIGURE_ENV+=	ac_cv_path_SPHINX_BUILD=
 .endif
 
 .include <bsd.port.pre.mk>
@@ -223,6 +226,6 @@ do-install:
 	done
 	@${RM} -r ${STAGEDIR}${PREFIX}/include
 
-.endif	# BIND_TOOLS_SLAVE
+.endif # BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>