summaryrefslogtreecommitdiff
path: root/net-mgmt
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2008-02-01 19:30:33 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2008-02-01 19:30:33 +0000
commit99cb0ba77cbd965b15b9309c04df7ffab48cc9dd (patch)
tree63baa272292532563e7272f131f2bd978dcb2558 /net-mgmt
parent- Update to 0.22 (diff)
- fix startup script
Submitted by: Florian Smeets
Notes
Notes: svn path=/head/; revision=206610
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/hobbit-server/Makefile3
-rw-r--r--net-mgmt/hobbit-server/files/hobbit-server.sh.in2
-rw-r--r--net-mgmt/xymon-server/Makefile3
-rw-r--r--net-mgmt/xymon-server/files/hobbit-server.sh.in2
4 files changed, 6 insertions, 4 deletions
diff --git a/net-mgmt/hobbit-server/Makefile b/net-mgmt/hobbit-server/Makefile
index 0ce439b9c791..9c660742936f 100644
--- a/net-mgmt/hobbit-server/Makefile
+++ b/net-mgmt/hobbit-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hobbit
PORTVERSION= 4.2.0
+PORTREVISION= 1
CATEGORIES= net-mgmt www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= hobbitmon
@@ -32,7 +33,7 @@ MAKE_ENV+= BBUSER="${BBUSER}"
MAKE_ENV+= BBHOSTNAME="${BBHOSTNAME}"
MAKE_ENV+= BBHOSTIP="${BBHOSTIP}"
USE_RC_SUBR= hobbit-server.sh
-SITE_SUB+= -e 's|%%BBUSER%%|${BBUSER}|g'
+SUB_LIST+= BBUSER="${BBUSER}"
PLIST_SUB+= BBUSER="${BBUSER}" VARBASE="/var"
CONFIG_FILES= bb-hosts bb-services bbcombotest.cfg client-local.cfg \
diff --git a/net-mgmt/hobbit-server/files/hobbit-server.sh.in b/net-mgmt/hobbit-server/files/hobbit-server.sh.in
index af0960179f19..e79f3950143d 100644
--- a/net-mgmt/hobbit-server/files/hobbit-server.sh.in
+++ b/net-mgmt/hobbit-server/files/hobbit-server.sh.in
@@ -14,7 +14,7 @@ rcvar=`set_rcvar`
load_rc_config "$name"
: ${hobbit_server_enable:="NO"}
-command="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh"
+command="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh'"
start_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh start'"
stop_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh stop'"
status_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh status'"
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 0ce439b9c791..9c660742936f 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hobbit
PORTVERSION= 4.2.0
+PORTREVISION= 1
CATEGORIES= net-mgmt www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= hobbitmon
@@ -32,7 +33,7 @@ MAKE_ENV+= BBUSER="${BBUSER}"
MAKE_ENV+= BBHOSTNAME="${BBHOSTNAME}"
MAKE_ENV+= BBHOSTIP="${BBHOSTIP}"
USE_RC_SUBR= hobbit-server.sh
-SITE_SUB+= -e 's|%%BBUSER%%|${BBUSER}|g'
+SUB_LIST+= BBUSER="${BBUSER}"
PLIST_SUB+= BBUSER="${BBUSER}" VARBASE="/var"
CONFIG_FILES= bb-hosts bb-services bbcombotest.cfg client-local.cfg \
diff --git a/net-mgmt/xymon-server/files/hobbit-server.sh.in b/net-mgmt/xymon-server/files/hobbit-server.sh.in
index af0960179f19..e79f3950143d 100644
--- a/net-mgmt/xymon-server/files/hobbit-server.sh.in
+++ b/net-mgmt/xymon-server/files/hobbit-server.sh.in
@@ -14,7 +14,7 @@ rcvar=`set_rcvar`
load_rc_config "$name"
: ${hobbit_server_enable:="NO"}
-command="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh"
+command="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh'"
start_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh start'"
stop_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh stop'"
status_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh status'"