Updated net/mrtg to 2.16.0

* Makesure mrtg repopulates its cache only once even in fork mode
* Added support for RRDtool based Holt-Winters aberrant behaviour detection.
  Threshold based alerts have been enhanced to be able to fire based on the
  FAILURES RRA. Note that Holt-Winters aberrant behaviour detection can only
  be enabled on newly created RRAs.
* when thresholds were UNboraken, the threshprogok did not run necessarily
* MIB parser rewritten for better compatibility
* allow RouterUptime to contain an explicit OID for queriing the uptime.
* support for nortel passport 8600 in cfgmaker
* Added Documentation for GeTNEXT prefix
* Added New Prefix for Counterd SNMP Walk -> CnTWaLK (see docs)
* Upgrade to SNMP Session 1.10
* Updates for  Net_SNMP_util.pm   and  SNMP_util.pm
* Fix if_is_ciscovlan condition in cfgmaker
* Updated port syntax in documentation (based on trac entry)

4 files changed, 24 insertions, 20 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 59915b6ef49..c4f66babd57 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2007/12/02 12:15:45 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2008/02/13 12:05:26 martti Exp $
 
-DISTNAME=	mrtg-2.15.2
-PKGREVISION=	1
+DISTNAME=	mrtg-2.16.0
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
 		http://oss.oetiker.ch/mrtg/pub/old/
@@ -70,7 +70,7 @@ do-install:
 	  ${INSTALL_SCRIPT} ${WRKDIR}/$$FILE ${PREFIX}/libexec; \
 	done
 	${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB}
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/mrtg2/BER.pm \
+	${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/BER.pm \
 	  ${WRKSRC}/lib/mrtg2/SNMP_Session.pm \
 	  ${WRKSRC}/lib/mrtg2/SNMP_util.pm \
 	  ${WRKSRC}/lib/mrtg2/Net_SNMP_util.pm \
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index 8529ad17491..7ff42b61ccf 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2007/08/08 20:22:16 joerg Exp $
+$NetBSD: distinfo,v 1.27 2008/02/13 12:05:26 martti Exp $
 
-SHA1 (mrtg-2.15.2.tar.gz) = 1d814dfeeaa77f83a0e6c20c4b9a5f9dcbd24089
-RMD160 (mrtg-2.15.2.tar.gz) = cf21cfeb5e68b00fec7552b58c60ad22a0c47e47
-Size (mrtg-2.15.2.tar.gz) = 1070900 bytes
+SHA1 (mrtg-2.16.0.tar.gz) = dd4d77179c84d30e0c38256d883f567417536317
+RMD160 (mrtg-2.16.0.tar.gz) = 83d0832c84e0233b0b54b99d03d8808cbbd6e78c
+Size (mrtg-2.16.0.tar.gz) = 1078505 bytes
 SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
 SHA1 (patch-ac) = e12f74ea083c1e3a7793afc35dcd698611823d81
-SHA1 (patch-ad) = f6d737bad01ffbfdeb40fe08361810881f0257d5
-SHA1 (patch-ae) = b76543d57a4c630adec51f78c1d6005dffee6a3d
+SHA1 (patch-ad) = f40b47771a2f13d3dcaf6760672f0243b0434a4c
+SHA1 (patch-ae) = 38793e3bd13570d18006a016c65a4cc3c3f5e1b5
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad
index 3939b3b3f69..7e0ba098dc0 100644
--- a/net/mrtg/patches/patch-ad
+++ b/net/mrtg/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.13 2007/01/10 14:25:40 martti Exp $
+$NetBSD: patch-ad,v 1.14 2008/02/13 12:05:26 martti Exp $
 
---- bin/mrtg.orig	2006-12-06 00:10:06.000000000 +0000
-+++ bin/mrtg	2007-01-10 16:00:01.000000000 +0000
-@@ -864,8 +864,8 @@
+--- bin/mrtg.orig	2008-02-06 16:35:49.000000000 +0200
++++ bin/mrtg	2008-02-13 13:57:31.000000000 +0200
+@@ -898,8 +898,8 @@
  
      ((($MRTG_lib::OS eq 'NT' or $MRTG_lib::OS eq 'OS2') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) or
       (($MRTG_lib::OS eq 'NW') and (-e "SYS:/Mrtg/bin/rateup.nlm")) or
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.13 2007/01/10 14:25:40 martti Exp $
  
      # rateup does not know about undef so we make inlast and outlast ready for rateup
      #warn "$NOW: ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast;
-@@ -877,7 +877,7 @@
+@@ -911,7 +911,7 @@
      $outlast = -1 unless defined $outlast;
      
      if ($$rcfg{'options'}{'dorelpercent'}{$router}) {
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.13 2007/01/10 14:25:40 martti Exp $
                   "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
                   $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
                   "$up_abs"."p", $inlast, $outlast, $absmax,
-@@ -886,7 +886,7 @@
+@@ -920,7 +920,7 @@
                   $$rcfg{'rgb5'}{$router});
      } else { 
  
diff --git a/net/mrtg/patches/patch-ae b/net/mrtg/patches/patch-ae
index 4c79a5e6fbd..573c1e232dd 100644
--- a/net/mrtg/patches/patch-ae
+++ b/net/mrtg/patches/patch-ae
@@ -1,9 +1,13 @@
-$NetBSD: patch-ae,v 1.4 2006/10/19 06:40:54 martti Exp $
+$NetBSD: patch-ae,v 1.5 2008/02/13 12:05:26 martti Exp $
 
---- lib/mrtg2/SNMP_Session.pm.orig	2006-09-06 13:42:50.000000000 +0000
-+++ lib/mrtg2/SNMP_Session.pm	2006-10-19 08:48:09.000000000 +0000
-@@ -111,3 +111,3 @@
+--- lib/mrtg2/SNMP_Session.pm.orig	2008-02-06 16:35:49.000000000 +0200
++++ lib/mrtg2/SNMP_Session.pm	2008-02-13 13:57:53.000000000 +0200
+@@ -110,7 +110,7 @@
+ ### some agents erroneously encode the response ID as an unsigned,
+ ### which prevents this code from matching such responses to requests.
  ###
 -$SNMP_Session::default_avoid_negative_request_ids = 0;
 +$SNMP_Session::default_avoid_negative_request_ids = 1;
  
+ ### Default value for "use_16bit_request_ids".
+ ###