From 2a20906a858af06ccf61e1e1cd0dd98dee88d575 Mon Sep 17 00:00:00 2001 From: erwin Date: Fri, 14 Dec 2012 10:43:35 +0000 Subject: - Use new OPTIONS_GROUP for DLZ options.[1] - This also allows more than one DLZ option to be set.[2] Submitted by: bapt [1] (as RADIO) Suggested by: az [2] (thus GROUP instead) --- dns/bind96/Makefile | 6 +++--- dns/bind97/Makefile | 6 +++--- dns/bind98/Makefile | 6 +++--- dns/bind99/Makefile | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'dns') diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile index 80a46d35f6d6..9f066df0c67a 100644 --- a/dns/bind96/Makefile +++ b/dns/bind96/Makefile @@ -23,9 +23,9 @@ CONFLICTS= bind9*-9.[45789].* bind9*-sdb-9.[45789].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ - SIGCHASE IPV6 THREADS DLZ FIXED_RRSET -OPTIONS_SINGLE= DLZ -OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ + SIGCHASE IPV6 THREADS FIXED_RRSET +OPTIONS_GROUP= DLZ +OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB SSL_DESC= Build with OpenSSL (Required for DNSSEC) diff --git a/dns/bind97/Makefile b/dns/bind97/Makefile index 22bd8e6963b7..31b8e724e680 100644 --- a/dns/bind97/Makefile +++ b/dns/bind97/Makefile @@ -27,9 +27,9 @@ OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE SIGCHASE \ IPV6 THREADS FIXED_RRSET .if !defined(BIND_TOOLS_SLAVE) -OPTIONS_DEFINE+= LINKS XML DLZ -OPTIONS_SINGLE= DLZ -OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ +OPTIONS_DEFINE+= LINKS XML +OPTIONS_GROUP= DLZ +OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB SSL_DESC= Build with OpenSSL (Required for DNSSEC) diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile index ddf8c97223b0..0a94c198e3e7 100644 --- a/dns/bind98/Makefile +++ b/dns/bind98/Makefile @@ -25,9 +25,9 @@ CONFLICTS= bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ FIXED_RRSET RPZ_NSIP RPZ_NSDNAME \ - SIGCHASE IPV6 THREADS DLZ -OPTIONS_SINGLE= DLZ -OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ + SIGCHASE IPV6 THREADS +OPTIONS_GROUP= DLZ +OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB SSL_DESC= Build with OpenSSL (Required for DNSSEC) diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index ebc4db39808a..c9b801ab673e 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -26,9 +26,9 @@ CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ FIXED_RRSET RPZ_NSIP RPZ_NSDNAME \ - SIGCHASE IPV6 THREADS DLZ -OPTIONS_SINGLE= DLZ -OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ + SIGCHASE IPV6 THREADS +OPTIONS_GROUP= DLZ +OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB SSL_DESC= Build with OpenSSL (Required for DNSSEC) -- cgit