package update to 4.3.2:

contains a lot of filename cleanup work (no more bb and hobbit)

9 files changed, 265 insertions, 229 deletions

diff --git a/net/xymonclient/Makefile b/net/xymonclient/Makefile
index 907cb90b8e7..2d05e4ffed7 100644
--- a/net/xymonclient/Makefile
+++ b/net/xymonclient/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2011/02/07 20:36:59 spz Exp $
+# $NetBSD: Makefile,v 1.7 2011/04/22 15:37:02 spz Exp $
 #
 
-DISTNAME=		xymon-4.3.0-beta2
-PKGNAME=		xymonclient-4.3.0b2
-PKGREVISION=		3
+DISTNAME=		xymon-4.3.2
+PKGNAME=		xymonclient-4.3.2
 CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xymon/}
 
 MAINTAINER=		spz@NetBSD.org
-HOMEPAGE=		http://hobbitmon.sourceforge.net/
+HOMEPAGE=		http://xymon.sourceforge.net/
 COMMENT=		Network services monitor a la Big Brother
 
 LICENSE=		gnu-gpl-v2
@@ -26,17 +25,17 @@ USE_TOOLS+=		gmake
 
 # xymons user/group
 
-BBUSER?=		xymon
-BBGROUP?=		xymon
+XYMONUSER?=		xymon
+XYMONGROUP?=		xymon
 
-PKG_GROUPS=		${BBGROUP}
-PKG_USERS=		${BBUSER:Q}:${BBGROUP:Q}
+PKG_GROUPS=		${XYMONGROUP}
+PKG_USERS=		${XYMONUSER:Q}:${XYMONGROUP:Q}
 
-PKG_GECOS.${BBUSER}=	Xymon monitor
-PKG_HOME.${BBUSER}=	${BBHOME}
+PKG_GECOS.${XYMONUSER}=	Xymon monitor
+PKG_HOME.${XYMONUSER}=	${XYMONHOME}
 
-PKG_GROUPS_VARS+=	BBGROUP
-PKG_USERS_VARS+=	BBUSER
+PKG_GROUPS_VARS+=	XYMONGROUP
+PKG_USERS_VARS+=	XYMONUSER
 
 # startup and config
 
@@ -44,27 +43,27 @@ RCD_SCRIPTS+=		xymonclient
 PKG_SYSCONFDIR.xymon=	${PREFIX}/etc/xymon
 EXAMPLEDIR=		${PREFIX}/share/examples/xymon
 
-BBHOME?=		${PREFIX}/share/xymon/bbhome
-BBTOPDIR?=		${PREFIX}/libexec/xymon
+XYMONHOME?=		${PREFIX}/share/xymon/bbhome
+XYMONTOPDIR?=		${PREFIX}/libexec/xymon
 
-BBSERVERNAME?=		"`uname -n`"
-BBSERVERIP?=		127.0.0.1
+XYMONSERVERNAME?=	"`uname -n`"
+XYMONSERVERIP?=		127.0.0.1
 
-BBLOGDIR?=		${VARBASE}/log/xymon
-BBVAR?=			${VARBASE}/xymon
+XYMONLOGDIR?=		${VARBASE}/log/xymon
+XYMONVAR?=		${VARBASE}/xymon
 
-XYBINDIR?=		${BBTOPDIR}
+XYBINDIR?=		${XYMONTOPDIR}
 XYETCDIR?=		${PKG_SYSCONFDIR.xymon}
-XYEXTDIR?=		${BBTOPDIR}/ext
+XYEXTDIR?=		${XYMONTOPDIR}/ext
 XYTMPDIR?=		${VARBASE}/xymon/tmp
 
 BUILD_DEFS+=		VARBASE
-BUILD_DEFS+=		BBSERVERNAME
-BUILD_DEFS+=		BBSERVERIP
+BUILD_DEFS+=		XYMONSERVERNAME
+BUILD_DEFS+=		XYMONSERVERIP
 
-FILES_SUBST+=		BBHOME=${BBHOME:Q}
-FILES_SUBST+=		BBLOGDIR=${BBLOGDIR}
-FILES_SUBST+=		BBVAR=${BBVAR:Q}
+FILES_SUBST+=		XYMONHOME=${XYMONHOME:Q}
+FILES_SUBST+=		XYMONLOGDIR=${XYMONLOGDIR}
+FILES_SUBST+=		XYMONVAR=${XYMONVAR:Q}
 FILES_SUBST+=		XYBINDIR=${XYBINDIR}
 FILES_SUBST+=		XYETCDIR=${XYETCDIR}
 FILES_SUBST+=		XYEXTDIR=${XYEXTDIR}
@@ -74,13 +73,13 @@ CONFIGURE_ARGS+=	"--client"
 
 CONFIGURE_ENV+=		CONFTYPE="server"
 CONFIGURE_ENV+=		PKGBUILD=y
-CONFIGURE_ENV+=		BBHOSTNAME=${BBSERVERNAME:Q}
-CONFIGURE_ENV+=		BBHOSTIP=${BBSERVERIP:Q}
-CONFIGURE_ENV+=		BBUSER=${BBUSER:Q}
-CONFIGURE_ENV+=		BBHOME=${BBHOME:Q}
-CONFIGURE_ENV+=		BBTOPDIR=${BBTOPDIR}
-CONFIGURE_ENV+=		BBLOGDIR=${BBLOGDIR}
-CONFIGURE_ENV+=		BBVAR=${BBVAR:Q}
+CONFIGURE_ENV+=		XYMONHOSTNAME=${XYMONSERVERNAME:Q}
+CONFIGURE_ENV+=		XYMONHOSTIP=${XYMONSERVERIP:Q}
+CONFIGURE_ENV+=		XYMONUSER=${XYMONUSER:Q}
+CONFIGURE_ENV+=		XYMONHOME=${XYMONHOME:Q}
+CONFIGURE_ENV+=		XYMONTOPDIR=${XYMONTOPDIR}
+CONFIGURE_ENV+=		XYMONLOGDIR=${XYMONLOGDIR}
+CONFIGURE_ENV+=		XYMONVAR=${XYMONVAR:Q}
 CONFIGURE_ENV+=		INSTALLROOT=${DESTDIR}
 CONFIGURE_ENV+=		INSTALLBINDIR=${XYBINDIR}
 CONFIGURE_ENV+=		INSTALLETCDIR=${XYETCDIR}
