From owner-svn-ports-all@FreeBSD.ORG Wed Apr 24 13:17:04 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BBCCC452; Wed, 24 Apr 2013 13:17:04 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9BC0814A5; Wed, 24 Apr 2013 13:17:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3ODH4QO041836; Wed, 24 Apr 2013 13:17:04 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3ODH4Xp041833; Wed, 24 Apr 2013 13:17:04 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201304241317.r3ODH4Xp041833@svn.freebsd.org> From: Niclas Zeising Date: Wed, 24 Apr 2013 13:17:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316430 - in head/dns: . bind-tools 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.14 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: Wed, 24 Apr 2013 13:17:04 -0000 Author: zeising Date: Wed Apr 24 13:17:03 2013 New Revision: 316430 URL: http://svnweb.freebsd.org/changeset/ports/316430 Log: Readd dns/bind-tools. This is done in a similar manner as the old bind-tools, but uses bind99 instead of bind97 as master port. Change bind99 to facilitate the bind-tools slave, in a simlar way as was done for bind97. Approved by: erwin (maintainer) Added: head/dns/bind-tools/ - copied from r316325, head/dns/bind-tools/ Modified: head/dns/Makefile head/dns/bind-tools/Makefile head/dns/bind99/Makefile Modified: head/dns/Makefile ============================================================================== --- head/dns/Makefile Wed Apr 24 13:07:34 2013 (r316429) +++ head/dns/Makefile Wed Apr 24 13:17:03 2013 (r316430) @@ -11,6 +11,7 @@ SUBDIR += bind98 SUBDIR += bind99 SUBDIR += bindgraph + SUBDIR += bind-tools SUBDIR += c-ares SUBDIR += checkdns SUBDIR += credns Modified: head/dns/bind-tools/Makefile ============================================================================== --- head/dns/bind-tools/Makefile Tue Apr 23 09:08:16 2013 (r316325) +++ head/dns/bind-tools/Makefile Wed Apr 24 13:17:03 2013 (r316430) @@ -6,9 +6,9 @@ COMMENT= Command line tools from BIND: d CONFIGURE_ARGS+= --disable-shared -CONFLICTS+= bind97-9.7.* +CONFLICTS+= bind99-9.9.* -MASTERDIR= ${.CURDIR}/../../dns/bind97 +MASTERDIR= ${.CURDIR}/../../dns/bind99 DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Wed Apr 24 13:07:34 2013 (r316429) +++ head/dns/bind99/Makefile Wed Apr 24 13:17:03 2013 (r316430) @@ -1,7 +1,8 @@ # $FreeBSD$ -PORTNAME= bind99 +PORTNAME?= bind99 PORTVERSION= 9.9.2.2 +PORTREVISION?= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} @@ -26,20 +27,24 @@ CONFIGURE_ARGS= --localstatedir=/var --d 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 RPZRRL_PATCH \ - SIGCHASE IPV6 THREADS +OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE \ + FIXED_RRSET SIGCHASE IPV6 THREADS +.if !defined(BIND_TOOLS_SLAVE) +OPTIONS_DEFINE+= LINKS XML RPZ_NSIP RPZ_NSDNAME RPZRR_PATCH OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +.endif # BIND_TOOLS_SLAVE 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 with this version LARGE_FILE_DESC= 64-bit file support -SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation FIXED_RRSET_DESC= Enable fixed rrset ordering +SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation + +.if !defined(BIND_TOOLS_SLAVE) +LINKS_DESC= Create conf file symlinks in ${PREFIX} +XML_DESC= Support for xml statistics output RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records RPZRRL_PATCH_DESC= RPZ improvements + RRL patch (experimental) @@ -51,6 +56,9 @@ DLZ_LDAP_DESC= DLZ LDAP driver DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_STUB_DESC= DLZ stub driver +CONFLICTS+= bind-tools-9.* +.endif # BIND_TOOLS_SLAVE + .include .if (${ARCH} == "amd64") @@ -65,7 +73,7 @@ CONFIGURE_ARGS+= --disable-openssl-versi CONFIGURE_ARGS+= --without-openssl .endif -.if ${PORT_OPTIONS:MXML} +.if ${PORT_OPTIONS:MXML} && !defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --with-libxml2=${LOCALBASE} LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 .else @@ -160,7 +168,8 @@ BIND_DESTETC= ${PREFIX}/etc PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -MAN1= arpaname.1 dig.1 host.1 isc-config.sh.1 nslookup.1 nsupdate.1 +MAN1?= arpaname.1 dig.1 host.1 isc-config.sh.1 nslookup.1 nsupdate.1 +.if !defined(BIND_TOOLS_SLAVE) MAN3= lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \ lwres_buffer_back.3 lwres_buffer_clear.3 lwres_buffer_first.3 \ lwres_buffer_forward.3 lwres_buffer_getmem.3 lwres_buffer_getuint16.3 \ @@ -202,7 +211,9 @@ MAN8= ddns-confgen.8 dnssec-dsfromkey.8 named-checkzone.8 named-journalprint.8 named.8 nsec3hash.8 \ rndc-confgen.8 rndc.8 MLINKS= named-checkzone.8 named-compilezone.8 +.endif # BIND_TOOLS_SLVE +.if !defined(BIND_TOOLS_SLAVE) post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @@ -240,4 +251,6 @@ post-install: @${CAT} ${PKGMESSAGE} +.endif # BIND_TOOLS_SLAVE + .include