>Number:         32811
>Category:       pkg
>Synopsis:       update for mrtg 1.12.2 -> 1.13.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Feb 13 02:10:00 +0000 2006
>Originator:     Geoff C. Wing
>Release:        NetBSD 3.99.15
>Organization:
>Environment:
System: NetBSD g.primenet.com.au 3.99.15 NetBSD 3.99.15 (G) #0: Mon Feb 6 12:42:32 EST 2006 gcw@g.primenet.com.au:/usr/netbsd/src/sys/arch/i386/compile/G i386
Architecture: i386
Machine: i386
>Description:
	Update for mrtg.
	Mostly bugfixes in new version including one for a
	regression in rateup w.r.t. absolute/relative scaling (which
	affects me).

>How-To-Repeat:
	.
>Fix:
--- net/mrtg/Makefile	2006-02-06 14:01:36.000000000 +1100
+++ net/mrtg/Makefile	2006-02-12 18:56:54.000000000 +1100
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.65 2006/02/05 23:10:27 joerg Exp $
 
-DISTNAME=	mrtg-2.12.2
-PKGREVISION=	2
+DISTNAME=	mrtg-2.13.2
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \

--- net/mrtg/PLIST	2005-08-06 16:19:24.000000000 +1000
+++ net/mrtg/PLIST	2006-02-12 19:00:25.000000000 +1100
@@ -33,65 +33,47 @@
 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

--- net/mrtg/distinfo	2005-06-23 18:12:13.000000000 +1000
+++ net/mrtg/distinfo	2006-02-12 18:58:22.000000000 +1100
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.20 2005/06/23 08:12:13 martti 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.13.2.tar.gz) = d8b049658e04bbbb7784d7a23ad295b13829e55a
+RMD160 (mrtg-2.13.2.tar.gz) = f2cfecce25c97ce382b87e68720de9802db4cf1a
+Size (mrtg-2.13.2.tar.gz) = 1107214 bytes
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
-SHA1 (patch-ac) = 591006bc9732f1ce59d0cd1d93348c6578089744
+SHA1 (patch-ac) = ca6673b9c53aa1dbd4b2d226d3fd7ee6f9c9852e
 SHA1 (patch-ad) = 150b3ebd1a11d83d46646cd068664d7d6b7c6f1d
 SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a

--- net/mrtg/patches/patch-ac	2004-12-31 21:44:27.000000000 +1100
+++ net/mrtg/patches/patch-ac	2006-02-13 12:59:16.000000000 +1100
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.7 2004/12/31 10:44:27 minskim Exp $
+$NetBSD:  Exp $
 

---- Makefile.in.orig	2004-08-08 04:49:14.000000000 -0500
-+++ Makefile.in
-@@ -36,8 +36,8 @@ bin/rateup.o: $(top_srcdir)/src/rateup.c
+--- Makefile.in.orig	2006-02-03 17:33:14.000000000 +1100
++++ Makefile.in	2006-02-12 18:57:45.000000000 +1100
+@@ -36,8 +36,8 @@
  	$(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@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