diff options
author | bouyer <bouyer> | 2000-10-20 16:06:16 +0000 |
---|---|---|
committer | bouyer <bouyer> | 2000-10-20 16:06:16 +0000 |
commit | 95900897fe47203ef6652ec6b3aed36aee2cbab3 (patch) | |
tree | 18841a5a1bf9146fb571e1b12c0109735993047d /net/mrtg | |
parent | d183dc090693570a15d2cbd2e84b267642fbe83b (diff) | |
download | pkgsrc-95900897fe47203ef6652ec6b3aed36aee2cbab3.tar.gz |
Upgrate to mrtg 2.9.2, and change maintainer back to packages@netbsd.org
(Todd Vierling doesn't use mrtg any more :)
Changes from 2.8.12:
MRTG 2.9 is the biggest change in MRTG since the release of MRTG 2.0.
So let's hear the news first:
* The rrdtool integration allows for massively increased logging
performance.
* Routers which change their interface numbers are no problem any more.
MRTG can now reliably address interfaces by IP, MAC, Description,
Name and Type. The cfgmaker tool has been rewritten from scratch and
allows to generate configurations with any of the above mentioned
interface addressing methods.
* Indexmaker has be rewritten from scratch, it is now much more
flexible and fully documented.
* All the MRTG documentation has been reviewed and ported to perls
"Plain Old Documentation (POD)" format. This allows to provide all
documentation in text, HTML and man format. It is now all available
on the MRTG web-site.
* Config file parsing has been optimized. This makes reading
configuration files much faster. Especially large configuration files
are faster by factors
* Under UNIX, mrtg can fork into several instances while querying
routers. This improves data acquisition performance dramatically,
especially with slow networks.
* Graphs and webpages can be generated on the fly is mrtg is used with
rrdtool logging. Several tools in the mrtg contrib section are
available for this purpose.
* And there is more: MRTG has been translated into 29 languages, OS
detection has been automated, did I mention performance, many of the
contributed tools have been dated and a slew of new ones has been
added, The config file reading code is now available in a documented
library which simplifies the creation of other tools which need
access to the mrtg cfg file.
* In total, over 200 individual changes are listed in the change log
since the release of MRTG 2.9.2.
Diffstat (limited to 'net/mrtg')
-rw-r--r-- | net/mrtg/Makefile | 21 | ||||
-rw-r--r-- | net/mrtg/files/md5 | 4 | ||||
-rw-r--r-- | net/mrtg/files/patch-sum | 8 | ||||
-rw-r--r-- | net/mrtg/patches/patch-aa | 8 | ||||
-rw-r--r-- | net/mrtg/patches/patch-ab | 20 | ||||
-rw-r--r-- | net/mrtg/patches/patch-ac | 12 | ||||
-rw-r--r-- | net/mrtg/patches/patch-ad | 32 | ||||
-rw-r--r-- | net/mrtg/pkg/PLIST | 76 |
8 files changed, 139 insertions, 42 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 894d24b021a..cd92d7e104b 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2000/09/03 12:50:42 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2000/10/20 16:06:16 bouyer Exp $ # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp # -DISTNAME= mrtg-2.8.12 +DISTNAME= mrtg-2.9.2 CATEGORIES= net MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ \ http://gd.tuwien.ac.at/infosys/network/tools/mrtg/pub/ \ @@ -13,7 +13,7 @@ MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ \ ftp://ftp.chg.ru/pub/networking/management/mrtg/ \ ftp://ftp.onet.pl/pub/unix/network/mrtg/pub/ -MAINTAINER= tv@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html DEPENDS= gd>=1.8.1:../../graphics/gd @@ -62,14 +62,17 @@ do-install: for file in netstat2mrtg sys2mrtg; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$$file ${PREFIX}/libexec/; \ done - ${INSTALL_PROGRAM} ${WRKSRC}/run/rateup ${PREFIX}/libexec/ - ${INSTALL_SCRIPT} ${WRKSRC}/run/mrtg ${PREFIX}/bin/ ${INSTALL_DATA_DIR} ${PERL5_SITELIB} - ${INSTALL_SCRIPT} ${WRKSRC}/run/BER.pm ${WRKSRC}/run/SNMP_Session.pm \ - ${WRKSRC}/run/SNMP_util.pm ${WRKSRC}/run/locales_mrtg.pm \ + ${INSTALL_SCRIPT} ${WRKSRC}/lib/mrtg2/BER.pm \ + ${WRKSRC}/lib/mrtg2/SNMP_Session.pm \ + ${WRKSRC}/lib/mrtg2/SNMP_util.pm \ + ${WRKSRC}/lib/mrtg2/MRTG_lib.pm \ + ${WRKSRC}/lib/mrtg2/locales_mrtg.pm \ ${PERL5_SITELIB} - for file in cfgmaker cfgmaker_ip indexmaker; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/run/$$file \ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/libexec/ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/mrtg ${PREFIX}/bin/ + for file in cfgmaker indexmaker; do \ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file \ ${PREFIX}/bin/mrtg$$file; \ done diff --git a/net/mrtg/files/md5 b/net/mrtg/files/md5 index b4dbe5d105d..83a35305aee 100644 --- a/net/mrtg/files/md5 +++ b/net/mrtg/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.6 2000/02/07 16:44:15 tron Exp $ +$NetBSD: md5,v 1.7 2000/10/20 16:06:17 bouyer Exp $ -MD5 (mrtg-2.8.12.tar.gz) = 1279ae12c85c458cb5b3111fe5e01341 +MD5 (mrtg-2.9.2.tar.gz) = 85d6b3d925d94357f97959a4d3637220 diff --git a/net/mrtg/files/patch-sum b/net/mrtg/files/patch-sum index 47ed52823d9..66fa19cd6fc 100644 --- a/net/mrtg/files/patch-sum +++ b/net/mrtg/files/patch-sum @@ -1,4 +1,6 @@ -$NetBSD: patch-sum,v 1.4 2000/03/17 23:31:48 tron Exp $ +$NetBSD: patch-sum,v 1.5 2000/10/20 16:06:17 bouyer Exp $ -MD5 (patch-aa) = 47edfe3905473e02d592c7b706fb1033 -MD5 (patch-ab) = 60d615ef73c9ab66d0127d6900b125f6 +MD5 (patch-aa) = e2cc26a0dc6c81bdbe99f9fe0663755b +MD5 (patch-ab) = c074df4f1ea350b0c78ae2966a19d927 +MD5 (patch-ac) = 36ec72901f436858572823bb3ae6d505 +MD5 (patch-ad) = 0be97d19a53ea60e344761c9a29057d6 diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa index 30f34b9aec5..de14371a39d 100644 --- a/net/mrtg/patches/patch-aa +++ b/net/mrtg/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2000/03/17 23:31:48 tron Exp $ +$NetBSD: patch-aa,v 1.9 2000/10/20 16:06:17 bouyer Exp $ ---- configure.orig Sun Feb 6 00:56:27 2000 -+++ configure Mon Feb 7 17:38:11 2000 -@@ -986,7 +986,7 @@ +--- configure.orig Fri Oct 13 16:07:49 2000 ++++ configure Thu Oct 19 14:16:18 2000 +@@ -1113,7 +1113,7 @@ fi diff --git a/net/mrtg/patches/patch-ab b/net/mrtg/patches/patch-ab index 078b79c732e..a65f0e9f95c 100644 --- a/net/mrtg/patches/patch-ab +++ b/net/mrtg/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.4 1999/05/22 10:45:33 rh Exp $ +$NetBSD: patch-ab,v 1.5 2000/10/20 16:06:17 bouyer Exp $ ---- run/mrtg.orig Tue Apr 27 10:04:06 1999 -+++ run/mrtg Sat May 22 10:59:57 1999 -@@ -52,7 +52,7 @@ - } - die "ERROR: Can\'t find location of mrtg executable\n" - unless $main::binpath; -- unshift (@INC,$main::binpath); -+ $main::binpath .= "/../libexec" +--- contrib/NSI/Mrtg_nsi.orig Thu Oct 19 14:20:46 2000 ++++ contrib/NSI/Mrtg_nsi Thu Oct 19 14:21:08 2000 +@@ -59,7 +59,7 @@ + } + die "ERROR: Can\'t find location of mrtg executable\n" + unless $main::binpath; +- unshift (@INC,$main::binpath); ++ $main::binpath .= "/../libexec" } - ### + # There older perls tend to behave peculiar with diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac new file mode 100644 index 00000000000..dc468eb457d --- /dev/null +++ b/net/mrtg/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2000/10/20 16:06:17 bouyer Exp $ + +--- Makefile.in.orig Fri Oct 20 11:18:50 2000 ++++ Makefile.in Fri Oct 20 11:20:39 2000 +@@ -29,6 +29,7 @@ + subst: + $(PERL) -0777 -pi -e 's@^#!\s*/\S*perl@#! $(PERL)@' bin/cfgmaker bin/indexmaker bin/mrtg + $(PERL) -0777 -pi -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' bin/mrtg bin/indexmaker ++ $(PERL) -0777 -pi -e "s@__PREFIX__@${prefix}@g" bin/cfgmaker bin/mrtg bin/indexmaker + + clean: + -rm bin/rateup diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad new file mode 100644 index 00000000000..6d3126a41f4 --- /dev/null +++ b/net/mrtg/patches/patch-ad @@ -0,0 +1,32 @@ +$NetBSD: patch-ad,v 1.1 2000/10/20 16:06:17 bouyer Exp $ + +--- bin/mrtg.orig Fri Oct 20 11:20:46 2000 ++++ bin/mrtg Fri Oct 20 11:22:26 2000 +@@ -421,15 +421,15 @@ + ########## 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")) || ++ die "ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n"; + + # rateup does not know about undef so we make inlast and outlast ready for rateup + $inlast = -1 unless defined $inlast; + $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", + $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z', + "$up_abs"."p", $inlast, $outlast, $absmax, +@@ -437,7 +437,7 @@ + $$rcfg{'rgb3'}{$router},$$rcfg{'rgb4'}{$router}, + $$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, diff --git a/net/mrtg/pkg/PLIST b/net/mrtg/pkg/PLIST index 98ed3f1ac9b..656e311d988 100644 --- a/net/mrtg/pkg/PLIST +++ b/net/mrtg/pkg/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.8 2000/08/27 07:11:16 jlam Exp $ +@comment $NetBSD: PLIST,v 1.9 2000/10/20 16:06:18 bouyer Exp $ bin/mrtg bin/mrtgcfgmaker -bin/mrtgcfgmaker_ip bin/mrtgindexmaker etc/mrtg/mrtg.conf.example ${PERL5_SITELIB}/BER.pm ${PERL5_SITELIB}/SNMP_Session.pm ${PERL5_SITELIB}/SNMP_util.pm +${PERL5_SITELIB}/MRTG_lib.pm ${PERL5_SITELIB}/locales_mrtg.pm libexec/netstat2mrtg libexec/rateup @@ -16,21 +16,69 @@ share/doc/mrtg/CHANGES share/doc/mrtg/COPYING share/doc/mrtg/COPYRIGHT share/doc/mrtg/README -share/doc/mrtg/config.html -share/doc/mrtg/config.pod -share/doc/mrtg/config.txt -share/doc/mrtg/htaccess.txt -share/doc/mrtg/logfile-format.txt -share/doc/mrtg/manual.html -share/doc/mrtg/manual.txt +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 +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-l.gif -share/doc/mrtg/mrtg-m.gif -share/doc/mrtg/mrtg-r.gif -share/doc/mrtg/mrtg-ti.gif +share/doc/mrtg/mrtg-l.png +share/doc/mrtg/mrtg-m.png +share/doc/mrtg/mrtg-r.png +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-ti.png +share/doc/mrtg/mrtg.1 +share/doc/mrtg/mrtg.html +share/doc/mrtg/mrtg.pod +share/doc/mrtg/mrtg.txt +share/doc/mrtg/nt-guide.1 share/doc/mrtg/nt-guide.html -share/doc/mrtg/sample-mrtg.cfg +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 |