Fixed pkglint warnings.

2 files changed, 159 insertions, 158 deletions

diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index 57d299436ba..b8a99b35551 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:10:25 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/12 15:00:55 rillig Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
@@ -28,19 +28,19 @@ BBCGIURL?=	/cgi-bin
 BBHOSTIP?=	127.0.0.1
 
 PKG_GROUPS=	${BBGROUP}
-PKG_USERS=	${BBUSER}:${BBGROUP}::Hobbit\ monitor:${BBTOPDIR}
+PKG_USERS=	${BBUSER:Q}:${BBGROUP:Q}::Hobbit\ monitor:${BBTOPDIR:Q}
 
 CONFIGURE_ENV+=	TARGET=hobbit
-CONFIGURE_ENV+=	FPING=${PREFIX}/sbin/fping
-CONFIGURE_ENV+=	RRDINC=${PREFIX}/include
-CONFIGURE_ENV+=	RRDLIB=${PREFIX}/lib/librrd.a
-CONFIGURE_ENV+=	PNGLIB=${PREFIX}/lib/libpng.a
-CONFIGURE_ENV+=	LDAPINC=${PREFIX}/include
-CONFIGURE_ENV+=	LDAPLIB=${PREFIX}/lib
-CONFIGURE_ENV+=	OSSLINC=${PREFIX}/include
-CONFIGURE_ENV+=	OSSLLIB=${PREFIX}/lib
-CONFIGURE_ENV+=	PCREINC=${PREFIX}/include
-CONFIGURE_ENV+=	PCRELIB=${PREFIX}/lib
+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+=	ENABLESSL=y
 CONFIGURE_ENV+=	ENABLELDAP=y
 CONFIGURE_ENV+=	ENABLELDAPSSL=y
@@ -53,7 +53,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}/man
+CONFIGURE_ENV+=	MANROOT=${PREFIX:Q}/man
 CONFIGURE_ENV+=	BARS=all
 CONFIGURE_ENV+=	USENEWHIST=y
 CONFIGURE_ENV+=	PIXELCOUNT=560
@@ -62,8 +62,9 @@ MAKE_ENV+=	MAKE=${MAKE_PROGRAM:Q}
 MAKE_ENV+=	PKGDIR=${PREFIX:Q}
 
 do-install:
-	cd ${WRKSRC} ; 						\
-	if ${TEST} -f ${BBTOPDIR}/server/etc/bb-hosts ; then	\
+	set -e;							\
+	cd ${WRKSRC:Q};						\
+	if ${TEST} -f ${BBTOPDIR:Q}/server/etc/bb-hosts ; then	\
 		${GMAKE} install ;				\
 	else							\
 		${GMAKE} setup ;				\
diff --git a/net/hobbitmon/PLIST b/net/hobbitmon/PLIST
index 86fdec93295..3c00168d60a 100644
--- a/net/hobbitmon/PLIST
+++ b/net/hobbitmon/PLIST
@@ -1,203 +1,203 @@
-@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
-man/man1/bbcmd.1
-man/man1/bb.1
-man/man1/bb-ack.cgi.1
-man/man1/bbgen.1
-man/man1/bbcombotest.1
-man/man1/bb-snapshot.cgi.1
-man/man1/bb-replog.cgi.1
-man/man1/bb-rep.cgi.1
-man/man1/bb-hostsvc.cgi.1
-man/man1/bb-hist.cgi.1
-man/man1/bb-findhost.cgi.1
-man/man1/bb-eventlog.cgi.1
-man/man1/bb-csvinfo.cgi.1
-man/man1/bbmessage.cgi.1
-man/man1/bbtest-net.1
-man/man1/bbretest-net.sh.1
-man/man1/hobbitgraph.cgi.1
-man/man5/hobbitserver.cfg.5
-man/man5/hobbitlaunch.cfg.5
-man/man5/bb-hosts.5
-man/man5/bbcombotest.cfg.5
-man/man5/bb-services.5
-man/man5/hobbitgraph.cfg.5
-man/man7/hobbit.7
-man/man8/hobbitlaunch.8
-man/man8/bbproxy.8
-man/man8/hobbitd_larrd.8
-man/man8/hobbitd_history.8
-man/man8/hobbitd_filestore.8
-man/man8/hobbitd_channel.8
-man/man8/hobbitd_alert.8
-man/man8/hobbitd.8
-hobbit/server/bin/bbcmd
-hobbit/server/bin/hobbitlaunch
+@comment $NetBSD: PLIST,v 1.3 2006/03/12 15:00:55 rillig Exp $
+hobbit/cgi-bin/bb-ack.sh
+hobbit/cgi-bin/bb-csvinfo.sh
+hobbit/cgi-bin/bb-eventlog.sh
+hobbit/cgi-bin/bb-findhost.sh
+hobbit/cgi-bin/bb-hist.sh
+hobbit/cgi-bin/bb-histlog.sh
+hobbit/cgi-bin/bb-hostsvc.sh
+hobbit/cgi-bin/bb-rep.sh
+hobbit/cgi-bin/bb-replog.sh
+hobbit/cgi-bin/bb-snapshot.sh
+hobbit/cgi-bin/bbmessage.cgi
+hobbit/cgi-bin/hobbitcolumn.sh
+hobbit/cgi-bin/hobbitgraph.sh
+hobbit/cgi-bin/maint.pl
 hobbit/server/bin/bb
