aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfeld <feld@FreeBSD.org>2013-11-05 00:45:24 +0800
committerfeld <feld@FreeBSD.org>2013-11-05 00:45:24 +0800
commit26915c1eed00045da3263b985721728f01a24603 (patch)
treea5bf0b7c86f0b95e5f796c62d6c2ddc86be750bc
parentd8f0735391cc16dd52d38f32ea58b0a8c2c6672f (diff)
downloadfreebsd-ports-gnome-26915c1eed00045da3263b985721728f01a24603.tar.gz
freebsd-ports-gnome-26915c1eed00045da3263b985721728f01a24603.tar.zst
freebsd-ports-gnome-26915c1eed00045da3263b985721728f01a24603.zip
Support STAGE
Approved by: swills (mentor)
-rw-r--r--net-mgmt/xymon-client/Makefile10
-rw-r--r--net-mgmt/xymon-client/pkg-plist10
2 files changed, 7 insertions, 13 deletions
diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 0762c04abbc2..ef9264cf3158 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -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>
diff --git a/net-mgmt/xymon-client/pkg-plist b/net-mgmt/xymon-client/pkg-plist
index 24c8a0476c40..f6ca3042bc80 100644
--- a/net-mgmt/xymon-client/pkg-plist
+++ b/net-mgmt/xymon-client/pkg-plist
@@ -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