summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/xymonclient/Makefile5
-rw-r--r--net/xymonclient/files/xymonclient.sh14
2 files changed, 14 insertions, 5 deletions
diff --git a/net/xymonclient/Makefile b/net/xymonclient/Makefile
index 2d05e4ffed7..e4e57e3f529 100644
--- a/net/xymonclient/Makefile
+++ b/net/xymonclient/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2011/04/22 15:37:02 spz Exp $
+# $NetBSD: Makefile,v 1.8 2011/04/22 20:36:49 spz Exp $
#
DISTNAME= xymon-4.3.2
PKGNAME= xymonclient-4.3.2
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
@@ -43,7 +44,7 @@ RCD_SCRIPTS+= xymonclient
PKG_SYSCONFDIR.xymon= ${PREFIX}/etc/xymon
EXAMPLEDIR= ${PREFIX}/share/examples/xymon
-XYMONHOME?= ${PREFIX}/share/xymon/bbhome
+XYMONHOME?= ${PREFIX}/share/xymon/xymonhome
XYMONTOPDIR?= ${PREFIX}/libexec/xymon
XYMONSERVERNAME?= "`uname -n`"
diff --git a/net/xymonclient/files/xymonclient.sh b/net/xymonclient/files/xymonclient.sh
index 5fac548e90a..940adcfa0f7 100644
--- a/net/xymonclient/files/xymonclient.sh
+++ b/net/xymonclient/files/xymonclient.sh
@@ -15,6 +15,7 @@ name="xymonclient"
# user-settable rc.conf variables
: ${xymon_launchcfg:="@XYETCDIR@/clientlaunch.cfg"}
: ${xymon_clientcfg:="@XYETCDIR@/xymonclient.cfg"}
+: ${xymon_configclass:=""}
: ${xymon_log:="@XYMONLOGDIR@/clientlaunch.log"}
: ${xymon_pidfile:="/var/run/xymonclient.pid"}
@@ -48,10 +49,17 @@ xymon_precmd()
MACHINEDOTS="`uname -n`"
export MACHINEDOTS
- XYMONOSTYPE="`uname -s | tr '[ABCDEFGHIJKLMNOPQRSTUVWXYZ/]' '[abcdefghijklmnopqrstuvwxyz_]'`"
- export XYMONOSTYPE
- XYMONOSSCRIPT="xymonclient-$XYMONOSTYPE.sh"
+ SERVEROSTYPE="`uname -s | tr '[ABCDEFGHIJKLMNOPQRSTUVWXYZ/]' '[abcdefghijklmnopqrstuvwxyz_]'`"
+ export SERVEROSTYPE
+ XYMONOSSCRIPT="xymonclient-$SERVEROSTYPE.sh"
export XYMONOSSCRIPT
+
+ if [ -z "$xymon_configclass" ]; then
+ CONFIGCLASS="$SERVEROSTYPE"
+ else
+ CONFIGCLASS="$xymon_configclass"
+ fi
+ export CONFIGCLASS
}
start_precmd="xymon_precmd"