@@ -98,24 +97,24 @@ USE_TOOLS+=	sort:run	tail:run	touch:run
 USE_TOOLS+=	tr:run		wc:run
 
 
-OWN_DIRS+=		${BBTOPDIR}
-MAKE_DIRS+=		${BBTOPDIR}/client
+OWN_DIRS+=		${XYMONTOPDIR}
+MAKE_DIRS+=		${XYMONTOPDIR}/client
 OWN_DIRS+=		${EXAMPLEDIR}
 OWN_DIRS+=		${PKG_SYSCONFDIR.xymon}
-OWN_DIRS+=		${BBHOME}
-MAKE_DIRS+=		${BBHOME}/client
+OWN_DIRS+=		${XYMONHOME}
+MAKE_DIRS+=		${XYMONHOME}/client
 
-OWN_DIRS_PERMS+=	${XYEXTDIR}/client ${BBUSER} ${BBGROUP} 0755
-OWN_DIRS_PERMS+=	${BBLOGDIR} ${BBUSER} ${BBGROUP} 0755
-OWN_DIRS_PERMS+=	${XYTMPDIR} ${BBUSER} ${BBGROUP} 0755
-OWN_DIRS_PERMS+=	${XYTMPDIR}/client ${BBUSER} ${BBGROUP} 0755
+OWN_DIRS_PERMS+=	${XYEXTDIR}/client ${XYMONUSER} ${XYMONGROUP} 0755
+OWN_DIRS_PERMS+=	${XYMONLOGDIR} ${XYMONUSER} ${XYMONGROUP} 0755
+OWN_DIRS_PERMS+=	${XYTMPDIR} ${XYMONUSER} ${XYMONGROUP} 0755
+OWN_DIRS_PERMS+=	${XYTMPDIR}/client ${XYMONUSER} ${XYMONGROUP} 0755
 
-OWN_DIRS_PERMS+=	${BBVAR} ${BBUSER} ${BBGROUP} 0755
-OWN_DIRS_PERMS+=	${BBVAR}/data ${BBUSER} ${BBGROUP} 0755
+OWN_DIRS_PERMS+=	${XYMONVAR} ${XYMONUSER} ${XYMONGROUP} 0755
+OWN_DIRS_PERMS+=	${XYMONVAR}/data ${XYMONUSER} ${XYMONGROUP} 0755
 
-CFILES+=		clientlaunch.cfg hobbitclient.cfg localclient.cfg
+CFILES+=		clientlaunch.cfg xymonclient.cfg
 .for file in ${CFILES}
