xymon is the successor to hobbit. This is the client (aka agent) package.

It's a beta, handle with care.
This commit is contained in:
spz 2010-02-14 16:11:11 +00:00
parent bf3efcc534
commit a1f5cdc4bd
12 changed files with 576 additions and 0 deletions

6
net/xymonclient/DESCR Normal file
View file

@ -0,0 +1,6 @@
Xymon is the successor to (rename of) Hobbit which was the successor
to the bbgen toolkit, which had been available as an add-on to Big Brother
since late 2002.
Xymon monitors your hosts, your network services, and anything else
you configure it to do via extensions. This is the client (agent) package.

124
net/xymonclient/Makefile Normal file
View file

@ -0,0 +1,124 @@
# $NetBSD: Makefile,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
#
DISTNAME= xymon-4.3.0-beta2
PKGNAME= xymonclient-4.3.0b2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
MAINTAINER= spz@NetBSD.org
HOMEPAGE= http://hobbitmon.sourceforge.net/
COMMENT= Network services monitor a la Big Brother
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= hobbitmon-[0-9]*
CONFLICTS+= hobbitclient-[0-9]*
HAS_CONFIGURE= YES
USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
# xymons user/group
BBUSER?= xymon
BBGROUP?= xymon
PKG_GROUPS= ${BBGROUP}
PKG_USERS= ${BBUSER:Q}:${BBGROUP:Q}
PKG_GECOS.${BBUSER}= Xymon monitor
PKG_HOME.${BBUSER}= ${BBHOME}
PKG_GROUPS_VARS+= BBGROUP
PKG_USERS_VARS+= BBUSER
# startup and config
RCD_SCRIPTS+= xymonclient
PKG_SYSCONFDIR.xymon= ${PREFIX}/etc/xymon
EXAMPLEDIR= ${PREFIX}/share/examples/xymon
BBHOME?= ${PREFIX}/share/xymon/bbhome
BBTOPDIR?= ${PREFIX}/libexec/xymon
BBSERVERNAME?= "`uname -n`"
BBSERVERIP?= 127.0.0.1
BBLOGDIR?= ${VARBASE}/log/xymon
BBVAR?= ${VARBASE}/xymon
XYBINDIR?= ${BBTOPDIR}
XYETCDIR?= ${PKG_SYSCONFDIR.xymon}
XYEXTDIR?= ${BBTOPDIR}/ext
XYTMPDIR?= ${VARBASE}/xymon/tmp
BUILD_DEFS+= VARBASE
BUILD_DEFS+= BBSERVERNAME
BUILD_DEFS+= BBSERVERIP
FILES_SUBST+= BBHOME=${BBHOME:Q}
FILES_SUBST+= BBLOGDIR=${BBLOGDIR:Q}
FILES_SUBST+= BBVAR=${BBVAR:Q}
FILES_SUBST+= XYBINDIR=${XYBINDIR:Q}
FILES_SUBST+= XYETCDIR=${XYETCDIR:Q}
FILES_SUBST+= XYEXTDIR=${XYEXTDIR:Q}
FILES_SUBST+= XYTMPDIR=${XYTMPDIR:Q}
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:Q}
CONFIGURE_ENV+= BBLOGDIR=${BBLOGDIR:Q}
CONFIGURE_ENV+= BBVAR=${BBVAR:Q}
CONFIGURE_ENV+= INSTALLROOT=${DESTDIR}
CONFIGURE_ENV+= INSTALLBINDIR=${XYBINDIR:Q}
CONFIGURE_ENV+= INSTALLETCDIR=${XYETCDIR:Q}
CONFIGURE_ENV+= INSTALLEXADIR=${EXAMPLEDIR:Q}
CONFIGURE_ENV+= INSTALLEXTDIR=${XYEXTDIR:Q}
CONFIGURE_ENV+= INSTALLTMPDIR=${XYTMPDIR:Q}
CONFIGURE_ENV+= MANROOT=${PREFIX}/${PKGMANDIR}/
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
OWN_DIRS+= ${BBTOPDIR}
MAKE_DIRS+= ${BBTOPDIR}/client
OWN_DIRS+= ${EXAMPLEDIR}
OWN_DIRS+= ${PKG_SYSCONFDIR.xymon}
OWN_DIRS+= ${BBHOME}
MAKE_DIRS+= ${BBHOME}/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+= ${BBVAR} ${BBUSER} ${BBGROUP} 0755
OWN_DIRS_PERMS+= ${BBVAR}/data ${BBUSER} ${BBGROUP} 0755
CFILES+= clientlaunch.cfg hobbitclient.cfg localclient.cfg
.for file in ${CFILES}
CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${BBUSER} ${BBGROUP} 0644
.endfor
MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
MAKE_ENV+= PKGDIR=${PREFIX:Q}
MAKE_ENV+= INSTALLROOT=${DESTDIR}
MAKE_ENV+= PKGBUILD=y
MAKE_ENV+= ${TOOLS_ENV}
.include "../../mk/bsd.pkg.mk"

