diff options
| -rw-r--r-- | net/mrtg/Makefile | 5 | ||||
| -rw-r--r-- | net/mrtg/PLIST | 6 | ||||
| -rw-r--r-- | net/mrtg/distinfo | 14 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-aa | 8 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-ac | 8 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-ad | 20 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-ae | 12 |
7 files changed, 38 insertions, 35 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 4d32d7de0fb..01bb9586e84 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.42 2003/07/17 22:51:23 grant Exp $ +# $NetBSD: Makefile,v 1.43 2003/10/05 12:02:52 martti Exp $ -DISTNAME= mrtg-2.9.29 -PKGREVISION= 1 +DISTNAME= mrtg-2.10.5 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/PLIST b/net/mrtg/PLIST index fe460fe0a0b..4790c5d451d 100644 --- a/net/mrtg/PLIST +++ b/net/mrtg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/09/30 09:12:13 martti Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/10/05 12:02:52 martti Exp $ ${PERL5_SITELIB}/BER.pm ${PERL5_SITELIB}/MRTG_lib.pm ${PERL5_SITELIB}/SNMP_Session.pm @@ -51,6 +51,10 @@ share/doc/mrtg/mibhelp.1 share/doc/mrtg/mibhelp.html share/doc/mrtg/mibhelp.pod share/doc/mrtg/mibhelp.txt +share/doc/mrtg/mrtg-ipv6.1 +share/doc/mrtg/mrtg-ipv6.html +share/doc/mrtg/mrtg-ipv6.pod +share/doc/mrtg/mrtg-ipv6.txt share/doc/mrtg/mrtg-l.gif share/doc/mrtg/mrtg-l.png share/doc/mrtg/mrtg-m.gif diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo index fad9879f5ac..b7274f76b24 100644 --- a/net/mrtg/distinfo +++ b/net/mrtg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2003/06/09 07:47:15 martti Exp $ +$NetBSD: distinfo,v 1.10 2003/10/05 12:02:52 martti Exp $ -SHA1 (mrtg-2.9.29.tar.gz) = 3cb13d8bef44e1a032b63875e901979d475ddaed -Size (mrtg-2.9.29.tar.gz) = 1026837 bytes -SHA1 (patch-aa) = 8aabf3fb03fe025b6a0e08c5202c0c89f5aff6a3 +SHA1 (mrtg-2.10.5.tar.gz) = 370fea7fa6cbae0857934a627314449d1d1c9802 +Size (mrtg-2.10.5.tar.gz) = 1085178 bytes +SHA1 (patch-aa) = 9b3bc1f7db23ef83d285e20e14ffb18027949648 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c -SHA1 (patch-ac) = 77e5a9894e6214962d453421abba00e896761dbb -SHA1 (patch-ad) = 3ebddc07d04c4871fbefe781423d6e22f440a186 -SHA1 (patch-ae) = 98f93ae72aac4cc63e5c6b11152e5ccec425def3 +SHA1 (patch-ac) = 2b3ea5a6199f45581c6daf660e7aab0a97b715e4 +SHA1 (patch-ad) = b0213b4bfb625e284dc12f10495508ded536d4bf +SHA1 (patch-ae) = f5c97172788f444e3fa69e3ee652f1c9c0fd83ae diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa index 0a75e0300f0..19c2b291d3d 100644 --- a/net/mrtg/patches/patch-aa +++ b/net/mrtg/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.13 2003/04/08 09:50:22 martti Exp $ +$NetBSD: patch-aa,v 1.14 2003/10/05 12:02:52 martti Exp $ ---- configure.orig Sat Mar 8 17:17:40 2003 -+++ configure Tue Apr 8 12:27:10 2003 -@@ -3156,7 +3156,7 @@ +--- configure.orig Fri Sep 12 00:16:20 2003 ++++ configure Sun Oct 5 12:58:03 2003 +@@ -3241,7 +3241,7 @@ fi; diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac index dfda960917e..e5b20ff9672 100644 --- a/net/mrtg/patches/patch-ac +++ b/net/mrtg/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2002/10/23 10:42:21 martti Exp $ +$NetBSD: patch-ac,v 1.4 2003/10/05 12:02:52 martti Exp $ ---- Makefile.in.orig Sat Oct 19 11:05:02 2002 -+++ Makefile.in Wed Oct 23 12:15:20 2002 -@@ -34,6 +34,7 @@ +--- Makefile.in.orig Fri Sep 12 00:14:17 2003 ++++ Makefile.in Sun Oct 5 12:58:33 2003 +@@ -38,6 +38,7 @@ subst: $(PERL) -0777 -p -i~ -e 's@^#!\s*/\S*perl@#! $(PERL)@' $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg $(PERL) -0777 -p -i~ -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad index 33b3cb0c805..3809a7db8fa 100644 --- a/net/mrtg/patches/patch-ad +++ b/net/mrtg/patches/patch-ad @@ -1,31 +1,31 @@ -$NetBSD: patch-ad,v 1.4 2003/04/08 09:50:22 martti Exp $ +$NetBSD: patch-ad,v 1.5 2003/10/05 12:02:52 martti Exp $ ---- bin/mrtg.orig Fri Apr 4 06:31:59 2003 -+++ bin/mrtg Tue Apr 8 12:30:22 2003 -@@ -586,8 +586,8 @@ +--- bin/mrtg.orig Fri Sep 12 00:15:22 2003 ++++ bin/mrtg Sun Oct 5 13:02:06 2003 +@@ -666,8 +666,8 @@ ########## rrdtool users have left here ############### - ((($MRTG_lib::OS eq 'NT') && (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) || + ((($MRTG_lib::OS eq 'NT' || $MRTG_lib::OS eq 'OS2') && (-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 warn "ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast; -@@ -595,7 +595,7 @@ +@@ -675,7 +675,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, -@@ -603,7 +603,7 @@ - $$rcfg{'rgb3'}{$router},$$rcfg{'rgb4'}{$router}, +@@ -684,7 +684,7 @@ $$rcfg{'rgb5'}{$router}); } else { + - @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", + @exec = ("__PREFIX__/libexec/rateup", "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router", diff --git a/net/mrtg/patches/patch-ae b/net/mrtg/patches/patch-ae index e57681562d4..216009861e5 100644 --- a/net/mrtg/patches/patch-ae +++ b/net/mrtg/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2002/11/19 11:24:29 martti Exp $ +$NetBSD: patch-ae,v 1.2 2003/10/05 12:02:52 martti Exp $ ---- lib/mrtg2/SNMP_Session.pm.orig Tue Nov 19 13:12:41 2002 -+++ lib/mrtg2/SNMP_Session.pm Tue Nov 19 13:13:35 2002 -@@ -99,7 +99,7 @@ +--- lib/mrtg2/SNMP_Session.pm.orig Fri Sep 12 00:15:23 2003 ++++ lib/mrtg2/SNMP_Session.pm Sun Oct 5 13:03:08 2003 +@@ -105,7 +105,7 @@ ### some agents erroneously encode the response ID as an unsigned, ### which prevents this code from matching such responses to requests. ### --my $default_avoid_negative_request_ids = 0; -+my $default_avoid_negative_request_ids = 1; +-$SNMP_Session::default_avoid_negative_request_ids = 0; ++$SNMP_Session::default_avoid_negative_request_ids = 1; ### Whether all SNMP_Session objects should share a single UDP socket. ### |