From 261d0e7b24dc711cfc724d4fcaa6ad56215dbb15 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 6 Mar 2014 17:31:55 +0000
Subject: Always depend on libxml[1] Add XML newstats support to bind99[2]
PR: 186890[1], 186791[2]
Submitted by: Jason Mann[1], Matthew Seaman[2]
Sponsored by: Absolight
---
dns/bind98/Makefile | 14 ++++++--------
dns/bind99/Makefile | 15 ++++++++-------
2 files changed, 14 insertions(+), 15 deletions(-)
(limited to 'dns')
diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index 260b9e88bd8f..8e76a5b2d665 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= 9.8.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -19,16 +19,19 @@ ISCVERSION= 9.8.7
MAKE_JOBS_UNSAFE= yes
+LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
--disable-symtable \
+ --with-libxml2=${LOCALBASE} \
--with-randomdev=/dev/random
ETCDIR= ${PREFIX}/etc/namedb
CONFLICTS= bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.*
-OPTIONS_DEFAULT= IPV6 SSL XML THREADS GSSAPI
-OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \
+OPTIONS_DEFAULT= IPV6 SSL THREADS GSSAPI
+OPTIONS_DEFINE= SSL LINKS IDN REPLACE_BASE LARGE_FILE \
FIXED_RRSET RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH \
SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA DOCS
OPTIONS_GROUP= DLZ
@@ -37,7 +40,6 @@ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
SSL_DESC= Build with OpenSSL (Required for DNSSEC)
LINKS_DESC= Create conf file symlinks in ${PREFIX}
-XML_DESC= Support for xml statistics output
REPLACE_BASE_DESC= Replace base BIND (FreeBSD 9.x and earlier)
LARGE_FILE_DESC= 64-bit file support
SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation
@@ -58,10 +60,6 @@ SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
SSL_USE= openssl=yes
SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl
-XML_CONFIGURE_ON= --with-libxml2=${LOCALBASE}
-XML_CONFIGURE_OFF= --without-libxml2
-XML_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
-
IDN_USES= iconv
IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
IDN_CONFIGURE_OFF= --without-idn
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 918f5aed3672..cd4b36d5c553 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= 9.9.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -19,20 +19,23 @@ ISCVERSION= 9.9.5
MAKE_JOBS_UNSAFE= yes
+LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
--disable-symtable \
--with-randomdev=/dev/random \
+ --with-libxml2=${LOCALBASE} \
--without-python
ETCDIR= ${PREFIX}/etc/namedb
CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
-OPTIONS_DEFAULT= IPV6 SSL XML THREADS GSSAPI
+OPTIONS_DEFAULT= IPV6 SSL THREADS GSSAPI
OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE \
FIXED_RRSET SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA
.if !defined(BIND_TOOLS_SLAVE)
-OPTIONS_DEFINE+= LINKS XML RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH
+OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS
OPTIONS_GROUP= DLZ
OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
@@ -46,7 +49,7 @@ SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation
FILTER_AAAA_DESC= Enable filtering of AAAA records
LINKS_DESC= Create conf file symlinks in ${PREFIX}
-XML_DESC= Support for xml statistics output
+NEWSTATS_DESC= Enable alternate xml statistics channel format
RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules
RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records
RPZ_PATCH_DESC= RPZ improvements
@@ -67,9 +70,7 @@ SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
SSL_USE= openssl=yes
SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl
-XML_CONFIGURE_ON= --with-libxml2=${LOCALBASE}
-XML_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
-XML_CONFIGURE_OFF= --without-libxml2
+NEWSTATS_CONFIGURE_ENABLE= newstats
IDN_USES= iconv
IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0