Date: Sun, 23 Feb 2014 23:31:44 +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: r345776 - in head/dns/nsd: . files Message-ID: <201402232331.s1NNViFE092024@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Feb 23 23:31:43 2014 New Revision: 345776 URL: http://svnweb.freebsd.org/changeset/ports/345776 QAT: https://qat.redports.org/buildarchive/r345776/ Log: - remove pre-patch delay - remove PKG-INSTALL from post-install (not used with staging) - move pkg-install and pkg-deinstall into pkg-plist Approved by: Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer, per PM) Deleted: head/dns/nsd/files/pkg-deinstall.in head/dns/nsd/files/pkg-install.in Modified: head/dns/nsd/Makefile head/dns/nsd/pkg-plist Modified: head/dns/nsd/Makefile ============================================================================== --- head/dns/nsd/Makefile Sun Feb 23 23:10:35 2014 (r345775) +++ head/dns/nsd/Makefile Sun Feb 23 23:31:43 2014 (r345776) @@ -3,7 +3,7 @@ PORTNAME= nsd PORTVERSION= 4.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= dns ipv6 MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \ ftp://ftp.rhnet.is/pub/nsd/ @@ -32,8 +32,7 @@ CONFIGURE_ARGS= --with-libevent=${LOCALB --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} @@ -77,26 +76,10 @@ MAXIPS_CONFIGURE_ON= --with-max-ips=${N RRL_CONFIGURE_ENABLE= ratelimit EUI_RRTYPES_CONFIGURE_ENABLE= draft-rrtypes -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 @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/dns/nsd/pkg-plist ============================================================================== --- head/dns/nsd/pkg-plist Sun Feb 23 23:10:35 2014 (r345775) +++ head/dns/nsd/pkg-plist Sun Feb 23 23:31:43 2014 (r345776) @@ -7,4 +7,10 @@ sbin/nsd sbin/nsd-checkconf sbin/nsd-control sbin/nsd-control-setup +@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?201402232331.s1NNViFE092024>