- Update to 2.19

PRs:		128642, 128643, 128644
Submitted by:	Xavier Beaudouin <kiwi at oav dot net> (maintainer)

4 files changed, 56 insertions, 23 deletions

diff --git a/net-mgmt/routers2/Makefile b/net-mgmt/routers2/Makefile
index 4dd3296788c8..428a9d24caf2 100644
--- a/net-mgmt/routers2/Makefile
+++ b/net-mgmt/routers2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	routers2
-PORTVERSION=	2.18
+PORTVERSION=	2.19
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
 		ftp://ftp.oav.oav.net/routers2/
diff --git a/net-mgmt/routers2/distinfo b/net-mgmt/routers2/distinfo
index 2277c49ae5e8..4619a1e5b5be 100644
--- a/net-mgmt/routers2/distinfo
+++ b/net-mgmt/routers2/distinfo
@@ -1,3 +1,3 @@
-MD5 (routers2-v2.18.tar.gz) = e9ed06d52acaa22467d8c31432905691
-SHA256 (routers2-v2.18.tar.gz) = 728d1788db58f8b99a72fdf74c1e1def3a4528bc0483b7f371472aa23396357f
-SIZE (routers2-v2.18.tar.gz) = 399144
+MD5 (routers2-v2.19.tar.gz) = c99af543f835c3c08cbd109a4ef8cc03
+SHA256 (routers2-v2.19.tar.gz) = 6763b5a039780d42a5f7b222cf4b90922fd3cd78787c8e36028a923142b0cacb
+SIZE (routers2-v2.19.tar.gz) = 411136
diff --git a/net-mgmt/routers2/files/patch-routers2.cgi.pl b/net-mgmt/routers2/files/patch-routers2.cgi.pl
index 5e27557cd108..5969a5ee8b9d 100644
--- a/net-mgmt/routers2/files/patch-routers2.cgi.pl
+++ b/net-mgmt/routers2/files/patch-routers2.cgi.pl
@@ -1,11 +1,10 @@
---- routers2.cgi.pl.orig	2008-06-09 07:18:11.000000000 +0200
-+++ routers2.cgi.pl	2008-07-07 22:43:34.000000000 +0200
+--- routers2.cgi.pl.orig	2008-11-06 11:17:27.000000000 +0100
++++ routers2.cgi.pl	2008-11-06 11:19:06.000000000 +0100
 @@ -1,9 +1,9 @@
 -#!/usr/bin/perl 
--# DONT FORGET TO CHANGE THE ABOVE PATH TO MATCH YOUR PERL LOCATION! 
 +#!%%LOCALBASE%%/bin/perl
-+# DONT FORGET TO CHANGE THE ABOVE PATH TO MATCH YOUR PERL LOCATION!
- # vim:ts=4
+ # DONT FORGET TO CHANGE THE ABOVE PATH TO MATCH YOUR PERL LOCATION! 
+ #vim:ts=4
  ##############################################################################
  # To use Speedycgi, you need to change the first line to this:
 -##!/usr/bin/speedy -- -M20 -t3600 -gnone -r500
@@ -18,7 +17,7 @@
  ##CONFIG#START################################################################
  # You MUST set this to the location of the configuration file!
 -my ($conffile) = '/u01/etc/routers2.conf';
-+my ($conffile) = '/usr/local/etc/routers2.conf';
++my ($conffile) = '%%LOCALBASE%%/etc/routers2.conf';
  ##############################################################################
  # Are we running in speedycgi or mod_perl mode?  Can we cache configs?
  # If you set this to 1 when you dont have speedycgi or mod_perl, it will
diff --git a/net-mgmt/routers2/files/patch-routers2.conf b/net-mgmt/routers2/files/patch-routers2.conf
index 6f9dc8207b37..25a1026e1b5f 100644
--- a/net-mgmt/routers2/files/patch-routers2.conf
+++ b/net-mgmt/routers2/files/patch-routers2.conf
@@ -1,6 +1,6 @@
---- routers2.conf.orig	Mon Dec 11 16:07:38 2006
-+++ routers2.conf	Mon Dec 11 16:26:10 2006
-@@ -150,7 +150,7 @@
+--- routers2.conf.orig	2008-11-06 11:19:55.000000000 +0100
++++ routers2.conf	2008-11-06 11:46:39.000000000 +0100
+@@ -148,7 +148,7 @@
  #mysql-database = authdb
  #
  # Multi-language characters support: set charset here.
@@ -9,7 +9,7 @@
  #charset = utf-8
  #
  # Language support 
