10 files changed, 19 insertions, 77 deletions

diff --git a/net-mgmt/routers2-extensions/Makefile b/net-mgmt/routers2-extensions/Makefile
index fa12e5070744..bd64546ae189 100644
--- a/net-mgmt/routers2-extensions/Makefile
+++ b/net-mgmt/routers2-extensions/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	routers2-extensions
-PORTVERSION=	2.19
-PORTREVISION=	2
+PORTVERSION=	2.23
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
 		ftp://ftp.oav.oav.net/routers2/
@@ -18,7 +17,10 @@ RUN_DEPENDS=	${LOCALBASE}/www/routers2/routers2.cgi:${PORTSDIR}/net-mgmt/routers
 
 WRKSRC=		${WRKDIR}/routers2-v${PORTVERSION}/extensions
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	trend.cgi \
+		showcfg.cgi \
+		tonagios.cgi
 
 NO_BUILD=	YES
 NO_ARCH=	yes
diff --git a/net-mgmt/routers2-extensions/distinfo b/net-mgmt/routers2-extensions/distinfo
index a572bf459f16..7c3e1a5159e4 100644
--- a/net-mgmt/routers2-extensions/distinfo
+++ b/net-mgmt/routers2-extensions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (routers2-v2.19.tar.gz) = 6763b5a039780d42a5f7b222cf4b90922fd3cd78787c8e36028a923142b0cacb
-SIZE (routers2-v2.19.tar.gz) = 411136
+SHA256 (routers2-v2.23.tar.gz) = bb1d98648afa11e487724069f0a160b4414cffa9ab1db412573db8e7a66fb4dd
+SIZE (routers2-v2.23.tar.gz) = 707749
diff --git a/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi b/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi
index 52e039014f21..a68d6739b3d7 100644
--- a/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi
+++ b/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi
@@ -1,5 +1,5 @@
---- ifrouter.cgi.orig	Wed Nov 16 03:06:47 2005
-+++ ifrouter.cgi	Thu Dec 14 00:38:58 2006
+--- ifrouter.cgi.orig	2012-09-19 02:32:33 UTC
++++ ifrouter.cgi
 @@ -1,4 +1,4 @@
 -#!e:\perl\bin\perl
 +#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
diff --git a/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi b/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi
index 5a5e2806bb03..a7d218220eb3 100644
--- a/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi
+++ b/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi
@@ -1,12 +1,12 @@
---- ifstatus.cgi.orig	Thu Dec 14 00:39:56 2006
-+++ ifstatus.cgi	Thu Dec 14 00:41:44 2006
+--- ifstatus.cgi.orig	2012-09-19 02:32:33 UTC
++++ ifstatus.cgi
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
 +#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
  # vim:ts=4
  # ifstatus.pl v1.0
  #
-@@ -27,7 +27,7 @@
+@@ -25,7 +25,7 @@ use Net::SNMP;
  my($VERSION) = "v1.0";
  
  # Variables
diff --git a/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi b/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi
index 3a923dc8e284..0fddffa8c1f1 100644
--- a/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi
+++ b/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi
@@ -1,5 +1,5 @@
---- ifswitch.cgi.orig	Thu Dec 14 00:43:22 2006
-+++ ifswitch.cgi	Thu Dec 14 00:44:22 2006
+--- ifswitch.cgi.orig	2012-09-19 02:32:33 UTC
++++ ifswitch.cgi
 @@ -1,4 +1,4 @@
 -#!e:\perl\bin\perl
 +#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
diff --git a/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi b/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi
index 29a2957a9ae6..1e2691607a34 100644
--- a/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi
+++ b/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi
@@ -1,12 +1,12 @@
---- pdfreport.cgi.orig	Thu Dec 14 00:46:13 2006
-+++ pdfreport.cgi	Thu Dec 14 00:48:43 2006
+--- pdfreport.cgi.orig	2012-09-19 02:32:33 UTC
++++ pdfreport.cgi
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
 +#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
  # vim:ts=4
  # pdfreport.cgi
  #
-@@ -13,11 +13,11 @@
+@@ -13,11 +13,11 @@ use FileHandle;
  require 5.006;
  
  # Configure here
@@ -19,6 +19,6 @@
 -my( $CONFPATH ) = "/u01/mrtg/conf";  # default path for cfg files
 +my( $WEBROOT ) = "%%LOCALBASE%%/www/data";    # docroot for your web server
 +my( $CONFPATH ) = "%%LOCALBASE%%/etc@/mrtg";  # default path for cfg files
