Updated mrtg to 2.9.25

* die gracefully when LANG is set to UTF-8 and give advice (RedHat 8)
* updated squid monitoring example
* Fixed indexmaker which got truncated during the last release process
* cosmetic tweaks for layout
* Use Snmp Session 0.93 with option avoid_negative_request_ids enabled
* Supress Posix Locales in the locale module ... people who have LANG
  set to UTF-8 report very strange errors otherwhise.
* skip all queries to a host for one round when 1 query has returned undef.
* skip all trailing space in keys when matching interface by Name,
  Description, Anything
* remove <br> before <hr> near pagetop
* make Includes search in directory of main config files as well as in
  current directory
* addhead option for indexmaker
* fix for uptime for squid and other non standard devices
* indexmaker: improve handling of urls given with --rrdviewer
* improved chinese translation

5 files changed, 25 insertions, 25 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index cfd6b6c8c4c..f31c5b40d86 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2002/09/30 09:12:13 martti Exp $
+# $NetBSD: Makefile,v 1.32 2002/10/23 10:42:18 martti Exp $
 #
 
-DISTNAME=	mrtg-2.9.22
+DISTNAME=	mrtg-2.9.25
 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/distinfo b/net/mrtg/distinfo
index 8d117ee836a..b2675cc3c95 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/09/30 09:12:13 martti Exp $
+$NetBSD: distinfo,v 1.5 2002/10/23 10:42:18 martti Exp $
 
-SHA1 (mrtg-2.9.22.tar.gz) = 1a24f501fc72d0c8b64418dc2f095c8eb5320b32
-Size (mrtg-2.9.22.tar.gz) = 1007515 bytes
-SHA1 (patch-aa) = a7e85f28f82b4d5407a0e37a8489a124e6913d54
+SHA1 (mrtg-2.9.25.tar.gz) = 7d29eb62f3161ad0c30e7d13d8a009895a9c2f4e
+Size (mrtg-2.9.25.tar.gz) = 1014028 bytes
+SHA1 (patch-aa) = 66a0eb55525b1c3953effba3bec5503d9c924dd7
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
-SHA1 (patch-ac) = 05d85b593b8ddad97c6084cb284ea1e3947e4e96
-SHA1 (patch-ad) = b4f29546744bbc81a9ef7cd7096dee3c09fe8b14
+SHA1 (patch-ac) = 77e5a9894e6214962d453421abba00e896761dbb
+SHA1 (patch-ad) = 1bb158d2fe639284c43e0bdb213fd7788cd66954
diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa
index db843ba6977..9eaa2c5f371 100644
--- a/net/mrtg/patches/patch-aa
+++ b/net/mrtg/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.10 2002/09/30 09:12:14 martti Exp $
+$NetBSD: patch-aa,v 1.11 2002/10/23 10:42:19 martti Exp $
 
---- 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}"
+--- configure.orig	Wed Oct 16 22:37:36 2002
++++ configure	Wed Oct 23 12:14:12 2002
+@@ -3063,7 +3063,7 @@
  fi;
  
+ 
 -LDFLAGS="${LDFLAGS} ${MATHLIBS}"
 +LDFLAGS="${LDFLAGS} ${MATHLIBS} -lgd -lttf -lintl -lXpm -lX11 -ljpeg"
  
  GDEXTRALIB=""
- echo "$as_me:2616: checking for gdImageGif in -lgd" >&5
+ echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac
index a047faea3a7..dfda960917e 100644
--- a/net/mrtg/patches/patch-ac
+++ b/net/mrtg/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2002/09/30 09:12:14 martti Exp $
+$NetBSD: patch-ac,v 1.3 2002/10/23 10:42:21 martti Exp $
 
---- Makefile.in.orig	Wed Jul 31 01:32:07 2002
-+++ Makefile.in	Tue Sep 24 15:43:19 2002
+--- Makefile.in.orig	Sat Oct 19 11:05:02 2002
++++ Makefile.in	Wed Oct 23 12:15:20 2002
 @@ -34,6 +34,7 @@
  subst:
- 	$(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
+ 	$(PERL) -0777 -p -i~ -e 's@^#!\s*/\S*perl@#! $(PERL)@' $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg
+ 	$(PERL) -0777 -p -i~ -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
++	$(PERL) -0777 -p -i~ -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 4c61bf6da8d..a0dcedad56f 100644
--- a/net/mrtg/patches/patch-ad
+++ b/net/mrtg/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2002/09/30 09:12:14 martti Exp $
+$NetBSD: patch-ad,v 1.3 2002/10/23 10:42:21 martti Exp $
 
---- bin/mrtg.orig	Wed Jul 31 07:48:18 2002
-+++ bin/mrtg	Tue Sep 24 16:25:53 2002
-@@ -523,15 +523,15 @@
+--- bin/mrtg.orig	Sat Oct 19 11:06:54 2002
++++ bin/mrtg	Wed Oct 23 12:15:42 2002
+@@ -535,15 +535,15 @@
      ########## rrdtool users have left here ###############
  
      ((($MRTG_lib::OS eq 'NT') && (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) ||
@@ -21,7 +21,7 @@ $NetBSD: patch-ad,v 1.2 2002/09/30 09:12:14 martti Exp $
                   "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
                   $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
                   "$up_abs"."p", $inlast, $outlast, $absmax,
-@@ -539,7 +539,7 @@
+@@ -551,7 +551,7 @@
                   $$rcfg{'rgb3'}{$router},$$rcfg{'rgb4'}{$router},
                   $$rcfg{'rgb5'}{$router});
      } else {