Date: Mon, 4 Nov 2013 16:45:25 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332740 - head/net-mgmt/xymon-client Message-ID: <201311041645.rA4GjPbe050301@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Mon Nov 4 16:45:24 2013 New Revision: 332740 URL: http://svnweb.freebsd.org/changeset/ports/332740 Log: Support STAGE Approved by: swills (mentor) Modified: head/net-mgmt/xymon-client/Makefile head/net-mgmt/xymon-client/pkg-plist Modified: head/net-mgmt/xymon-client/Makefile ============================================================================== --- head/net-mgmt/xymon-client/Makefile Mon Nov 4 16:06:15 2013 (r332739) +++ head/net-mgmt/xymon-client/Makefile Mon Nov 4 16:45:24 2013 (r332740) @@ -20,23 +20,25 @@ XYMONUSER?= xymon XYMONHOSTIP?= 127.0.0.1 MAKE_JOBS_UNSAFE= yes -USE_GMAKE= yes +USES= gmake CONFIGURE_ENV= MAKE=gmake MAKE_ENV+= XYMONUSER="${XYMONUSER}" MAKE_ENV+= XYMONHOSTIP="${XYMONHOSTIP}" +MAKE_ENV+= INSTALLROOT="${STAGEDIR}" +MAKE_ENV+= PKGBUILD=1 +MANPREFIX= ${STAGEDIR}${PREFIX} USE_RC_SUBR= xymon-client PLIST_SUB+= XYMONUSER="${XYMONUSER}" CONFIG_FILES= clientlaunch.cfg xymonclient.cfg localclient.cfg # Configure script is interactive -NO_STAGE= yes do-configure: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ post-install: .for i in ${CONFIG_FILES} - ${CP} -np ${WWWDIR}/client/etc/${i}.DIST \ - ${WWWDIR}/client/etc/${i} || ${TRUE} + ${CP} -np ${STAGEDIR}${WWWDIR}/client/etc/${i}.DIST \ + ${STAGEDIR}${WWWDIR}/client/etc/${i} || ${TRUE} .endfor .include <bsd.port.mk> Modified: head/net-mgmt/xymon-client/pkg-plist ============================================================================== --- head/net-mgmt/xymon-client/pkg-plist Mon Nov 4 16:06:15 2013 (r332739) +++ head/net-mgmt/xymon-client/pkg-plist Mon Nov 4 16:45:24 2013 (r332740) @@ -1,6 +1,3 @@ -@exec if ! pw groupshow %%XYMONUSER%% 2>/dev/null; then pw groupadd %%XYMONUSER%% -g 280; fi -@exec if ! pw usershow %%XYMONUSER%% 2>/dev/null; then pw useradd %%XYMONUSER%% -g %%XYMONUSER%% -u 280 -h - -d %%WWWDIR%% -s /usr/sbin/nologin -c "Xymon Monitor"; fi -@unexec if pw usershow %%XYMONUSER%%; then pw userdel %%XYMONUSER%%; fi %%WWWDIR%%/client/bin/clientupdate %%WWWDIR%%/client/bin/freebsd-meminfo %%WWWDIR%%/client/bin/orcaxymon @@ -36,12 +33,7 @@ @exec [ ! -f %B/localclient.cfg ] && cp %B/%f %B/localclient.cfg %%WWWDIR%%/client/local/README %%WWWDIR%%/client/runclient.sh -@exec mkdir %D/%%WWWDIR%%/client/ext -@exec mkdir %D/%%WWWDIR%%/client/logs -@exec mkdir %D/%%WWWDIR%%/client/tmp -@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/ext -@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/logs -@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/tmp +@exec chown -R %%XYMONUSER%% %D/%%WWWDIR%%/client @dirrm %%WWWDIR%%/client/tmp @dirrm %%WWWDIR%%/client/logs @dirrm %%WWWDIR%%/client/local
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311041645.rA4GjPbe050301>