diff options
Diffstat (limited to 'net/mrtg')
| -rw-r--r-- | net/mrtg/Makefile | 5 | ||||
| -rw-r--r-- | net/mrtg/PLIST | 82 | ||||
| -rw-r--r-- | net/mrtg/distinfo | 12 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-ac | 12 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-ad | 28 | ||||
| -rw-r--r-- | net/mrtg/patches/patch-ae | 12 |
6 files changed, 65 insertions, 86 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 49927132f59..a07223de6ff 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.47 2004/02/10 02:22:50 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2004/02/15 07:34:03 martti Exp $ -DISTNAME= mrtg-2.10.11 -PKGREVISION= 1 +DISTNAME= mrtg-2.10.13 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 4790c5d451d..1257ac07269 100644 --- a/net/mrtg/PLIST +++ b/net/mrtg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/10/05 12:02:52 martti Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/02/15 07:34:03 martti Exp $ ${PERL5_SITELIB}/BER.pm ${PERL5_SITELIB}/MRTG_lib.pm ${PERL5_SITELIB}/SNMP_Session.pm @@ -24,18 +24,6 @@ share/doc/mrtg/cfgmaker.1 share/doc/mrtg/cfgmaker.html share/doc/mrtg/cfgmaker.pod share/doc/mrtg/cfgmaker.txt -share/doc/mrtg/contrib.1 -share/doc/mrtg/contrib.html -share/doc/mrtg/contrib.pod -share/doc/mrtg/contrib.txt -share/doc/mrtg/faq.1 -share/doc/mrtg/faq.html -share/doc/mrtg/faq.pod -share/doc/mrtg/faq.txt -share/doc/mrtg/forum.1 -share/doc/mrtg/forum.html -share/doc/mrtg/forum.pod -share/doc/mrtg/forum.txt share/doc/mrtg/index.html share/doc/mrtg/index.txt share/doc/mrtg/index.wml @@ -43,29 +31,61 @@ share/doc/mrtg/indexmaker.1 share/doc/mrtg/indexmaker.html share/doc/mrtg/indexmaker.pod share/doc/mrtg/indexmaker.txt -share/doc/mrtg/logfile.1 -share/doc/mrtg/logfile.html -share/doc/mrtg/logfile.pod -share/doc/mrtg/logfile.txt -share/doc/mrtg/mibhelp.1 -share/doc/mrtg/mibhelp.html -share/doc/mrtg/mibhelp.pod -share/doc/mrtg/mibhelp.txt +share/doc/mrtg/mrtg-contrib.1 +share/doc/mrtg/mrtg-contrib.html +share/doc/mrtg/mrtg-contrib.pod +share/doc/mrtg/mrtg-contrib.txt +share/doc/mrtg/mrtg-faq.1 +share/doc/mrtg/mrtg-faq.html +share/doc/mrtg/mrtg-faq.pod +share/doc/mrtg/mrtg-faq.txt +share/doc/mrtg/mrtg-forum.1 +share/doc/mrtg/mrtg-forum.html +share/doc/mrtg/mrtg-forum.pod +share/doc/mrtg/mrtg-forum.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-logfile.1 +share/doc/mrtg/mrtg-logfile.html +share/doc/mrtg/mrtg-logfile.pod +share/doc/mrtg/mrtg-logfile.txt share/doc/mrtg/mrtg-m.gif share/doc/mrtg/mrtg-m.png +share/doc/mrtg/mrtg-mibhelp.1 +share/doc/mrtg/mrtg-mibhelp.html +share/doc/mrtg/mrtg-mibhelp.pod +share/doc/mrtg/mrtg-mibhelp.txt +share/doc/mrtg/mrtg-nt-guide.1 +share/doc/mrtg/mrtg-nt-guide.html +share/doc/mrtg/mrtg-nt-guide.pod +share/doc/mrtg/mrtg-nt-guide.txt share/doc/mrtg/mrtg-r.gif share/doc/mrtg/mrtg-r.png +share/doc/mrtg/mrtg-reference.1 +share/doc/mrtg/mrtg-reference.html +share/doc/mrtg/mrtg-reference.pod +share/doc/mrtg/mrtg-reference.txt share/doc/mrtg/mrtg-rrd.1 share/doc/mrtg/mrtg-rrd.html share/doc/mrtg/mrtg-rrd.pod share/doc/mrtg/mrtg-rrd.txt +share/doc/mrtg/mrtg-squid.1 +share/doc/mrtg/mrtg-squid.html +share/doc/mrtg/mrtg-squid.pod +share/doc/mrtg/mrtg-squid.txt share/doc/mrtg/mrtg-ti.png +share/doc/mrtg/mrtg-unix-guide.1 +share/doc/mrtg/mrtg-unix-guide.html +share/doc/mrtg/mrtg-unix-guide.pod +share/doc/mrtg/mrtg-unix-guide.txt +share/doc/mrtg/mrtg-webserver.1 +share/doc/mrtg/mrtg-webserver.html +share/doc/mrtg/mrtg-webserver.pod +share/doc/mrtg/mrtg-webserver.txt share/doc/mrtg/mrtg.1 share/doc/mrtg/mrtg.html share/doc/mrtg/mrtg.pod @@ -74,26 +94,6 @@ share/doc/mrtg/mrtglib.1 share/doc/mrtg/mrtglib.html share/doc/mrtg/mrtglib.pod share/doc/mrtg/mrtglib.txt -share/doc/mrtg/nt-guide.1 -share/doc/mrtg/nt-guide.html -share/doc/mrtg/nt-guide.pod -share/doc/mrtg/nt-guide.txt -share/doc/mrtg/reference.1 -share/doc/mrtg/reference.html -share/doc/mrtg/reference.pod -share/doc/mrtg/reference.txt -share/doc/mrtg/squid.1 -share/doc/mrtg/squid.html -share/doc/mrtg/squid.pod -share/doc/mrtg/squid.txt -share/doc/mrtg/unix-guide.1 -share/doc/mrtg/unix-guide.html -share/doc/mrtg/unix-guide.pod -share/doc/mrtg/unix-guide.txt -share/doc/mrtg/webserver.1 -share/doc/mrtg/webserver.html -share/doc/mrtg/webserver.pod -share/doc/mrtg/webserver.txt share/mrtg/mrtg-l.png share/mrtg/mrtg-m.png share/mrtg/mrtg-r.png diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo index a55f541d865..105d92a1137 100644 --- a/net/mrtg/distinfo +++ b/net/mrtg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2003/12/07 13:53:32 martti Exp $ +$NetBSD: distinfo,v 1.12 2004/02/15 07:34:03 martti Exp $ -SHA1 (mrtg-2.10.11.tar.gz) = c866e9cedb5e5f8d8437c7d52367dc5dbdc3505b -Size (mrtg-2.10.11.tar.gz) = 1092999 bytes +SHA1 (mrtg-2.10.13.tar.gz) = 246705e3b49b24a6985defe3db8a42c786bebdc9 +Size (mrtg-2.10.13.tar.gz) = 1095402 bytes SHA1 (patch-aa) = 031d81c31191b6694d272c876ac470b369b67284 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c -SHA1 (patch-ac) = 2b3ea5a6199f45581c6daf660e7aab0a97b715e4 -SHA1 (patch-ad) = fb408bbbfd45c6686e7052c6c4308982427a7ecf -SHA1 (patch-ae) = f5c97172788f444e3fa69e3ee652f1c9c0fd83ae +SHA1 (patch-ac) = fbb1c3306f05d0e5c4c3fba210bf29719dd20278 +SHA1 (patch-ad) = 477ecae639677a5dad2bf15fa97c267ed6981a3c +SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac index e5b20ff9672..6e19e4121dd 100644 --- a/net/mrtg/patches/patch-ac +++ b/net/mrtg/patches/patch-ac @@ -1,12 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2003/10/05 12:02:52 martti Exp $ +$NetBSD: patch-ac,v 1.5 2004/02/15 07:34:03 martti Exp $ ---- 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 +--- Makefile.in.orig Mon Jan 19 09:28:44 2004 ++++ Makefile.in Sun Feb 15 09:18:46 2004 +@@ -40,2 +40,3 @@ $(PERL) -0777 -p -i~ -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker + $(PERL) -0777 -p -i~ -e "s@__PREFIX__@${prefix}@g" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker - clean: - -rm bin/rateup diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad index 92978f00b43..40e0571e16d 100644 --- a/net/mrtg/patches/patch-ad +++ b/net/mrtg/patches/patch-ad @@ -1,33 +1,21 @@ -$NetBSD: patch-ad,v 1.6 2003/12/07 13:53:32 martti Exp $ +$NetBSD: patch-ad,v 1.7 2004/02/15 07:34:04 martti Exp $ ---- bin/mrtg.orig Fri Dec 5 19:56:57 2003 -+++ bin/mrtg Sun Dec 7 15:36:59 2003 -@@ -685,8 +685,8 @@ - ########## rrdtool users have left here ############### - - ((($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")) || +--- bin/mrtg.orig Mon Jan 19 09:30:19 2004 ++++ bin/mrtg Sun Feb 15 09:20:41 2004 +@@ -695,4 +695,4 @@ + ((($MRTG_lib::OS eq 'NT' or $MRTG_lib::OS eq 'OS2') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) 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"; - # 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; -@@ -698,7 +698,7 @@ - $outlast = -1 unless defined $outlast; - +@@ -708,3 +708,3 @@ if ($$rcfg{'options'}{'dorelpercent'}{$router}) { - @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"."p", $inlast, $outlast, $absmax, -@@ -707,7 +707,7 @@ - $$rcfg{'rgb5'}{$router}); - } else { +@@ -717,3 +717,3 @@ - @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, diff --git a/net/mrtg/patches/patch-ae b/net/mrtg/patches/patch-ae index 216009861e5..11bb669ab41 100644 --- a/net/mrtg/patches/patch-ae +++ b/net/mrtg/patches/patch-ae @@ -1,13 +1,9 @@ -$NetBSD: patch-ae,v 1.2 2003/10/05 12:02:52 martti Exp $ +$NetBSD: patch-ae,v 1.3 2004/02/15 07:34:04 martti Exp $ ---- 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. +--- lib/mrtg2/SNMP_Session.pm.orig Mon Jan 19 09:30:19 2004 ++++ lib/mrtg2/SNMP_Session.pm Sun Feb 15 09:21:08 2004 +@@ -109,3 +109,3 @@ ### -$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. - ### |