-CONF_FILES_PERMS+=	${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${BBUSER} ${BBGROUP} 0644
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644
 .endfor
 
 MAKE_ENV+=		MAKE=${MAKE_PROGRAM:Q}
diff --git a/net/xymonclient/PLIST b/net/xymonclient/PLIST
index 2f1863b7b75..a24d993d407 100644
--- a/net/xymonclient/PLIST
+++ b/net/xymonclient/PLIST
@@ -1,29 +1,31 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
-libexec/xymon/client/bb
-libexec/xymon/client/bbcmd
-libexec/xymon/client/bbdigest
-libexec/xymon/client/bbhostgrep
-libexec/xymon/client/bbhostshow
+@comment $NetBSD: PLIST,v 1.2 2011/04/22 15:37:02 spz Exp $
 libexec/xymon/client/clientupdate
-libexec/xymon/client/hobbitclient-aix.sh
-libexec/xymon/client/hobbitclient-darwin.sh
-libexec/xymon/client/hobbitclient-freebsd.sh
-libexec/xymon/client/hobbitclient-hp-ux.sh
-libexec/xymon/client/hobbitclient-irix.sh
-libexec/xymon/client/hobbitclient-linux.sh
-libexec/xymon/client/hobbitclient-${LOWER_OPSYS}.sh
-libexec/xymon/client/hobbitclient-openbsd.sh
-libexec/xymon/client/hobbitclient-osf1.sh
-libexec/xymon/client/hobbitclient-sco_sv.sh
-libexec/xymon/client/hobbitclient-sunos.sh
-libexec/xymon/client/hobbitclient.sh
-libexec/xymon/client/hobbitlaunch
 libexec/xymon/client/logfetch
 libexec/xymon/client/msgcache
 libexec/xymon/client/${LOWER_OPSYS}-meminfo
-libexec/xymon/client/orcahobbit
+libexec/xymon/client/orcaxymon
 libexec/xymon/client/runclient.sh
+libexec/xymon/client/xymon
+libexec/xymon/client/xymoncfg
+libexec/xymon/client/xymonclient-aix.sh
+libexec/xymon/client/xymonclient-darwin.sh
+libexec/xymon/client/xymonclient-freebsd.sh
+libexec/xymon/client/xymonclient-hp-ux.sh
+libexec/xymon/client/xymonclient-irix.sh
+libexec/xymon/client/xymonclient-linux.sh
+libexec/xymon/client/xymonclient-${LOWER_OPSYS}.sh
+libexec/xymon/client/xymonclient-openbsd.sh
+libexec/xymon/client/xymonclient-osf1.sh
+libexec/xymon/client/xymonclient-sco_sv.sh
+libexec/xymon/client/xymonclient-sunos.sh
+libexec/xymon/client/xymonclient-unixware.sh
+libexec/xymon/client/xymonclient.sh
+libexec/xymon/client/xymoncmd
+libexec/xymon/client/xymondigest
+libexec/xymon/client/xymongrep
+libexec/xymon/client/xymonlaunch
 share/examples/rc.d/xymonclient
 share/examples/xymon/clientlaunch.cfg
-share/examples/xymon/hobbitclient.cfg
-share/examples/xymon/localclient.cfg
+share/examples/xymon/xymonclient.cfg
+@pkgdir share/examples/xymon
+@pkgdir libexec/xymon/ext/client
diff --git a/net/xymonclient/distinfo b/net/xymonclient/distinfo
index 00922200046..ad7e6a19c2a 100644
--- a/net/xymonclient/distinfo
+++ b/net/xymonclient/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2011/02/07 20:36:59 spz Exp $
+$NetBSD: distinfo,v 1.4 2011/04/22 15:37:02 spz Exp $
 
-SHA1 (xymon-4.3.0-beta2.tar.gz) = 484ab668358856c7bbc7ba85bfe2afa7c0fa2f10
-RMD160 (xymon-4.3.0-beta2.tar.gz) = ab8db88d1e2cb7363c8a9b35396094ea921cc5b5
-Size (xymon-4.3.0-beta2.tar.gz) = 2405826 bytes
-SHA1 (patch-aa) = 20df57a6b398ffc95543cd3aee387547b66475b4
-SHA1 (patch-ab) = 08c807e64fff565234cf4ec910506a3e33e23a71
-SHA1 (patch-ac) = eb97125d0bfb6ef640054f14d7046ed375620d25
-SHA1 (patch-ad) = 8be66af4b877958f2bc64e18494c67a73acd4360
+SHA1 (xymon-4.3.2.tar.gz) = 6663470565545d1801d2ff05cab78bc89695a821
+RMD160 (xymon-4.3.2.tar.gz) = 45b75a7d3b8a57518aa12f12ee36c6de6de96aae
+Size (xymon-4.3.2.tar.gz) = 2698224 bytes
+SHA1 (patch-aa) = 0475a9a92883ab3350bb8043366d455d841cb173
+SHA1 (patch-ab) = 7486e1cb5733898c8511d7ee212fd90741ba3d83
+SHA1 (patch-ac) = 1777cd0f2a179e4d4099130210396fd06e904187
+SHA1 (patch-ad) = aa29eefcf9f0fa87014166692dcf146cebd70ef5
 SHA1 (patch-ae) = e5a42cbc6537e23a5a44ed343c86e121adadb139
 SHA1 (patch-af) = ae5d0acde8e2cd05527253c41e31a806b04614f6
-SHA1 (patch-ag) = ffecf3de095995bbd01bb27dc99126cbe04a08fd
+SHA1 (patch-ag) = 11f03fba971ef26c2f95104615178a619d9ff159
diff --git a/net/xymonclient/files/xymonclient.sh b/net/xymonclient/files/xymonclient.sh
index d78e91ca513..5fac548e90a 100644
--- a/net/xymonclient/files/xymonclient.sh
+++ b/net/xymonclient/files/xymonclient.sh
@@ -14,44 +14,44 @@ name="xymonclient"
 
 # user-settable rc.conf variables
 : ${xymon_launchcfg:="@XYETCDIR@/clientlaunch.cfg"}
-: ${xymon_clientcfg:="@XYETCDIR@/hobbitclient.cfg"}
-: ${xymon_log:="@BBLOGDIR@/clientlaunch.log"}
+: ${xymon_clientcfg:="@XYETCDIR@/xymonclient.cfg"}
+: ${xymon_log:="@XYMONLOGDIR@/clientlaunch.log"}
 : ${xymon_pidfile:="/var/run/xymonclient.pid"}
 
 rcvar=${name}
 xymonclient_user="xymon"
 pidfile=${xymon_pidfile}
 required_files="${xymon_launchcfg} ${xymon_clientcfg}"
-command="@XYBINDIR@/client/hobbitlaunch"
+command="@XYBINDIR@/client/xymonlaunch"
 command_args="--config=${xymon_launchcfg} --env=${xymon_clientcfg} --log=${xymon_log} --pidfile=${xymon_pidfile}"
 
 xymon_precmd()
 {
-	HOBBITCLIENTHOME="@BBHOME@/client"
-	export HOBBITCLIENTHOME
-	if [ ! -h $HOBBITCLIENTHOME/bin ]; then
-		ln -s @XYBINDIR@/client $HOBBITCLIENTHOME/bin
+	XYMONCLIENTHOME="@XYMONHOME@/client"
+	export XYMONCLIENTHOME
+	if [ ! -h $XYMONCLIENTHOME/bin ]; then
+		ln -s @XYBINDIR@/client $XYMONCLIENTHOME/bin
 	fi
-	if [ ! -h $HOBBITCLIENTHOME/etc ]; then
-		ln -s @XYETCDIR@ $HOBBITCLIENTHOME/etc
+	if [ ! -h $XYMONCLIENTHOME/etc ]; then
+		ln -s @XYETCDIR@ $XYMONCLIENTHOME/etc
 	fi
-	if [ ! -h $HOBBITCLIENTHOME/ext ]; then
-		ln -s @XYEXTDIR@/client $HOBBITCLIENTHOME/ext
+	if [ ! -h $XYMONCLIENTHOME/ext ]; then
+		ln -s @XYEXTDIR@/client $XYMONCLIENTHOME/ext
 	fi
-	if [ ! -h $HOBBITCLIENTHOME/tmp ]; then
-		ln -s @XYTMPDIR@/client $HOBBITCLIENTHOME/tmp
+	if [ ! -h $XYMONCLIENTHOME/tmp ]; then
+		ln -s @XYTMPDIR@/client $XYMONCLIENTHOME/tmp
 	fi
-	if [ ! -h $HOBBITCLIENTHOME/logs ]; then
-		ln -s @BBLOGDIR@ $HOBBITCLIENTHOME/logs
+	if [ ! -h $XYMONCLIENTHOME/logs ]; then
+		ln -s @XYMONLOGDIR@ $XYMONCLIENTHOME/logs
 	fi
 	touch ${xymon_pidfile} && chown ${xymonclient_user} ${xymon_pidfile}
 
 	MACHINEDOTS="`uname -n`"
 	export MACHINEDOTS
-	BBOSTYPE="`uname -s | tr '[ABCDEFGHIJKLMNOPQRSTUVWXYZ/]' '[abcdefghijklmnopqrstuvwxyz_]'`"
-	export BBOSTYPE
-	BBOSSCRIPT="hobbitclient-$BBOSTYPE.sh"
-	export BBOSSCRIPT
+	XYMONOSTYPE="`uname -s | tr '[ABCDEFGHIJKLMNOPQRSTUVWXYZ/]' '[abcdefghijklmnopqrstuvwxyz_]'`"
+	export XYMONOSTYPE
+	XYMONOSSCRIPT="xymonclient-$XYMONOSTYPE.sh"
+	export XYMONOSSCRIPT
 }
 
 start_precmd="xymon_precmd"
diff --git a/net/xymonclient/patches/patch-aa b/net/xymonclient/patches/patch-aa
index 5452d6941d7..366c93b1d85 100644
--- a/net/xymonclient/patches/patch-aa
+++ b/net/xymonclient/patches/patch-aa
@@ -1,34 +1,34 @@
-$NetBSD: patch-aa,v 1.2 2011/02/07 20:37:00 spz Exp $
+$NetBSD: patch-aa,v 1.3 2011/04/22 15:37:02 spz Exp $
 
---- configure.client.orig	2009-02-22 20:41:16.000000000 +0000
+--- configure.client.orig	2011-03-08 17:20:28.000000000 +0000
 +++ configure.client
 @@ -75,7 +75,7 @@ then
- 	BBUSER="xymon"
+ 	XYMONUSER="xymon"
  fi
  
--if test -z "$BBTOPDIR"
-+if test -z "$BBHOME"
+-if test -z "$XYMONTOPDIR"
++if test -z "$XYMONHOME"
  then
  	if test "`uname -s`" = "Darwin"
  	then
-@@ -92,22 +92,24 @@ then
+@@ -92,29 +92,31 @@ then
  		echo ""; echo ""
- 		HOMEDIR="`dscl . -read /Users/$BBUSER | grep HomeDirectory | awk '{print $2}'`"
+ 		HOMEDIR="`dscl . -read /Users/$XYMONUSER | grep HomeDirectory | awk '{print $2}'`"
  	else
--		USERDATA=`getent passwd $BBUSER 2>/dev/null || ypmatch "${BBUSER}" passwd || grep "^${BBUSER}:" /etc/passwd`
+-		USERDATA=`getent passwd $XYMONUSER 2>/dev/null || ypmatch "${XYMONUSER}" passwd || grep "^${XYMONUSER}:" /etc/passwd`
 -		if test $? -eq 0
 -		then
 -			echo "Found passwd entry for user $USERDATA"
 -		else
--			echo "FAILURE: The user $BBUSER does not exist. Create user and try again."
+-			echo "FAILURE: The user $XYMONUSER does not exist. Create user and try again."
 -			exit 1
 +		if [ -z ${PKGBUILD} ]; then
-+			USERDATA=`getent passwd $BBUSER 2>/dev/null || ypmatch "${BBUSER}" passwd || grep "^${BBUSER}:" /etc/passwd`
++			USERDATA=`getent passwd $XYMONUSER 2>/dev/null || ypmatch "${XYMONUSER}" passwd || grep "^${XYMONUSER}:" /etc/passwd`
 +			if test $? -eq 0
 +			then
 +				echo "Found passwd entry for user $USERDATA"
 +			else
-+				echo "FAILURE: The user $BBUSER does not exist. Create user and try again."
++				echo "FAILURE: The user $XYMONUSER does not exist. Create user and try again."
 +				exit 1
 +			fi
 +			echo ""; echo ""
@@ -38,27 +38,35 @@ $NetBSD: patch-aa,v 1.2 2011/02/07 20:37:00 spz Exp $
 -		HOMEDIR="`echo $USERDATA|cut -d: -f6`"
  	fi
  else
--	HOMEDIR="$BBTOPDIR"
-+	HOMEDIR="$BBHOME"
+-	HOMEDIR="$XYMONTOPDIR"
++	HOMEDIR="$XYMONHOME"
  fi
  
 -echo "Where do you want the Xymon installation [${HOMEDIR}] ?"
-+echo "Where do you want the Xymon installation [${BBTOPDIR}] ?"
- if test -z "$BBTOPDIR"
++echo "Where do you want the Xymon installation [${XYMONTOPDIR}] ?"
+ if test -z "$XYMONTOPDIR"
+ then
+ 	read XYMONTOPDIR
+ fi
+ if test -z "$XYMONTOPDIR"
+ then
+-	XYMONTOPDIR=${HOMEDIR}
++	XYMONTOPDIR=${XYMONTOPDIR}
+ fi
+ if test -d "$XYMONTOPDIR"
  then
- 	read BBTOPDIR
 @@ -158,9 +160,12 @@ echo "# Toplevel dir"                   
- echo "BBTOPDIR = $BBTOPDIR"              >>Makefile
+ echo "XYMONTOPDIR = $XYMONTOPDIR"        >>Makefile
  echo "# Server home dir for etc/, www/"  >>Makefile
- echo "BBHOME = $BBHOME"                  >>Makefile
-+echo "HOBBITCLIENTHOME = $BBHOME/client" >>Makefile
+ echo "XYMONHOME = $XYMONHOME"            >>Makefile
++echo "XYMONCLIENTHOME = $XYMONHOME/client"            >>Makefile
  echo ""                                  >>Makefile
  echo "# Xymon settings follows"          >>Makefile
  echo "#"                                 >>Makefile
 +echo "# Xymon Logdir"                    >>Makefile
-+echo "BBLOGDIR = $BBLOGDIR"              >>Makefile
++echo "XYMONLOGDIR = $XYMONLOGDIR"        >>Makefile
  echo "# Username running Xymon"          >>Makefile
- echo "BBUSER = $BBUSER"                  >>Makefile
+ echo "XYMONUSER = $XYMONUSER"            >>Makefile
  echo "# Xymon server IP-address"         >>Makefile
 @@ -194,6 +199,9 @@ fi
  if test "$INSTALLETCDIR" != ""; then
diff --git a/net/xymonclient/patches/patch-ab b/net/xymonclient/patches/patch-ab
index 0ddaba1d7bd..b25b9e95a49 100644
--- a/net/xymonclient/patches/patch-ab
+++ b/net/xymonclient/patches/patch-ab
@@ -1,125 +1,150 @@
-$NetBSD: patch-ab,v 1.2 2010/10/21 09:31:35 spz Exp $
+$NetBSD: patch-ab,v 1.3 2011/04/22 15:37:02 spz Exp $
 
---- build/Makefile.rules.orig	2009-02-12 13:00:50.000000000 +0000
+--- build/Makefile.rules.orig	2011-03-08 17:20:28.000000000 +0000
 +++ build/Makefile.rules
 @@ -34,6 +34,9 @@ endif
  ifndef INSTALLETCDIR
- INSTALLETCDIR = $(BBHOME)/etc
+ INSTALLETCDIR = $(XYMONHOME)/etc
  endif
 +ifndef INSTALLEXADIR
-+INSTALLEXADIR = $(BBHOME)/etc
++INSTALLEXADIR = $(XYMONHOME)/etc
 +endif
  ifndef INSTALLEXTDIR
- INSTALLEXTDIR = $(BBHOME)/ext
+ INSTALLEXTDIR = $(XYMONHOME)/ext
  endif
-@@ -156,58 +159,67 @@ install-servermsg:
- 	@echo "To view the Hobbit webpages, go to http://${BBHOSTNAME}${BBHOSTURL}"
+@@ -167,64 +170,66 @@ install-servermsg:
+ 	@echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}"
  
  install-dirs:
