diff options
author | manu <manu@pkgsrc.org> | 2005-01-24 18:16:20 +0000 |
---|---|---|
committer | manu <manu@pkgsrc.org> | 2005-01-24 18:16:20 +0000 |
commit | d93e1a458369f6d5af8c5c5ccd080f44ab322eea (patch) | |
tree | db6f8266fb0bc9e6852247f9517b4d966fc03f1b | |
parent | a3ef0f9e87e9a50793fdac62cc13ffc52f48c916 (diff) | |
download | pkgsrc-d93e1a458369f6d5af8c5c5ccd080f44ab322eea.tar.gz |
Hobbit 0.6beta2: bugfixes
-rw-r--r-- | net/hobbitmon/Makefile | 11 | ||||
-rw-r--r-- | net/hobbitmon/PLIST | 86 | ||||
-rw-r--r-- | net/hobbitmon/distinfo | 17 | ||||
-rw-r--r-- | net/hobbitmon/patches/patch-ab | 11 | ||||
-rw-r--r-- | net/hobbitmon/patches/patch-ae | 20 | ||||
-rw-r--r-- | net/hobbitmon/patches/patch-aj | 23 |
6 files changed, 106 insertions, 62 deletions
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile index f514ab127a3..522385732bf 100644 --- a/net/hobbitmon/Makefile +++ b/net/hobbitmon/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/01/13 09:27:06 manu Exp $ +# $NetBSD: Makefile,v 1.2 2005/01/24 18:16:20 manu Exp $ # -DISTNAME= hobbit-4.0beta4 +DISTNAME= hobbit-4.0-beta6 +PKGNAME= hobbit-4.0b6 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hobbitmon/} @@ -43,6 +45,8 @@ CONFIGURE_ENV+= PCREINC=${PREFIX}/include CONFIGURE_ENV+= PCRELIB=${PREFIX}/lib CONFIGURE_ENV+= ENABLESSL=y CONFIGURE_ENV+= ENABLELDAP=y +CONFIGURE_ENV+= ENABLELDAPSSL=y +CONFIGURE_ENV+= BBHOSTNAME="" CONFIGURE_ENV+= BBUSER=${BBUSER} CONFIGURE_ENV+= BBTOPDIR=${BBTOPDIR} CONFIGURE_ENV+= BBHOSTURL=${BBHOSTURL} @@ -56,6 +60,9 @@ CONFIGURE_ENV+= BARS=all CONFIGURE_ENV+= USENEWHIST=y CONFIGURE_ENV+= PIXELCOUNT=560 +MAKE_ENV+= MAKE=${MAKE_PROGRAM} +MAKE_ENV+= PKGDIR=${PREFIX} + do-install: cd ${WRKSRC} ; \ if ${TEST} -f ${BBTOPDIR}/server/etc/bb-hosts ; then \ diff --git a/net/hobbitmon/PLIST b/net/hobbitmon/PLIST index 21f26292c82..86fdec93295 100644 --- a/net/hobbitmon/PLIST +++ b/net/hobbitmon/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/13 09:27:06 manu Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/01/24 18:16:20 manu Exp $ man/man1/bbhostshow.1 man/man1/bbhostgrep.1 man/man1/bbdigest.1 @@ -62,6 +62,7 @@ hobbit/server/bin/hobbitd_larrd hobbit/server/bin/hobbitd_alert hobbit/server/bin/hobbitd_history hobbit/server/bin/hobbitd_filestore +hobbit/server/bin/hobbitd_filter hobbit/server/bin/hobbitd_channel hobbit/server/bin/hobbitgraph.cgi hobbit/server/etc/bb-services @@ -75,37 +76,26 @@ hobbit/server/etc/hobbitlaunch.cfg hobbit/server/ext/bbcombotest hobbit/server/ext/bbretest-net.sh hobbit/server/web/acknowledge_header -hobbit/server/web/acknowledge_footer hobbit/server/web/acknowledge_form hobbit/server/web/findhost_header -hobbit/server/web/findhost_footer hobbit/server/web/findhost_form hobbit/server/web/report_header -hobbit/server/web/report_footer hobbit/server/web/report_form -hobbit/server/web/bbrep_footer -hobbit/server/web/info_footer -hobbit/server/web/bbnk_footer +hobbit/server/web/snapshot_header +hobbit/server/web/snapshot_form hobbit/server/web/bbrep_header -hobbit/server/web/graphs_footer hobbit/server/web/info_header hobbit/server/web/bbnk_header -hobbit/server/web/bb2_header -hobbit/server/web/bb2_footer -hobbit/server/web/histlog_footer hobbit/server/web/graphs_header -hobbit/server/web/hostsvc_footer -hobbit/server/web/maint_footer -hobbit/server/web/hist_footer hobbit/server/web/histlog_header +hobbit/server/web/bb2_header hobbit/server/web/hostsvc_header hobbit/server/web/bb_footer -hobbit/server/web/replog_footer hobbit/server/web/bb_header hobbit/server/web/maint_header -hobbit/server/web/columndoc_footer hobbit/server/web/hist_header hobbit/server/web/replog_header +hobbit/server/web/bbsnap_header hobbit/server/web/columndoc_header hobbit/server/www/gifs/bbfindhost1.gif hobbit/server/www/gifs/bbfindhost2.gif @@ -135,27 +125,31 @@ hobbit/server/www/gifs/clear-recent.gif hobbit/server/www/gifs/bkg-purple.gif hobbit/server/www/help/bb-findhost.html hobbit/server/www/help/manpages/man1/bb-eventlog.cgi.1.html +hobbit/server/www/help/manpages/man1/bb-webpage.1.html +hobbit/server/www/help/manpages/man1/bb-findhost.cgi.1.html hobbit/server/www/help/manpages/man1/bb-rep.cgi.1.html hobbit/server/www/help/manpages/man1/bbmessage.cgi.1.html hobbit/server/www/help/manpages/man1/bbtest-net.1.html hobbit/server/www/help/manpages/man1/bb-ack.cgi.1.html -hobbit/server/www/help/manpages/man1/bb-findhost.cgi.1.html -hobbit/server/www/help/manpages/man1/bb-hist.cgi.1.html hobbit/server/www/help/manpages/man1/bb-csvinfo.cgi.1.html -hobbit/server/www/help/manpages/man1/bbcombotest.1.html +hobbit/server/www/help/manpages/man1/bb-hist.cgi.1.html hobbit/server/www/help/manpages/man1/bb-hostsvc.cgi.1.html -hobbit/server/www/help/manpages/man1/bbcmd.1.html +hobbit/server/www/help/manpages/man1/bbcombotest.1.html hobbit/server/www/help/manpages/man1/bbdigest.1.html +hobbit/server/www/help/manpages/man1/bbcmd.1.html +hobbit/server/www/help/manpages/man1/bbretest-net.sh.1.html +hobbit/server/www/help/manpages/man1/bb-larrdcolumn.1.html hobbit/server/www/help/manpages/man1/bbhostgrep.1.html hobbit/server/www/help/manpages/man1/bbhostshow.1.html hobbit/server/www/help/manpages/man1/bb.1.html -hobbit/server/www/help/manpages/man1/bbgen.1.html -hobbit/server/www/help/manpages/man1/bbretest-net.sh.1.html -hobbit/server/www/help/manpages/man1/bb-replog.cgi.1.html hobbit/server/www/help/manpages/man1/hobbitgraph.cgi.1.html +hobbit/server/www/help/manpages/man1/bb-infocolumn.1.html hobbit/server/www/help/manpages/man1/bb-snapshot.cgi.1.html +hobbit/server/www/help/manpages/man1/bb-replog.cgi.1.html +hobbit/server/www/help/manpages/man1/bbgen.1.html hobbit/server/www/help/manpages/man5/hobbitlaunch.cfg.5.html hobbit/server/www/help/manpages/man5/hobbitgraph.cfg.5.html +hobbit/server/www/help/manpages/man5/hobbit-alerts.cfg.5.html hobbit/server/www/help/manpages/man5/hobbitserver.cfg.5.html hobbit/server/www/help/manpages/man5/bb-hosts.5.html hobbit/server/www/help/manpages/man5/bb-services.5.html @@ -167,6 +161,7 @@ hobbit/server/www/help/manpages/man8/hobbitd_filestore.8.html hobbit/server/www/help/manpages/man8/hobbitd_larrd.8.html hobbit/server/www/help/manpages/man8/hobbitd_history.8.html hobbit/server/www/help/manpages/man8/hobbitd_alert.8.html +hobbit/server/www/help/manpages/man8/hobbitd_sample.8.html hobbit/server/www/help/manpages/man8/bbproxy.8.html hobbit/server/www/help/manpages/man8/hobbitlaunch.8.html hobbit/server/www/help/manpages/index.html @@ -189,7 +184,6 @@ hobbit/server/www/menu/menu.css hobbit/server/www/menu/README hobbit/server/www/menu/menu.js hobbit/server/www/menu/menu_items.js.DIST -hobbit/server/starthobbit.sh hobbit/cgi-bin/bb-rep.sh hobbit/cgi-bin/bb-histlog.sh hobbit/cgi-bin/bb-hostsvc.sh @@ -204,31 +198,35 @@ hobbit/cgi-bin/hobbitcolumn.sh hobbit/cgi-bin/maint.pl hobbit/cgi-bin/hobbitgraph.sh hobbit/cgi-bin/bb-ack.sh -@dirrm hobbit/server/bin -@dirrm hobbit/server/etc -@dirrm hobbit/server/ext -@dirrm hobbit/server/tmp -@dirrm hobbit/server/web -@dirrm hobbit/server/www/gifs -@dirrm hobbit/server/www/help/manpages/man1 -@dirrm hobbit/server/www/help/manpages/man5 -@dirrm hobbit/server/www/help/manpages/man7 +@dirrm hobbit/server/www/wml +@dirrm hobbit/server/www/snap +@dirrm hobbit/server/www/rep +@dirrm hobbit/server/www/notes +@dirrm hobbit/server/www/menu +@dirrm hobbit/server/www/html @dirrm hobbit/server/www/help/manpages/man8 +@dirrm hobbit/server/www/help/manpages/man7 +@dirrm hobbit/server/www/help/manpages/man5 +@dirrm hobbit/server/www/help/manpages/man1 @dirrm hobbit/server/www/help/manpages @dirrm hobbit/server/www/help -@dirrm hobbit/server/www/html -@dirrm hobbit/server/www/menu -@dirrm hobbit/server/www/notes -@dirrm hobbit/server/www/rep -@dirrm hobbit/server/www/wml +@dirrm hobbit/server/www/gifs @dirrm hobbit/server/www +@dirrm hobbit/server/web +@dirrm hobbit/server/tmp +@dirrm hobbit/server/ext +@dirrm hobbit/server/etc +@dirrm hobbit/server/bin @dirrm hobbit/server -@dirrm hobbit/data/acks -@dirrm hobbit/data/data -@dirrm hobbit/data/disabled -@dirrm hobbit/data/hist -@dirrm hobbit/data/histlogs -@dirrm hobbit/data/logs @dirrm hobbit/data/rrd +@dirrm hobbit/data/logs +@dirrm hobbit/data/histlogs/plan_info_espci_fr/info +@dirrm hobbit/data/histlogs/plan_info_espci_fr +@dirrm hobbit/data/histlogs +@dirrm hobbit/data/hist +@dirrm hobbit/data/disabled +@dirrm hobbit/data/data +@dirrm hobbit/data/acks @dirrm hobbit/data @dirrm hobbit/cgi-bin +@dirrm hobbit diff --git a/net/hobbitmon/distinfo b/net/hobbitmon/distinfo index c80336663f1..8f6ba4c086a 100644 --- a/net/hobbitmon/distinfo +++ b/net/hobbitmon/distinfo @@ -1,12 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/01/13 09:27:06 manu Exp $ +$NetBSD: distinfo,v 1.2 2005/01/24 18:16:20 manu Exp $ -SHA1 (hobbit-4.0beta4.tar.gz) = a08d9f9f66a4682010b52b37044ed56e8bbcdee9 -Size (hobbit-4.0beta4.tar.gz) = 877211 bytes -SHA1 (patch-aa) = e6b4ec53db64820dbb412c51ca1c982cb5682488 -SHA1 (patch-ab) = 56c15c5a0ae06ba11a57db4afa54b581cdae6be1 -SHA1 (patch-ac) = 45978593d7842e57bcc208a82f78e817322152ff -SHA1 (patch-ad) = e14f9b6c0f45ac8ef86f2ee1019a21c1fa976a0f -SHA1 (patch-af) = ac26bffb8f079d8352c76b6aef71103f2cd2e720 -SHA1 (patch-ag) = 4451bb8bf64bb241f8fc4f689b9bf6a975981137 -SHA1 (patch-ah) = e2df4e6cfafdb701473137f735572b89ab8a56fa -SHA1 (patch-ai) = b0af1ab453e7f6170362a676f04eab2b07284e22 +SHA1 (hobbit-4.0-beta6.tar.gz) = 82e6a76e55682c205adac47e54830064bba44f2d +Size (hobbit-4.0-beta6.tar.gz) = 1130547 bytes +SHA1 (patch-ab) = a5d0145f0dd6886a631aa22a093da1d6a28299e3 +SHA1 (patch-ae) = 2cef35b4f81874e4e2e2ec1610d34cb336c7f791 +SHA1 (patch-aj) = 4758ccbabb6a109c3f3da40c3fd5129be1f7bbfd diff --git a/net/hobbitmon/patches/patch-ab b/net/hobbitmon/patches/patch-ab index 3eec11fbdb6..2f7bcecd462 100644 --- a/net/hobbitmon/patches/patch-ab +++ b/net/hobbitmon/patches/patch-ab @@ -1,13 +1,14 @@ -$NetBSD: patch-ab,v 1.1.1.1 2005/01/13 09:27:06 manu Exp $ ---- build/fping.sh.orig 2005-01-12 18:56:26.000000000 +0100 -+++ build/fping.sh 2005-01-12 18:56:38.000000000 +0100 -@@ -1,9 +1,8 @@ +$NetBSD: patch-ab,v 1.2 2005/01/24 18:16:20 manu Exp $ +--- build/fping.sh.orig 2005-01-24 17:28:28.000000000 +0100 ++++ build/fping.sh 2005-01-24 17:28:01.000000000 +0100 +@@ -1,9 +1,9 @@ #!/bin/sh echo "Checking for fping ..." - FPING="" ++# FPING="" - for DIR in /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin /opt/bin + for DIR in /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin /opt/bin /usr/pkg/bin do if test -x $DIR/fping diff --git a/net/hobbitmon/patches/patch-ae b/net/hobbitmon/patches/patch-ae new file mode 100644 index 00000000000..15f45ff4cd7 --- /dev/null +++ b/net/hobbitmon/patches/patch-ae @@ -0,0 +1,20 @@ +$NetBSD: patch-ae,v 1.1 2005/01/24 18:16:20 manu Exp $ +--- configure.orig 2005-01-24 17:31:35.000000000 +0100 ++++ configure 2005-01-24 17:33:04.000000000 +0100 +@@ -302,12 +302,12 @@ + fi + echo ""; echo "" + + echo "What is the name of this host [`uname -n`] ? " +- if test -z "$BBHOSTNAME" +- then +- read BBHOSTNAME +- fi ++# if test -z "$BBHOSTNAME" ++# then ++# read BBHOSTNAME ++# fi + if test -z "$BBHOSTNAME" + then + BBHOSTNAME=`uname -n` + fi diff --git a/net/hobbitmon/patches/patch-aj b/net/hobbitmon/patches/patch-aj new file mode 100644 index 00000000000..2ee3fbb8acb --- /dev/null +++ b/net/hobbitmon/patches/patch-aj @@ -0,0 +1,23 @@ +$NetBSD: patch-aj,v 1.1 2005/01/24 18:16:20 manu Exp $ +--- build/Makefile.NetBSD.orig 2005-01-23 11:48:05.000000000 +0100 ++++ build/Makefile.NetBSD 2005-01-24 18:07:38.000000000 +0100 +@@ -6,13 +6,13 @@ + # NETLIBS: None needed + NETLIBS = + # + # Compile flags for normal build +-CC = gcc +-CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT -I/usr/local/include \ +- -I/usr/pkg/include -L/usr/local/lib -L/usr/pkg/lib ++CC= gcc ++PKGDIR?=/usr/pkg ++CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT \ ++ -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib + # + # Compile flags for debugging +-# CFLAGS = -g -DDEBUG -Wall -D_REENTRANT -I/usr/local/include -L/usr/local/lib +- +-RUNTIMEDEFS="LD_LIBRARY_PATH=\"/usr/pkg/lib\"" ++# CFLAGS = -g -DDEBUG -Wall -D_REENTRANT \ ++ -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib + |