Updated mrtg to 2.9.22 [lots of bug fixes]

6 files changed, 44 insertions, 42 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 71523bb84bd..cfd6b6c8c4c 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2002/03/13 17:37:31 fredb Exp $
+# $NetBSD: Makefile,v 1.31 2002/09/30 09:12:13 martti Exp $
 #
 
-DISTNAME=	mrtg-2.9.17
-PKGREVISION=	1
+DISTNAME=	mrtg-2.9.22
 CATEGORIES=	net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		http://gd.tuwien.ac.at/infosys/network/tools/mrtg/pub/ \
diff --git a/net/mrtg/PLIST b/net/mrtg/PLIST
index e5e839250d6..fe460fe0a0b 100644
--- a/net/mrtg/PLIST
+++ b/net/mrtg/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/06 19:18:21 tv Exp $
-bin/mrtg
-bin/mrtgcfgmaker
-bin/mrtgindexmaker
-etc/mrtg/mrtg.conf.example
+@comment $NetBSD: PLIST,v 1.3 2002/09/30 09:12:13 martti Exp $
 ${PERL5_SITELIB}/BER.pm
+${PERL5_SITELIB}/MRTG_lib.pm
 ${PERL5_SITELIB}/SNMP_Session.pm
 ${PERL5_SITELIB}/SNMP_util.pm
-${PERL5_SITELIB}/MRTG_lib.pm
 ${PERL5_SITELIB}/locales_mrtg.pm
+bin/mrtg
+bin/mrtgcfgmaker
+bin/mrtgindexmaker
+etc/mrtg/mrtg.conf.example
 libexec/envstat2mrtg
 libexec/netstat2mrtg
 libexec/rateup
@@ -51,8 +51,11 @@ share/doc/mrtg/mibhelp.1
 share/doc/mrtg/mibhelp.html
 share/doc/mrtg/mibhelp.pod
 share/doc/mrtg/mibhelp.txt
+share/doc/mrtg/mrtg-l.gif
 share/doc/mrtg/mrtg-l.png
+share/doc/mrtg/mrtg-m.gif
 share/doc/mrtg/mrtg-m.png
+share/doc/mrtg/mrtg-r.gif
 share/doc/mrtg/mrtg-r.png
 share/doc/mrtg/mrtg-rrd.1
 share/doc/mrtg/mrtg-rrd.html
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index ec681317deb..8d117ee836a 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/20 14:21:52 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/09/30 09:12:13 martti Exp $
 
-SHA1 (mrtg-2.9.17.tar.gz) = 34b14e09631c9e7b04b04b5a250789853a1f0a41
-Size (mrtg-2.9.17.tar.gz) = 986994 bytes
-SHA1 (patch-aa) = d54197641587e870c11a4b20d5475ce094a3edde
+SHA1 (mrtg-2.9.22.tar.gz) = 1a24f501fc72d0c8b64418dc2f095c8eb5320b32
+Size (mrtg-2.9.22.tar.gz) = 1007515 bytes
+SHA1 (patch-aa) = a7e85f28f82b4d5407a0e37a8489a124e6913d54
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
-SHA1 (patch-ac) = d74d8165029799bd4b3af230548deb1e2c4a0b45
-SHA1 (patch-ad) = e0668531b8bc3e24e3b7361b7319f5375700082d
+SHA1 (patch-ac) = 05d85b593b8ddad97c6084cb284ea1e3947e4e96
+SHA1 (patch-ad) = b4f29546744bbc81a9ef7cd7096dee3c09fe8b14
diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa
index de14371a39d..db843ba6977 100644
--- a/net/mrtg/patches/patch-aa
+++ b/net/mrtg/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2000/10/20 16:06:17 bouyer Exp $
+$NetBSD: patch-aa,v 1.10 2002/09/30 09:12:14 martti Exp $
 
---- configure.orig	Fri Oct 13 16:07:49 2000
-+++ configure	Thu Oct 19 14:16:18 2000
-@@ -1113,7 +1113,7 @@
- fi
+--- configure.orig	Wed Jul 31 07:49:25 2002
++++ configure	Tue Sep 24 15:50:26 2002
+@@ -2610,7 +2610,7 @@
+   CPPFLAGS="${CPPFLAGS} -I${withval}"
+ fi;
  
