Use the correct path to each dependencies' libraries and headers by

using BUILDLINK_PREFIX.*, honor PKGMANDIR, and add missing file entries
to the PLIST.  Bump the PKGREVISION to 8.  This should fix the error
noted in the bulk build results:

    http://mail-index.netbsd.org/pkgsrc-bulk/2006/06/20/0000.html

2 files changed, 39 insertions, 23 deletions

diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index fa3ac88cd30..3ef07f66e57 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2006/05/31 18:22:24 ghen Exp $
+# $NetBSD: Makefile,v 1.17 2006/06/21 16:54:25 jlam Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
 PKGNAME=	hobbit-4.0b6
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
 
@@ -15,6 +15,7 @@ DEPENDS+=	fping>2:../../net/fping
 
 HAS_CONFIGURE=	YES
 USE_TOOLS+=	gmake
+INSTALL_TARGET=	setup
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -33,17 +34,19 @@ PKG_USERS=	${BBUSER:Q}:${BBGROUP:Q}
 PKG_GECOS.${BBUSER}=	Hobbit monitor
 PKG_HOME.${BBUSER}=	${BBTOPDIR}
 
+EVAL_PREFIX+=	PREFIX.fping=fping
+
 CONFIGURE_ENV+=	TARGET=hobbit
-CONFIGURE_ENV+=	FPING=${PREFIX:Q}/sbin/fping
-CONFIGURE_ENV+=	RRDINC=${PREFIX:Q}/include
-CONFIGURE_ENV+=	RRDLIB=${PREFIX:Q}/lib/librrd.a
-CONFIGURE_ENV+=	PNGLIB=${PREFIX:Q}/lib/libpng.a
-CONFIGURE_ENV+=	LDAPINC=${PREFIX:Q}/include
-CONFIGURE_ENV+=	LDAPLIB=${PREFIX:Q}/lib
-CONFIGURE_ENV+=	OSSLINC=${PREFIX:Q}/include
-CONFIGURE_ENV+=	OSSLLIB=${PREFIX:Q}/lib
-CONFIGURE_ENV+=	PCREINC=${PREFIX:Q}/include
-CONFIGURE_ENV+=	PCRELIB=${PREFIX:Q}/lib
+CONFIGURE_ENV+=	FPING=${PREFIX.fping}/sbin/fping
+CONFIGURE_ENV+=	RRDINC=${BUILDLINK_PREFIX.rrdtool}/include
+CONFIGURE_ENV+=	RRDLIB=${BUILDLINK_PREFIX.rrdtool}/lib/librrd.a
+CONFIGURE_ENV+=	PNGLIB=${BUILDLINK_PREFIX.png}/lib/libpng.a
+CONFIGURE_ENV+=	LDAPINC=${BUILDLINK_PREFIX.openldap-client}/include
+CONFIGURE_ENV+=	LDAPLIB=${BUILDLINK_PREFIX.openldap-client}/lib
+CONFIGURE_ENV+=	OSSLINC=${BUILDLINK_PREFIX.openssl}/include
+CONFIGURE_ENV+=	OSSLLIB=${BUILDLINK_PREFIX.openssl}/lib
+CONFIGURE_ENV+=	PCREINC=${BUILDLINK_PREFIX.pcre}/include
+CONFIGURE_ENV+=	PCRELIB=${BUILDLINK_PREFIX.pcre}/lib
 CONFIGURE_ENV+=	ENABLESSL=y
 CONFIGURE_ENV+=	ENABLELDAP=y
 CONFIGURE_ENV+=	ENABLELDAPSSL=y
@@ -56,7 +59,7 @@ CONFIGURE_ENV+=	BBCGIURL=${BBCGIURL:Q}
 CONFIGURE_ENV+=	HTTPDGID=${APACHE_GROUP:Q}
 CONFIGURE_ENV+=	BBLOGDIR=${BBLOGDIR:Q}
 CONFIGURE_ENV+=	BBHOSTIP=${BBHOSTIP:Q}
-CONFIGURE_ENV+=	MANROOT=${PREFIX:Q}/man
+CONFIGURE_ENV+=	MANROOT=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ENV+=	BARS=all
 CONFIGURE_ENV+=	USENEWHIST=y
 CONFIGURE_ENV+=	PIXELCOUNT=560