--	mkdir -p $(INSTALLROOT)$(BBHOME) $(INSTALLROOT)$(BBHOME)/download $(INSTALLROOT)$(BBVAR)
-+	mkdir -p $(INSTALLROOT)$(BBHOME) $(INSTALLROOT)$(BBVAR)
-+
-+	mkdir -p $(INSTALLROOT)$(BBVAR)/download
-+ifndef PKGBUILD
-+ifneq ($(BBVAR),$(BBHOME))
-+	ln -sf $(BBVAR)/download $(INSTALLROOT)$(BBHOME)/download
-+endif
-+endif
+-	mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/download $(INSTALLROOT)$(XYMONVAR)
++	mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONVAR)/download
  
  	mkdir -p $(INSTALLROOT)$(INSTALLBINDIR)
 +ifndef PKGBUILD
- ifneq ($(INSTALLBINDIR),$(BBHOME)/bin)
- 	ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(BBHOME)/bin
+ ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin)
+ 	rm -f $(INSTALLROOT)$(XYMONHOME)/bin || true
+ 	ln -s $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin || true
  endif
 -ifndef PKGBUILD
- 	chown $(BBUSER) $(INSTALLROOT)$(INSTALLBINDIR)
- 	chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLBINDIR)
+ 	chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLBINDIR)
+ 	chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLBINDIR)
  endif
  
  	mkdir -p $(INSTALLROOT)$(INSTALLETCDIR)
 +ifndef PKGBUILD
