svn commit: r500009 - in head/dns: bind9-devel bind913 bind914
Mathieu Arnold
mat at FreeBSD.org
Thu Apr 25 14:54:20 UTC 2019
Author: mat
Date: Thu Apr 25 14:54:18 2019
New Revision: 500009
URL: https://svnweb.freebsd.org/changeset/ports/500009
Log:
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
Modified:
head/dns/bind9-devel/Makefile (contents, props changed)
head/dns/bind913/Makefile (contents, props changed)
head/dns/bind914/Makefile (contents, props changed)
Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile Thu Apr 25 14:54:03 2019 (r500008)
+++ head/dns/bind9-devel/Makefile Thu Apr 25 14:54:18 2019 (r500009)
@@ -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,27 +80,29 @@ 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
Modified: head/dns/bind913/Makefile
==============================================================================
--- head/dns/bind913/Makefile Thu Apr 25 14:54:03 2019 (r500008)
+++ head/dns/bind913/Makefile Thu Apr 25 14:54:18 2019 (r500009)
@@ -59,7 +59,6 @@ CONFLICTS= bind911 bind912 bind914 bind9-devel
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
@@ -69,27 +68,29 @@ 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 MINCACHE 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 \
- MINCACHE 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} \
+ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
+ START_LATE TUNING_LARGE TCP_FASTOPEN
+.else
+OPTIONS_EXCLUDE= PYTHON
+.endif # BIND_TOOLS_SLAVE
OPTIONS_SUB= yes
Modified: head/dns/bind914/Makefile
==============================================================================
--- head/dns/bind914/Makefile Thu Apr 25 14:54:03 2019 (r500008)
+++ head/dns/bind914/Makefile Thu Apr 25 14:54:18 2019 (r500009)
@@ -59,7 +59,6 @@ CONFLICTS= bind911 bind912 bind13 bind9-devel
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
@@ -69,27 +68,29 @@ 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 MINCACHE 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 \
- MINCACHE 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} \
+ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
+ START_LATE TUNING_LARGE TCP_FASTOPEN
+.else
+OPTIONS_EXCLUDE= PYTHON
+.endif # BIND_TOOLS_SLAVE
OPTIONS_SUB= yes
More information about the svn-ports-all
mailing list