Date: Tue, 17 Jul 2012 10:36:25 +0000 (UTC) From: Jase Thew <jase@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r300997 - head/dns/nsd Message-ID: <201207171036.q6HAaPNq044166@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jase Date: Tue Jul 17 10:36:25 2012 New Revision: 300997 URL: http://svn.freebsd.org/changeset/ports/300997 Log: - Update to 3.2.11 [1] - Convert to optionsNG, add DOCS option - Replace bsd.port.{pre,post}.mk includes - Remove non-existent DNSSEC, TSIG, NSID options - Fix typo in NSEC3PREHASH option CONFIGURE_ARGS - Replace hardcoded ETCDIR in pkg-plist PR: ports/169731 [1] Submitted by: Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer) Approved by: flo (mentor) Modified: head/dns/nsd/Makefile (contents, props changed) head/dns/nsd/distinfo (contents, props changed) head/dns/nsd/pkg-plist (contents, props changed) Directory Properties: head/dns/nsd/pkg-descr (props changed) head/dns/nsd/pkg-message (props changed) Modified: head/dns/nsd/Makefile ============================================================================== --- head/dns/nsd/Makefile Tue Jul 17 08:58:09 2012 (r300996) +++ head/dns/nsd/Makefile Tue Jul 17 10:36:25 2012 (r300997) @@ -6,7 +6,7 @@ # PORTNAME= nsd -PORTVERSION= 3.2.10 +PORTVERSION= 3.2.11 CATEGORIES= dns ipv6 MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \ ftp://ftp.rhnet.is/pub/nsd/ @@ -49,68 +49,67 @@ PORTDOCS= CREDITS ChangeLog LICENSE NSD- REQUIREMENTS TESTPLAN TODO UPGRADING coding-style \ differences.tex -OPTIONS= ROOT_SERVER "Configure NSD as a root server" Off \ - LARGEFILE "Enable support for large files" On \ - IPV6 "Enable IPv6 support" On \ - BIND8_STATS "Enable BIND8 like NSTATS & XSTATS" Off \ - CHECKING "Enable internal runtime checks" Off \ - NSEC3 "Enable NSEC3 support" On \ - MINRESPSIZE "Enable minimized response size" On \ - NSEC3PREHASH "Enable full NSEC3 prehashing" On \ - MMAP "Use mmap instead of malloc(experimental)" Off \ - MAXIPS "Raise max-ips from 8 to ${NSDMAX_IPS}" Off +OPTIONS_DEFINE= ROOT_SERVER LARGEFILE IPV6 BIND8_STATS ZONE_STATS CHECKING \ + MINRESPSIZE NSEC3 NSEC3PREHASH MMAP MAXIPS DOCS +OPTIONS_DEFAULT= LARGEFILE IPV6 NSEC3 NSEC3PREHASH MINRESPSIZE + +ROOT_SERVER_DESC= Configure as a root server +LARGEFILE_DESC= Largefile support +BIND8_STATS_DESC= BIND8-like NSTATS & XSTATS +ZONE_STATS_DESC= Per-zone BIND8 stats +CHECKING_DESC= Internal run-time checks +NSEC3_DESC= NSEC3 support +NSEC3PREHASH_DESC= Full NSEC3 pre-hashing +MINRESPSIZE_DESC= Minimial response sizing +MMAP_DESC= Use mmap instead of malloc (experimental) +MAXIPS_DESC= Raise max-ips from 8 to ${NSDMAX_IPS} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_ROOT_SERVER) +.if ${PORT_OPTIONS:MROOT_SERVER} CONFIGURE_ARGS+= --enable-root-server .endif -.if defined(WITHOUT_LARGEFILE) +.if empty(PORT_OPTIONS:MLARGFILE) CONFIGURE_ARGS+= --disable-largefile .endif -.if defined(WITHOUT_IPV6) +.if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(WITHOUT_DNSSEC) -CONFIGURE_ARGS+= --disable-dnssec +.if ${PORT_OPTIONS:MBIND8_STATS} +CONFIGURE_ARGS+= --enable-bind8-stats .endif -.if defined(WITH_BIND8_STATS) +.if ${PORT_OPTIONS:MZONE_STATS} +. if empty(PORT_OPTIONS:MBIND8_STATS) CONFIGURE_ARGS+= --enable-bind8-stats +. endif +CONFIGURE_ARGS+= --enable-zone-stats .endif -.if defined(WITH_CHECKING) +.if ${PORT_OPTIONS:MCHECKING} CONFIGURE_ARGS+= --enable-checking .endif -.if defined(WITHOUT_TSIG) -CONFIGURE_ARGS+= --disable-tsig -.endif - -.if defined(WITHOUT_NSEC3) +.if empty(PORT_OPTIONS:MNSEC3) CONFIGURE_ARGS+= --disable-nsec3 .endif -.if defined(WITHOUT_MINRESPSIZE) +.if empty(PORT_OPTIONS:MMINRESPSIZE) CONFIGURE_ARGS+= --disable-minimal-responses .endif -.if defined(WITHOUT_NSEC3PREHASH) -CONFIGURE_ARGS+= --disable-disable-full-prehash -.endif - -.if defined(WITHOUT_NSID) -CONFIGURE_ARGS+= --disable-nsid +.if empty(PORT_OPTIONS:MNSEC3PREHASH) +CONFIGURE_ARGS+= --disable-full-prehash .endif -.if defined(WITH_MMAP) +.if ${PORT_OPTIONS:MMMAP} CONFIGURE_ARGS+= --enable-mmap .endif -.if defined(WITH_MAXIPS) +.if ${PORT_OPTIONS:MMAXIPS) CONFIGURE_ARGS+= --with-max-ips=${NSDMAX_IPS} .endif @@ -132,7 +131,7 @@ pre-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \ ${PREFIX}/etc/nsd/nsd.conf.sample -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f} @@ -141,4 +140,4 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/dns/nsd/distinfo ============================================================================== --- head/dns/nsd/distinfo Tue Jul 17 08:58:09 2012 (r300996) +++ head/dns/nsd/distinfo Tue Jul 17 10:36:25 2012 (r300997) @@ -1,2 +1,2 @@ -SHA256 (nsd-3.2.10.tar.gz) = fe6d9fae7ec549f1fa1f4fb1e40c9f05311fac43edf256a0d9f4f46377c23f31 -SIZE (nsd-3.2.10.tar.gz) = 879180 +SHA256 (nsd-3.2.11.tar.gz) = 9cd23d177ca241836d184b0203f6add0e5c2b98461069100001efe79afdc0d80 +SIZE (nsd-3.2.11.tar.gz) = 885810 Modified: head/dns/nsd/pkg-plist ============================================================================== --- head/dns/nsd/pkg-plist Tue Jul 17 08:58:09 2012 (r300996) +++ head/dns/nsd/pkg-plist Tue Jul 17 10:36:25 2012 (r300997) @@ -1,4 +1,4 @@ -etc/nsd/nsd.conf.sample +%%ETCDIR%%/nsd.conf.sample sbin/nsd sbin/nsd-checkconf sbin/nsd-notify @@ -6,4 +6,4 @@ sbin/nsd-patch sbin/nsd-xfer sbin/nsdc sbin/zonec -@dirrmtry etc/nsd +@dirrmtry %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207171036.q6HAaPNq044166>