- ifneq ($(INSTALLETCDIR),$(BBHOME)/etc)
- 	ln -sf $(INSTALLETCDIR) $(INSTALLROOT)$(BBHOME)/etc
+ ifneq ($(INSTALLETCDIR),$(XYMONHOME)/etc)
+ 	rm -f $(INSTALLROOT)$(XYMONHOME)/etc || true
+ 	ln -s $(INSTALLETCDIR) $(INSTALLROOT)$(XYMONHOME)/etc || true
  endif
 -ifndef PKGBUILD
- 	chown $(BBUSER) $(INSTALLROOT)$(INSTALLETCDIR)
- 	chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLETCDIR)
+ 	chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLETCDIR)
+ 	chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLETCDIR)
  endif
  
 +	mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)
 +
  	mkdir -p $(INSTALLROOT)$(INSTALLEXTDIR)
 +ifndef PKGBUILD
- ifneq ($(INSTALLEXTDIR),$(BBHOME)/ext)
- 	ln -sf $(INSTALLEXTDIR) $(INSTALLROOT)$(BBHOME)/ext
+ ifneq ($(INSTALLEXTDIR),$(XYMONHOME)/ext)
+ 	rm -f $(INSTALLROOT)$(XYMONHOME)/ext || true
+ 	ln -s $(INSTALLEXTDIR) $(INSTALLROOT)$(XYMONHOME)/ext || true
  endif
 -ifndef PKGBUILD
- 	chown $(BBUSER) $(INSTALLROOT)$(INSTALLEXTDIR)
- 	chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLEXTDIR)
+ 	chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLEXTDIR)
+ 	chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLEXTDIR)
  endif
  
  	mkdir -p $(INSTALLROOT)$(INSTALLTMPDIR)
 +ifndef PKGBUILD
- ifneq ($(INSTALLTMPDIR),$(BBHOME)/tmp)
- 	ln -sf $(INSTALLTMPDIR) $(INSTALLROOT)$(BBHOME)/tmp
+ ifneq ($(INSTALLTMPDIR),$(XYMONHOME)/tmp)
+ 	rm -f $(INSTALLROOT)$(XYMONHOME)/tmp || true
+ 	ln -s $(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONHOME)/tmp || true
  endif
 -ifndef PKGBUILD
