- Update to 2.18

PR:		125381
Submitted by:	Xavier Beaudouin <kiwi@oav.net> (maintainer)

5 files changed, 19 insertions, 25 deletions

diff --git a/net-mgmt/routers2/Makefile b/net-mgmt/routers2/Makefile
index 1cd33092f5cd..4dd3296788c8 100644
--- a/net-mgmt/routers2/Makefile
+++ b/net-mgmt/routers2/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	routers2
-PORTVERSION=	2.17
-PORTREVISION=	1
+PORTVERSION=	2.18
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
 		ftp://ftp.oav.oav.net/routers2/
-DISTNAME=	${PORTNAME}-v${PORTVERSION}a
+DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Frontend for the MRTG system monitoring software
diff --git a/net-mgmt/routers2/distinfo b/net-mgmt/routers2/distinfo
index 7d2d8539b328..2277c49ae5e8 100644
--- a/net-mgmt/routers2/distinfo
+++ b/net-mgmt/routers2/distinfo
@@ -1,3 +1,3 @@
-MD5 (routers2-v2.17a.tar.gz) = 57e1542bca50940aa4b3908cc7ed5551
-SHA256 (routers2-v2.17a.tar.gz) = a8aa61db9969ebae2b56fe92184d045f03780a8c9412f99f48ecfed879d9703e
-SIZE (routers2-v2.17a.tar.gz) = 383280
+MD5 (routers2-v2.18.tar.gz) = e9ed06d52acaa22467d8c31432905691
+SHA256 (routers2-v2.18.tar.gz) = 728d1788db58f8b99a72fdf74c1e1def3a4528bc0483b7f371472aa23396357f
+SIZE (routers2-v2.18.tar.gz) = 399144
diff --git a/net-mgmt/routers2/files/patch-routers2.cgi.pl b/net-mgmt/routers2/files/patch-routers2.cgi.pl
index 367dee9f74c2..5e27557cd108 100644
--- a/net-mgmt/routers2/files/patch-routers2.cgi.pl
+++ b/net-mgmt/routers2/files/patch-routers2.cgi.pl
@@ -1,22 +1,24 @@
---- routers2.cgi.pl.old	Mon Dec 11 15:57:57 2006
-+++ routers2.cgi.pl	Mon Dec 11 16:01:18 2006
-@@ -1,9 +1,4 @@
+--- routers2.cgi.pl.orig	2008-06-09 07:18:11.000000000 +0200
++++ routers2.cgi.pl	2008-07-07 22:43:34.000000000 +0200
+@@ -1,9 +1,9 @@
 -#!/usr/bin/perl 
 -# 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:
++#!%%LOCALBASE%%/bin/perl
++# 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
-+#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
++###!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
  # and then set the CACHE global variable (below) to 1.
  # To use mod_perl, you should be able to put the script directly into the
  # mod_perl directory and it will work.  This is not very thoroughly tested 
-@@ -30,7 +25,7 @@
- use POSIX qw(tzset);  # For timezone support
+@@ -35,7 +35,7 @@
+ #use Data::Dumper;     # For persistent caching
  ##CONFIG#START################################################################
  # You MUST set this to the location of the configuration file!
 -my ($conffile) = '/u01/etc/routers2.conf';
-+my ($conffile) = '%%LOCALBASE%%/etc/routers2.conf';
++my ($conffile) = '/usr/local/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 d11d45343ddc..6f9dc8207b37 100644
--- a/net-mgmt/routers2/files/patch-routers2.conf
+++ b/net-mgmt/routers2/files/patch-routers2.conf
@@ -94,12 +94,3 @@
  #
  # 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
-@@ -489,7 +490,7 @@
- #
- # Use smooth slopes in graph?  
- # y/n default is n
--#slope = yes
-+slope = yes
- 
- # short descriptions for routers and interfaces
- # These are used in the lefthand menu, and in small graphs.
diff --git a/net-mgmt/routers2/pkg-plist b/net-mgmt/routers2/pkg-plist
index e4d7e1b68734..07ab0099b339 100644
--- a/net-mgmt/routers2/pkg-plist
+++ b/net-mgmt/routers2/pkg-plist
@@ -170,6 +170,7 @@ www/routers2/rrdicons/target2-sm.gif
 www/routers2/rrdicons/targets.gif
 www/routers2/rrdicons/temp-sm.gif
 www/routers2/rrdicons/tick-sm.gif
+www/routers2/rrdicons/juniper-sm.gif
 www/routers2/rrdicons/tick-vsm.gif
 www/routers2/rrdicons/traffic-sm.gif
 www/routers2/rrdicons/user-sm.gif
@@ -186,6 +187,7 @@ www/routers2/rrdicons/zoomout-bw.gif
 www/routers2/rrdicons/zoomout.gif
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/PERFORMANCE
 %%PORTDOCS%%%%DOCSDIR%%/AUTHENTICATION
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLES