Remove installation of the documentation from this package, to be

provided by the soon-to-be-committed munin-doc package.

Other minor changes:
 o Remove comented-out bits from package Makefile
 o Re-ordered variables reported by NetBSD's cpu plugin script
 o Use shorter legend text in NetBSD's interrupts plugin script

Bumped package revision.

4 files changed, 45 insertions, 49 deletions

diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 772a8d1af53..b0c585e1f1d 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/06/04 20:53:56 he Exp $
+# $NetBSD: Makefile,v 1.2 2006/06/08 18:59:25 he Exp $
 #
 
-DISTNAME=	${PKGNAME:S:-node-:_:}
-PKGNAME=	munin-node-1.3.1
+DISTNAME=	munin_${VER}
+VER=		1.3.1
+PKGNAME=	munin-node-${VER}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=munin/}
+PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://munin.sourceforge.net/
@@ -12,8 +14,7 @@ COMMENT=	System monitoring tool, client version
 
 DEPENDS+=	p5-Net-Server>=0:../../net/p5-Net-Server
 DEPENDS+=	p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
-BUILD_DEPENDS+=	htmldoc>=0:../../www/htmldoc
-BUILD_DEPENDS+= html2text>=0:../../textproc/html2text
+#DEPENDS+=	munin-doc>=1.3.1:../../sysutils/munin-doc
 
 USE_TOOLS+=	perl
 USE_TOOLS+=	gmake
@@ -44,12 +45,10 @@ OWN_DIRS_PERMS+=${VARBASE}/run/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755
 OWN_DIRS_PERMS+=${VARBASE}/log/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755
 OWN_DIRS_PERMS+=${VARBASE}/munin/plugin-state ${MUNIN_USER} ${MUNIN_GROUP} 0775
 
-INSTALL_TARGET=	install-doc install-man
-INSTALL_TARGET+=install-node install-node-plugins
+INSTALL_TARGET=	install-node install-node-plugins
 
-BUILD_TARGET=	build build-doc build-man
+BUILD_TARGET=	build
 
-#MAKE_ENV+=	PERL=${PERL5:Q}
 #MAKE_ENV+=	PERL5_SITELIB=${PERL5_SITELIB}
 MAKE_ENV+=	MUNIN_USER=${MUNIN_USER}
 MAKE_ENV+=	MUNIN_GROUP=${MUNIN_GROUP}
@@ -73,12 +72,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/build/node/munin-node.conf ${EGDIR}
 
-#pre-install:
-#	sed -e "s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!;	\
-#		s!@PERL@!${PERL5}!;			\
-#		s!@PREFIX@!${PREFIX}!;"			\
-#		<${WRKSRC}/munin-node.sh \
-#		> ${WRKSRC}/rc.d/munin-node
-
 .include "../../mk/bsd.pkg.mk"
 .include "../../lang/python/application.mk"
diff --git a/sysutils/munin-node/PLIST b/sysutils/munin-node/PLIST
index d729bdcee65..7fa9bc00baf 100644
--- a/sysutils/munin-node/PLIST
+++ b/sysutils/munin-node/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/06/04 20:53:57 he Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/06/08 18:59:25 he Exp $
 lib/munin/plugins/acpi
 lib/munin/plugins/amavis
 lib/munin/plugins/apache_accesses
@@ -106,31 +106,13 @@ lib/munin/plugins/swap
 lib/munin/plugins/sybase_space
 lib/munin/plugins/uptime
 lib/munin/plugins/vmstat
-man/man5/munin-node.conf.5
-man/man5/munin.conf.5
-man/man8/munin-cron.8
-man/man8/munin-graph.8
-man/man8/munin-html.8
-man/man8/munin-limits.8
-man/man8/munin-node.8
-man/man8/munin-run.8
-man/man8/munin-update.8
 sbin/munin-node
 sbin/munin-node-configure
 sbin/munin-node-configure-snmp
 sbin/munin-run
-share/doc/munin/COPYING
-share/doc/munin/README.api
-share/doc/munin/README.plugins
-share/doc/munin/munin-doc.html
-share/doc/munin/munin-doc.pdf
-share/doc/munin/munin-doc.txt
-share/doc/munin/munin-faq.html
-share/doc/munin/munin-faq.pdf
-share/doc/munin/munin-faq.txt
 share/examples/munin/munin-node.conf
 share/examples/rc.d/munin-node
 @comment pkg-specific directories:
-@dirrm share/doc/munin
 @dirrm lib/munin/plugins
