Switch to using OPTIONS_EXCLUDE to avoid picking up strays.

If you had things installed, say, lmdb, it would be picked up and linked
with.

Reported by:	sunpoet

1 files changed, 14 insertions, 13 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 1f027bb8e8c7..017d76c720c4 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -71,7 +71,6 @@ CONFLICTS=	bind911 bind912 bind913 bind914
 CONFIGURE_ARGS+=	--disable-shared
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-bind-tools
 .else
-CONFIGURE_ARGS+=	--without-python
 USE_RC_SUBR=	named
 SUB_FILES=	pkg-message named.conf
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-no-bind-tools
@@ -81,28 +80,30 @@ PORTDOCS=	*
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFAULT=	SIGCHASE IDN GSSAPI_NONE JSON
-OPTIONS_DEFINE=		IDN LARGE_FILE JSON \
-			FIXED_RRSET SIGCHASE
+OPTIONS_DEFAULT=	DLZ_FILESYSTEM GSSAPI_NONE IDN JSON \
+			LMDB PYTHON SIGCHASE TCP_FASTOPEN
+OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET IDN JSON LARGE_FILE \
+			LMDB OVERRIDECACHE PORTREVISION PYTHON QUERYTRACE \
+			SIGCHASE START_LATE TCP_FASTOPEN TUNING_LARGE
 
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	NATIVE_PKCS11
 
-.if defined(BIND_TOOLS_SLAVE)
-OPTIONS_DEFINE+=	PYTHON
-OPTIONS_DEFAULT+=	PYTHON
-.else
-OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB TCP_FASTOPEN
-OPTIONS_DEFINE+=	DOCS \
-			OVERRIDECACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
-			START_LATE TUNING_LARGE TCP_FASTOPEN
 OPTIONS_GROUP=		DLZ
 OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
 			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
-.endif	# BIND_TOOLS_SLAVE
+
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
+.if defined(BIND_TOOLS_SLAVE)
+OPTIONS_EXCLUDE=	DOCS ${OPTIONS_GROUP_DLZ} \
+			OVERRIDECACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
+			START_LATE TUNING_LARGE TCP_FASTOPEN
+.else
+OPTIONS_EXCLUDE=	PYTHON
+.endif	# BIND_TOOLS_SLAVE
+
 OPTIONS_SUB=	yes
 
 CRYPTO_DESC=		Choose which crypto engine to use