diff options
-rw-r--r-- | doc/CHANGES | 3 | ||||
-rw-r--r-- | net/mrtg/MESSAGE | 5 | ||||
-rw-r--r-- | net/mrtg/Makefile | 15 | ||||
-rw-r--r-- | net/mrtg/PLIST | 6 |
4 files changed, 17 insertions, 12 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 9a4cd2a1ff4..0aec3c0b46a 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.6215 2004/06/15 14:27:38 grant Exp $ +$NetBSD: CHANGES,v 1.6216 2004/06/15 17:12:13 xtraeme Exp $ Changes to the packages collection and infrastructure in 2004: @@ -2950,3 +2950,4 @@ Changes to the packages collection and infrastructure in 2004: Updated xmill to 0.9.1nb1 [minskim 2004-06-15] Updated kmymoney2 to 0.6 [markd 2004-06-15] Updated smpeg to 0.4.4nb6 [grant 2004-06-15] + Updated mrtg to 2.0.13nb1 [xtraeme 2004-06-15] diff --git a/net/mrtg/MESSAGE b/net/mrtg/MESSAGE index 69864300b6d..daf7fafddb5 100644 --- a/net/mrtg/MESSAGE +++ b/net/mrtg/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2002/12/22 17:50:44 cjep Exp $ +$NetBSD: MESSAGE,v 1.5 2004/06/15 17:12:13 xtraeme Exp $ The Multi Router Traffic Grapher is now installed. Do note that two programs have changed names to more readily reflect their MRTG-specific @@ -11,7 +11,4 @@ function; make sure to prefix them with "mrtg": The documentation can be found at ${PREFIX}/share/doc/mrtg/index.html; 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/Makefile b/net/mrtg/Makefile index 6094b418874..45c0d292239 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2004/05/08 07:37:40 snj Exp $ +# $NetBSD: Makefile,v 1.50 2004/06/15 17:12:13 xtraeme Exp $ DISTNAME= mrtg-2.10.13 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \ ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \ @@ -27,10 +28,12 @@ HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html COMMENT= The Multi-Router Traffic Grapher USE_BUILDLINK3= YES +USE_X11= YES USE_PERL5= YES PERL5_REQD+= 5.6.1 -USE_X11= YES GNU_CONFIGURE= YES +USE_PKGINSTALL= YES + BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" @@ -42,6 +45,10 @@ CONFIGURE_ARGS+= --with-png-lib=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-png-inc=${LOCALBASE}/include .endif +EGDIR= ${PREFIX}/share/examples/${PKGBASE} + +CONF_FILES= ${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf + post-build: ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/mrtg.conf.example \ >${WRKDIR}/mrtg.conf.example @@ -53,7 +60,7 @@ post-build: >${WRKDIR}/envstat2mrtg do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/etc/mrtg + ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA_DIR} ${PREFIX}/share/mrtg ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mrtg for FILE in ${WRKSRC}/doc/*; do \ @@ -69,7 +76,7 @@ do-install: for FILE in ${WRKSRC}/images/*.png; do \ ${INSTALL_DATA} $$FILE ${PREFIX}/share/mrtg; \ done - ${INSTALL_DATA} ${WRKDIR}/mrtg.conf.example ${PREFIX}/etc/mrtg + ${INSTALL_DATA} ${WRKDIR}/mrtg.conf.example ${EGDIR}/mrtg.conf for FILE in netstat2mrtg sys2mrtg envstat2mrtg; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$$FILE ${PREFIX}/libexec; \ done diff --git a/net/mrtg/PLIST b/net/mrtg/PLIST index 1257ac07269..9f1929576f6 100644 --- a/net/mrtg/PLIST +++ b/net/mrtg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2004/02/15 07:34:03 martti Exp $ +@comment $NetBSD: PLIST,v 1.6 2004/06/15 17:12:13 xtraeme Exp $ ${PERL5_SITELIB}/BER.pm ${PERL5_SITELIB}/MRTG_lib.pm ${PERL5_SITELIB}/SNMP_Session.pm @@ -7,7 +7,6 @@ ${PERL5_SITELIB}/locales_mrtg.pm bin/mrtg bin/mrtgcfgmaker bin/mrtgindexmaker -etc/mrtg/mrtg.conf.example libexec/envstat2mrtg libexec/netstat2mrtg libexec/rateup @@ -94,10 +93,11 @@ share/doc/mrtg/mrtglib.1 share/doc/mrtg/mrtglib.html share/doc/mrtg/mrtglib.pod share/doc/mrtg/mrtglib.txt +share/examples/mrtg/mrtg.conf share/mrtg/mrtg-l.png share/mrtg/mrtg-m.png share/mrtg/mrtg-r.png share/mrtg/mrtg-ti.png -@dirrm etc/mrtg @dirrm share/doc/mrtg +@dirrm share/examples/mrtg @dirrm share/mrtg |