-@dirrm lib/munin
+@comment shared with munin-server
+@unexec ${RMDIR} %D/lib/munin 2>/dev/null || ${TRUE}
diff --git a/sysutils/munin-node/files/node/node.d.netbsd/cpu.in b/sysutils/munin-node/files/node/node.d.netbsd/cpu.in
index 2a47984cc84..b37bb62a998 100755
--- a/sysutils/munin-node/files/node/node.d.netbsd/cpu.in
+++ b/sysutils/munin-node/files/node/node.d.netbsd/cpu.in
@@ -10,6 +10,17 @@
 # 	autoconf (optional - used by munin-config)
 #
 # $Log: cpu.in,v $
+# Revision 1.2  2006/06/08 18:59:26  he
+# Remove installation of the documentation from this package, to be
+# provided by the soon-to-be-committed munin-doc package.
+#
+# Other minor changes:
+#  o Remove comented-out bits from package Makefile
+#  o Re-ordered variables reported by NetBSD's cpu plugin script
+#  o Use shorter legend text in NetBSD's interrupts plugin script
+#
+# Bumped package revision.
+#
 # Revision 1.1.1.1  2006/06/04 20:53:57  he
 # Import the client version of the Munin system monitoring/graphing
 # tool -- project homepage is at http://munin.sourceforge.net/
@@ -65,7 +76,7 @@ if [ "$1" = "config" ]; then
 #	USRWARNING=$PERCENT*80/100
 
     echo 'graph_title CPU usage (' $NCPU ' CPUs)'
-    echo 'graph_order system interrupt user nice idle'
+    echo 'graph_order system interrupt user idle nice'
     echo "graph_args --base 1000 -r --lower-limit 0 --upper-limit $PERCENT "
     echo 'graph_vlabel %'
     echo 'graph_scale no'
@@ -101,14 +112,6 @@ if [ "$1" = "config" ]; then
     echo 'user.min 0'
     echo "user.cdef user,$CDEF"
 
-    echo 'nice.label nice'
-    echo 'nice.draw STACK'
-    echo 'nice.max 5000'
-    echo 'nice.type DERIVE'
-    echo 'nice.info CPU time spent by nice(1)d programs'
-    echo 'nice.min 0'
-    echo "nice.cdef nice,$CDEF"
-
     echo 'idle.label idle'
     echo 'idle.draw STACK'
     echo 'idle.max 5000'
@@ -117,6 +120,14 @@ if [ "$1" = "config" ]; then
     echo 'idle.min 0'
     echo "idle.cdef idle,$CDEF"
 
+    echo 'nice.label nice'
+    echo 'nice.draw STACK'
+    echo 'nice.max 5000'
+    echo 'nice.type DERIVE'
+    echo 'nice.info CPU time spent by nice(1)d programs'
+    echo 'nice.min 0'
+    echo "nice.cdef nice,$CDEF"
+
     exit 0
 fi
 
@@ -126,8 +137,8 @@ fi
 	print "system.value " a[10];
 	print "interrupt.value " a[13];
 	print "user.value " a[4];
-	print "nice.value " a[7];
 	print "idle.value " a[16];
+	print "nice.value " a[7];
 }'
 
 
diff --git a/sysutils/munin-node/files/node/node.d.netbsd/interrupts.in b/sysutils/munin-node/files/node/node.d.netbsd/interrupts.in
index 9b0d315f9b2..5b9cc35c846 100755
--- a/sysutils/munin-node/files/node/node.d.netbsd/interrupts.in
+++ b/sysutils/munin-node/files/node/node.d.netbsd/interrupts.in
@@ -7,6 +7,17 @@
 # Usage: Link or copy into /etc/munin/node.d/
 #
 # $Log: interrupts.in,v $
+# Revision 1.2  2006/06/08 18:59:26  he
+# Remove installation of the documentation from this package, to be
+# provided by the soon-to-be-committed munin-doc package.
+#
+# Other minor changes:
+#  o Remove comented-out bits from package Makefile
+#  o Re-ordered variables reported by NetBSD's cpu plugin script
+#  o Use shorter legend text in NetBSD's interrupts plugin script
+#
+# Bumped package revision.
+#
 # Revision 1.1.1.1  2006/06/04 20:53:57  he
 # Import the client version of the Munin system monitoring/graphing
 # tool -- project homepage is at http://munin.sourceforge.net/
@@ -60,8 +71,8 @@ if [ "$1" = "config" ]; then
 
     # The fields. "label" is used in the legend. "label" is the only
     # required subfield. 
-    echo 'devint.label device interrupts'
-    echo 'softint.label software interrupts'
+    echo 'devint.label device intrs'
+    echo 'softint.label software intrs'
     echo 'ctx.label context switches'
 
     # Specify type