From 478f77da58737bd36204214aff62690b9847651d Mon Sep 17 00:00:00 2001
From: martti <martti@pkgsrc.org>
Date: Sun, 7 Dec 2003 13:53:32 +0000
Subject: Updated mrtg to 2.10.11

* lots of bug fixes
---
 net/mrtg/Makefile         |  4 ++--
 net/mrtg/distinfo         | 10 +++++-----
 net/mrtg/patches/patch-aa |  8 ++++----
 net/mrtg/patches/patch-ad | 18 +++++++++---------
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'net/mrtg')

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 01bb9586e84..e0ff490ad1f 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2003/10/05 12:02:52 martti Exp $
+# $NetBSD: Makefile,v 1.44 2003/12/07 13:53:32 martti Exp $
 
-DISTNAME=	mrtg-2.10.5
+DISTNAME=	mrtg-2.10.11
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index b7274f76b24..a55f541d865 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2003/10/05 12:02:52 martti Exp $
+$NetBSD: distinfo,v 1.11 2003/12/07 13:53:32 martti Exp $
 
-SHA1 (mrtg-2.10.5.tar.gz) = 370fea7fa6cbae0857934a627314449d1d1c9802
-Size (mrtg-2.10.5.tar.gz) = 1085178 bytes
-SHA1 (patch-aa) = 9b3bc1f7db23ef83d285e20e14ffb18027949648
+SHA1 (mrtg-2.10.11.tar.gz) = c866e9cedb5e5f8d8437c7d52367dc5dbdc3505b
+Size (mrtg-2.10.11.tar.gz) = 1092999 bytes
+SHA1 (patch-aa) = 031d81c31191b6694d272c876ac470b369b67284
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
 SHA1 (patch-ac) = 2b3ea5a6199f45581c6daf660e7aab0a97b715e4
-SHA1 (patch-ad) = b0213b4bfb625e284dc12f10495508ded536d4bf
+SHA1 (patch-ad) = fb408bbbfd45c6686e7052c6c4308982427a7ecf
 SHA1 (patch-ae) = f5c97172788f444e3fa69e3ee652f1c9c0fd83ae
diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa
index 19c2b291d3d..ac7800df953 100644
--- a/net/mrtg/patches/patch-aa
+++ b/net/mrtg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2003/10/05 12:02:52 martti Exp $
+$NetBSD: patch-aa,v 1.15 2003/12/07 13:53:32 martti Exp $
 
---- configure.orig	Fri Sep 12 00:16:20 2003
-+++ configure	Sun Oct  5 12:58:03 2003
-@@ -3241,7 +3241,7 @@
+--- configure.orig	Fri Dec  5 00:11:29 2003
++++ configure	Sun Dec  7 15:36:34 2003
+@@ -3526,7 +3526,7 @@
  fi;
  
  
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad
index 3809a7db8fa..92978f00b43 100644
--- a/net/mrtg/patches/patch-ad
+++ b/net/mrtg/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2003/10/05 12:02:52 martti Exp $
+$NetBSD: patch-ad,v 1.6 2003/12/07 13:53:32 martti Exp $
 
---- bin/mrtg.orig	Fri Sep 12 00:15:22 2003
-+++ bin/mrtg	Sun Oct  5 13:02:06 2003
-@@ -666,8 +666,8 @@
+--- bin/mrtg.orig	Fri Dec  5 19:56:57 2003
++++ bin/mrtg	Sun Dec  7 15:36:59 2003
+@@ -685,8 +685,8 @@
      ########## rrdtool users have left here ###############
  
      ((($MRTG_lib::OS eq 'NT' || $MRTG_lib::OS eq 'OS2') && (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) ||
@@ -12,17 +12,17 @@ $NetBSD: patch-ad,v 1.5 2003/10/05 12:02:52 martti Exp $
 +       die "ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n";
  
      # rateup does not know about undef so we make inlast and outlast ready for rateup
-     warn "ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast;
-@@ -675,7 +675,7 @@
-     return undef unless defined $inlast and defined $outlast;
- 
+     #warn "ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast;
+@@ -698,7 +698,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,
-@@ -684,7 +684,7 @@
+@@ -707,7 +707,7 @@
                   $$rcfg{'rgb5'}{$router});
      } else { 
  
-- 
cgit v1.2.3