diff options
| author | martti <martti@pkgsrc.org> | 2004-06-21 16:20:14 +0000 |
|---|---|---|
| committer | martti <martti@pkgsrc.org> | 2004-06-21 16:20:14 +0000 |
| commit | fc3543644cc926eba091d05a886309927996c7fa (patch) | |
| tree | 3be8510feb9e20a68c5142dae8b235a6950eabf4 /net/mrtg | |
| parent | 771eb5af78fe0a0b6c81479e641c1ca98ebcc202 (diff) | |
| download | pkgsrc-fc3543644cc926eba091d05a886309927996c7fa.tar.gz | |
Updated mrtg to 2.10.14
* new option subtitle for indexmaker
* added new options for printing date inside the graph:
TimeStrPos[] and TimeStrFmt[]
* fix indexmaker when used with 14all
* translation updates
* added 3com RMON VLAN detection to cfgmaker
Diffstat (limited to 'net/mrtg')
| -rw-r--r-- | net/mrtg/Makefile | 5 | ||||
| -rw-r--r-- | net/mrtg/distinfo | 8 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-ad | 24 |
3 files changed, 24 insertions, 13 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index af4ca35b092..919b31bf2f2 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.51 2004/06/20 21:52:08 xtraeme Exp $ +# $NetBSD: Makefile,v 1.52 2004/06/21 16:20:14 martti Exp $ -DISTNAME= mrtg-2.10.13 -PKGREVISION= 2 +DISTNAME= mrtg-2.10.14 CATEGORIES= net MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \ ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \ diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo index f2db4ac8527..b52efe4cfc7 100644 --- a/net/mrtg/distinfo +++ b/net/mrtg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.13 2004/06/20 21:53:18 xtraeme Exp $ +$NetBSD: distinfo,v 1.14 2004/06/21 16:20:14 martti Exp $ -SHA1 (mrtg-2.10.13.tar.gz) = 246705e3b49b24a6985defe3db8a42c786bebdc9 -Size (mrtg-2.10.13.tar.gz) = 1095402 bytes +SHA1 (mrtg-2.10.14.tar.gz) = b4239e17c59ca8dae68511223215b9772949876d +Size (mrtg-2.10.14.tar.gz) = 1101215 bytes SHA1 (patch-aa) = 15b23737797e274018187ea74919c1affa02372c SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c SHA1 (patch-ac) = fbb1c3306f05d0e5c4c3fba210bf29719dd20278 -SHA1 (patch-ad) = 477ecae639677a5dad2bf15fa97c267ed6981a3c +SHA1 (patch-ad) = 183c9e3fdb1ee46caa681efd4939a70ea2d11939 SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad index 40e0571e16d..5939c62031a 100644 --- a/net/mrtg/patches/patch-ad +++ b/net/mrtg/patches/patch-ad @@ -1,21 +1,33 @@ -$NetBSD: patch-ad,v 1.7 2004/02/15 07:34:04 martti Exp $ +$NetBSD: patch-ad,v 1.8 2004/06/21 16:20:14 martti Exp $ ---- bin/mrtg.orig Mon Jan 19 09:30:19 2004 -+++ bin/mrtg Sun Feb 15 09:20:41 2004 -@@ -695,4 +695,4 @@ +--- bin/mrtg.orig 2004-06-08 21:08:28.000000000 +0000 ++++ bin/mrtg 2004-06-14 17:32:26.000000000 +0000 +@@ -700,8 +700,8 @@ + ((($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 "${FindBin::Bin}${MRTG_lib::SL}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"; -@@ -708,3 +708,3 @@ + # rateup does not know about undef so we make inlast and outlast ready for rateup + #warn "ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast; +@@ -713,7 +713,7 @@ + $outlast = -1 unless defined $outlast; + if ($$rcfg{'options'}{'dorelpercent'}{$router}) { - @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", + @exec = ("__PREFIX__/libexec/rateup", "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router", -@@ -717,3 +717,3 @@ + $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z', + "$up_abs"."p", $inlast, $outlast, $absmax, +@@ -722,7 +722,7 @@ + $$rcfg{'rgb5'}{$router}); + } else { - @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", + @exec = ("__PREFIX__/libexec/rateup", "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router", + $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z', + "$up_abs", $inlast, $outlast, $absmax, |