Changes 2.16.4:

* fix "P_DETACH" and Pod::Usage issues with perl 5.12
* relax cfgmaker option parsing when figuring whether to test for highspeed
  counters or not.
* fix sorting of numbered interface names index maker
* belarusian translation for mrtg 2.16

Changes 2.16.3:
* three new config options to compliment the existing
  RRDRowCount option to explicitly set the size of all RRAs
* allow to rename target in the clonedirectory option
* add import to the require File::Copy
* support multiple options in ifdesc and ifref setting for cfgmaker
* teach cfgmaker about nortel switches
* make sure rates over 4G work too
* allow group and user option to be set to roo

7 files changed, 107 insertions, 163 deletions

diff --git a/net/mrtg/MESSAGE b/net/mrtg/MESSAGE
deleted file mode 100644
index b0d12080e35..00000000000
--- a/net/mrtg/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$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
-function; make sure to prefix them with "mrtg":
-
-    cfgmaker -> mrtgcfgmaker
-    indexmaker -> mrtgindexmaker
-
-The documentation can be found at ${PREFIX}/share/doc/mrtg/
-
-===========================================================================
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 29301cd2683..c3dba1a5276 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.97 2010/06/13 22:45:12 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2010/07/09 08:45:33 adam Exp $
 
-DISTNAME=	mrtg-2.16.2
-PKGREVISION=	5
+DISTNAME=	mrtg-2.16.4
 CATEGORIES=	net
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
 		http://oss.oetiker.ch/mrtg/pub/old/
@@ -13,21 +12,14 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	perl:run
-GNU_CONFIGURE=	YES
+USE_TOOLS+=		perl:run
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-gd=${BUILDLINK_PREFIX.gd}
+CONFIGURE_ARGS+=	--with-png=${BUILDLINK_PREFIX.png}
+CONFIGURE_ARGS+=	--with-z=${BUILDLINK_PREFIX.zlib}
+MAKE_ENV+=		PERL5_INSTALLVENDORLIB=${PERL5_INSTALLVENDORLIB}
 
