diff options
Diffstat (limited to 'net/mrtg')
| -rw-r--r-- | net/mrtg/Makefile | 7 | ||||
| -rw-r--r-- | net/mrtg/distinfo | 10 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-aa | 8 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-ad | 19 |
4 files changed, 22 insertions, 22 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 3493a64f394..11cf0f54647 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2002/11/28 10:18:14 tron Exp $ +# $NetBSD: Makefile,v 1.37 2003/04/08 09:50:22 martti Exp $ -DISTNAME= mrtg-2.9.26b -PKGNAME= mrtg-2.9.26.2 -PKGREVISION= 2 +DISTNAME= mrtg-2.9.28 +PKGNAME= mrtg-2.9.28 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 968ff8b5c75..8cdf8e7e00c 100644 --- a/net/mrtg/distinfo +++ b/net/mrtg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2002/11/19 11:24:28 martti Exp $ +$NetBSD: distinfo,v 1.8 2003/04/08 09:50:22 martti Exp $ -SHA1 (mrtg-2.9.26b.tar.gz) = a2ee04326234f6d96ff3223d1b901d1358b80641 -Size (mrtg-2.9.26b.tar.gz) = 1013564 bytes -SHA1 (patch-aa) = 623fed93b4247e0da7ac34a0c8ae3ee2d17a5df7 +SHA1 (mrtg-2.9.28.tar.gz) = e6fbd79275d984b5a3af0c5bcd3c417da3c1d909 +Size (mrtg-2.9.28.tar.gz) = 1026331 bytes +SHA1 (patch-aa) = 8aabf3fb03fe025b6a0e08c5202c0c89f5aff6a3 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c SHA1 (patch-ac) = 77e5a9894e6214962d453421abba00e896761dbb -SHA1 (patch-ad) = 1bb158d2fe639284c43e0bdb213fd7788cd66954 +SHA1 (patch-ad) = 3ebddc07d04c4871fbefe781423d6e22f440a186 SHA1 (patch-ae) = 98f93ae72aac4cc63e5c6b11152e5ccec425def3 diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa index b537466636f..0a75e0300f0 100644 --- a/net/mrtg/patches/patch-aa +++ b/net/mrtg/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.12 2002/11/18 14:12:54 martti Exp $ +$NetBSD: patch-aa,v 1.13 2003/04/08 09:50:22 martti Exp $ ---- configure.orig Mon Nov 18 12:41:24 2002 -+++ configure Mon Nov 18 14:53:16 2002 -@@ -3036,7 +3036,7 @@ +--- configure.orig Sat Mar 8 17:17:40 2003 ++++ configure Tue Apr 8 12:27:10 2003 +@@ -3156,7 +3156,7 @@ fi; 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 { |