29
net/xymonclient/PLIST Normal file
View file

@ -0,0 +1,29 @@
@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
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/runclient.sh
share/examples/rc.d/xymonclient
share/examples/xymon/clientlaunch.cfg
share/examples/xymon/hobbitclient.cfg
share/examples/xymon/localclient.cfg

12
net/xymonclient/distinfo Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: distinfo,v 1.1.1.1 2010/02/14 16:11:11 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) = 169d8e4287b8c8c22660d683403bc644c3764e75
SHA1 (patch-ab) = 344d5ec4ebc681ac592d2456c1abccd83a3e60f8
SHA1 (patch-ac) = eb97125d0bfb6ef640054f14d7046ed375620d25
SHA1 (patch-ad) = 8be66af4b877958f2bc64e18494c67a73acd4360
SHA1 (patch-ae) = e5a42cbc6537e23a5a44ed343c86e121adadb139
SHA1 (patch-af) = ae5d0acde8e2cd05527253c41e31a806b04614f6
SHA1 (patch-ag) = ffecf3de095995bbd01bb27dc99126cbe04a08fd

View file

@ -0,0 +1,52 @@
#!/bin/sh
#
# Xymon site monitoring server
# Startup script contributed by Nathan Arthur (originally for hobbitmon)
#
# PROVIDE: xymonclient
# REQUIRE: DAEMON
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
name="xymonclient"
# user-settable rc.conf variables
: ${xymon_launchcfg:="@XYETCDIR@/clientlaunch.cfg"}
: ${xymon_clientcfg:="@XYETCDIR@/hobbitclient.cfg"}
: ${xymon_log:="@BBLOGDIR@/clientlaunch.log"}
: ${xymon_pidfile:="/var/run/xymonclient.pid"}
rcvar=${name}
xymon_user="xymon"
pidfile=${xymon_pidfile}
required_files="${xymon_launchcfg} ${xymon_clientcfg}"
command="@XYBINDIR@/client/hobbitlaunch"
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
fi
if [ ! -h $HOBBITCLIENTHOME/etc ]; then
ln -s @XYETCDIR@ $HOBBITCLIENTHOME/etc
fi
if [ ! -h $HOBBITCLIENTHOME/ext ]; then
ln -s @XYEXTDIR@/client $HOBBITCLIENTHOME/ext
fi
if [ ! -h $HOBBITCLIENTHOME/tmp ]; then
ln -s @XYTMPDIR@/client $HOBBITCLIENTHOME/tmp
fi
if [ ! -h $HOBBITCLIENTHOME/logs ]; then
ln -s @BBLOGDIR@ $HOBBITCLIENTHOME/logs
fi
}
start_precmd="xymon_precmd"
load_rc_config $name
run_rc_command "$1"

View file

@ -0,0 +1,67 @@
$NetBSD: patch-aa,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
--- configure.client.orig 2009-02-22 20:41:16.000000000 +0000
+++ configure.client
@@ -75,7 +75,7 @@ then
BBUSER="xymon"
fi
-if test -z "$BBTOPDIR"
+if test -z "$BBHOME"
then
if test "`uname -s`" = "Darwin"
then
@@ -92,22 +92,24 @@ then
echo ""; echo ""
HOMEDIR="`dscl . -read /Users/$BBUSER | grep HomeDirectory | awk '{print $2}'`"
else
- USERDATA=`getent passwd $BBUSER 2>/dev/null || ypmatch "${BBUSER}" passwd || grep "^${BBUSER}:" /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."
- exit 1
+ if [ -z ${PKGBUILD} ]; then
+ USERDATA=`getent passwd $BBUSER 2>/dev/null || ypmatch "${BBUSER}" passwd || grep "^${BBUSER}:" /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."
+ exit 1
+ fi
+ echo ""; echo ""
+ HOMEDIR="`echo $USERDATA|cut -d: -f6`"
fi
- echo ""; echo ""
- HOMEDIR="`echo $USERDATA|cut -d: -f6`"
fi
else
- HOMEDIR="$BBTOPDIR"
+ HOMEDIR="$BBHOME"
fi
-echo "Where do you want the Xymon installation [${HOMEDIR}] ?"
+echo "Where do you want the Xymon installation [${BBTOPDIR}] ?"
if test -z "$BBTOPDIR"
then
read BBTOPDIR
@@ -158,6 +160,7 @@ echo "# Toplevel dir"
echo "BBTOPDIR = $BBTOPDIR" >>Makefile
echo "# Server home dir for etc/, www/" >>Makefile
echo "BBHOME = $BBHOME" >>Makefile
+echo "HOBBITCLIENTHOME = $BBHOME/client" >>Makefile
echo "" >>Makefile
echo "# Xymon settings follows" >>Makefile
echo "#" >>Makefile
@@ -194,6 +197,9 @@ fi
if test "$INSTALLETCDIR" != ""; then
echo "INSTALLETCDIR = $INSTALLETCDIR" >>Makefile
fi
+if test "$INSTALLEXADIR" != ""; then
+ echo "INSTALLEXADIR = $INSTALLEXADIR" >>Makefile
+fi
if test "$INSTALLEXTDIR" != ""; then
echo "INSTALLEXTDIR = $INSTALLEXTDIR" >>Makefile
fi

