svn commit: r346220 - in head/net-mgmt/xymon-server: . files

[Mark Felder]

Author: feld
Date: Wed Feb 26 18:00:51 2014
New Revision: 346220
URL: http://svnweb.freebsd.org/changeset/ports/346220
QAT: https://qat.redports.org/buildarchive/r346220/

Log:
  Clean up / simplify rc script.
  
  I have been meaning to solve the following error that used to happen
  every time you executed the rc script:
  
  /usr/local/etc/rc.d/xymon-server: WARNING: cannot read shebang line from su
  
  Sponsored by:	SupraNet Communications, Inc

Modified:
  head/net-mgmt/xymon-server/Makefile
  head/net-mgmt/xymon-server/files/xymon-server.in

Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile	Wed Feb 26 17:52:45 2014	(r346219)
+++ head/net-mgmt/xymon-server/Makefile	Wed Feb 26 18:00:51 2014	(r346220)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xymon
 PORTVERSION=	4.3.17
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}

Modified: head/net-mgmt/xymon-server/files/xymon-server.in
==============================================================================
--- head/net-mgmt/xymon-server/files/xymon-server.in	Wed Feb 26 17:52:45 2014	(r346219)
+++ head/net-mgmt/xymon-server/files/xymon-server.in	Wed Feb 26 18:00:51 2014	(r346220)
@@ -14,15 +14,13 @@ rcvar=xymon_server_enable
 
 load_rc_config "$name"
 : ${xymon_server_enable:=NO}
+: ${xymon_server_user:=%%XYMONUSER%%}
 
-command="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh'"
+command="%%WWWDIR%%/server/xymon.sh"
+command_args="start"
 start_precmd=xymon_prestart
-start_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh start'"
-stop_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh stop'"
-status_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh status'"
-reload_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh reload'"
-restart_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh restart'"
-pidfile=/var/log/xymon/xymond.pid
+pidfile=/var/log/xymon/xymonlaunch.pid
+procname="%%WWWDIR%%/server/bin/xymonlaunch"
 
 xymon_prestart()
 {