Update hobbit client from 0.3 to 4.2.0 + allinone.patch

Changes:
http://www.hobbitmon.com/hobbiton/2006/08/msg00321.html
* Full client support. The Hobbit clients now support monitoring
  of cpu-, disk- and memory-utilisation, as well as system logfiles,
  network ports and traffic, processes, file- and directory sizes,
  system clock synchronization, and much more. When a problem is
  detected on a host, the client data is automatically saved so
  it is available for later troubleshooting - even if the host
  has completely crashed.

7 files changed, 155 insertions, 38 deletions

diff --git a/net/hobbitclient/DESCR b/net/hobbitclient/DESCR
index e0818ad92ea..33292d64ffa 100644
--- a/net/hobbitclient/DESCR
+++ b/net/hobbitclient/DESCR
@@ -1,2 +1 @@
-hobbitclient is a free-software client for the Hobbit monitor or Big Brother.
-It is written in C with OS-dependant back-ends.
+hobbitclient is a free-software client for the Hobbit monitor.
diff --git a/net/hobbitclient/Makefile b/net/hobbitclient/Makefile
index b6ed180801f..d95e9755b30 100644
--- a/net/hobbitclient/Makefile
+++ b/net/hobbitclient/Makefile
@@ -1,18 +1,63 @@
-# $NetBSD: Makefile,v 1.4 2006/06/09 16:14:37 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2007/05/29 04:58:06 gendalia Exp $
 #
 
-DISTNAME=		hobbitclient-0.3
-CATEGORIES=		security
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
-EXTRACT_SUFX=		.tgz
+DISTNAME=	hobbit-4.2.0
+PKGNAME=	hobbitclient-4.2.0
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
 
-MAINTAINER=		manu@NetBSD.org
-HOMEPAGE=		http://hobbitmon.sourceforge.net/
-COMMENT=		Client for Hobbit Monitor or Big brother
+MAINTAINER=	gendalia@NetBSD.org
+HOMEPAGE=	http://hobbitmon.sourceforge.net/
+COMMENT=	Free-software client for the Hobbit monitor
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		yacc
-BUILD_TARGET=		hobbitc
+PATCHFILES+=allinone.patch
+SITES.allinone.patch=http://www.hobbitmon.com/hobbitsw/patches/
+
+HAS_CONFIGURE=	YES
+USE_TOOLS+=	gmake
+#INSTALL_TARGET=
+
+.include "../../mk/bsd.prefs.mk"
+
+BBUSER?=	hobbit
+BBGROUP?=	hobbit
+BBTOPDIR?=	${PREFIX}/hobbit
+BBLOGDIR?=	${VARBASE}/log/hobbit
+BBSERVERNAME?=	"`uname -n`"
+BBSERVERIP?=	127.0.0.1
+CONFTYPE?=	"server"
+BUILD_DEFS+=	VARBASE
+BUILD_DEFS+=	BBSERVERNAME
+BUILD_DEFS+=	BBSERVERIP
+
+RCD_SCRIPTS+=	hobbitclient
+PKG_GROUPS=	${BBGROUP}
+PKG_USERS=	${BBUSER:Q}:${BBGROUP:Q}
+
+PKG_GECOS.${BBUSER}=	Hobbit monitor
+PKG_HOME.${BBUSER}=	${BBTOPDIR}
+
+CONFIGURE_ARGS+="--client"
+
+CONFIGURE_ENV+=	TARGET=hobbit
+CONFIGURE_ENV+=	BBHOSTNAME="${BBSERVERNAME}"
+CONFIGURE_ENV+=	BBUSER=${BBUSER:Q}
+CONFIGURE_ENV+=	BBTOPDIR=${BBTOPDIR:Q}
+CONFIGURE_ENV+=	BBLOGDIR=${BBLOGDIR:Q}
+CONFIGURE_ENV+=	BBHOSTIP=${BBSERVERIP:Q}
+CONFIGURE_ENV+=	MANROOT=${PREFIX}/${PKGMANDIR}/
+CONFIGURE_ENV+=	CONFTYPE="${CONFTYPE}"
+
+USE_TOOLS+=     awk:run         cat:run         cp:run
+USE_TOOLS+=     cut:run         date:run        egrep:run
+USE_TOOLS+=     expr:run        find:run        grep:run
+USE_TOOLS+=     head:run        id:run          ls:run
+USE_TOOLS+=     mv:run          rm:run          sed:run
+USE_TOOLS+=     sort:run        tail:run        touch:run
+USE_TOOLS+=     tr:run          wc:run
+
+MAKE_ENV+=	MAKE=${MAKE_PROGRAM:Q}
+MAKE_ENV+=	PKGDIR=${PREFIX:Q}
+MAKE_ENV+=	${TOOLS_ENV}
 
