From owner-svn-ports-all@FreeBSD.ORG Thu Mar 6 17:31:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11732E93; Thu, 6 Mar 2014 17:31:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F292A133; Thu, 6 Mar 2014 17:31:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26HVtsf012549; Thu, 6 Mar 2014 17:31:55 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26HVt8Q012547; Thu, 6 Mar 2014 17:31:55 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201403061731.s26HVt8Q012547@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 6 Mar 2014 17:31:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347284 - in head/dns: bind98 bind99 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 17:31:56 -0000 Author: mat Date: Thu Mar 6 17:31:55 2014 New Revision: 347284 URL: http://svnweb.freebsd.org/changeset/ports/347284 QAT: https://qat.redports.org/buildarchive/r347284/ Log: 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 Modified: head/dns/bind98/Makefile head/dns/bind99/Makefile Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Thu Mar 6 17:30:00 2014 (r347283) +++ head/dns/bind98/Makefile Thu Mar 6 17:31:55 2014 (r347284) @@ -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_MY 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=${OPENS 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 Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Thu Mar 6 17:30:00 2014 (r347283) +++ head/dns/bind99/Makefile Thu Mar 6 17:31:55 2014 (r347284) @@ -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 d 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=${OPENS 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}