diff options
Diffstat (limited to 'net/mrtg/patches/patch-ad')
| -rw-r--r-- | net/mrtg/patches/patch-ad | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad index 1c0fb812038..d15128d751f 100644 --- a/net/mrtg/patches/patch-ad +++ b/net/mrtg/patches/patch-ad @@ -1,21 +1,33 @@ -$NetBSD: patch-ad,v 1.10 2005/06/23 08:12:13 martti Exp $ +$NetBSD: patch-ad,v 1.11 2006/08/09 21:42:42 adrianp Exp $ ---- bin/mrtg.orig 2005-06-19 16:40:02.000000000 +0300 -+++ bin/mrtg 2005-06-23 08:05:14.000000000 +0300 -@@ -721,4 +721,4 @@ +--- 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 (($MRTG_lib::OS eq 'NW') and (-e "SYS:/Mrtg/bin/rateup.nlm")) or - (-x "${FindBin::Bin}${MRTG_lib::SL}rateup")) or -- die "ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n"; -+ (-x "__PREFIX__/libexec/rateup")) || -+ die "ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n"; +- 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"; -@@ -734,3 +734,3 @@ + # 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; + 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", -@@ -743,3 +743,3 @@ + $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z', + "$up_abs"."p", $inlast, $outlast, $absmax, +@@ -846,7 +846,7 @@ sub writegraphics { + $$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, |