-.include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/hobbitclient/PLIST b/net/hobbitclient/PLIST
index 979d08e7bd2..23ac5e2d0aa 100644
--- a/net/hobbitclient/PLIST
+++ b/net/hobbitclient/PLIST
@@ -1,4 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/16 08:51:46 manu Exp $
-etc/hobbitc.conf
-bin/hobbitc
-man/man8/hobbitc.8
+@comment $NetBSD: PLIST,v 1.2 2007/05/29 04:58:06 gendalia Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/05/29 04:58:06 gendalia Exp $
+hobbit/client/bin/bb
+hobbit/client/bin/bbcmd
+hobbit/client/bin/bbdigest
+hobbit/client/bin/bbhostgrep
+hobbit/client/bin/bbhostshow
+hobbit/client/bin/clientupdate
+hobbit/client/bin/hobbitlaunch
+hobbit/client/bin/logfetch
+hobbit/client/bin/msgcache
+hobbit/client/bin/${LOWER_OPSYS}-meminfo
+hobbit/client/bin/orcahobbit
+hobbit/client/etc/clientlaunch.cfg
+hobbit/client/etc/hobbitclient.cfg
+hobbit/client/etc/localclient.cfg
+hobbit/client/bin/hobbitclient-aix.sh
+hobbit/client/bin/hobbitclient-darwin.sh
+hobbit/client/bin/hobbitclient-freebsd.sh
+hobbit/client/bin/hobbitclient-hp-ux.sh
+hobbit/client/bin/hobbitclient-irix.sh
+hobbit/client/bin/hobbitclient-linux.sh
+hobbit/client/bin/hobbitclient-netbsd.sh
+hobbit/client/bin/hobbitclient-openbsd.sh
+hobbit/client/bin/hobbitclient-osf1.sh
+hobbit/client/bin/hobbitclient-sco_sv.sh
+hobbit/client/bin/hobbitclient-sunos.sh
+hobbit/client/bin/hobbitclient.sh
+hobbit/client/runclient.sh
+share/examples/rc.d/hobbitclient
+@exec ${MKDIR} %D/hobbit/client/tmp
+@dirrm hobbit/client/tmp
+@exec ${MKDIR} %D/hobbit/client/logs
+@dirrm hobbit/client/logs
+@exec ${MKDIR} %D/hobbit/client/ext
+@dirrm hobbit/client/ext
+@dirrm hobbit/client/etc
+@dirrm hobbit/client/bin
+@dirrm hobbit/client
+@dirrm hobbit
diff --git a/net/hobbitclient/distinfo b/net/hobbitclient/distinfo
index 95c0be9c69e..fa97699f044 100644
--- a/net/hobbitclient/distinfo
+++ b/net/hobbitclient/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.3 2006/06/01 22:15:18 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/05/29 04:58:06 gendalia Exp $
 
-SHA1 (hobbitclient-0.3.tgz) = cc7b31e6e6ba3ae81d5e16c808fbcbf8af98527c
-RMD160 (hobbitclient-0.3.tgz) = 481727fae95ae4ff4979a481a5106b241f53b766
-Size (hobbitclient-0.3.tgz) = 50675 bytes
-SHA1 (patch-aa) = 776d9f25d4c5c164da20bb2a029394d61263cd83
+SHA1 (allinone.patch) = 16631a912955fcf57e86d923522e6dde899cdcd8
+RMD160 (allinone.patch) = 52773fbb89f67e7a53782da9a4c3a05e42452914
+Size (allinone.patch) = 287659 bytes
+SHA1 (hobbit-4.2.0.tar.gz) = 9a784696f6d7211f60f07d575cb1142bbf4661d2
+RMD160 (hobbit-4.2.0.tar.gz) = d3633c32f4fa7961d1069df2eb39104e9c891be2
+Size (hobbit-4.2.0.tar.gz) = 2341167 bytes
+SHA1 (patch-ab) = 8be66af4b877958f2bc64e18494c67a73acd4360
diff --git a/net/hobbitclient/files/hobbitclient.sh b/net/hobbitclient/files/hobbitclient.sh
new file mode 100644
index 00000000000..d54e3ce2f27
--- /dev/null
+++ b/net/hobbitclient/files/hobbitclient.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+#
+# PROVIDE: hobbitclient
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="hobbitclient"
+rcvar="$name"
+command="@PREFIX@/hobbit/client/runclient.sh"
+
+start_cmd="$command start"
+restart_cmd="$command restart"
+stop_cmd="$command stop"
+status_cmd="$command status"
+
+load_rc_config "$name"
+run_rc_command "$1"
diff --git a/net/hobbitclient/patches/patch-aa b/net/hobbitclient/patches/patch-aa
deleted file mode 100644
index eddbf7b43a7..00000000000
--- a/net/hobbitclient/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/06/01 22:15:18 joerg Exp $
-
---- conf_load.h.orig	2006-06-01 22:11:36.000000000 +0000
-+++ conf_load.h
-@@ -34,6 +34,10 @@
- 
- #define DEFAULT_CONF "hobbitc.conf"
- 
-+#if defined(__DragonFly__) && !defined(LOGIN_NAME_MAX)
-+#define LOGIN_NAME_MAX MAXLOGNAME
-+#endif
-+
- struct disk_limit {
- 	char dl_mount[MAXPATHLEN + 1];
- 	int dl_yellow;
diff --git a/net/hobbitclient/patches/patch-ab b/net/hobbitclient/patches/patch-ab
new file mode 100644
index 00000000000..5b2d36a5d09
--- /dev/null
+++ b/net/hobbitclient/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2007/05/29 04:58:07 gendalia Exp $
+
+--- build/bb-commands.sh.orig	2007-04-14 00:20:21.000000000 -0500
++++ build/bb-commands.sh
+@@ -9,6 +9,11 @@
+ 
+ findbin() {
+ 	MYP="`echo ${PATH} | sed -e 's/:/ /g'`"
++	eval _var=\"\${${ENVNAME}}\"
++	if test -n "$_var"; then
++		echo "$_var"
++		return
++	fi
+ 
+ 	for D in $MYP
+ 	do
+@@ -31,11 +36,13 @@ do
+ done
+ 
+ # WC is special
++ENVNAME=WC
+ PGM=`findbin wc | head -n 1`
+ echo "WC=\"${PGM} -l\""
+ echo "WCC=\"${PGM}\""
+ 
+ # 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=\"${PGM} -Pk\""