-LDFLAGS+=	-lgd -lintl -ljpeg
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--with-z-lib=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-z-inc=${LOCALBASE}/include
-CONFIGURE_ARGS+=	--with-png-lib=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-png-inc=${LOCALBASE}/include
-.endif
-
-REPLACE_PERL=	bin/cfgmaker bin/indexmaker bin/mrtg
+REPLACE_PERL=	bin/cfgmaker bin/indexmaker bin/mrtg bin/mrtg-traffic-sum
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
 CONF_FILES=	${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf
@@ -36,16 +28,12 @@ CONF_FILES=	${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf
 
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-patch
-SUBST_FILES.files=	../mrtg.conf.example ../netstat2mrtg		\
+SUBST_FILES.files=	../mrtg.conf.example ../netstat2mrtg	\
 			../sys2mrtg ../envstat2mrtg
 SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.files=	Fixing default configuration files.
 
-INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man1 ${EGDIR}
-INSTALLATION_DIRS+=	share/mrtg share/doc/mrtg ${PERL5_INSTALLVENDORLIB}
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
+INSTALLATION_DIRS+=	${EGDIR}
 
 post-extract:
 	cp ${FILESDIR}/mrtg.conf.example ${WRKDIR}
@@ -53,35 +41,14 @@ post-extract:
 	cp ${FILESDIR}/sys2mrtg ${WRKDIR}
 	cp ${FILESDIR}/envstat2mrtg ${WRKDIR}
 
-do-install:
-	for FILE in ${WRKSRC}/doc/*.??*; do \
-	  ${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/doc/mrtg; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/doc/mrtg*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-	for FILE in cfgmaker.1 indexmaker.1; do \
-	  ${INSTALL_DATA} ${WRKSRC}/doc/$$FILE ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mrtg$$FILE; \
-	done
-	for FILE in CHANGES COPYING COPYRIGHT README; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/mrtg; \
-	done
-	for FILE in ${WRKSRC}/images/*.png; do \
-	  ${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/mrtg; \
-	done
+post-install:
 	${INSTALL_DATA} ${WRKDIR}/mrtg.conf.example ${DESTDIR}${EGDIR}/mrtg.conf
-	for FILE in netstat2mrtg sys2mrtg envstat2mrtg; do \
-	  ${INSTALL_SCRIPT} ${WRKDIR}/$$FILE ${DESTDIR}${PREFIX}/libexec; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/BER.pm \
-	  ${WRKSRC}/lib/mrtg2/SNMP_Session.pm \
-	  ${WRKSRC}/lib/mrtg2/SNMP_util.pm \
-	  ${WRKSRC}/lib/mrtg2/Net_SNMP_util.pm \
-	  ${WRKSRC}/lib/mrtg2/MRTG_lib.pm \
-	  ${WRKSRC}/lib/mrtg2/locales_mrtg.pm \
-	  ${DESTDIR}${PERL5_INSTALLVENDORLIB}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/mrtg ${DESTDIR}${PREFIX}/bin/
-	for FILE in cfgmaker indexmaker; do \
-	  ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$FILE ${DESTDIR}${PREFIX}/bin/mrtg$$FILE; \
-	done
+	${INSTALL_SCRIPT} ${WRKDIR}/envstat2mrtg ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_SCRIPT} ${WRKDIR}/netstat2mrtg ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_SCRIPT} ${WRKDIR}/sys2mrtg ${DESTDIR}${PREFIX}/libexec
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mrtg/PLIST b/net/mrtg/PLIST
index 9b567c5c473..d28167c47c2 100644
--- a/net/mrtg/PLIST
+++ b/net/mrtg/PLIST
@@ -1,17 +1,25 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 18:09:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/07/09 08:45:33 adam Exp $
+bin/cfgmaker
+bin/indexmaker
 bin/mrtg
-bin/mrtgcfgmaker
-bin/mrtgindexmaker
+bin/mrtg-traffic-sum
+bin/rateup
 libexec/envstat2mrtg
 libexec/netstat2mrtg
-libexec/rateup
 libexec/sys2mrtg
 ${PERL5_SUB_INSTALLVENDORLIB}/BER.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/MRTG_lib.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/SNMP_Session.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/SNMP_util.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Net_SNMP_util.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Pod/InputObjects.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Pod/Parser.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Pod/PlainText.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Pod/Select.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Pod/Usage.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/locales_mrtg.pm
+man/man1/cfgmaker.1
+man/man1/indexmaker.1
 man/man1/mrtg-contrib.1
 man/man1/mrtg-faq.1
 man/man1/mrtg-forum.1
@@ -26,56 +34,56 @@ man/man1/mrtg-squid.1
 man/man1/mrtg-unix-guide.1
 man/man1/mrtg-webserver.1
 man/man1/mrtg.1
-man/man1/mrtgcfgmaker.1
-man/man1/mrtgindexmaker.1
 man/man1/mrtglib.1
-share/doc/mrtg/CHANGES
-share/doc/mrtg/COPYING
-share/doc/mrtg/COPYRIGHT
-share/doc/mrtg/README
-share/doc/mrtg/cfgmaker.pod
-share/doc/mrtg/cfgmaker.txt
-share/doc/mrtg/indexmaker.pod
-share/doc/mrtg/indexmaker.txt
-share/doc/mrtg/mrtg-contrib.pod
-share/doc/mrtg/mrtg-contrib.txt
-share/doc/mrtg/mrtg-faq.pod
-share/doc/mrtg/mrtg-faq.txt
-share/doc/mrtg/mrtg-forum.pod
-share/doc/mrtg/mrtg-forum.txt
-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.pod
-share/doc/mrtg/mrtg-logfile.txt
-share/doc/mrtg/mrtg-m.gif
-share/doc/mrtg/mrtg-m.png
-share/doc/mrtg/mrtg-mibhelp.pod
-share/doc/mrtg/mrtg-mibhelp.txt
-share/doc/mrtg/mrtg-nt-guide.pod
-share/doc/mrtg/mrtg-nt-guide.txt
-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.pod
-share/doc/mrtg/mrtg-reference.txt
-share/doc/mrtg/mrtg-rrd.pod
-share/doc/mrtg/mrtg-rrd.txt
-share/doc/mrtg/mrtg-squid.pod
-share/doc/mrtg/mrtg-squid.txt
-share/doc/mrtg/mrtg-ti.png
-share/doc/mrtg/mrtg-unix-guide.pod
-share/doc/mrtg/mrtg-unix-guide.txt
-share/doc/mrtg/mrtg-webserver.pod
-share/doc/mrtg/mrtg-webserver.txt
-share/doc/mrtg/mrtg.pod
-share/doc/mrtg/mrtg.txt
-share/doc/mrtg/mrtglib.pod
-share/doc/mrtg/mrtglib.txt
+share/doc/mrtg2/CHANGES
+share/doc/mrtg2/COPYING
+share/doc/mrtg2/COPYRIGHT
+share/doc/mrtg2/README
+share/doc/mrtg2/THANKS
+share/doc/mrtg2/cfgmaker.pod
+share/doc/mrtg2/cfgmaker.txt
+share/doc/mrtg2/indexmaker.pod
+share/doc/mrtg2/indexmaker.txt
+share/doc/mrtg2/mrtg-contrib.pod
+share/doc/mrtg2/mrtg-contrib.txt
+share/doc/mrtg2/mrtg-faq.pod
+share/doc/mrtg2/mrtg-faq.txt
+share/doc/mrtg2/mrtg-forum.pod
+share/doc/mrtg2/mrtg-forum.txt
+share/doc/mrtg2/mrtg-ipv6.pod
+share/doc/mrtg2/mrtg-ipv6.txt
+share/doc/mrtg2/mrtg-l.png
+share/doc/mrtg2/mrtg-logfile.pod
+share/doc/mrtg2/mrtg-logfile.txt
+share/doc/mrtg2/mrtg-m.png
+share/doc/mrtg2/mrtg-mibhelp.pod
+share/doc/mrtg2/mrtg-mibhelp.txt
+share/doc/mrtg2/mrtg-nt-guide.pod
+share/doc/mrtg2/mrtg-nt-guide.txt
+share/doc/mrtg2/mrtg-nw-guide.pod
+share/doc/mrtg2/mrtg-nw-guide.txt
+share/doc/mrtg2/mrtg-r.png
+share/doc/mrtg2/mrtg-reference.pod
+share/doc/mrtg2/mrtg-reference.txt
+share/doc/mrtg2/mrtg-rrd.pod
+share/doc/mrtg2/mrtg-rrd.txt
+share/doc/mrtg2/mrtg-squid.pod
+share/doc/mrtg2/mrtg-squid.txt
+share/doc/mrtg2/mrtg-ti.png
+share/doc/mrtg2/mrtg-unix-guide.pod
+share/doc/mrtg2/mrtg-unix-guide.txt
+share/doc/mrtg2/mrtg-webserver.pod
+share/doc/mrtg2/mrtg-webserver.txt
+share/doc/mrtg2/mrtg.pod
+share/doc/mrtg2/mrtg.txt
+share/doc/mrtg2/mrtglib.pod
+share/doc/mrtg2/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
+share/mrtg2/icons/mrtg-l.gif
+share/mrtg2/icons/mrtg-l.png
+share/mrtg2/icons/mrtg-m.gif
+share/mrtg2/icons/mrtg-m.png
+share/mrtg2/icons/mrtg-r.gif
+share/mrtg2/icons/mrtg-r.png
+share/mrtg2/icons/mrtg-ti.gif
+share/mrtg2/icons/mrtg-ti.png
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index 7f359e51624..151e9ad24f1 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.29 2008/08/10 16:50:56 adrianp Exp $
+$NetBSD: distinfo,v 1.30 2010/07/09 08:45:33 adam Exp $
 
-SHA1 (mrtg-2.16.2.tar.gz) = 44f336c79e1418b59f5a25cb5cc03a82f983fdea
-RMD160 (mrtg-2.16.2.tar.gz) = 2d60324f6c3bcd64fcd6b626ec6a36d4d3c92604
-Size (mrtg-2.16.2.tar.gz) = 1078423 bytes
+SHA1 (mrtg-2.16.4.tar.gz) = 8d810487585c929bf48246311512f88077e10e55
+RMD160 (mrtg-2.16.4.tar.gz) = 9d7f2573fded09b16cd5b108271b9dd68d78bc18
+Size (mrtg-2.16.4.tar.gz) = 1089068 bytes
 SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
-SHA1 (patch-ac) = e12f74ea083c1e3a7793afc35dcd698611823d81
-SHA1 (patch-ad) = d571917c468edde3ef3670154039da2a46681d27
+SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018
 SHA1 (patch-ae) = 38793e3bd13570d18006a016c65a4cc3c3f5e1b5
diff --git a/net/mrtg/options.mk b/net/mrtg/options.mk
index 868aaa16c66..aa87036e329 100644
--- a/net/mrtg/options.mk
+++ b/net/mrtg/options.mk
@@ -1,7 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2009/03/07 15:02:23 seb Exp $
+# $NetBSD: options.mk,v 1.3 2010/07/09 08:45:33 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mrtg
-
 PKG_SUPPORTED_OPTIONS=	inet6 mrtg-snmpv3
 
 .include "../../mk/bsd.options.mk"
diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac
index 612cfa51566..ab2abf176f3 100644
--- a/net/mrtg/patches/patch-ac
+++ b/net/mrtg/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.8 2006/08/09 21:42:42 adrianp Exp $
+$NetBSD: patch-ac,v 1.9 2010/07/09 08:45:34 adam Exp $
 
---- Makefile.in.orig	2006-07-14 12:39:05.000000000 +0100
+--- Makefile.in.orig	2010-05-17 12:07:01.000000000 +0000
 +++ Makefile.in
 @@ -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
@@ -11,3 +11,20 @@ $NetBSD: patch-ac,v 1.8 2006/08/09 21:42:42 adrianp Exp $
  	$(PERL) -0777 -p -i~ -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
  
  clean:
+@@ -49,12 +49,12 @@ install: all
+ 	for x in $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg-traffic-sum; do \
+ 	  $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done
+ 	for x in bin/rateup; do \
+-	  $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/mrtg2/Pod
++	  $(INSTALL) -m 755 -s $$x $(DESTDIR)$(bindir); done
++	$(MKINSTALLDIRS) $(DESTDIR)${PERL5_INSTALLVENDORLIB}/Pod
+ 	for x in $(top_srcdir)/lib/mrtg2/*.pm; do \
+-	  $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2; done
++	  $(INSTALL) -m 644 $$x $(DESTDIR)${PERL5_INSTALLVENDORLIB}; done
+ 	for x in $(top_srcdir)/lib/mrtg2/Pod/*.pm; do \
+-	  $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2/Pod; done
++	  $(INSTALL) -m 644 $$x $(DESTDIR)${PERL5_INSTALLVENDORLIB}/Pod; done
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mrtg2/icons
+ 	for x in $(top_srcdir)/images/*.gif $(top_srcdir)/images/*.png; do \
+ 	  $(INSTALL) -m 644 $$x $(DESTDIR)$(datadir)/mrtg2/icons; done
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad
deleted file mode 100644
index 07d5030b32b..00000000000
--- a/net/mrtg/patches/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ad,v 1.15 2008/04/15 11:02:04 martti Exp $
-
---- bin/mrtg.orig	2008-02-17 12:27:36.000000000 +0200
-+++ bin/mrtg	2008-04-15 13:56:27.000000000 +0300
-@@ -899,8 +899,8 @@
- 
-     ((($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 "$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";
- 
-     # 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;
-@@ -912,7 +912,7 @@
-     $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,
-@@ -921,7 +921,7 @@
-                  $$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,