Updated net/mrtg to 2.14.7

* take over MAINTAINERship

* removed extra spaces from Makefile.in
* timestamps in log files to be YYYY-MM-DD HH:MM:SS
* fixed rateup to propely support kMG option
* fixed problem with conversioncode option throwing an exception.
* fixed config parsing problem for libadd lines terminated by a \
* added 'eval' debug target
* updated local $SIG{__DIE__} locations to work as intended
* fix ifspeed for foundry switches in cfgmaker
* Added expscale option (opposite of logscale) to emphasize the top end of
  the scale; this improves display of line voltages that don't change a whole
  lot
* added sample startup script for mrtg

4 files changed, 25 insertions, 39 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 8bdb6b30816..9ae2935dd7c 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2006/10/07 08:18:31 taca Exp $
+# $NetBSD: Makefile,v 1.75 2006/10/19 06:40:54 martti Exp $
 
-DISTNAME=	mrtg-2.14.5
+DISTNAME=	mrtg-2.14.7
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/old/ \
@@ -22,7 +22,7 @@ MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://sunsite.icm.edu.pl/pub/unix/net/mrtg/ \
 		ftp://net2b.co.pt/pub/mrtg/
 
-MAINTAINER=	bouyer@NetBSD.org
+MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://oss.oetiker.ch/mrtg/
 COMMENT=	The Multi-Router Traffic Grapher
 
@@ -54,21 +54,19 @@ SUBST_FILES.files=	../mrtg.conf.example ../netstat2mrtg		\
 SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.files=	Fixing default configuration files.
 
-INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man1 ${EGDIR}
+INSTALLATION_DIRS+=	share/mrtg share/doc/mrtg
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 
 post-extract:
-	${CP} ${FILESDIR}/mrtg.conf.example ${WRKDIR}
-	${CP} ${FILESDIR}/netstat2mrtg ${WRKDIR}
-	${CP} ${FILESDIR}/sys2mrtg ${WRKDIR}
-	${CP} ${FILESDIR}/envstat2mrtg ${WRKDIR}
+	cp ${FILESDIR}/mrtg.conf.example ${WRKDIR}
+	cp ${FILESDIR}/netstat2mrtg ${WRKDIR}
+	cp ${FILESDIR}/sys2mrtg ${WRKDIR}
+	cp ${FILESDIR}/envstat2mrtg ${WRKDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mrtg
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mrtg
 	for FILE in ${WRKSRC}/doc/*.??*; do \
 	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/mrtg; \
 	done
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index ce806edd591..d34c251fa4b 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2006/08/09 21:42:42 adrianp Exp $
+$NetBSD: distinfo,v 1.22 2006/10/19 06:40:54 martti Exp $
 
-SHA1 (mrtg-2.14.5.tar.gz) = 2c9fe80a50e0611516122c2b95b028c39b735cec
-RMD160 (mrtg-2.14.5.tar.gz) = 08597e98a555c5e7dc8e2e3eca23fedf2fbef487
-Size (mrtg-2.14.5.tar.gz) = 1100574 bytes
+SHA1 (mrtg-2.14.7.tar.gz) = dd97dfb75dffe0c4abfabb26c73951641994ffc5
+RMD160 (mrtg-2.14.7.tar.gz) = e7c57aaef0160ef3a1144e2f9f9720c483192c65
+Size (mrtg-2.14.7.tar.gz) = 1061341 bytes
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
 SHA1 (patch-ac) = e12f74ea083c1e3a7793afc35dcd698611823d81
-SHA1 (patch-ad) = aad7bd2acafb41f05691d0fd701e1be7f12fda55
-SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a
+SHA1 (patch-ad) = 5d6cb2ea1c16dc53fab49e7dd166b6f246db40e1
+SHA1 (patch-ae) = b76543d57a4c630adec51f78c1d6005dffee6a3d
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad
index d15128d751f..cdd15b0d5e9 100644
--- a/net/mrtg/patches/patch-ad
+++ b/net/mrtg/patches/patch-ad
@@ -1,33 +1,21 @@
-$NetBSD: patch-ad,v 1.11 2006/08/09 21:42:42 adrianp Exp $
+$NetBSD: patch-ad,v 1.12 2006/10/19 06:40:54 martti Exp $
 
---- bin/mrtg.orig	2006-07-14 12:39:19.000000000 +0100
-+++ bin/mrtg
-@@ -824,8 +824,8 @@ sub writegraphics {
- 
-     ((($MRTG_lib::OS eq 'NT' or $MRTG_lib::OS eq 'OS2') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) or
+--- bin/mrtg.orig	2006-09-06 13:42:50.000000000 +0000
++++ bin/mrtg	2006-10-19 08:47:41.000000000 +0000
+@@ -828,4 +828,4 @@
       (($MRTG_lib::OS eq 'NW') and (-e "SYS:/Mrtg/bin/rateup.nlm")) or
 -     (-x "${FindBin::Bin}${MRTG_lib::SL}rateup")) or 
 -       die "$NOW: ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n";
 +     (-x "__PREFIX__/libexec/rateup")) or 
 +       die "$NOW: ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n";
  
-     # 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;
-@@ -837,7 +837,7 @@ sub writegraphics {
-     $outlast = -1 unless defined $outlast;
-     
+@@ -841,3 +841,3 @@
      if ($$rcfg{'options'}{'dorelpercent'}{$router}) {
 -        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
 +        @exec = ("__PREFIX__/libexec/rateup", 
                   "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
-                  $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
-                  "$up_abs"."p", $inlast, $outlast, $absmax,
-@@ -846,7 +846,7 @@ sub writegraphics {
-                  $$rcfg{'rgb5'}{$router});
-     } else { 
+@@ -850,3 +850,3 @@
  
 -        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
 +        @exec = ("__PREFIX__/libexec/rateup", 
                   "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
-                  $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
-                  "$up_abs", $inlast, $outlast, $absmax,
diff --git a/net/mrtg/patches/patch-ae b/net/mrtg/patches/patch-ae
index 11bb669ab41..4c79a5e6fbd 100644
--- a/net/mrtg/patches/patch-ae
+++ b/net/mrtg/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/02/15 07:34:04 martti Exp $
+$NetBSD: patch-ae,v 1.4 2006/10/19 06:40:54 martti Exp $
 
---- lib/mrtg2/SNMP_Session.pm.orig	Mon Jan 19 09:30:19 2004
-+++ lib/mrtg2/SNMP_Session.pm	Sun Feb 15 09:21:08 2004
-@@ -109,3 +109,3 @@
+--- 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 @@
  ###
 -$SNMP_Session::default_avoid_negative_request_ids = 0;
 +$SNMP_Session::default_avoid_negative_request_ids = 1;