- 	chown $(BBUSER) $(INSTALLROOT)$(INSTALLTMPDIR)
- 	chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLTMPDIR)
+ 	chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLTMPDIR)
+ 	chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLTMPDIR)
  endif
  
  	mkdir -p $(INSTALLROOT)$(INSTALLWEBDIR)
 +ifndef PKGBUILD
- ifneq ($(INSTALLWEBDIR),$(BBHOME)/web)
- 	ln -sf $(INSTALLWEBDIR) $(INSTALLROOT)$(BBHOME)/web
+ ifneq ($(INSTALLWEBDIR),$(XYMONHOME)/web)
+ 	rm -f $(INSTALLROOT)$(XYMONHOME)/web || true
+ 	ln -s $(INSTALLWEBDIR) $(INSTALLROOT)$(XYMONHOME)/web || true
  endif
 -ifndef PKGBUILD
- 	chown $(BBUSER) $(INSTALLROOT)$(INSTALLWEBDIR)
- 	chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLWEBDIR)
+ 	chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWEBDIR)
+ 	chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWEBDIR)
  endif
  
  	mkdir -p $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
 +ifndef PKGBUILD
- ifneq ($(INSTALLWWWDIR),$(BBHOME)/www)
- 	ln -sf $(INSTALLWWWDIR) $(INSTALLROOT)$(BBHOME)/www
+ ifneq ($(INSTALLWWWDIR),$(XYMONHOME)/www)
+ 	rm -f $(INSTALLROOT)$(XYMONHOME)/www || true
+ 	ln -s $(INSTALLWWWDIR) $(INSTALLROOT)$(XYMONHOME)/www || true
  endif
 -ifndef PKGBUILD
