diff options
Diffstat (limited to 'net/mrtg/patches/patch-ad')
| -rw-r--r-- | net/mrtg/patches/patch-ad | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad index a0dcedad56f..33b3cb0c805 100644 --- a/net/mrtg/patches/patch-ad +++ b/net/mrtg/patches/patch-ad @@ -1,27 +1,28 @@ -$NetBSD: patch-ad,v 1.3 2002/10/23 10:42:21 martti Exp $ +$NetBSD: patch-ad,v 1.4 2003/04/08 09:50:22 martti Exp $ ---- bin/mrtg.orig Sat Oct 19 11:06:54 2002 -+++ bin/mrtg Wed Oct 23 12:15:42 2002 -@@ -535,15 +535,15 @@ +--- bin/mrtg.orig Fri Apr 4 06:31:59 2003 ++++ bin/mrtg Tue Apr 8 12:30:22 2003 +@@ -586,8 +586,8 @@ ########## 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 - 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; + warn "ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast; +@@ -595,7 +595,7 @@ + return undef unless defined $inlast and 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, -@@ -551,7 +551,7 @@ +@@ -603,7 +603,7 @@ $$rcfg{'rgb3'}{$router},$$rcfg{'rgb4'}{$router}, $$rcfg{'rgb5'}{$router}); } else { |