Index: head/net-mgmt/xymon-client/Makefile =================================================================== --- head/net-mgmt/xymon-client/Makefile (revision 378733) +++ head/net-mgmt/xymon-client/Makefile (revision 378734) @@ -1,43 +1,43 @@ # $FreeBSD$ PORTNAME= xymon PORTVERSION= 4.3.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -client${PKGNAMESUFFIX2} DIST_SUBDIR= repacked MAINTAINER= feld@FreeBSD.org COMMENT= System for monitoring servers and networks - Client LICENSE= GPLv2 USERS= xymon GROUPS= xymon # Options XYMONUSER?= xymon XYMONHOSTIP?= 127.0.0.1 SUB_LIST+= XYMONUSER="${XYMONUSER}" MAKE_JOBS_UNSAFE= yes USES= cpe gmake CPE_VENDOR= xymon CPE_PRODUCT= xymon CONFIGURE_ENV= MAKE=${MAKE_CMD} 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 do-configure: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ .include Index: head/net-mgmt/xymon-client/files/xymon-client.in =================================================================== --- head/net-mgmt/xymon-client/files/xymon-client.in (revision 378733) +++ head/net-mgmt/xymon-client/files/xymon-client.in (revision 378734) @@ -1,24 +1,25 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: xymon_client # REQUIRE: DAEMON # KEYWORD: shutdown . /etc/rc.subr name=xymon_client rcvar=xymon_client_enable load_rc_config "$name" : ${xymon_client_enable:=NO} : ${xymon_client_user:=%%XYMONUSER%%} -command=/usr/local/www/xymon/client/runclient.sh +command=%%WWWDIR%%/client/runclient.sh command_args="${xymon_client_flags} ${1}" -procname=/usr/local/www/xymon/client/bin/xymonlaunch -pidfile="/usr/local/www/xymon/client/logs/clientlaunch.`hostname`.pid" +procname=%%WWWDIR%%/client/bin/xymonlaunch +pidfile="%%WWWDIR%%/client/logs/clientlaunch.`hostname`.pid" +start_precmd="chown -R %%XYMONUSER%% %%WWWDIR%%/client/logs" run_rc_command "$1"