From owner-svn-ports-head@freebsd.org Wed Jan 24 10:43:29 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5EA20ECC700; Wed, 24 Jan 2018 10:43:29 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6694C82A78; Wed, 24 Jan 2018 10:43:27 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 93E5D1C9DF; Wed, 24 Jan 2018 10:43:26 +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 w0OAhQDB048147; Wed, 24 Jan 2018 10:43:26 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0OAhQQX048146; Wed, 24 Jan 2018 10:43:26 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201801241043.w0OAhQQX048146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 24 Jan 2018 10:43:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459830 - head/dns/bind911 X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/dns/bind911 X-SVN-Commit-Revision: 459830 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2018 10:43:29 -0000 Author: mat Date: Wed Jan 24 10:43:26 2018 New Revision: 459830 URL: https://svnweb.freebsd.org/changeset/ports/459830 Log: Remove support for bind-tools from the BIND9 9.11 port. Sponsored by: Absolight Modified: head/dns/bind911/Makefile (contents, props changed) Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Wed Jan 24 10:43:21 2018 (r459829) +++ head/dns/bind911/Makefile Wed Jan 24 10:43:26 2018 (r459830) @@ -3,28 +3,14 @@ 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 -.else -# dns/bind911 here PORTREVISION= 1 -.endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} -.if defined(BIND_TOOLS_SLAVE) -PKGNAMESUFFIX= -tools -.else PKGNAMESUFFIX= 911 -.endif DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org -.if defined(BIND_TOOLS_SLAVE) -COMMENT= Command line tools from BIND: delv, dig, host, nslookup... -.else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 -.endif LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT @@ -52,38 +38,30 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind99 bind910 bind9-devel +CONFLICTS= bind-tools bind99 bind910 bind9-devel -.if defined(BIND_TOOLS_SLAVE) -CONFIGURE_ARGS+= --disable-shared -CONFLICTS+= bind911 -.else -USE_RC_SUBR= named SUB_FILES= pkg-message named.conf -CONFLICTS+= bind-tools -.endif # BIND_TOOLS_SLAVE +USE_RC_SUBR= named MAKE_JOBS_UNSAFE= yes PORTDOCS= * -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON +OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON \ + DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ - FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA + FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \ + RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ + MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ + START_LATE TUNING_LARGE OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 -.if !defined(BIND_TOOLS_SLAVE) -OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP -OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ - MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ - START_LATE TUNING_LARGE OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB -.endif # BIND_TOOLS_SLAVE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE @@ -230,38 +208,26 @@ BROKEN= OpenSSL from the base system does not support .endif post-patch: -.if defined(BIND_TOOLS_SLAVE) - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ - -e 's#isc-config.sh installdirs#installdirs#' \ - -e 's#.*INSTALL.*isc-config.*##' \ - -e 's#.*INSTALL.*bind.keys.*##' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ - -e 's#^ .*check confgen ##' \ - ${WRKSRC}/bin/Makefile.in -.else -. for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ +.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} -. endfor -.endif +.endfor -.if !defined(BIND_TOOLS_SLAVE) -. if ${PORTREVISION:N0} +.if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version -. endif +.endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} -. for i in dynamic master slave working +.for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i -. endfor +.endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master @@ -278,7 +244,6 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES \ ${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR} -.endif # BIND_TOOLS_SLAVE # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: