svn commit: r308897 - in head/dns: bind96 bind97 bind98 bind99

[Erwin Lansing]

Author: erwin
Date: Fri Dec 14 10:43:35 2012
New Revision: 308897
URL: http://svnweb.freebsd.org/changeset/ports/308897

Log:
  - 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)

Modified:
  head/dns/bind96/Makefile
  head/dns/bind97/Makefile
  head/dns/bind98/Makefile
  head/dns/bind99/Makefile

Modified: head/dns/bind96/Makefile
==============================================================================
--- head/dns/bind96/Makefile	Fri Dec 14 09:50:14 2012	(r308896)
+++ head/dns/bind96/Makefile	Fri Dec 14 10:43:35 2012	(r308897)
@@ -23,9 +23,9 @@ CONFLICTS=	bind9*-9.[45789].* bind9*-sdb
 
 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)

Modified: head/dns/bind97/Makefile
==============================================================================
--- head/dns/bind97/Makefile	Fri Dec 14 09:50:14 2012	(r308896)
+++ head/dns/bind97/Makefile	Fri Dec 14 10:43:35 2012	(r308897)
@@ -27,9 +27,9 @@ OPTIONS_DEFAULT=	IPV6 SSL LINKS XML THRE
 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)

Modified: head/dns/bind98/Makefile
==============================================================================
--- head/dns/bind98/Makefile	Fri Dec 14 09:50:14 2012	(r308896)
+++ head/dns/bind98/Makefile	Fri Dec 14 10:43:35 2012	(r308897)
@@ -25,9 +25,9 @@ CONFLICTS=	bind9*-9.[45679].* bind9*-sdb
 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)

Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile	Fri Dec 14 09:50:14 2012	(r308896)
+++ head/dns/bind99/Makefile	Fri Dec 14 10:43:35 2012	(r308897)
@@ -26,9 +26,9 @@ CONFLICTS=	bind9*-9.[45678].* bind9*-sdb
 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)