@@ -64,15 +67,6 @@ CONFIGURE_ENV+=	PIXELCOUNT=560
 MAKE_ENV+=	MAKE=${MAKE_PROGRAM:Q}
 MAKE_ENV+=	PKGDIR=${PREFIX:Q}
 
-do-install:
-	set -e;							\
-	cd ${WRKSRC:Q};						\
-	if ${TEST} -f ${BBTOPDIR:Q}/server/etc/bb-hosts ; then	\
-		${GMAKE} install ;				\
-	else							\
-		${GMAKE} setup ;				\
-	fi
-
 .include "../../databases/rrdtool/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/hobbitmon/PLIST b/net/hobbitmon/PLIST
index 3c00168d60a..53e8f5cf684 100644
--- a/net/hobbitmon/PLIST
+++ b/net/hobbitmon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/12 15:00:55 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/06/21 16:54:25 jlam Exp $
 hobbit/cgi-bin/bb-ack.sh
 hobbit/cgi-bin/bb-csvinfo.sh
 hobbit/cgi-bin/bb-eventlog.sh
@@ -54,26 +54,43 @@ hobbit/server/etc/hobbitlaunch.cfg
 hobbit/server/etc/hobbitserver.cfg
 hobbit/server/ext/bbcombotest
 hobbit/server/ext/bbretest-net.sh
+hobbit/server/starthobbit.sh
+hobbit/server/web/acknowledge_footer
 hobbit/server/web/acknowledge_form
 hobbit/server/web/acknowledge_header
+hobbit/server/web/bb2_footer
 hobbit/server/web/bb2_header
 hobbit/server/web/bb_footer
 hobbit/server/web/bb_header
+hobbit/server/web/bbnk_footer
 hobbit/server/web/bbnk_header
+hobbit/server/web/bbrep_footer
 hobbit/server/web/bbrep_header
+hobbit/server/web/bbsnap_footer
 hobbit/server/web/bbsnap_header
+hobbit/server/web/columndoc_footer
 hobbit/server/web/columndoc_header
+hobbit/server/web/findhost_footer
 hobbit/server/web/findhost_form
 hobbit/server/web/findhost_header
+hobbit/server/web/graphs_footer
 hobbit/server/web/graphs_header
+hobbit/server/web/hist_footer
 hobbit/server/web/hist_header
+hobbit/server/web/histlog_footer
 hobbit/server/web/histlog_header
+hobbit/server/web/hostsvc_footer
 hobbit/server/web/hostsvc_header
+hobbit/server/web/info_footer
 hobbit/server/web/info_header
+hobbit/server/web/maint_footer
 hobbit/server/web/maint_header
+hobbit/server/web/replog_footer
 hobbit/server/web/replog_header
+hobbit/server/web/report_footer
 hobbit/server/web/report_form
 hobbit/server/web/report_header
+hobbit/server/web/snapshot_footer
 hobbit/server/web/snapshot_form
 hobbit/server/web/snapshot_header
 hobbit/server/www/gifs/README
@@ -169,9 +186,12 @@ man/man1/bb-eventlog.cgi.1
 man/man1/bb-findhost.cgi.1
 man/man1/bb-hist.cgi.1
 man/man1/bb-hostsvc.cgi.1
+man/man1/bb-infocolumn.1
+man/man1/bb-larrdcolumn.1
 man/man1/bb-rep.cgi.1
 man/man1/bb-replog.cgi.1
 man/man1/bb-snapshot.cgi.1
+man/man1/bb-webpage.1
 man/man1/bb.1
 man/man1/bbcmd.1
 man/man1/bbcombotest.1
@@ -186,6 +206,7 @@ man/man1/hobbitgraph.cgi.1
 man/man5/bb-hosts.5
 man/man5/bb-services.5
 man/man5/bbcombotest.cfg.5
+man/man5/hobbit-alerts.cfg.5
 man/man5/hobbitgraph.cfg.5
 man/man5/hobbitlaunch.cfg.5
 man/man5/hobbitserver.cfg.5
@@ -197,6 +218,7 @@ man/man8/hobbitd_channel.8
 man/man8/hobbitd_filestore.8
 man/man8/hobbitd_history.8
 man/man8/hobbitd_larrd.8
+man/man8/hobbitd_sample.8
 man/man8/hobbitlaunch.8
 @dirrm hobbit/server/www/wml
 @dirrm hobbit/server/www/snap