View file

@ -0,0 +1,123 @@
$NetBSD: patch-ab,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
--- build/Makefile.rules.orig 2009-02-12 13:00:50.000000000 +0000
+++ build/Makefile.rules
@@ -34,6 +34,9 @@ endif
ifndef INSTALLETCDIR
INSTALLETCDIR = $(BBHOME)/etc
endif
+ifndef INSTALLEXADIR
+INSTALLEXADIR = $(BBHOME)/etc
+endif
ifndef INSTALLEXTDIR
INSTALLEXTDIR = $(BBHOME)/ext
endif
@@ -156,58 +159,67 @@ install-servermsg:
@echo "To view the Hobbit webpages, go to http://${BBHOSTNAME}${BBHOSTURL}"
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)$(INSTALLBINDIR)
+ifndef PKGBUILD
ifneq ($(INSTALLBINDIR),$(BBHOME)/bin)
ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(BBHOME)/bin
endif
-ifndef PKGBUILD
chown $(BBUSER) $(INSTALLROOT)$(INSTALLBINDIR)
chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLBINDIR)
endif
mkdir -p $(INSTALLROOT)$(INSTALLETCDIR)
+ifndef PKGBUILD
ifneq ($(INSTALLETCDIR),$(BBHOME)/etc)
ln -sf $(INSTALLETCDIR) $(INSTALLROOT)$(BBHOME)/etc
endif
-ifndef PKGBUILD
chown $(BBUSER) $(INSTALLROOT)$(INSTALLETCDIR)
chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLETCDIR)
endif
+ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)
+
mkdir -p $(INSTALLROOT)$(INSTALLEXTDIR)
+ifndef PKGBUILD
ifneq ($(INSTALLEXTDIR),$(BBHOME)/ext)
ln -sf $(INSTALLEXTDIR) $(INSTALLROOT)$(BBHOME)/ext
endif
-ifndef PKGBUILD
chown $(BBUSER) $(INSTALLROOT)$(INSTALLEXTDIR)
chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLEXTDIR)
endif
mkdir -p $(INSTALLROOT)$(INSTALLTMPDIR)
+ifndef PKGBUILD
ifneq ($(INSTALLTMPDIR),$(BBHOME)/tmp)
ln -sf $(INSTALLTMPDIR) $(INSTALLROOT)$(BBHOME)/tmp
endif
-ifndef PKGBUILD
chown $(BBUSER) $(INSTALLROOT)$(INSTALLTMPDIR)
chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLTMPDIR)
endif
mkdir -p $(INSTALLROOT)$(INSTALLWEBDIR)
+ifndef PKGBUILD
ifneq ($(INSTALLWEBDIR),$(BBHOME)/web)
ln -sf $(INSTALLWEBDIR) $(INSTALLROOT)$(BBHOME)/web
endif
-ifndef PKGBUILD
chown $(BBUSER) $(INSTALLROOT)$(INSTALLWEBDIR)
chgrp `$(IDTOOL) -g $(BBUSER)` $(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
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
ifdef HTTPDGID
@@ -266,5 +278,5 @@ 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
@@ -297,16 +309,16 @@ install-man:
BBHOME="$(BBHOME)" 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
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"
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
install-clientmsg:
@echo ""
@@ -315,5 +327,5 @@ install-clientmsg:
@echo "To start the Hobbit client, as the $(BBUSER) user run '${BBHOME}/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

View file

@ -0,0 +1,91 @@
$NetBSD: patch-ac,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
--- client/Makefile.orig 2009-02-12 13:09:34.000000000 +0000
+++ client/Makefile
@@ -19,6 +19,22 @@ endif
PROGRAMS=hobbitlaunch logfetch clientupdate orcahobbit msgcache
COMMONTOOLS=bb bbcmd bbhostgrep bbhostshow bbdigest
+ifndef INSTALLBINDIR
+INSTALLBINDIR = $(BBHOME)/bin
+endif
+ifndef INSTALLETCDIR
+INSTALLETCDIR = $(BBHOME)/etc
+endif
+ifndef INSTALLEXTDIR
+INSTALLEXTDIR = $(BBHOME)/ext
+endif
+ifndef INSTALLTMPDIR
+INSTALLTMPDIR = $(BBHOME)/tmp
+endif
+ifndef BBLOGDIR
+BBLOGDIR = $(BBHOME)/logs
+endif
+
all: $(PROGRAMS) $(COMMONTOOLS) hobbitclient.cfg clientlaunch.cfg $(EXTRATOOLS)
hobbitclient.cfg: hobbitclient.cfg.DIST
@@ -58,24 +74,50 @@ 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)$(INSTALLBINDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLBINDIR) ; fi
+ifndef PKGBUILD
+ifneq ($(INSTALLBINDIR),$(BBHOME)/bin)
+ ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(BBHOME)/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
+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
+endif
+endif
+ if test ! -d $(INSTALLROOT)$(BBLOGDIR) ; then mkdir -p $(INSTALLROOT)$(BBLOGDIR) ; fi
+ifndef PKGBUILD
+ifneq ($(BBLOGDIR),$(BBHOME)/logs)
+ ln -sf $(BBLOGDIR) $(INSTALLROOT)$(BBHOME)/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
+endif
+endif
+
+ if test ! -f $(INSTALLROOT)$(INSTALLETCDIR)/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(INSTALLETCDIR)/ ; fi
+ cp -fp runclient.sh $(INSTALLROOT)$(INSTALLBINDIR)
+ cp -fp $(PROGRAMS) hobbitclient*.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)$(INSTALLETCDIR)/clientlaunch.cfg
+ ../build/merge-lines hobbitclient.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitclient.cfg
ifndef PKGBUILD
- chown -R $(BBUSER) $(INSTALLROOT)$(BBHOME)
+ chown -R $(BBUSER) $(INSTALLROOT)$(BBHOME) $(INSTALLROOT)$(INSTALLETCDIR) $(INSTALLROOT)$(INSTALLEXTDIR) $(INSTALLROOT)$(INSTALLBINDIR) $(INSTALLROOT)$(INSTALLTMPDIR) $(INSTALLROOT)$(BBLOGDIR)
endif
install-localclient:
- cp -fp hobbitd_client $(INSTALLROOT)$(BBHOME)/bin/
+ cp -fp hobbitd_client $(INSTALLROOT)$(INSTALLBINDIR)
ifndef PKGBUILD
chown $(BBUSER) $(INSTALLROOT)$(BBHOME)/bin/hobbitd_client
endif