-hobbit/server/bin/bbdigest
-hobbit/server/bin/bbhostshow
-hobbit/server/bin/bbhostgrep
-hobbit/server/bin/bbgen
-hobbit/server/bin/bb-larrdcolumn
-hobbit/server/bin/bb-webpage
 hobbit/server/bin/bb-ack.cgi
-hobbit/server/bin/bb-hostsvc.cgi
 hobbit/server/bin/bb-csvinfo.cgi
-hobbit/server/bin/bb-findhost.cgi
 hobbit/server/bin/bb-eventlog.cgi
-hobbit/server/bin/bb-snapshot.cgi
+hobbit/server/bin/bb-findhost.cgi
 hobbit/server/bin/bb-hist.cgi
-hobbit/server/bin/bb-replog.cgi
-hobbit/server/bin/bb-rep.cgi
+hobbit/server/bin/bb-hostsvc.cgi
 hobbit/server/bin/bb-infocolumn
-hobbit/server/bin/bbtest-net
+hobbit/server/bin/bb-larrdcolumn
+hobbit/server/bin/bb-rep.cgi
+hobbit/server/bin/bb-replog.cgi
+hobbit/server/bin/bb-snapshot.cgi
+hobbit/server/bin/bb-webpage
+hobbit/server/bin/bbcmd
+hobbit/server/bin/bbdigest
+hobbit/server/bin/bbgen
+hobbit/server/bin/bbhostgrep
+hobbit/server/bin/bbhostshow
 hobbit/server/bin/bbproxy
+hobbit/server/bin/bbtest-net
 hobbit/server/bin/hobbitd
-hobbit/server/bin/starthobbit.sh
-hobbit/server/bin/hobbitd_sample
-hobbit/server/bin/hobbitd_larrd
 hobbit/server/bin/hobbitd_alert
-hobbit/server/bin/hobbitd_history
+hobbit/server/bin/hobbitd_channel
 hobbit/server/bin/hobbitd_filestore
 hobbit/server/bin/hobbitd_filter
-hobbit/server/bin/hobbitd_channel
+hobbit/server/bin/hobbitd_history
+hobbit/server/bin/hobbitd_larrd
+hobbit/server/bin/hobbitd_sample
 hobbit/server/bin/hobbitgraph.cgi
+hobbit/server/bin/hobbitlaunch
+hobbit/server/bin/starthobbit.sh
+hobbit/server/etc/bb-hosts
 hobbit/server/etc/bb-services
-hobbit/server/etc/hobbitgraph.cfg
 hobbit/server/etc/columndoc.csv
-hobbit/server/etc/hobbit-apache.conf
-hobbit/server/etc/hobbitserver.cfg
-hobbit/server/etc/bb-hosts
 hobbit/server/etc/hobbit-alerts.cfg
+hobbit/server/etc/hobbit-apache.conf
+hobbit/server/etc/hobbitgraph.cfg
 hobbit/server/etc/hobbitlaunch.cfg
+hobbit/server/etc/hobbitserver.cfg
 hobbit/server/ext/bbcombotest
 hobbit/server/ext/bbretest-net.sh
-hobbit/server/web/acknowledge_header
 hobbit/server/web/acknowledge_form
-hobbit/server/web/findhost_header
-hobbit/server/web/findhost_form
-hobbit/server/web/report_header
-hobbit/server/web/report_form
-hobbit/server/web/snapshot_header
-hobbit/server/web/snapshot_form
-hobbit/server/web/bbrep_header
-hobbit/server/web/info_header
+hobbit/server/web/acknowledge_header
+hobbit/server/web/bb2_header
+hobbit/server/web/bb_footer
+hobbit/server/web/bb_header
 hobbit/server/web/bbnk_header
