From owner-svn-ports-all@freebsd.org Fri Dec 9 15:02:38 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4D0AC6D7B0; Fri, 9 Dec 2016 15:02:38 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A516A1AF; Fri, 9 Dec 2016 15:02:38 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB9F2boA016739; Fri, 9 Dec 2016 15:02:37 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB9F2bUL016735; Fri, 9 Dec 2016 15:02:37 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201612091502.uB9F2bUL016735@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 9 Dec 2016 15:02:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428214 - in head/dns: bind9-devel bind910 bind911 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.23 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: Fri, 09 Dec 2016 15:02:39 -0000 Author: mat Date: Fri Dec 9 15:02:37 2016 New Revision: 428214 URL: https://svnweb.freebsd.org/changeset/ports/428214 Log: Fixup libedit for all BIND9 ports, and fix spurious json dependency by adding an option. PR: 215170 Reported by: sunpoet Sponsored by: Absolight Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind910/Makefile (contents, props changed) head/dns/bind911/Makefile (contents, props changed) head/dns/bind99/Makefile (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Fri Dec 9 14:49:54 2016 (r428213) +++ head/dns/bind9-devel/Makefile Fri Dec 9 15:02:37 2016 (r428214) @@ -5,10 +5,10 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 0 +PORTREVISION= 1 .else # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= LOCAL/mat/bind @@ -48,7 +48,7 @@ CONFIGURE_ARGS+= --localstatedir=/var -- --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ - --with-readline=-ledit \ + --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --sysconfdir=${ETCDIR} .if defined(BIND_TOOLS_SLAVE) @@ -63,8 +63,8 @@ CONFLICTS+= bind9*-9.[456789].* bind910- SUB_FILES= pkg-message .endif -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE -OPTIONS_DEFINE= IDN LARGE_FILE PYTHON \ +OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON +OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 @@ -149,6 +149,9 @@ NATIVE_PKCS11_CONFIGURE_ENABLE= native-p GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c +JSON_CONFIGURE_WITH= libjson + GOST_CONFIGURE_ON= --with-gost GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Fri Dec 9 14:49:54 2016 (r428213) +++ head/dns/bind910/Makefile Fri Dec 9 15:02:37 2016 (r428214) @@ -5,10 +5,10 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 0 +PORTREVISION= 1 .else # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -60,8 +60,8 @@ CONFLICTS+= bind9*-9.[456789].* bind911- SUB_FILES= pkg-message .endif -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE -OPTIONS_DEFINE= IDN LARGE_FILE PYTHON \ +OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON +OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 @@ -145,6 +145,9 @@ NATIVE_PKCS11_CONFIGURE_ENABLE= native-p GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c +JSON_CONFIGURE_WITH= libjson + GOST_CONFIGURE_ON= --with-gost GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Fri Dec 9 14:49:54 2016 (r428213) +++ head/dns/bind911/Makefile Fri Dec 9 15:02:37 2016 (r428214) @@ -5,10 +5,10 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 0 +PORTREVISION= 1 .else # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --localstatedir=/var -- --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ - --with-readline=-ledit \ + --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --sysconfdir=${ETCDIR} .if defined(BIND_TOOLS_SLAVE) @@ -60,8 +60,8 @@ CONFLICTS+= bind9*-9.[456789].* bind910- SUB_FILES= pkg-message .endif -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE -OPTIONS_DEFINE= IDN LARGE_FILE PYTHON \ +OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON +OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 @@ -146,6 +146,9 @@ NATIVE_PKCS11_CONFIGURE_ENABLE= native-p GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c +JSON_CONFIGURE_WITH= libjson + GOST_CONFIGURE_ON= --with-gost GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Fri Dec 9 14:49:54 2016 (r428213) +++ head/dns/bind99/Makefile Fri Dec 9 15:02:37 2016 (r428214) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --localstatedir=/var --d --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ - --with-readline=-ledit \ + --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb