5 files changed, 52 insertions, 51 deletions

diff --git a/net-mgmt/xymon-client/files/Makefile b/net-mgmt/xymon-client/files/Makefile
index b143241db438..f4162b2ed59a 100644
--- a/net-mgmt/xymon-client/files/Makefile
+++ b/net-mgmt/xymon-client/files/Makefile
@@ -1,22 +1,22 @@
-# Toplevel Makefile for Hobbit
+# Toplevel Makefile for Xymon
 # $FreeBSD$
 BUILDTOPDIR=`pwd`
 CLIENTONLY = yes
 LOCALCLIENT = no
 
-# configure settings for Hobbit
+# configure settings for Xymon
 #
 # Toplevel dir
-BBTOPDIR = ${PREFIX}/www/xymon
+XYMONTOPDIR = ${PREFIX}/www/xymon
 # Server home dir for etc/, www/
-BBHOME = ${PREFIX}/www/xymon/client
+XYMONHOME = ${PREFIX}/www/xymon/client
 
 # hobbit settings follows
 #
 # Username running hobbit
-#BBUSER = nobody
-# Hobbit server IP-address
-#BBHOSTIP = 127.0.0.1
+#XYMONUSER = nobody
+# Xymon server IP-address
+#XYMONHOSTIP = 127.0.0.1
 # Large File Support settings
 LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
diff --git a/net-mgmt/xymon-client/files/hobbit-client.sh.in b/net-mgmt/xymon-client/files/hobbit-client.sh.in
deleted file mode 100644
index 7ae6ddf9ce5a..000000000000
--- a/net-mgmt/xymon-client/files/hobbit-client.sh.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: hobbit_client
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="hobbit_client"
-rcvar=`set_rcvar`
-
-load_rc_config "$name"
-: ${hobbit_client_enable:="NO"}
-: ${hobbit_client_flags:=""}
-
-command="%%PREFIX%%/www/xymon/client/runclient.sh"
-start_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${hobbit_client_flags} start"
-stop_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${hobbit_client_flags} stop"
-status_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${hobbit_client_flags} status"
-reload_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${hobbit_client_flags} restart"
-pidfile="%%PREFIX%%/www/xymon/client/logs/clientlaunch.`hostname`.pid"
-
-run_rc_command "$1"
-# eof
diff --git a/net-mgmt/xymon-client/files/patch-Makefile b/net-mgmt/xymon-client/files/patch-Makefile
index 77d6d6045367..7c8adbdcbcc9 100644
--- a/net-mgmt/xymon-client/files/patch-Makefile
+++ b/net-mgmt/xymon-client/files/patch-Makefile
@@ -1,18 +1,19 @@
---- client/Makefile.orig	2006-08-09 22:09:58.000000000 +0200
-+++ client/Makefile	2008-01-28 12:01:34.000000000 +0100
-@@ -63,12 +63,12 @@
- 	if test ! -d $(INSTALLROOT)$(BBHOME)/tmp ; then mkdir -p $(INSTALLROOT)$(BBHOME)/tmp ; fi
- 	if test ! -d $(INSTALLROOT)$(BBHOME)/logs; then mkdir -p $(INSTALLROOT)$(BBHOME)/logs; fi
- 	if test ! -d $(INSTALLROOT)$(BBHOME)/ext ; then mkdir -p $(INSTALLROOT)$(BBHOME)/ext ; fi
--	if test ! -f $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(BBHOME)/etc/ ; fi
-+	if test ! -f $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg-dist ; fi
- 	cp -fp runclient.sh $(INSTALLROOT)$(BBHOME)
- 	cp -fp $(PROGRAMS) hobbitclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(BBHOME)/bin/
+--- client/Makefile.orig	2011-03-04 11:01:25.000000000 +0100
++++ client/Makefile	2011-03-31 08:03:39.000000000 +0200
+@@ -63,13 +63,13 @@
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/tmp ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/tmp ; fi
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/logs; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/logs; fi
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/ext ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/ext ; fi
+-	if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/ ; fi
++	if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg.DIST ; fi
+ 	cp -fp runclient.sh $(INSTALLROOT)$(XYMONHOME)
+ 	cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(XYMONHOME)/bin/
+ 	chmod ugo+x $(INSTALLROOT)$(XYMONHOME)/bin/*
  
--	../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(BBHOME)/etc/clientlaunch.cfg
--	../build/merge-lines hobbitclient.cfg $(INSTALLROOT)$(BBHOME)/etc/hobbitclient.cfg
-+	../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(BBHOME)/etc/clientlaunch.cfg-dist
-+	../build/merge-lines hobbitclient.cfg $(INSTALLROOT)$(BBHOME)/etc/hobbitclient.cfg-dist
+-	../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg
+-	../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg
++	../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg.DIST
++	../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg.DIST
  ifndef PKGBUILD
- 	chown -R $(BBUSER) $(INSTALLROOT)$(BBHOME)
+ 	chown -R $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME)
  endif
diff --git a/net-mgmt/xymon-client/files/patch-hobbitclient-freebsd.sh b/net-mgmt/xymon-client/files/patch-xymonclient-freebsd.sh
index 047721ed0da8..e121274bc4b3 100644
--- a/net-mgmt/xymon-client/files/patch-hobbitclient-freebsd.sh
+++ b/net-mgmt/xymon-client/files/patch-xymonclient-freebsd.sh
@@ -1,6 +1,6 @@
---- client/hobbitclient-freebsd.sh.orig	2006-07-05 07:52:22.000000000 +0200
-+++ client/hobbitclient-freebsd.sh	2010-07-09 09:37:22.000000000 +0200
-@@ -41,7 +41,7 @@
+--- client/xymonclient-freebsd.sh.orig	2010-11-14 18:21:19.000000000 +0100
++++ client/xymonclient-freebsd.sh	2011-03-31 06:52:18.000000000 +0200
+@@ -43,7 +43,7 @@
  echo "[netstat]"
  netstat -s
  echo "[ports]"
diff --git a/net-mgmt/xymon-client/files/xymon-client.sh.in b/net-mgmt/xymon-client/files/xymon-client.sh.in
new file mode 100644
index 000000000000..2cafdc67c758
--- /dev/null
+++ b/net-mgmt/xymon-client/files/xymon-client.sh.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: xymon_client
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="xymon_client"
+rcvar=`set_rcvar`
+
+load_rc_config "$name"
+: ${xymon_client_enable:="NO"}
+: ${xymon_client_flags:=""}
+
+command="%%PREFIX%%/www/xymon/client/runclient.sh"
+start_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} start"
+stop_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} stop"
+status_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} status"
+reload_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} restart"
+pidfile="%%PREFIX%%/www/xymon/client/logs/clientlaunch.`hostname`.pid"
+
+run_rc_command "$1"
+# eof