diff options
author | adrianp <adrianp@pkgsrc.org> | 2006-08-09 21:42:42 +0000 |
---|---|---|
committer | adrianp <adrianp@pkgsrc.org> | 2006-08-09 21:42:42 +0000 |
commit | 89f20fab5ae599be1d06e08d2ad4c865f6724a12 (patch) | |
tree | f9dbe269e7c3bf283b93b08c1f47f69cc8bad689 | |
parent | b1e09bbdfa819e710c5572fc14eae33624c64caf (diff) | |
download | pkgsrc-89f20fab5ae599be1d06e08d2ad4c865f6724a12.tar.gz |
Update to 2.14.5
Package changes include:
- pkglintification
- move to options.mk
- add in extra option for building with snmpv3 support (not tested)
- tidy up MESSAGE (no more html docs)
MRTG changes include:
* updated SNMP_util.pm and Net_SNMP_util.pm
* new: clonedirectory function
* Updated SNMP_Session to 1.08
* SNMP v3 support added Net::SNMP library required for this
For a full list see:
http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/CHANGES
Addresses PR# 32811
ok'ed bouyer@
-rw-r--r-- | net/mrtg/MESSAGE | 5 | ||||
-rw-r--r-- | net/mrtg/Makefile | 22 | ||||
-rw-r--r-- | net/mrtg/PLIST | 23 | ||||
-rw-r--r-- | net/mrtg/distinfo | 12 | ||||
-rw-r--r-- | net/mrtg/options.mk | 21 | ||||
-rw-r--r-- | net/mrtg/patches/patch-ac | 11 | ||||
-rw-r--r-- | net/mrtg/patches/patch-ad | 34 |
7 files changed, 67 insertions, 61 deletions
diff --git a/net/mrtg/MESSAGE b/net/mrtg/MESSAGE index daf7fafddb5..b0d12080e35 100644 --- a/net/mrtg/MESSAGE +++ b/net/mrtg/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2004/06/15 17:12:13 xtraeme Exp $ +$NetBSD: MESSAGE,v 1.6 2006/08/09 21:42:42 adrianp Exp $ The Multi Router Traffic Grapher is now installed. Do note that two programs have changed names to more readily reflect their MRTG-specific @@ -8,7 +8,6 @@ function; make sure to prefix them with "mrtg": cfgmaker -> mrtgcfgmaker indexmaker -> mrtgindexmaker -The documentation can be found at ${PREFIX}/share/doc/mrtg/index.html; -there is a .txt version there as well. +The documentation can be found at ${PREFIX}/share/doc/mrtg/ =========================================================================== diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 6d95d9cf639..a1788ebc07f 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.71 2006/07/07 22:10:07 jlam Exp $ +# $NetBSD: Makefile,v 1.72 2006/08/09 21:42:42 adrianp Exp $ -DISTNAME= mrtg-2.12.2 -PKGREVISION= 5 +DISTNAME= mrtg-2.14.5 CATEGORIES= net MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \ http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/old/ \ @@ -30,15 +29,10 @@ COMMENT= The Multi-Router Traffic Grapher USE_TOOLS+= perl:run GNU_CONFIGURE= YES -BUILD_DEFS+= USE_INET6 LDFLAGS+= -lgd -lintl -ljpeg .include "../../mk/bsd.prefs.mk" -.if defined(USE_INET6) && ${USE_INET6} == "YES" -DEPENDS+= p5-INET6>=2.00:../../net/p5-INET6 -.endif - .if ${OPSYS} == "SunOS" CONFIGURE_ARGS+= --with-z-lib=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-z-inc=${LOCALBASE}/include @@ -51,6 +45,8 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf +.include "options.mk" + SUBST_CLASSES+= files SUBST_STAGE.files= post-patch SUBST_FILES.files= ../mrtg.conf.example ../netstat2mrtg \ @@ -58,16 +54,16 @@ SUBST_FILES.files= ../mrtg.conf.example ../netstat2mrtg \ SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" SUBST_MESSAGE.files= Fixing default configuration files. -INSTALLATION_DIRS= bin libexec man/man1 +INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" post-extract: - @${CP} ${FILESDIR}/mrtg.conf.example ${WRKDIR} - @${CP} ${FILESDIR}/netstat2mrtg ${WRKDIR} - @${CP} ${FILESDIR}/sys2mrtg ${WRKDIR} - @${CP} ${FILESDIR}/envstat2mrtg ${WRKDIR} + ${CP} ${FILESDIR}/mrtg.conf.example ${WRKDIR} + ${CP} ${FILESDIR}/netstat2mrtg ${WRKDIR} + ${CP} ${FILESDIR}/sys2mrtg ${WRKDIR} + ${CP} ${FILESDIR}/envstat2mrtg ${WRKDIR} do-install: ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/net/mrtg/PLIST b/net/mrtg/PLIST index 8d172eb1711..ef052cbd741 100644 --- a/net/mrtg/PLIST +++ b/net/mrtg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2005/08/06 06:19:24 jlam Exp $ +@comment $NetBSD: PLIST,v 1.10 2006/08/09 21:42:42 adrianp Exp $ bin/mrtg bin/mrtgcfgmaker bin/mrtgindexmaker @@ -28,70 +28,49 @@ man/man1/mrtg.1 man/man1/mrtgcfgmaker.1 man/man1/mrtgindexmaker.1 man/man1/mrtglib.1 -share/doc/mrtg/ANNOUNCE share/doc/mrtg/CHANGES share/doc/mrtg/COPYING share/doc/mrtg/COPYRIGHT share/doc/mrtg/README -share/doc/mrtg/cfgmaker.html share/doc/mrtg/cfgmaker.pod share/doc/mrtg/cfgmaker.txt -share/doc/mrtg/index.html -share/doc/mrtg/index.txt -share/doc/mrtg/index.wml -share/doc/mrtg/indexmaker.html share/doc/mrtg/indexmaker.pod share/doc/mrtg/indexmaker.txt -share/doc/mrtg/mrtg-contrib.html share/doc/mrtg/mrtg-contrib.pod share/doc/mrtg/mrtg-contrib.txt -share/doc/mrtg/mrtg-faq.html share/doc/mrtg/mrtg-faq.pod share/doc/mrtg/mrtg-faq.txt -share/doc/mrtg/mrtg-forum.html share/doc/mrtg/mrtg-forum.pod share/doc/mrtg/mrtg-forum.txt -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.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.html share/doc/mrtg/mrtg-mibhelp.pod share/doc/mrtg/mrtg-mibhelp.txt -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-nw-guide.html share/doc/mrtg/mrtg-nw-guide.pod share/doc/mrtg/mrtg-nw-guide.txt share/doc/mrtg/mrtg-r.gif share/doc/mrtg/mrtg-r.png -share/doc/mrtg/mrtg-reference.html share/doc/mrtg/mrtg-reference.pod share/doc/mrtg/mrtg-reference.txt -share/doc/mrtg/mrtg-rrd.html share/doc/mrtg/mrtg-rrd.pod share/doc/mrtg/mrtg-rrd.txt -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.html share/doc/mrtg/mrtg-unix-guide.pod share/doc/mrtg/mrtg-unix-guide.txt -share/doc/mrtg/mrtg-webserver.html share/doc/mrtg/mrtg-webserver.pod share/doc/mrtg/mrtg-webserver.txt -share/doc/mrtg/mrtg.html share/doc/mrtg/mrtg.pod share/doc/mrtg/mrtg.txt -share/doc/mrtg/mrtglib.html share/doc/mrtg/mrtglib.pod share/doc/mrtg/mrtglib.txt share/examples/mrtg/mrtg.conf diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo index db359fe9211..ce806edd591 100644 --- a/net/mrtg/distinfo +++ b/net/mrtg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.20 2005/06/23 08:12:13 martti Exp $ +$NetBSD: distinfo,v 1.21 2006/08/09 21:42:42 adrianp Exp $ -SHA1 (mrtg-2.12.2.tar.gz) = b968a8afca8bc12a5164de0f869422bb2d0156a5 -RMD160 (mrtg-2.12.2.tar.gz) = e7ceab248909369c1e92807cf121a6d3eee089ff -Size (mrtg-2.12.2.tar.gz) = 1135438 bytes +SHA1 (mrtg-2.14.5.tar.gz) = 2c9fe80a50e0611516122c2b95b028c39b735cec +RMD160 (mrtg-2.14.5.tar.gz) = 08597e98a555c5e7dc8e2e3eca23fedf2fbef487 +Size (mrtg-2.14.5.tar.gz) = 1100574 bytes SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c -SHA1 (patch-ac) = 591006bc9732f1ce59d0cd1d93348c6578089744 -SHA1 (patch-ad) = 150b3ebd1a11d83d46646cd068664d7d6b7c6f1d +SHA1 (patch-ac) = e12f74ea083c1e3a7793afc35dcd698611823d81 +SHA1 (patch-ad) = aad7bd2acafb41f05691d0fd701e1be7f12fda55 SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a diff --git a/net/mrtg/options.mk b/net/mrtg/options.mk new file mode 100644 index 00000000000..471fc48047a --- /dev/null +++ b/net/mrtg/options.mk @@ -0,0 +1,21 @@ +# $NetBSD: options.mk,v 1.1 2006/08/09 21:42:42 adrianp Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mrtg + +PKG_SUPPORTED_OPTIONS= inet6 mrtg-snmpv3 + +.include "../../mk/bsd.options.mk" + +### +### Use an external SNMP module to get SNMPv3 support +### +.if !empty(PKG_OPTIONS:Mmrtg-snmpv3) +DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP +.endif + +### +### Support for IPv6 enabled devices +### +.if !empty(PKG_OPTIONS:Minet6) +DEPENDS+= p5-INET6>=2.00:../../net/p5-INET6 +.endif diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac index 0a0a519c453..612cfa51566 100644 --- a/net/mrtg/patches/patch-ac +++ b/net/mrtg/patches/patch-ac @@ -1,14 +1,13 @@ -$NetBSD: patch-ac,v 1.7 2004/12/31 10:44:27 minskim Exp $ +$NetBSD: patch-ac,v 1.8 2006/08/09 21:42:42 adrianp Exp $ ---- Makefile.in.orig 2004-08-08 04:49:14.000000000 -0500 +--- Makefile.in.orig 2006-07-14 12:39:05.000000000 +0100 +++ Makefile.in -@@ -36,8 +36,8 @@ bin/rateup.o: $(top_srcdir)/src/rateup.c +@@ -36,7 +36,7 @@ bin/rateup.o: $(top_srcdir)/src/rateup.c $(CC) $(CPPFLAGS) $(CFLAGS) -c $(top_srcdir)/src/rateup.c -o bin/rateup.o 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'^#!\s*/\S*perl'#! $(PERL)'" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg ++ $(PERL) -0777 -p -i~ -e "s@__PREFIX__@${prefix}@g" $(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 -+ $(PERL) -0777 -p -i~ -e "s@__PREFIX__@${prefix}@g" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker clean: - -rm -f bin/rateup diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad index 1c0fb812038..d15128d751f 100644 --- a/net/mrtg/patches/patch-ad +++ b/net/mrtg/patches/patch-ad @@ -1,21 +1,33 @@ -$NetBSD: patch-ad,v 1.10 2005/06/23 08:12:13 martti Exp $ +$NetBSD: patch-ad,v 1.11 2006/08/09 21:42:42 adrianp Exp $ ---- bin/mrtg.orig 2005-06-19 16:40:02.000000000 +0300 -+++ bin/mrtg 2005-06-23 08:05:14.000000000 +0300 -@@ -721,4 +721,4 @@ +--- bin/mrtg.orig 2006-07-14 12:39:19.000000000 +0100 ++++ bin/mrtg +@@ -824,8 +824,8 @@ sub writegraphics { + + ((($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 "SYS:/Mrtg/bin/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"; +- die "$NOW: ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n"; ++ (-x "__PREFIX__/libexec/rateup")) or ++ die "$NOW: ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n"; -@@ -734,3 +734,3 @@ + # rateup does not know about undef so we make inlast and outlast ready for rateup + #warn "$NOW: ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast; +@@ -837,7 +837,7 @@ sub writegraphics { + $outlast = -1 unless 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", -@@ -743,3 +743,3 @@ + $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z', + "$up_abs"."p", $inlast, $outlast, $absmax, +@@ -846,7 +846,7 @@ sub writegraphics { + $$rcfg{'rgb5'}{$router}); + } else { - @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", $inlast, $outlast, $absmax, |