Date: Wed, 18 Jun 2014 12:23:28 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358262 - in head/dns: bind-tools bind910 bind99 Message-ID: <201406181223.s5ICNSFl028805@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Jun 18 12:23:28 2014 New Revision: 358262 URL: http://svnweb.freebsd.org/changeset/ports/358262 QAT: https://qat.redports.org/buildarchive/r358262/ Log: Fix dns/bind-tools after the gssapi update. Also, move it from BIND 9.9 to 9.10, and add delv and nsupdate. Sponsored by: Absolight Modified: head/dns/bind-tools/Makefile head/dns/bind-tools/pkg-plist head/dns/bind910/Makefile head/dns/bind99/Makefile Modified: head/dns/bind-tools/Makefile ============================================================================== --- head/dns/bind-tools/Makefile Wed Jun 18 12:23:22 2014 (r358261) +++ head/dns/bind-tools/Makefile Wed Jun 18 12:23:28 2014 (r358262) @@ -6,9 +6,9 @@ COMMENT= Command line tools from BIND: d CONFIGURE_ARGS+= --disable-shared -CONFLICTS+= bind99-9.9.* +CONFLICTS+= bind910-9.10.* -MASTERDIR= ${.CURDIR}/../../dns/bind99 +MASTERDIR= ${.CURDIR}/../../dns/bind910 DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist @@ -22,7 +22,7 @@ post-patch: -e 's#.*INSTALL.*isc-config.*##' \ -e 's#.*INSTALL.*bind.keys.*##' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = dig dnssec#' \ + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate#' \ -e 's#^ .*check confgen ##' \ ${WRKSRC}/bin/Makefile.in @@ -31,6 +31,10 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/dig/${file} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/bin/dig/${file}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .endfor +.for file in delv nsupdate + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${file}/${file} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/bin/${file}/${file}.1 ${STAGEDIR}${MANPREFIX}/man/man1 +.endfor .for file in dnssec-dsfromkey dnssec-importkey dnssec-keyfromlabel \ dnssec-keygen dnssec-revoke dnssec-settime dnssec-signzone \ dnssec-verify Modified: head/dns/bind-tools/pkg-plist ============================================================================== --- head/dns/bind-tools/pkg-plist Wed Jun 18 12:23:22 2014 (r358261) +++ head/dns/bind-tools/pkg-plist Wed Jun 18 12:23:28 2014 (r358262) @@ -1,17 +1,22 @@ +bin/delv bin/dig bin/host bin/nslookup -%%SHARE_MAN%%man/man1/dig.1.gz -%%SHARE_MAN%%man/man1/host.1.gz -%%SHARE_MAN%%man/man1/nslookup.1.gz -%%SHARE_MAN%%man/man8/dnssec-dsfromkey.8.gz -%%SHARE_MAN%%man/man8/dnssec-importkey.8.gz -%%SHARE_MAN%%man/man8/dnssec-keyfromlabel.8.gz -%%SHARE_MAN%%man/man8/dnssec-keygen.8.gz -%%SHARE_MAN%%man/man8/dnssec-revoke.8.gz -%%SHARE_MAN%%man/man8/dnssec-settime.8.gz -%%SHARE_MAN%%man/man8/dnssec-signzone.8.gz -%%SHARE_MAN%%man/man8/dnssec-verify.8.gz +bin/nsupdate +etc/rc.d/named +man/man1/delv.1.gz +man/man1/dig.1.gz +man/man1/host.1.gz +man/man1/nslookup.1.gz +man/man1/nsupdate.1.gz +man/man8/dnssec-dsfromkey.8.gz +man/man8/dnssec-importkey.8.gz +man/man8/dnssec-keyfromlabel.8.gz +man/man8/dnssec-keygen.8.gz +man/man8/dnssec-revoke.8.gz +man/man8/dnssec-settime.8.gz +man/man8/dnssec-signzone.8.gz +man/man8/dnssec-verify.8.gz sbin/dnssec-dsfromkey sbin/dnssec-importkey sbin/dnssec-keyfromlabel Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Wed Jun 18 12:23:22 2014 (r358261) +++ head/dns/bind910/Makefile Wed Jun 18 12:23:28 2014 (r358262) @@ -5,7 +5,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/} PORTREVISION= 2 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} -PKGNAMESUFFIX= 910 +PKGNAMESUFFIX?= 910 DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --localstatedir=/var --d --without-python ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind9*-9.[456789].* bind9*-sdb-9.[456789].* bind-tools-9.* +CONFLICTS= bind9*-9.[456789].* bind9*-sdb-9.[456789].* SUB_FILES= pkg-message @@ -39,14 +39,14 @@ OPTIONS_DEFINE= IDN LARGE_FILE GOST \ OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= RRL OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS NEWSTATS GEOIP OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB -OPTIONS_SINGLE= GSSAPI -OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE .endif # BIND_TOOLS_SLAVE SSL_DESC= Build with OpenSSL (Required for DNSSEC) Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Wed Jun 18 12:23:22 2014 (r358261) +++ head/dns/bind99/Makefile Wed Jun 18 12:23:28 2014 (r358262) @@ -5,7 +5,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/} PORTREVISION= 2 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} -PKGNAMESUFFIX?= 99 +PKGNAMESUFFIX= 99 DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org @@ -32,15 +32,13 @@ CONFLICTS= bind9*-9.[45678].* bind9*-sdb OPTIONS_DEFAULT= IPV6 SSL THREADS GSSAPI_NONE OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \ - IPV6 THREADS FILTER_AAAA GOST -.if !defined(BIND_TOOLS_SLAVE) -OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS + IPV6 THREADS FILTER_AAAA GOST \ + 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 OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -.endif # BIND_TOOLS_SLAVE SSL_DESC= Build with OpenSSL (Required for DNSSEC) REPLACE_BASE_DESC= Replace base BIND (FreeBSD 9.x and earlier) @@ -68,10 +66,6 @@ GSSAPI_HEIMDAL_DESC= ${GSSAPI_DESC} (sec GSSAPI_MIT_DESC= ${GSSAPI_DESC} (security/krb5) GSSAPI_NONE_DESC= No ${GSSAPI_DESC} -.if !defined(BIND_TOOLS_SLAVE) -CONFLICTS+= bind-tools-9.* -.endif # BIND_TOOLS_SLAVE - SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_USE= openssl=yes SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl @@ -186,7 +180,6 @@ WITH_OPENSSL_PORT= yes .endif .endif -.if !defined(BIND_TOOLS_SLAVE) post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @@ -229,6 +222,5 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf ${STAGEDIR}${ETCDIR}/rndc.conf.sample .endif -.endif # BIND_TOOLS_SLAVE .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406181223.s5ICNSFl028805>