Updated mrtg to 2.12.2

* fix warnings produced by pkglint
* fix portname math in indexmaker
* accept extreme networks switches for ifAlias in cfgmaker
* set unknown values to 0 for threshold checking if unknonwnaszero is set
* updated NetWare integration

5 files changed, 24 insertions, 21 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 84cf2ffb391..8c567435a96 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2005/06/17 03:50:26 jlam Exp $
+# $NetBSD: Makefile,v 1.62 2005/06/23 08:12:13 martti Exp $
 
-DISTNAME=	mrtg-2.11.1
-PKGREVISION=	1
+DISTNAME=	mrtg-2.12.2
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \
@@ -26,7 +26,7 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
 COMMENT=	The Multi-Router Traffic Grapher
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl
 PERL5_REQD+=	5.6.1
 GNU_CONFIGURE=	YES
 USE_PKGINSTALL=	YES
@@ -55,7 +55,7 @@ CONF_FILES=	${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-patch
 SUBST_FILES.files=	../mrtg.conf.example ../netstat2mrtg		\
-			../sys2mrtg ../envstat2mrtg	
+			../sys2mrtg ../envstat2mrtg
 SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.files=	"Fixing default configuration files."
 
diff --git a/net/mrtg/PLIST b/net/mrtg/PLIST
index e30e958e0aa..4cb06699e22 100644
--- a/net/mrtg/PLIST
+++ b/net/mrtg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/01/24 16:25:05 tv Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/06/23 08:12:13 martti Exp $
 ${PERL5_SITELIB}/BER.pm
 ${PERL5_SITELIB}/MRTG_lib.pm
 ${PERL5_SITELIB}/SNMP_Session.pm
@@ -11,7 +11,6 @@ libexec/envstat2mrtg
 libexec/netstat2mrtg
 libexec/rateup
 libexec/sys2mrtg
-man/man1/mrtg.1
 man/man1/mrtg-contrib.1
 man/man1/mrtg-faq.1
 man/man1/mrtg-forum.1
@@ -19,11 +18,13 @@ man/man1/mrtg-ipv6.1
 man/man1/mrtg-logfile.1
 man/man1/mrtg-mibhelp.1
 man/man1/mrtg-nt-guide.1
+man/man1/mrtg-nw-guide.1
 man/man1/mrtg-reference.1
 man/man1/mrtg-rrd.1
 man/man1/mrtg-squid.1
 man/man1/mrtg-unix-guide.1
 man/man1/mrtg-webserver.1
+man/man1/mrtg.1
 man/man1/mrtgcfgmaker.1
 man/man1/mrtgindexmaker.1
 man/man1/mrtglib.1
@@ -66,6 +67,9 @@ share/doc/mrtg/mrtg-mibhelp.txt
 share/doc/mrtg/mrtg-nt-guide.html
 share/doc/mrtg/mrtg-nt-guide.pod
 share/doc/mrtg/mrtg-nt-guide.txt
+share/doc/mrtg/mrtg-nw-guide.html
+share/doc/mrtg/mrtg-nw-guide.pod
+share/doc/mrtg/mrtg-nw-guide.txt
 share/doc/mrtg/mrtg-r.gif
 share/doc/mrtg/mrtg-r.png
 share/doc/mrtg/mrtg-reference.html
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index 547c99c4d73..db359fe9211 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2005/02/24 12:13:53 agc Exp $
+$NetBSD: distinfo,v 1.20 2005/06/23 08:12:13 martti Exp $
 
-SHA1 (mrtg-2.11.1.tar.gz) = cc682e23db63696b83438a0ee21d0718f04104cb
-RMD160 (mrtg-2.11.1.tar.gz) = 665ee0e49de26753a3a771a30ad1e19f1c57a7a0
-Size (mrtg-2.11.1.tar.gz) = 1118175 bytes
+SHA1 (mrtg-2.12.2.tar.gz) = b968a8afca8bc12a5164de0f869422bb2d0156a5
+RMD160 (mrtg-2.12.2.tar.gz) = e7ceab248909369c1e92807cf121a6d3eee089ff
+Size (mrtg-2.12.2.tar.gz) = 1135438 bytes
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
 SHA1 (patch-ac) = 591006bc9732f1ce59d0cd1d93348c6578089744
-SHA1 (patch-ad) = bdcea3ea03b988a675552c74eefe0b3278d7349b
+SHA1 (patch-ad) = 150b3ebd1a11d83d46646cd068664d7d6b7c6f1d
 SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a
diff --git a/net/mrtg/files/envstat2mrtg b/net/mrtg/files/envstat2mrtg
index 6ded0cfeaad..21d542737c6 100755
--- a/net/mrtg/files/envstat2mrtg
+++ b/net/mrtg/files/envstat2mrtg
@@ -1,5 +1,5 @@
 #! @PREFIX@/bin/perl
-#	$NetBSD: envstat2mrtg,v 1.1 2001/11/07 18:26:50 bouyer Exp $
+#	$NetBSD: envstat2mrtg,v 1.2 2005/06/23 08:12:13 martti Exp $
 
 if (@ARGV == 1)
 {
@@ -70,4 +70,3 @@ sub end
 	}
 	exit(0);
 }
-
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad
index 18076f5ba68..1c0fb812038 100644
--- a/net/mrtg/patches/patch-ad
+++ b/net/mrtg/patches/patch-ad
@@ -1,20 +1,20 @@
-$NetBSD: patch-ad,v 1.9 2004/08/30 18:40:14 martti Exp $
+$NetBSD: patch-ad,v 1.10 2005/06/23 08:12:13 martti Exp $
 
---- bin/mrtg.orig	2004-08-08 12:58:55.000000000 +0300
-+++ bin/mrtg	2004-08-30 21:23:13.000000000 +0300
-@@ -703,4 +703,4 @@
-      (($MRTG_lib::OS eq 'NW') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.nlm")) or
+--- bin/mrtg.orig	2005-06-19 16:40:02.000000000 +0300
++++ bin/mrtg	2005-06-23 08:05:14.000000000 +0300
+@@ -721,4 +721,4 @@
+      (($MRTG_lib::OS eq 'NW') and (-e "SYS:/Mrtg/bin/rateup.nlm")) or
 -     (-x "${FindBin::Bin}${MRTG_lib::SL}rateup")) or 
 -       die "ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n";
 +     (-x "__PREFIX__/libexec/rateup")) ||
 +       die "ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n";
  
-@@ -716,3 +716,3 @@
+@@ -734,3 +734,3 @@
      if ($$rcfg{'options'}{'dorelpercent'}{$router}) {
 -        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
 +        @exec = ("__PREFIX__/libexec/rateup",
                   "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
-@@ -725,3 +725,3 @@
+@@ -743,3 +743,3 @@
  
 -        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
 +        @exec = ("__PREFIX__/libexec/rateup",