Updated mrtg to 2.9.22 [lots of bug fixes]

3 files changed, 27 insertions, 27 deletions

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,