+hobbit/server/web/bbrep_header
+hobbit/server/web/bbsnap_header
+hobbit/server/web/columndoc_header
+hobbit/server/web/findhost_form
+hobbit/server/web/findhost_header
 hobbit/server/web/graphs_header
+hobbit/server/web/hist_header
 hobbit/server/web/histlog_header
-hobbit/server/web/bb2_header
 hobbit/server/web/hostsvc_header
-hobbit/server/web/bb_footer
-hobbit/server/web/bb_header
+hobbit/server/web/info_header
 hobbit/server/web/maint_header
-hobbit/server/web/hist_header
 hobbit/server/web/replog_header
-hobbit/server/web/bbsnap_header
-hobbit/server/web/columndoc_header
+hobbit/server/web/report_form
+hobbit/server/web/report_header
+hobbit/server/web/snapshot_form
+hobbit/server/web/snapshot_header
+hobbit/server/www/gifs/README
+hobbit/server/www/gifs/arrow.gif
 hobbit/server/www/gifs/bbfindhost1.gif
 hobbit/server/www/gifs/bbfindhost2.gif
-hobbit/server/www/gifs/unknown-recent.gif
-hobbit/server/www/gifs/clear.gif
-hobbit/server/www/gifs/green.gif
-hobbit/server/www/gifs/yellow.gif
-hobbit/server/www/gifs/red.gif
-hobbit/server/www/gifs/purple-recent.gif
+hobbit/server/www/gifs/bkg-blue.gif
 hobbit/server/www/gifs/bkg-clear.gif
 hobbit/server/www/gifs/bkg-green.gif
-hobbit/server/www/gifs/README
-hobbit/server/www/gifs/purple.gif
-hobbit/server/www/gifs/bkg-blue.gif
+hobbit/server/www/gifs/bkg-purple.gif
+hobbit/server/www/gifs/bkg-red.gif
+hobbit/server/www/gifs/bkg-yellow.gif
 hobbit/server/www/gifs/blue-recent.gif
-hobbit/server/www/gifs/red-recent.gif
 hobbit/server/www/gifs/blue.gif
-hobbit/server/www/gifs/yellow-ack.gif
+hobbit/server/www/gifs/clear-recent.gif
+hobbit/server/www/gifs/clear.gif
 hobbit/server/www/gifs/green-recent.gif
-hobbit/server/www/gifs/arrow.gif
+hobbit/server/www/gifs/green.gif
 hobbit/server/www/gifs/purple-ack.gif
+hobbit/server/www/gifs/purple-recent.gif
+hobbit/server/www/gifs/purple.gif
 hobbit/server/www/gifs/red-ack.gif
+hobbit/server/www/gifs/red-recent.gif
+hobbit/server/www/gifs/red.gif
+hobbit/server/www/gifs/unknown-recent.gif
+hobbit/server/www/gifs/yellow-ack.gif
 hobbit/server/www/gifs/yellow-recent.gif
-hobbit/server/www/gifs/bkg-red.gif
-hobbit/server/www/gifs/bkg-yellow.gif
-hobbit/server/www/gifs/clear-recent.gif
-hobbit/server/www/gifs/bkg-purple.gif
+hobbit/server/www/gifs/yellow.gif
+hobbit/server/www/help/about.html
 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/bb-to-hobbit.html
+hobbit/server/www/help/configure.txt
+hobbit/server/www/help/hobbit-alerts.html
+hobbit/server/www/help/hobbit-apacheconf.txt
+hobbit/server/www/help/hobbit-bbhosts.png
+hobbit/server/www/help/hobbit-bigbrother.html
+hobbit/server/www/help/hobbit-config.html
+hobbit/server/www/help/hobbit-tips.html
+hobbit/server/www/help/hobbitmain.png
+hobbit/server/www/help/hobbitprocs.png
+hobbit/server/www/help/install.html
+hobbit/server/www/help/known-issues.html
+hobbit/server/www/help/manpages/index.html
 hobbit/server/www/help/manpages/man1/bb-ack.cgi.1.html
 hobbit/server/www/help/manpages/man1/bb-csvinfo.cgi.1.html
+hobbit/server/www/help/manpages/man1/bb-eventlog.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-hostsvc.cgi.1.html
+hobbit/server/www/help/manpages/man1/bb-infocolumn.1.html
+hobbit/server/www/help/manpages/man1/bb-larrdcolumn.1.html
+hobbit/server/www/help/manpages/man1/bb-rep.cgi.1.html
+hobbit/server/www/help/manpages/man1/bb-replog.cgi.1.html
+hobbit/server/www/help/manpages/man1/bb-snapshot.cgi.1.html
+hobbit/server/www/help/manpages/man1/bb-webpage.1.html
+hobbit/server/www/help/manpages/man1/bb.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/bbgen.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/bbmessage.cgi.1.html
+hobbit/server/www/help/manpages/man1/bbretest-net.sh.1.html
+hobbit/server/www/help/manpages/man1/bbtest-net.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
 hobbit/server/www/help/manpages/man5/bbcombotest.cfg.5.html
