Date: Sun, 23 Feb 2014 23:58:35 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345777 - in head/dns/nsd3: . files Message-ID: <201402232358.s1NNwZb7000685@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Feb 23 23:58:35 2014 New Revision: 345777 URL: http://svnweb.freebsd.org/changeset/ports/345777 QAT: https://qat.redports.org/buildarchive/r345777/ Log: - remove duplicate PORTDOCS (from r343903) - remove pre-patch delay - remove PKGMESSAGE and PKG-INSTALL from post-install section - move MANx into pkg-plist - move pkg-install and pkg-deinstall into pkg-plist - adopt ${opt}_ENABLE|ON syntax Deleted: head/dns/nsd3/files/pkg-deinstall.in head/dns/nsd3/files/pkg-install.in Modified: head/dns/nsd3/Makefile head/dns/nsd3/pkg-plist Modified: head/dns/nsd3/Makefile ============================================================================== --- head/dns/nsd3/Makefile Sun Feb 23 23:31:43 2014 (r345776) +++ head/dns/nsd3/Makefile Sun Feb 23 23:58:35 2014 (r345777) @@ -3,6 +3,7 @@ PORTNAME= nsd PORTVERSION= 3.2.17 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \ ftp://ftp.rhnet.is/pub/nsd/ @@ -13,8 +14,6 @@ COMMENT= Authoritative only non-recursiv LICENSE= BSD3CLAUSE -PORTDOCS= CREDITS ChangeLog LICENSE NSD-DATABASE NSD-DIFFFILE \ - CONFLICTS= nsd-[0-2]* nsd-4* USE_RC_SUBR= nsd @@ -33,18 +32,13 @@ CONFIGURE_ARGS= --with-user=${NSDUSER} \ --with-dbfile=${NSDDBDIR}/nsd.db \ --with-pidfile=${NSDRUNDIR}/nsd.pid -SUB_FILES= pkg-install pkg-deinstall -SUB_LIST+= NSDUSER=${NSDUSER} \ +PLIST_SUB= NSDUSER=${NSDUSER} \ NSDGROUP=${NSDGROUP} \ NSDDBDIR=${NSDDBDIR} \ NSDRUNDIR=${NSDRUNDIR} USE_OPENSSL= yes -MAN5= nsd.conf.5 -MAN8= nsd.8 nsdc.8 zonec.8 nsd-checkconf.8 nsd-notify.8 nsd-patch.8 \ - nsd-xfer.8 - PORTDOCS= CREDITS ChangeLog LICENSE NSD-DATABASE NSD-DIFFFILE \ NSD-FOR-BIND-USERS README README.icc RELNOTES \ REQUIREMENTS TESTPLAN TODO UPGRADING coding-style \ @@ -67,88 +61,32 @@ MAXIPS_DESC= Raise max-ips from 8 to ${ RRL_DESC= Response Rate Limiting EUI_RRTYPES_DESC= EUI48 and EUI64 RRtypes support -.include <bsd.port.options.mk> - -.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 +ROOT_SERVER_CONFIGURE_ENABLE= root-server +LARGEFILE_CONFIGURE_ENABLE= largefile +IPV6_CONFIGURE_ENABLE= ipv6 +BIND8_STATS_CONFIGURE_ON= --enable-bind8-stats +CHECKING_CONFIGURE_ENABLE= checking +NSEC3_CONFIGURE_ENABLE= nsec3 +MINRESPSIZE_CONFIGURE_ENABLE= minimal-responses +NSEC3PREHASH_CONFIGURE_ENABLE= full-prehash +MMAP_CONFIGURE_ENABLE= mmap +MAXIPS_CONFIGURE_ON= --with-max-ips=${NSDMAX_IPS} +RRL_CONFIGURE_ENABLE= ratelimit +EUI_RRTYPES_CONFIGURE_ENABLE= draft-rrtypes -.if ${PORT_OPTIONS:MBIND8_STATS} -CONFIGURE_ARGS+= --enable-bind8-stats -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MZONE_STATS} -. if empty(PORT_OPTIONS:MBIND8_STATS) +. if !${PORT_OPTIONS:MBIND8_STATS} CONFIGURE_ARGS+= --enable-bind8-stats . endif CONFIGURE_ARGS+= --enable-zone-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 - -.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 - -pre-patch: -.if defined(NSD_OPTIONS) - @${ECHO_MSG} - @${ECHO_MSG} - @${ECHO_MSG} - @${ECHO_MSG} "***** ALERT *****" - @${ECHO_MSG} "NSD_OPTIONS is no longer supported," - @${ECHO_MSG} "${PORTNAME} uses OPTIONS, consider running" - @${ECHO_MSG} "# make config" - @${ECHO_MSG} - @${ECHO_MSG} - @${ECHO_MSG} - @sleep 10 -.endif - 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 - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/dns/nsd3/pkg-plist ============================================================================== --- head/dns/nsd3/pkg-plist Sun Feb 23 23:31:43 2014 (r345776) +++ head/dns/nsd3/pkg-plist Sun Feb 23 23:58:35 2014 (r345777) @@ -1,4 +1,12 @@ %%ETCDIR%%/nsd.conf.sample +man/man5/nsd.conf.5.gz +man/man8/nsd-checkconf.8.gz +man/man8/nsd-notify.8.gz +man/man8/nsd-patch.8.gz +man/man8/nsd-xfer.8.gz +man/man8/nsd.8.gz +man/man8/nsdc.8.gz +man/man8/zonec.8.gz sbin/nsd sbin/nsd-checkconf sbin/nsd-notify @@ -6,4 +14,10 @@ sbin/nsd-patch sbin/nsd-xfer sbin/nsdc sbin/zonec +@exec install -o %%NSDUSER%% -g %%NSDGROUP%% -m 0755 -d %%NSDRUNDIR%% +@exec install -o %%NSDUSER%% -g %%NSDGROUP%% -m 0755 -d %%NSDDBDIR%% +@exec chown -R %%NSDUSER%%:%%NSDGROUP%% %%NSDRUNDIR%% +@exec chown -R %%NSDUSER%%:%%NSDGROUP%% %%NSDDBDIR%% @dirrmtry %%ETCDIR%% +@dirrmtry %%NSDRUNDIR%% +@dirrmtry %%NSDDBDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402232358.s1NNwZb7000685>