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

2 files changed, 19 insertions, 35 deletions

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,