From owner-svn-ports-head@FreeBSD.ORG Wed Feb 26 18:00:52 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC035BA6; Wed, 26 Feb 2014 18:00:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AE7511640; Wed, 26 Feb 2014 18:00:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QI0qoE028155; Wed, 26 Feb 2014 18:00:52 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1QI0qbV028153; Wed, 26 Feb 2014 18:00:52 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201402261800.s1QI0qbV028153@svn.freebsd.org> From: Mark Felder Date: Wed, 26 Feb 2014 18:00:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346220 - in head/net-mgmt/xymon-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 18:00:52 -0000 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() {