From owner-svn-ports-head@FreeBSD.ORG Sat Feb 22 12:47:26 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53C7E11F; Sat, 22 Feb 2014 12:47:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F837144A; Sat, 22 Feb 2014 12:47:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1MClQun045235; Sat, 22 Feb 2014 12:47:26 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1MClP1T045233; Sat, 22 Feb 2014 12:47:25 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201402221247.s1MClP1T045233@svn.freebsd.org> From: Pawel Pekala Date: Sat, 22 Feb 2014 12:47:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345629 - head/dns/nsd X-SVN-Group: ports-head 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.17 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: Sat, 22 Feb 2014 12:47:26 -0000 Author: pawel Date: Sat Feb 22 12:47:25 2014 New Revision: 345629 URL: http://svnweb.freebsd.org/changeset/ports/345629 QAT: https://qat.redports.org/buildarchive/r345629/ Log: - Fix man installation after port was stagified [1] - Convert LIB_DEPENDS to new format [1] - Remove leading article from COMMENT - Switch to options helpers - Conditional installation of docs is not needed with stage - Don't show pkg-message twice PR: ports/186693 [1] Submitted by: Denis Generalov Approved by: maintainer Modified: head/dns/nsd/Makefile head/dns/nsd/pkg-plist Modified: head/dns/nsd/Makefile ============================================================================== --- head/dns/nsd/Makefile Sat Feb 22 12:27:20 2014 (r345628) +++ head/dns/nsd/Makefile Sat Feb 22 12:47:25 2014 (r345629) @@ -3,13 +3,13 @@ PORTNAME= nsd PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns ipv6 MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \ ftp://ftp.rhnet.is/pub/nsd/ MAINTAINER= jaap@NLnetLabs.nl -COMMENT= An authoritative only non-recursive name server +COMMENT= Authoritative only non-recursive name server LICENSE= BSD3CLAUSE @@ -40,9 +40,6 @@ SUB_LIST+= NSDUSER=${NSDUSER} \ USE_OPENSSL= yes -MAN5= nsd.conf.5 -MAN8= nsd.8 nsd-checkconf.8 nsd-control.8 - PORTDOCS= CREDITS ChangeLog LICENSE NSD-DATABASE NSD-DIFFFILE \ NSD-4-features NSD-FOR-BIND-USERS README README.icc RELNOTES \ REQUIREMENTS TESTPLAN TODO UPGRADING coding-style \ @@ -65,57 +62,20 @@ MAXIPS_DESC= Raise max-ips from 8 to ${ RRL_DESC= Response Rate Limiting EUI_RRTYPES_DESC= EUI48 and EUI64 RRtypes support -.include - -LIB_DEPENDS+= event-1:${PORTSDIR}/devel/libevent - -.if ${PORT_OPTIONS:MROOT_SERVER} -CONFIGURE_ARGS+= --enable-root-server -.endif - -.if empty(PORT_OPTIONS:MLARGEFILE) -CONFIGURE_ARGS+= --disable-largefile -.endif - -.if empty(PORT_OPTIONS:MIPV6) -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if ${PORT_OPTIONS:MBIND8_STATS} -CONFIGURE_ARGS+= --enable-bind8-stats -.endif - -.if ${PORT_OPTIONS:MCHECKING} -CONFIGURE_ARGS+= --enable-checking -.endif - -.if empty(PORT_OPTIONS:MNSEC3) -CONFIGURE_ARGS+= --disable-nsec3 -.endif - -.if empty(PORT_OPTIONS:MMINRESPSIZE) -CONFIGURE_ARGS+= --disable-minimal-responses -.endif +LIB_DEPENDS+= libevent-1.4.so:${PORTSDIR}/devel/libevent -.if empty(PORT_OPTIONS:MNSEC3PREHASH) -CONFIGURE_ARGS+= --disable-full-prehash -.endif - -.if ${PORT_OPTIONS:MMMAP} -CONFIGURE_ARGS+= --enable-mmap -.endif - -.if ${PORT_OPTIONS:MMAXIPS} -CONFIGURE_ARGS+= --with-max-ips=${NSDMAX_IPS} -.endif - -.if ${PORT_OPTIONS:MRRL} -CONFIGURE_ARGS+= --enable-ratelimit -.endif - -.if ${PORT_OPTIONS:MEUI_RRTYPES} -CONFIGURE_ARGS+= --enable-draft-rrtypes -.endif +ROOT_SERVER_CONFIGURE_ON= --enable-root-server +LARGEFILE_CONFIGURE_OFF= --disable-largefile +IPV6_CONFIGURE_OFF= --disable-ipv6 +BIND8_STATS_CONFIGURE_ON= --enable-bind8-stats +CHECKING_CONFIGURE_ON= --enable-checking +NSEC3_CONFIGURE_OFF= --disable-nsec3 +MINRESPSIZE_CONFIGURE_OFF= --disable-minimal-responses +NSEC3PREHASH_CONFIGURE_OFF= --disable-full-prehash +MMAP_CONFIGURE_ON= --enable-mmap +MAXIPS_CONFIGURE_ON= --with-max-ips=${NSDMAX_IPS} +RRL_CONFIGURE_ON= --enable-ratelimit +EUI_RRTYPES_CONFIGURE_ON= --enable-draft-rrtypes pre-patch: .if defined(NSD_OPTIONS) @@ -135,13 +95,8 @@ pre-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \ ${STAGEDIR}${PREFIX}/etc/nsd/nsd.conf.sample -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}/${f} -.endfor -.endif + (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} .include Modified: head/dns/nsd/pkg-plist ============================================================================== --- head/dns/nsd/pkg-plist Sat Feb 22 12:27:20 2014 (r345628) +++ head/dns/nsd/pkg-plist Sat Feb 22 12:47:25 2014 (r345629) @@ -1,4 +1,8 @@ %%ETCDIR%%/nsd.conf.sample +man/man5/nsd.conf.5.gz +man/man8/nsd-checkconf.8.gz +man/man8/nsd-control.8.gz +man/man8/nsd.8.gz sbin/nsd sbin/nsd-checkconf sbin/nsd-control