- my( $VERSION ) = "1.3";
+ my( $VERSION ) = "1.6";
+ my( $DWMY ) = "my";                  # set to dw for short term graphs
  
- # Variables
diff --git a/net-mgmt/routers2-extensions/files/patch-routingtable.cgi b/net-mgmt/routers2-extensions/files/patch-routingtable.cgi
deleted file mode 100644
index c93a299733e2..000000000000
--- a/net-mgmt/routers2-extensions/files/patch-routingtable.cgi
+++ /dev/null
@@ -1,8 +0,0 @@
---- routingtable.cgi.orig	2008-11-06 11:49:06.000000000 +0100
-+++ routingtable.cgi	2008-11-06 11:49:39.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
- # CHANGE ABOVE PATH TO MATCH YOUR PERL LOCATION! You may remove the -w
- ##############################################################################.
- # routingtable.cgi : Version v1.5
diff --git a/net-mgmt/routers2-extensions/files/patch-showcfg.cgi b/net-mgmt/routers2-extensions/files/patch-showcfg.cgi
deleted file mode 100644
index e7b7ee5f8732..000000000000
--- a/net-mgmt/routers2-extensions/files/patch-showcfg.cgi
+++ /dev/null
@@ -1,17 +0,0 @@
---- showcfg.cgi.orig	Thu Dec 14 00:58:09 2006
-+++ showcfg.cgi	Thu Dec 14 00:58:54 2006
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
- #
- # showcfg.cgi
- #
-@@ -11,7 +11,7 @@
- use CGI;
- 
- # Variables
--my( $confpath ) = "/home/stevesh/public_html/mrtg/conf/";
-+my( $confpath ) = "%%LOCALBASE%%/etc/mrtg/";
- my( $device, $community, $targetwindow, $target, $file, $backurl )
- 	= ( "","public","graph","","","");
- my( $conffile );
diff --git a/net-mgmt/routers2-extensions/files/patch-tonagios.cgi b/net-mgmt/routers2-extensions/files/patch-tonagios.cgi
deleted file mode 100644
index 8f6ee99523b2..000000000000
--- a/net-mgmt/routers2-extensions/files/patch-tonagios.cgi
+++ /dev/null
@@ -1,17 +0,0 @@
---- tonagios.cgi.orig	2008-11-06 11:51:08.000000000 +0100
-+++ tonagios.cgi	2008-11-06 11:51:45.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
- #
- # tonagios.cgi
- #
-@@ -8,7 +8,7 @@
- use CGI;
- 
- # configure here: Nagios status.cgi URL (or use extinfo.cgi instead)
--my( $NAGIOS ) = "http://nagios.auckland.ac.nz/nagios/cgi-bin/status.cgi";
-+my( $NAGIOS ) = "http://changeme/nagios/cgi-bin/status.cgi";
- # This is chopped from the end of the configuration filename
- my( $TRUNCATE ) = "\.(cfg|conf)?";
- # Alternative examples
diff --git a/net-mgmt/routers2-extensions/files/patch-trend.cgi b/net-mgmt/routers2-extensions/files/patch-trend.cgi
deleted file mode 100644
index 5269990dd493..000000000000
--- a/net-mgmt/routers2-extensions/files/patch-trend.cgi
+++ /dev/null
@@ -1,18 +0,0 @@
---- trend.cgi.orig	Thu Dec 14 01:07:06 2006
-+++ trend.cgi	Thu Dec 14 01:08:21 2006
-@@ -1,5 +1,4 @@
--#!/usr/bin/perl 
--##!/usr/bin/speedy 
-+#!%%LOCALBASE%%/bin/speedy -- -M20 -t3600 -gnone -r500
- # vim:ts=4
- # trend.cgi
- #    Generate a trending graph, based on yearly data, for the specified
-@@ -67,7 +66,7 @@
- my( $BASE    ) = 0; # 0=current, 1=average
- my( $device, $community, $targetwindow, $target, $file, $backurl )
- 	= ( "","public","graph","","","");
--my( $conffile ) = "/u01/etc/routers2.conf"; # overridden by passed parameters
-+my( $conffile ) = "%%LOCALBASE%%/etc/routers2.conf"; # overridden by passed parameters
- my( $routersurl ) = '';
- my( $q ) = new CGI;
- my( %headeropts ) = ();