-@@ -188,7 +188,7 @@
+@@ -186,7 +186,7 @@
  # Set this to 'yes' to greatly speed up the parsing at the expense of
  # having to have your .cfg files in a set format.  DO NOT enable this
  # unless you are sure that your .cfg files meet the necessary criteria.
@@ -18,7 +18,7 @@
  #
  # Set this to no if your browser barfs on the popup javascript. Default is yes.
  #javascript = no
-@@ -204,17 +204,17 @@
+@@ -208,17 +208,17 @@
  # is not really necessary in here and can (usually) be safely ignored.
  # NT users can put a drive letter in if required.
  # dbpath = D:\rrdtool\files
@@ -39,7 +39,12 @@
  # Wildcarded pattern match for MRTG conf files.
  # You can put several of these here, separated by spaces.
  # Note that these can include a path separator - eg, site*/*.cfg
-@@ -256,10 +256,10 @@
+@@ -269,28 +269,29 @@
+ #
+ # The default graph type.  Must be 6 d w m y or dwmy (All graphs). Default is d
+ #graphtype = d
++graphtype = dwmy
+ #
  # to be superceeded by MRTG file support
  # Show peak lines on all graphs by default? yes/no. Default is 'yes'.
  # This can be overridden by the MRTG WithPeak[] directive.
@@ -52,12 +57,15 @@
  
  # to be superceeded by MRTG file support
  # Show the graphs relative to the max bandwidth, instead of scaling the y-axis
-@@ -269,11 +269,11 @@
+ # to show the most detail? Default is 'yes'
+ # This can be overridden by the MRTG 'Unscaled[]' directive.
+-unscaled = no
++#unscaled = no
  
  # Shall we include 6-hour graphs, where the graph Interval is < 5mins?
  # yes/no/always default: no
 -#6hour = no
-+6hour = no
++6hour = yes
  # Shall we have the 95th percentile and total usage calculations?
  # This can eat a LOT of CPU/Memory, so make sure to test with it OFF first.
  # default: no
@@ -66,16 +74,34 @@
  # Shall we use the last update time as the base, instead of the current time?
  # This can stop the occasional occurence of a grey band at the end of the graph
  # and is useful if demoing the software with some (non-updated) test data.
-@@ -339,7 +339,7 @@
+@@ -311,7 +312,7 @@
+ # All styles:
+ #sorder = s t n n2 l l2 l2D x x2 x3 x3D sbp nbp sp np
+ # No PDA support:
+-sorder = t n n2 l l2 x2 x3 
++sorder = s t n n2 l l2 l2D x x2 x3 x3D sbp nbp sp np
+ # Style codes are usually made from the width code (stnlx), and an optional
+ # suffix consisting of 2(double heigth), b(black and white), p(PDA mode).
+ # Also now we can have a suffix of 3 for triple-height.
+@@ -353,14 +354,14 @@
+ # Do we want a 'total traffic' line on the default 'incoming' and 
+ # 'outgoing' graphs?
+ # yes/no default is NO
+-#showtotal = no
++showtotal = yes
  #
  # Group the router names in the left-hand menu by directory name?
  # yes/no default is NO
 -#group = yes
 +group = yes
  # override later in per-user
- # You can enable the beta multi-level grouping here
- #multilevel = yes
-@@ -367,8 +367,8 @@
+ # You can enable the multi-level grouping code here
+-#multilevel = yes
++multilevel = yes
+ # Groups heirachy is by group description, separated by :. Change the separating
+ # character here:
+ #groupsep = :
+@@ -385,8 +386,8 @@
  # maybe you'd prefer 8 and 18 ?
  # These hours may NOT cross midnight (ie, end > start) and are relative to the
  # timezone of the target in question, or local timezone if not known.
@@ -86,7 +112,7 @@
  # Work days - Sun=0 -- default 1 2 3 4 5
  # THIS NOT YET USED: EXPERIMENTAL
  #workdays = 1 2 3 4 5 
-@@ -444,6 +444,7 @@
+@@ -462,6 +463,7 @@
  # Use twin-menu screen format (not recommended for screens < 1024x768 )
  # yes/no default is NO
  #twinmenu = no
@@ -94,3 +120,11 @@
  #
  # Normally, graphs refresh automatically as soon as they become out of date.
  # This is about every 5 mins for daily graphs.  You may wish to make the
+@@ -521,6 +523,7 @@
+ # Set to 'no' to never use 'lazy' mode.  A bug in rrdtool 1.3.0 and 1.3.1 can 
+ # make lazy mode result in nondisplaying or nonupdating graph images.
+ #lazy = no
++lazy = yes
+ 
+ # short descriptions for routers and interfaces
+ # These are used in the lefthand menu, and in small graphs.