+-LDFLAGS="${LDFLAGS} ${MATHLIBS}"
++LDFLAGS="${LDFLAGS} ${MATHLIBS} -lgd -lttf -lintl -lXpm -lX11 -ljpeg"
  
--LDFLAGS="${LDFLAGS} -lgd"
-+LDFLAGS="${LDFLAGS} -lgd -lttf -lintl -lXpm -lX11 -ljpeg"
- 
- # Check whether --with-z or --without-z was given.
- if test "${with_z+set}" = set; then
+ GDEXTRALIB=""
+ echo "$as_me:2616: checking for gdImageGif in -lgd" >&5
diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac
index dc468eb457d..a047faea3a7 100644
--- a/net/mrtg/patches/patch-ac
+++ b/net/mrtg/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2000/10/20 16:06:17 bouyer Exp $
+$NetBSD: patch-ac,v 1.2 2002/09/30 09:12:14 martti Exp $
 
---- Makefile.in.orig	Fri Oct 20 11:18:50 2000
-+++ Makefile.in	Fri Oct 20 11:20:39 2000
-@@ -29,6 +29,7 @@
+--- Makefile.in.orig	Wed Jul 31 01:32:07 2002
++++ Makefile.in	Tue Sep 24 15:43:19 2002
+@@ -34,6 +34,7 @@
  subst:
- 	$(PERL) -0777 -pi -e 's@^#!\s*/\S*perl@#! $(PERL)@' bin/cfgmaker bin/indexmaker bin/mrtg
- 	$(PERL) -0777 -pi -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' bin/mrtg bin/indexmaker
-+	$(PERL) -0777 -pi -e "s@__PREFIX__@${prefix}@g" bin/cfgmaker bin/mrtg bin/indexmaker
+ 	$(PERL) -0777 -pi -e 's@^#!\s*/\S*perl@#! $(PERL)@' $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg
+ 	$(PERL) -0777 -pi -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
++	$(PERL) -0777 -pi -e "s@__PREFIX__@${prefix}@g" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
  
  clean:
  	-rm bin/rateup
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad
index 6d3126a41f4..4c61bf6da8d 100644
--- a/net/mrtg/patches/patch-ad
+++ b/net/mrtg/patches/patch-ad
@@ -1,32 +1,32 @@
-$NetBSD: patch-ad,v 1.1 2000/10/20 16:06:17 bouyer Exp $
+$NetBSD: patch-ad,v 1.2 2002/09/30 09:12:14 martti Exp $
 
---- bin/mrtg.orig	Fri Oct 20 11:20:46 2000
-+++ bin/mrtg	Fri Oct 20 11:22:26 2000
-@@ -421,15 +421,15 @@
+--- bin/mrtg.orig	Wed Jul 31 07:48:18 2002
++++ bin/mrtg	Tue Sep 24 16:25:53 2002
+@@ -523,15 +523,15 @@
      ########## rrdtool users have left here ###############
  
      ((($MRTG_lib::OS eq 'NT') && (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) ||
 -     (-x "${FindBin::Bin}${MRTG_lib::SL}rateup")) || 
 -       die "ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n";
-+     (-x "__PREFIX__/libexec/rateup")) || 
++     (-x "__PREFIX__/libexec/rateup")) ||
 +       die "ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n";
  
      # rateup does not know about undef so we make inlast and outlast ready for rateup
-     $inlast = -1 unless defined $inlast;
-     $outlast = -1 unless defined $outlast;
+     die "ERROR: inlast is undefined. This should not be possible\n" unless defined $inlast;
+     die "ERROR: outlast is undefined. This should not be possible\n" unless defined $outlast;
  
      if ($$rcfg{'options'}{'dorelpercent'}{$router}) {
 -        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
-+        @exec = ("__PREFIX__/libexec/rateup", 
++        @exec = ("__PREFIX__/libexec/rateup",
                   "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
                   $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
                   "$up_abs"."p", $inlast, $outlast, $absmax,
-@@ -437,7 +437,7 @@
+@@ -539,7 +539,7 @@
                   $$rcfg{'rgb3'}{$router},$$rcfg{'rgb4'}{$router},
                   $$rcfg{'rgb5'}{$router});
      } else { 
 -        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
-+        @exec = ("__PREFIX__/libexec/rateup", 
++        @exec = ("__PREFIX__/libexec/rateup",
                   "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
                   $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
                   "$up_abs", $inlast, $outlast, $absmax,