Subject: Re: pkg/32811: net/mrtg (1.13.2) update
To: None <bouyer@NetBSD.org, gnats-admin@netbsd.org,>
From: Geoff Wing <gcw@pobox.com>
List: pkgsrc-bugs
Date: 08/04/2006 01:00:13
The following reply was made to PR pkg/32811; it has been noted by GNATS.
From: Geoff Wing <gcw@pobox.com>
To: NetBSD GNATS <gnats-bugs@netbsd.org>
Cc:
Subject: Re: pkg/32811: net/mrtg (1.13.2) update
Date: Fri, 4 Aug 2006 10:58:33 +1000
On Monday 2006-02-13 13:10 +1100, Geoff Wing output:
:>Synopsis: update for mrtg 1.12.2 -> 1.13.2
should be ^ 2.12.2 ^ 2.13.2
What I'm now using: current pkg 2.12.2nb5 -> 2.14.5
PLIST diff slightly different.
--- net/mrtg/Makefile 2006-07-18 16:35:23.000000000 +1000
+++ net/mrtg/Makefile 2006-08-03 15:51:35.000000000 +1000
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.71 2006/07/07 22:10:07 jlam 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/ \
--- net/mrtg/PLIST 2005-08-06 16:19:24.000000000 +1000
+++ net/mrtg/PLIST 2006-08-03 15:55:59.000000000 +1000
@@ -28,70 +28,49 @@
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
--- net/mrtg/distinfo 2005-06-23 18:12:13.000000000 +1000
+++ net/mrtg/distinfo 2006-08-03 15:54:22.000000000 +1000
@@ -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.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) = 0e292536b9fde11bd6cc4beb5d2bdbd8a05e4064
+SHA1 (patch-ad) = 131215c79e4b5cf97aad43b718d133a9da234665
SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a
--- net/mrtg/patches/patch-ac 2004-12-31 21:44:27.000000000 +1100
+++ net/mrtg/patches/patch-ac 2006-08-03 15:48:55.000000000 +1000
@@ -1,12 +1,12 @@
$NetBSD: patch-ac,v 1.7 2004/12/31 10:44:27 minskim 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.org 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
--- net/mrtg/patches/patch-ad 2005-06-23 18:12:13.000000000 +1000
+++ net/mrtg/patches/patch-ad 2006-08-03 15:54:18.000000000 +1000
@@ -1,21 +1,33 @@
$NetBSD: patch-ad,v 1.10 2005/06/23 08:12:13 martti 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 21:39:19.000000000 +1000
++++ bin/mrtg 2006-08-03 15:53:20.000000000 +1000
+@@ -824,8 +824,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 "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 @@
+ $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",
-@@ -743,3 +743,3 @@
+ $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
+ "$up_abs"."p", $inlast, $outlast, $absmax,
+@@ -846,7 +846,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,