From aefbfaf76157813e86453b307f9adc649a500aa7 Mon Sep 17 00:00:00 2001 From: rh Date: Sat, 22 May 1999 10:45:32 +0000 Subject: Update mrtg to 2.7.4 Notable changes are: - several bug fixes - now uses GNU configure script - documentation update - cleaned up distribution - new indexmaker accepts multiple config files - optional 2-column layout - option to specify bacground color - option to specify overview graphs sizes - few options to increase/decrease bells and whistles - improvements for perminute perhour - integration of SNMP_util and the latest SNMP_session - changed cfgmaker to use ipaddress as name for targets - fixed html in indexmaker and mrtg - optional handling of two different MaxBytes settings --- net/mrtg/Makefile | 38 +++++++++++++++++++++++++------------- net/mrtg/files/md5 | 4 ++-- net/mrtg/patches/patch-aa | 31 ------------------------------- net/mrtg/patches/patch-ab | 8 ++++---- net/mrtg/pkg/MESSAGE | 9 +++++---- net/mrtg/pkg/PLIST | 37 +++++++++++++++++++++++++------------ 6 files changed, 61 insertions(+), 66 deletions(-) delete mode 100644 net/mrtg/patches/patch-aa (limited to 'net/mrtg') diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index e5cde9db5cf..7d946f64f3e 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,10 +1,17 @@ -# $NetBSD: Makefile,v 1.6 1999/05/18 14:16:53 bouyer Exp $ +# $NetBSD: Makefile,v 1.7 1999/05/22 10:45:32 rh Exp $ # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp # -DISTNAME= mrtg-2.5.3 +DISTNAME= mrtg-2.7.4b CATEGORIES= net -MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ +MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ \ + http://gd.tuwien.ac.at/infosys/network/tools/mrtg/pub/ \ + ftp://mrtg.hdl.com/ \ + ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \ + ftp://ftp.ou.edu/mirrors/mrtg/ \ + ftp://eesa.webstar.co.uk/pub/mrtg/ \ + ftp://ftp.chg.ru/pub/networking/management/mrtg/ \ + ftp://ftp.onet.pl/pub/unix/network/mrtg/pub/ MAINTAINER= tv@netbsd.org HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html @@ -12,8 +19,8 @@ HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html DEPENDS= gd-1.3p1:../../graphics/gd USE_PERL5= YES - -ALL_TARGET= rateup substitute +GNU_CONFIGURE= YES +CONFIGURE_ARGS= --with-gd-inc=${PREFIX}/include/gd post-build: ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/mrtg.conf.example \ @@ -22,26 +29,31 @@ post-build: >${WRKDIR}/netstat2mrtg ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/sys2mrtg \ >${WRKDIR}/sys2mrtg + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/etc/mrtg ${INSTALL_DATA_DIR} ${PREFIX}/share/mrtg ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mrtg - for file in mrtg-conf.html mrtg-conf.txt readme.html readme.txt mibhelp.txt COPYING COPYRIGHT; do \ + for file in ${WRKSRC}/doc/*; do \ + ${INSTALL_DATA} $$file ${PREFIX}/share/doc/mrtg/; \ + done + for file in ANNOUNCE CHANGES COPYING COPYRIGHT README; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/mrtg/; \ done - for file in ${WRKSRC}/*.gif; do \ + for file in ${WRKSRC}/images/*.gif; do \ ${INSTALL_DATA} $$file ${PREFIX}/share/mrtg/; \ done ${INSTALL_DATA} ${WRKDIR}/mrtg.conf.example ${PREFIX}/etc/mrtg for file in netstat2mrtg sys2mrtg; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$$file ${PREFIX}/libexec/; \ done - ${INSTALL_PROGRAM} ${WRKSRC}/rateup ${PREFIX}/libexec/ - ${INSTALL_SCRIPT} ${WRKSRC}/mrtg ${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${WRKSRC}/BER.pm ${WRKSRC}/SNMP_Session.pm \ - ${PREFIX}/lib/perl5/site_perl/ - for file in cfgmaker convert indexmaker; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/$$file ${PREFIX}/bin/mrtg$$file; \ + ${INSTALL_PROGRAM} ${WRKSRC}/run/rateup ${PREFIX}/libexec/ + ${INSTALL_SCRIPT} ${WRKSRC}/run/mrtg ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/run/BER.pm ${WRKSRC}/run/SNMP_Session.pm \ + ${WRKSRC}/run/SNMP_util.pm ${PREFIX}/lib/perl5/site_perl/ + for file in cfgmaker cfgmaker_ip indexmaker; do \ + ${INSTALL_SCRIPT} ${WRKSRC}/run/$$file \ + ${PREFIX}/bin/mrtg$$file; \ done .include "../../mk/bsd.pkg.mk" diff --git a/net/mrtg/files/md5 b/net/mrtg/files/md5 index 5b4f6e4bae3..a78360d33ec 100644 --- a/net/mrtg/files/md5 +++ b/net/mrtg/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1998/08/07 13:25:10 agc Exp $ +$NetBSD: md5,v 1.4 1999/05/22 10:45:32 rh Exp $ -MD5 (mrtg-2.5.3.tar.gz) = 32d4da17cedbbd2b3a999edfc389e4a0 +MD5 (mrtg-2.7.4b.tar.gz) = 2f30710aa9668097e4a93820cdbd3df4 diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa deleted file mode 100644 index 8f15d7b966d..00000000000 --- a/net/mrtg/patches/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig Mon May 25 07:26:30 1998 -+++ Makefile Mon May 10 18:03:33 1999 -@@ -6,16 +6,16 @@ - # GD_INCLUDE - # The path to the include files for the gd graphics library. - #GD_INCLUDE=/usr/local/include/gd --GD_INCLUDE=gd1.2 -+GD_INCLUDE=${PREFIX}/include/gd - - # GD_LIB - # The path to the gd graphics library: libgd.a - #GD_LIB=/usr/local/lib --GD_LIB=gd1.2 -+GD_LIB=${PREFIX}/lib - - # Where is perl 5 on this machine - # PERL=/usr/local/bin/perl --PERL=/usr/local/gnu/bin/perl5 -+PERL=${PREFIX}/bin/perl - - - # CC -@@ -57,7 +57,7 @@ - @echo "" - - rateup: rateup.c -- $(CC) $(CFLAGS) rateup.c -I$(GD_INCLUDE) -L$(GD_LIB) -lgd -lm -o rateup -+ $(CC) $(CFLAGS) rateup.c -I$(GD_INCLUDE) $(LDFLAGS) -L$(GD_LIB) -lgd -lm -o rateup - - PERLFILES = mrtg cfgmaker indexmaker convert - diff --git a/net/mrtg/patches/patch-ab b/net/mrtg/patches/patch-ab index b2a87c1086a..078b79c732e 100644 --- a/net/mrtg/patches/patch-ab +++ b/net/mrtg/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 11:10:47 agc Exp $ +$NetBSD: patch-ab,v 1.4 1999/05/22 10:45:33 rh Exp $ ---- mrtg.orig Mon Jul 13 13:17:55 1998 -+++ mrtg Mon Jul 13 13:19:52 1998 -@@ -54,7 +54,7 @@ +--- 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; diff --git a/net/mrtg/pkg/MESSAGE b/net/mrtg/pkg/MESSAGE index bceb2bc06fc..441477c7477 100644 --- a/net/mrtg/pkg/MESSAGE +++ b/net/mrtg/pkg/MESSAGE @@ -1,17 +1,18 @@ ============================================================================= -$NetBSD: MESSAGE,v 1.3 1999/05/18 14:16:53 bouyer Exp $ +$NetBSD: MESSAGE,v 1.4 1999/05/22 10:45:33 rh Exp $ The Multi Router Traffic Grapher is now installed. Do note that three programs have changed names to more readily reflect their MRTG-specific function; make sure to prefix them with "mrtg": cfgmaker -> mrtgcfgmaker - convert -> mrtgconvert + cfgmaker_ip -> mrtgcfgmaker_ip indexmaker -> mrtgindexmaker -The documentation can be found at $PREFIX/share/doc/mrtg/readme.html -(where $PREFIX is typically /usr/pkg); there is a .txt version there as well. +The documentation can be found at $PREFIX/share/doc/mrtg/manual.html +(where $PREFIX is typically /usr/pkg); there is a .txt version there +as well. A sample config file collecting various datas from a NetBSD machine can be found in $PREFIX/etc/mrtg/. diff --git a/net/mrtg/pkg/PLIST b/net/mrtg/pkg/PLIST index f32d98f5f21..ea2d9d98b39 100644 --- a/net/mrtg/pkg/PLIST +++ b/net/mrtg/pkg/PLIST @@ -1,25 +1,38 @@ -@comment $NetBSD: PLIST,v 1.3 1999/05/18 14:16:53 bouyer Exp $ -etc/mrtg/mrtg.conf.example +@comment $NetBSD: PLIST,v 1.4 1999/05/22 10:45:34 rh Exp $ +bin/mrtg bin/mrtgcfgmaker -bin/mrtgconvert +bin/mrtgcfgmaker_ip bin/mrtgindexmaker -bin/mrtg +etc/mrtg/mrtg.conf.example lib/perl5/site_perl/BER.pm lib/perl5/site_perl/SNMP_Session.pm -libexec/rateup +lib/perl5/site_perl/SNMP_util.pm libexec/netstat2mrtg libexec/sys2mrtg +libexec/rateup +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/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/sample-mrtg.cfg +share/doc/mrtg/squid.txt +share/doc/mrtg/ANNOUNCE +share/doc/mrtg/CHANGES +share/doc/mrtg/COPYING +share/doc/mrtg/COPYRIGHT +share/doc/mrtg/README share/mrtg/mrtg-l.gif share/mrtg/mrtg-m.gif share/mrtg/mrtg-r.gif share/mrtg/mrtg-ti.gif -share/doc/mrtg/COPYING -share/doc/mrtg/COPYRIGHT -share/doc/mrtg/mibhelp.txt -share/doc/mrtg/mrtg-conf.html -share/doc/mrtg/mrtg-conf.txt -share/doc/mrtg/readme.html -share/doc/mrtg/readme.txt @dirrm etc/mrtg @dirrm share/doc/mrtg @dirrm share/mrtg -- cgit v1.2.3