+hobbit/server/www/help/manpages/man5/hobbit-alerts.cfg.5.html
+hobbit/server/www/help/manpages/man5/hobbitgraph.cfg.5.html
+hobbit/server/www/help/manpages/man5/hobbitlaunch.cfg.5.html
+hobbit/server/www/help/manpages/man5/hobbitserver.cfg.5.html
 hobbit/server/www/help/manpages/man7/hobbit.7.html
-hobbit/server/www/help/manpages/man8/hobbitd_channel.8.html
+hobbit/server/www/help/manpages/man8/bbproxy.8.html
 hobbit/server/www/help/manpages/man8/hobbitd.8.html
+hobbit/server/www/help/manpages/man8/hobbitd_alert.8.html
+hobbit/server/www/help/manpages/man8/hobbitd_channel.8.html
 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_larrd.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
-hobbit/server/www/help/about.html
-hobbit/server/www/help/hobbitmain.png
-hobbit/server/www/help/hobbit-bbhosts.png
-hobbit/server/www/help/hobbit-apacheconf.txt
-hobbit/server/www/help/configure.txt
-hobbit/server/www/help/known-issues.html
-hobbit/server/www/help/install.html
-hobbit/server/www/help/hobbit-tips.html
-hobbit/server/www/help/hobbit-config.html
-hobbit/server/www/help/hobbit-bigbrother.html
-hobbit/server/www/help/hobbit-alerts.html
-hobbit/server/www/help/bb-to-hobbit.html
-hobbit/server/www/help/hobbitprocs.png
-hobbit/server/www/menu/menu_items.js
-hobbit/server/www/menu/menu_tpl.js
-hobbit/server/www/menu/menu.css
 hobbit/server/www/menu/README
+hobbit/server/www/menu/menu.css
 hobbit/server/www/menu/menu.js
+hobbit/server/www/menu/menu_items.js
 hobbit/server/www/menu/menu_items.js.DIST
-hobbit/cgi-bin/bb-rep.sh
-hobbit/cgi-bin/bb-histlog.sh
-hobbit/cgi-bin/bb-hostsvc.sh
-hobbit/cgi-bin/bbmessage.cgi
-hobbit/cgi-bin/bb-csvinfo.sh
-hobbit/cgi-bin/bb-findhost.sh
-hobbit/cgi-bin/bb-eventlog.sh
-hobbit/cgi-bin/bb-snapshot.sh
-hobbit/cgi-bin/bb-hist.sh
-hobbit/cgi-bin/bb-replog.sh
-hobbit/cgi-bin/hobbitcolumn.sh
-hobbit/cgi-bin/maint.pl
-hobbit/cgi-bin/hobbitgraph.sh
-hobbit/cgi-bin/bb-ack.sh
+hobbit/server/www/menu/menu_tpl.js
+man/man1/bb-ack.cgi.1
+man/man1/bb-csvinfo.cgi.1
+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-rep.cgi.1
+man/man1/bb-replog.cgi.1
+man/man1/bb-snapshot.cgi.1
+man/man1/bb.1
+man/man1/bbcmd.1
+man/man1/bbcombotest.1
+man/man1/bbdigest.1
+man/man1/bbgen.1
+man/man1/bbhostgrep.1
+man/man1/bbhostshow.1
+man/man1/bbmessage.cgi.1
+man/man1/bbretest-net.sh.1
+man/man1/bbtest-net.1
+man/man1/hobbitgraph.cgi.1
+man/man5/bb-hosts.5
+man/man5/bb-services.5
+man/man5/bbcombotest.cfg.5
+man/man5/hobbitgraph.cfg.5
+man/man5/hobbitlaunch.cfg.5
+man/man5/hobbitserver.cfg.5
+man/man7/hobbit.7
+man/man8/bbproxy.8
+man/man8/hobbitd.8
+man/man8/hobbitd_alert.8
+man/man8/hobbitd_channel.8
+man/man8/hobbitd_filestore.8
+man/man8/hobbitd_history.8
+man/man8/hobbitd_larrd.8
+man/man8/hobbitlaunch.8
 @dirrm hobbit/server/www/wml
 @dirrm hobbit/server/www/snap
 @dirrm hobbit/server/www/rep