View file

@ -0,0 +1,30 @@
$NetBSD: patch-ad,v 1.1.1.1 2010/02/14 16:11:11 spz 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\""

View file

@ -0,0 +1,14 @@
$NetBSD: patch-ae,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
--- build/Makefile.NetBSD.orig 2010-02-08 23:58:57.000000000 +0000
+++ build/Makefile.NetBSD
@@ -10,7 +10,8 @@ NETLIBS =
CC= gcc
PKGDIR?=/usr/pkg
CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
+ -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib \
+ -DHAVE_STDINT_H
RPATH = "-Wl,--rpath,"
# Compile flags for debugging

View file

@ -0,0 +1,13 @@
$NetBSD: patch-af,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
--- client/netbsd-meminfo.c.orig 2009-02-12 13:09:34.000000000 +0000
+++ client/netbsd-meminfo.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$Id: netbsd-memin
int main(int argc, char *argv[])
{
int hw_physmem[] = { CTL_HW, HW_PHYSMEM64 };
- int64 physmem;
+ int64_t physmem;
int hw_pagesize[] = { CTL_HW, HW_PAGESIZE };
int pagesize;

View file

@ -0,0 +1,15 @@
$NetBSD: patch-ag,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
--- build/Makefile.orig 2009-02-12 13:00:50.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)
clean:
rm -f $(TOOLS) testfile *.o *~