- 	chown $(BBUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
- 	chgrp `$(IDTOOL) -g $(BBUSER)`  $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
+ 	chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
+ 	chgrp `$(IDTOOL) -g $(XYMONUSER)`  $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
  ifdef HTTPDGID
-@@ -266,7 +278,7 @@ ifndef PKGBUILD
+@@ -283,25 +288,25 @@ ifndef PKGBUILD
  endif
  
  install-common: install-dirs
--	BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
-+	BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
+-	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
++	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
+ 
+ install-xymongen: install-common
+-	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install
++	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install
+ 
+ install-xymongen-nocgi: install-common
+-	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
++	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
  
- install-bbdisplay: install-common
- 	BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install
-@@ -297,16 +309,16 @@ install-man:
- 	BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man
+ install-xymonnet: install-common
+-	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
++	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
+ 
+ install-xymonproxy: install-common
+-	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
++	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
+ 
+ install-xymond: install-common
+-	MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
++	MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
+ 
+ install-web: install-common
+-	MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
++	MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
+ 
+ 
+ # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install"
+@@ -314,23 +319,23 @@ install-man:
+ 	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man
  
  install-docs:
--	BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install
-+	BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install
+-	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install
++	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install
  
  install-custom:
--	BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
-+	BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
+-	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
++	XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
  
  
  client-install: install-client
  
  install-client: client
--	BBHOME="$(BBTOPDIR)/client" INSTALLROOT="$(INSTALLROOT)" BBUSER="$(BBUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install
-+	BBHOME="$(BBHOME)/client" INSTALLTMPDIR="$(INSTALLTMPDIR)/client" INSTALLEXTDIR="$(INSTALLEXTDIR)/client" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLBINDIR="$(INSTALLBINDIR)/client" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install
+-	XYMONHOME="$(XYMONTOPDIR)/client" INSTALLROOT="$(INSTALLROOT)" XYMONUSER="$(XYMONUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install
++	XYMONHOME="$(XYMONTOPDIR)/client" INSTALLTMPDIR="$(INSTALLTMPDIR)/client" INSTALLEXTDIR="$(INSTALLEXTDIR)/client" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLBINDIR="$(INSTALLBINDIR)/client" XYMONLOGDIR="$(XYMONLOGDIR)" INSTALLROOT="$(INSTALLROOT)" XYMONUSER="$(XYMONUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install
  
  install-clientmsg:
  	@echo ""
-@@ -315,5 +327,5 @@ install-clientmsg:
- 	@echo "To start the Hobbit client, as the $(BBUSER) user run '${BBHOME}/runclient.sh start'"
+ 	@echo "Installation complete."
+ 	@echo ""
+-	@echo "To start the Xymon client, as the $(XYMONUSER) user run '${XYMONHOME}/runclient.sh start'"
++	@echo "To start the Xymon client, as the $(XYMONUSER) user run '$(INSTALLROOT)/$(INSTALLBINDIR)/runclient.sh start'"
  
  install-localclient:
--	BBHOME="$(BBTOPDIR)/client" INSTALLROOT="$(INSTALLROOT)" BBUSER="$(BBUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install-localclient
-+	BBHOME="$(BBHOME)/client" INSTALLTMPDIR="$(INSTALLTMPDIR)/client" INSTALLEXTDIR="$(INSTALLEXTDIR)/client" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLBINDIR="$(INSTALLBINDIR)/client" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install-localclient
+-	XYMONHOME="$(XYMONTOPDIR)/client" INSTALLROOT="$(INSTALLROOT)" XYMONUSER="$(XYMONUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install-localclient
++	XYMONHOME="$(XYMONTOPDIR)/client" INSTALLTMPDIR="$(INSTALLTMPDIR)/client" INSTALLEXTDIR="$(INSTALLEXTDIR)/client" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLBINDIR="$(INSTALLBINDIR)/client" XYMONLOGDIR="$(XYMONLOGDIR)" INSTALLROOT="$(INSTALLROOT)" XYMONUSER="$(XYMONUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install-localclient
  
diff --git a/net/xymonclient/patches/patch-ac b/net/xymonclient/patches/patch-ac
index f1307d86d1d..38022bd7d5c 100644
--- a/net/xymonclient/patches/patch-ac
+++ b/net/xymonclient/patches/patch-ac
@@ -1,91 +1,93 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
+$NetBSD: patch-ac,v 1.2 2011/04/22 15:37:02 spz Exp $
 
---- client/Makefile.orig	2009-02-12 13:09:34.000000000 +0000
+--- client/Makefile.orig	2011-03-08 17:20:28.000000000 +0000
 +++ client/Makefile
 @@ -19,6 +19,22 @@ endif
- PROGRAMS=hobbitlaunch logfetch clientupdate orcahobbit msgcache
- COMMONTOOLS=bb bbcmd bbhostgrep bbhostshow bbdigest
+ PROGRAMS=xymonlaunch logfetch clientupdate orcaxymon msgcache
+ COMMONTOOLS=xymon xymoncmd xymongrep xymoncfg xymondigest
  
 +ifndef INSTALLBINDIR
-+INSTALLBINDIR = $(BBHOME)/bin
++INSTALLBINDIR = $(XYMONHOME)/bin
 +endif
 +ifndef INSTALLETCDIR
-+INSTALLETCDIR = $(BBHOME)/etc
++INSTALLETCDIR = $(XYMONHOME)/etc
 +endif
 +ifndef INSTALLEXTDIR
-+INSTALLEXTDIR = $(BBHOME)/ext
++INSTALLEXTDIR = $(XYMONHOME)/ext
 +endif
 +ifndef INSTALLTMPDIR
-+INSTALLTMPDIR = $(BBHOME)/tmp
++INSTALLTMPDIR = $(XYMONHOME)/tmp
 +endif
-+ifndef BBLOGDIR
-+BBLOGDIR = $(BBHOME)/logs
++ifndef XYMONLOGDIR
++XYMONLOGDIR = $(XYMONHOME)/logs
 +endif
 +
- all: $(PROGRAMS) $(COMMONTOOLS) hobbitclient.cfg clientlaunch.cfg $(EXTRATOOLS)
+ all: $(PROGRAMS) $(COMMONTOOLS) xymonclient.cfg clientlaunch.cfg $(EXTRATOOLS)
  
- hobbitclient.cfg: hobbitclient.cfg.DIST
-@@ -58,24 +74,50 @@ netbsd-meminfo: netbsd-meminfo.c
+ xymonclient.cfg: xymonclient.cfg.DIST
+@@ -58,26 +72,51 @@ netbsd-meminfo: netbsd-meminfo.c
  
  install:
- 	if test ! -d $(INSTALLROOT)$(BBHOME)     ; then mkdir -p $(INSTALLROOT)$(BBHOME)     ; fi
--	if test ! -d $(INSTALLROOT)$(BBHOME)/bin ; then mkdir -p $(INSTALLROOT)$(BBHOME)/bin ; fi
--	if test ! -d $(INSTALLROOT)$(BBHOME)/etc ; then mkdir -p $(INSTALLROOT)$(BBHOME)/etc ; fi
--	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
--	cp -fp runclient.sh $(INSTALLROOT)$(BBHOME)
--	cp -fp $(PROGRAMS) hobbitclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(BBHOME)/bin/
--	chmod ugo+x $(INSTALLROOT)$(BBHOME)/bin/*
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)     ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)     ; fi
+-	if test ! -d $(INSTALLROOT)$(XYMONHOME)/bin ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/bin ; fi
+-	if test ! -d $(INSTALLROOT)$(XYMONHOME)/etc ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/etc ; fi
+-	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
+-	cp -fp runclient.sh $(INSTALLROOT)$(XYMONHOME)
+-	cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(XYMONHOME)/bin/
+-	chmod ugo+x $(INSTALLROOT)$(XYMONHOME)/bin/*
 +	if test ! -d $(INSTALLROOT)$(INSTALLBINDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLBINDIR) ; fi
 +ifndef PKGBUILD
-+ifneq ($(INSTALLBINDIR),$(BBHOME)/bin)
-+	ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(BBHOME)/bin
++ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin)
++       ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin
 +endif
 +endif
 +	if test ! -d $(INSTALLROOT)$(INSTALLETCDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLETCDIR) ; fi
 +ifndef PKGBUILD
-+ifneq ($(INSTALLETCDIR),$(BBHOME)/etc)
-+	ln -sf $(INSTALLETCDIR) $(INSTALLROOT)$(BBHOME)/etc
++ifneq ($(INSTALLETCDIR),$(XYMONHOME)/etc)
++       ln -sf $(INSTALLETCDIR) $(INSTALLROOT)$(XYMONHOME)/etc
 +endif
 +endif
 +	if test ! -d $(INSTALLROOT)$(INSTALLTMPDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLTMPDIR) ; fi
 +ifndef PKGBUILD
-+ifneq ($(INSTALLTMPDIR),$(BBHOME)/tmp)
-+	ln -sf $(INSTALLTMPDIR) $(INSTALLROOT)$(BBHOME)/tmp
++ifneq ($(INSTALLTMPDIR),$(XYMONHOME)/tmp)
++       ln -sf $(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONHOME)/tmp
 +endif
 +endif
-+	if test ! -d $(INSTALLROOT)$(BBLOGDIR) ; then mkdir -p $(INSTALLROOT)$(BBLOGDIR) ; fi
++	if test ! -d $(INSTALLROOT)$(XYMONLOGDIR); then mkdir -p $(INSTALLROOT)$(XYMONLOGDIR); fi
 +ifndef PKGBUILD
-+ifneq ($(BBLOGDIR),$(BBHOME)/logs)
-+	ln -sf $(BBLOGDIR) $(INSTALLROOT)$(BBHOME)/logs
++ifneq ($(BBLOGDIR),$(XYMONHOME)/logs)
++       ln -sf $(BBLOGDIR) $(INSTALLROOT)$(XYMONHOME)/logs
 +endif
 +endif
 +	if test ! -d $(INSTALLROOT)$(INSTALLEXTDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLEXTDIR) ; fi
 +ifndef PKGBUILD
-+ifneq ($(INSTALLEXTDIR),$(BBHOME)/ext)
-+	ln -sf $(INSTALLEXTDIR) $(INSTALLROOT)$(BBHOME)/ext
++ifneq ($(INSTALLEXTDIR),$(XYMONHOME)/ext)
++       ln -sf $(INSTALLEXTDIR) $(INSTALLROOT)$(XYMONHOME)/ext
 +endif
 +endif
-+
-+	if test ! -f $(INSTALLROOT)$(INSTALLETCDIR)/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(INSTALLETCDIR)/ ; fi
++	if test ! -f $(INSTALLROOT)$(INSTALLEXADIR)/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(INSTALLEXADIR)/ ; fi
 +	cp -fp runclient.sh $(INSTALLROOT)$(INSTALLBINDIR)
-+	cp -fp $(PROGRAMS) hobbitclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(INSTALLBINDIR)
++	cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(INSTALLBINDIR)/
 +	chmod ugo+x $(INSTALLROOT)$(INSTALLBINDIR)/*
  
--	../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)$(XYMONHOME)/etc/clientlaunch.cfg
+-	../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg
 +	../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(INSTALLETCDIR)/clientlaunch.cfg
-+	../build/merge-lines hobbitclient.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitclient.cfg
++	../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(INSTALLETCDIR)/xymonclient.cfg
  ifndef PKGBUILD
--	chown -R $(BBUSER) $(INSTALLROOT)$(BBHOME)
-+	chown -R $(BBUSER) $(INSTALLROOT)$(BBHOME) $(INSTALLROOT)$(INSTALLETCDIR) $(INSTALLROOT)$(INSTALLEXTDIR) $(INSTALLROOT)$(INSTALLBINDIR) $(INSTALLROOT)$(INSTALLTMPDIR) $(INSTALLROOT)$(BBLOGDIR)
+-	chown -R $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME)
++	chown -R $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(INSTALLETCDIR) $(INSTALLROOT)$(INSTALLEXADIR) $(INSTALLROOT)$(INSTALLEXTDIR) $(INSTALLROOT)$(INSTALLBINDIR) $(INSTALLROOT)$(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONLOGDIR)
  endif
  
  install-localclient:
--	cp -fp hobbitd_client $(INSTALLROOT)$(BBHOME)/bin/
-+	cp -fp hobbitd_client $(INSTALLROOT)$(INSTALLBINDIR)
+-	cp -fp xymond_client $(INSTALLROOT)$(XYMONHOME)/bin/
++	cp -fp xymond_client $(INSTALLROOT)$(INSTALLBINDIR)/
  ifndef PKGBUILD
- 	chown $(BBUSER) $(INSTALLROOT)$(BBHOME)/bin/hobbitd_client
+-	chown $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME)/bin/xymond_client
++	chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLBINDIR)/xymond_client
  endif
+ 
+ clean:
diff --git a/net/xymonclient/patches/patch-ad b/net/xymonclient/patches/patch-ad
index 6d6362d114b..d54f4b13107 100644
--- a/net/xymonclient/patches/patch-ad
+++ b/net/xymonclient/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
+$NetBSD: patch-ad,v 1.2 2011/04/22 15:37:02 spz Exp $
 
---- build/bb-commands.sh.orig	2007-04-14 00:20:21.000000000 -0500
+--- build/bb-commands.sh.orig	2011-03-08 17:20:28.000000000 +0000
 +++ build/bb-commands.sh
 @@ -9,6 +9,11 @@
  
@@ -26,5 +26,5 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
  # DFCMD is an alias for DF
 +ENVNAME=DF
  PGM=`findbin df | head -n 1`
- echo "# DF,DFCMD and PS are for compatibility only, NOT USED by the Hobbit client"
+ echo "# DF,DFCMD and PS are for compatibility only, NOT USED by the Xymon client"
  echo "DF=\"${PGM} -Pk\""
diff --git a/net/xymonclient/patches/patch-ag b/net/xymonclient/patches/patch-ag
index 48aa63e394f..1bdfad9056e 100644
--- a/net/xymonclient/patches/patch-ag
+++ b/net/xymonclient/patches/patch-ag
@@ -1,15 +1,15 @@
-$NetBSD: patch-ag,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
+$NetBSD: patch-ag,v 1.2 2011/04/22 15:37:02 spz Exp $
 
---- build/Makefile.orig	2009-02-12 13:00:50.000000000 +0000
+--- build/Makefile.orig	2011-03-08 17:20:28.000000000 +0000
 +++ build/Makefile
 @@ -8,8 +8,8 @@ merge-lines: merge-lines.c
  merge-sects: merge-sects.c
  	$(CC) -o $@ $(CFLAGS) $<
  
 -setup-newfiles: setup-newfiles.c
--	$(CC) -o $@ $(CFLAGS) $(RPATHOPT) $< ../lib/hobbitclient.a $(SSLLIBS) $(NETLIBS) $(LIBRTDEF)
-+setup-newfiles: setup-newfiles.c ../lib/hobbitclient.a
-+	$(CC) -o $@ $(CFLAGS) $< ../lib/hobbitclient.a $(RPATHOPT) $(SSLLIBS) $(NETLIBS) $(LIBRTDEF) 
+-	$(CC) -o $@ $(CFLAGS) $(RPATHOPT) $< ../lib/xymonclient.a $(SSLLIBS) $(NETLIBS) $(LIBRTDEF)
++setup-newfiles: setup-newfiles.c ../lib/xymonclient.a
++	$(CC) -o $@ $(CFLAGS) $< ../lib/xymonclient.a $(RPATHOPT) $(SSLLIBS) $(NETLIBS) $(LIBRTDEF)
  
- clean:
- 	rm -f $(TOOLS) testfile *.o *~
+ renamevars: renamevars.c
+ 	$(CC) -o $@ $(CFLAGS) $<