Index: head/net-mgmt/routers2/Makefile
===================================================================
--- head/net-mgmt/routers2/Makefile	(revision 411616)
+++ head/net-mgmt/routers2/Makefile	(revision 411617)
@@ -1,71 +1,70 @@
 # Created by: Xavier Beaudouin <kiwi@oav.net>
 # $FreeBSD$
 
 PORTNAME=	routers2
-PORTVERSION=	2.19
-PORTREVISION=	5
+PORTVERSION=	2.23
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
 		ftp://ftp.oav.oav.net/routers2/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Frontend for the MRTG system monitoring software
 
 BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 RUN_DEPENDS=	p5-Convert-ASN1>=0:${PORTSDIR}/converters/p5-Convert-ASN1 \
 		p5-Crypt-UnixCrypt>=0:${PORTSDIR}/security/p5-Crypt-UnixCrypt \
 		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		p5-Crypt-UnixCrypt>=0:${PORTSDIR}/security/p5-Crypt-UnixCrypt \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 		p5-CGI-SpeedyCGI>=0:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
 		${LOCALBASE}/bin/mrtg:${PORTSDIR}/net-mgmt/mrtg
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${PORTVERSION}
 USES=		perl5
 NO_BUILD=	yes
 NO_ARCH=	yes
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${RM} ${WRKSRC}/extras/targetnames/BER.pm \
 		${WRKSRC}/extras/targetnames/SNMP_*.pm
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/routers2.cgi.pl ${WRKSRC}/routers2.conf
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/routers2 \
 		${STAGEDIR}${PREFIX}/www/routers2/rrdicons \
 		${STAGEDIR}${PREFIX}/www/routers2/graphs \
 		${STAGEDIR}/var/db/rrdtool
 	${INSTALL_DATA} ${WRKSRC}/routers2.conf \
 		${STAGEDIR}${PREFIX}/etc/routers2.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/rrdicons/* \
 		${STAGEDIR}${PREFIX}/www/routers2/rrdicons
 	${INSTALL_SCRIPT} ${WRKSRC}/routers2.cgi.pl \
 		${STAGEDIR}${PREFIX}/www/routers2/routers2.cgi
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}; \
 		${INSTALL_DATA} CHANGES README doc/* ${STAGEDIR}${DOCSDIR}
 
 #post-install:
 #.if !defined(BATCH)
 #	@${ECHO} ""
 #	@${ECHO} "############################################################################"
 #	@${ECHO} "# Please create a MRTG config file in ${PREFIX}/etc/mrtg                  #"
 #	@${ECHO} "# A configuration file can be automatically generated with cfgmaker        #"
 #	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
 #	@${ECHO} "#                                                                          #"
 #	@${ECHO} "# To enable MRTG in daemon mode, put the following to your /etc/rc.conf or #"
 #	@${ECHO} "# /etc/rc.conf.local file:                                                 #"
 #	@${ECHO} "#      mrtg_daemon_enable=\"YES\"                                            #"
 #	@${ECHO} "############################################################################"
 #.endif
 
 .include <bsd.port.mk>
Index: head/net-mgmt/routers2/distinfo
===================================================================
--- head/net-mgmt/routers2/distinfo	(revision 411616)
+++ head/net-mgmt/routers2/distinfo	(revision 411617)
@@ -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
Index: head/net-mgmt/routers2/files/patch-routers2.conf
===================================================================
--- head/net-mgmt/routers2/files/patch-routers2.conf	(revision 411616)
+++ head/net-mgmt/routers2/files/patch-routers2.conf	(revision 411617)
@@ -1,130 +1,132 @@
---- 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
+--- routers2.conf.orig	2013-07-30 06:09:20.000000000 +0200
++++ routers2.conf	2016-02-05 08:48:48.910106000 +0100
+@@ -162,7 +162,7 @@
+ # pass = varchar(50), encrypted password
  #
  # Multi-language characters support: set charset here.
 -#charset = iso-8859-1
 +charset = iso-8859-1
  #charset = utf-8
  #
  # Language support 
-@@ -186,7 +186,7 @@
+@@ -214,7 +214,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.
 -#optimise = yes
 +optimise = yes
  #
  # Set this to no if your browser barfs on the popup javascript. Default is yes.
  #javascript = no
-@@ -208,17 +208,17 @@
+@@ -236,17 +236,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
 -dbpath = /var/rrdtool
 +dbpath = /var/db/rrdtool
  # Where the graphs are to be created - absolute filesystem path
  # graphpath = C:/www/html/graphs
 -graphpath = /www/html/graphs
 +graphpath = %%LOCALBASE%%/www/routers2/graphs
  # The URL of the above directory - a URL path, so use '/' as a path separator
  graphurl = /graphs
  #
  # Where the MRTG config files live - absolute filesystem path
  # NO SPACES allowed in path names, NT people. 
  # confpath = C:\mrtg\conf
 -confpath = /mrtg/conf
 +confpath = %%LOCALBASE%%/etc/mrtg
  # 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
-@@ -269,28 +269,29 @@
+@@ -297,29 +297,30 @@
  #
  # 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.
 -#withpeak = yes
 +withpeak = yes
  
  # Show red 'Max Bandwidth' lines on graphs? yes/no. Default is 'yes'.
 -#maxima = yes
 +maxima = yes
  
  # to be superceeded by MRTG file support
  # Show the graphs relative to the max bandwidth, instead of scaling the y-axis
  # 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 = 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
 -#percentile = yes
 +percentile = yes
- # 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.
-@@ -311,7 +312,7 @@
+ # What level should this percentile be?  Default is 95th.
+ # default: 95
+ #percent = 90
+@@ -345,7 +346,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 @@
+@@ -387,14 +388,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 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 @@
+@@ -418,8 +419,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.
 -#daystart = 8 
 -#dayend   = 18
 +daystart = 8 
 +dayend   = 18
- # Work days - Sun=0 -- default 1 2 3 4 5
+ 
  # THIS NOT YET USED: EXPERIMENTAL
- #workdays = 1 2 3 4 5 
-@@ -462,6 +463,7 @@
+ # Work days - Sun=0 -- default 1 2 3 4 5
+@@ -496,7 +497,7 @@
+ 
  # Use twin-menu screen format (not recommended for screens < 1024x768 )
  # yes/no default is NO
- #twinmenu = no
+-#twinmenu = no
 +twinmenu = yes
- #
+ 
  # 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 @@
+@@ -560,6 +561,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.
+ # Set to 'yes' to enable Pango markup in graph labels.  Experimental.
+ #pango = no
Index: head/net-mgmt/routers2-extensions/Makefile
===================================================================
--- head/net-mgmt/routers2-extensions/Makefile	(revision 411616)
+++ head/net-mgmt/routers2-extensions/Makefile	(revision 411617)
@@ -1,42 +1,44 @@
 # Created by: Xavier Beaudouin <kiwi@oav.net>
 # $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/
 DISTNAME=	routers2-v${PORTVERSION}
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Extensions of routers2 frontend
 
 RUN_DEPENDS=	${LOCALBASE}/www/routers2/routers2.cgi:${PORTSDIR}/net-mgmt/routers2 \
 		p5-Net-Telnet-Cisco>=0:${PORTSDIR}/net-mgmt/p5-Telnet-Cisco \
 		${LOCALBASE}/bin/htmldoc:${PORTSDIR}/textproc/htmldoc
 
 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
 PORTDOCS=	README *.txt extension.cgi.pl
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/*.cgi
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/routers2/extensions
 	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi \
 		${STAGEDIR}${PREFIX}/www/routers2/extensions
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} README *.txt extension.cgi.pl \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net-mgmt/routers2-extensions/distinfo
===================================================================
--- head/net-mgmt/routers2-extensions/distinfo	(revision 411616)
+++ head/net-mgmt/routers2-extensions/distinfo	(revision 411617)
@@ -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
Index: head/net-mgmt/routers2-extensions/files/patch-tonagios.cgi
===================================================================
--- head/net-mgmt/routers2-extensions/files/patch-tonagios.cgi	(revision 411616)
+++ head/net-mgmt/routers2-extensions/files/patch-tonagios.cgi	(nonexistent)
@@ -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

Property changes on: head/net-mgmt/routers2-extensions/files/patch-tonagios.cgi
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/routers2-extensions/files/patch-trend.cgi
===================================================================
--- head/net-mgmt/routers2-extensions/files/patch-trend.cgi	(revision 411616)
+++ head/net-mgmt/routers2-extensions/files/patch-trend.cgi	(nonexistent)
@@ -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 ) = ();

Property changes on: head/net-mgmt/routers2-extensions/files/patch-trend.cgi
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/routers2-extensions/files/patch-showcfg.cgi
===================================================================
--- head/net-mgmt/routers2-extensions/files/patch-showcfg.cgi	(revision 411616)
+++ head/net-mgmt/routers2-extensions/files/patch-showcfg.cgi	(nonexistent)
@@ -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 );

Property changes on: head/net-mgmt/routers2-extensions/files/patch-showcfg.cgi
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/routers2-extensions/files/patch-routingtable.cgi
===================================================================
--- head/net-mgmt/routers2-extensions/files/patch-routingtable.cgi	(revision 411616)
+++ head/net-mgmt/routers2-extensions/files/patch-routingtable.cgi	(nonexistent)
@@ -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

Property changes on: head/net-mgmt/routers2-extensions/files/patch-routingtable.cgi
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi
===================================================================
--- head/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi	(revision 411616)
+++ head/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi	(revision 411617)
@@ -1,8 +1,8 @@
---- 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
  #
  # Brian Dietz 
  # brian.dietz@caremark.com
Index: head/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi
===================================================================
--- head/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi	(revision 411616)
+++ head/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi	(revision 411617)
@@ -1,17 +1,17 @@
---- 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
 -my( $conffile ) = '/u01/etc/routers2.conf';
 +my( $conffile ) = '%%LOCALBASE%%/etc/routers2.conf';
  
  my( $device, $community, $targetwindow, $target, $file, $backurl, $ifno )
  	= ( "","","graph","","","","");
Index: head/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi
===================================================================
--- head/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi	(revision 411616)
+++ head/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi	(revision 411617)
@@ -1,8 +1,8 @@
---- 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
  #
  # Brian Dietz 
  # brian.dietz@caremark.com
Index: head/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi
===================================================================
--- head/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi	(revision 411616)
+++ head/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi	(revision 411617)
@@ -1,24 +1,24 @@
---- 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
 -my( $HTMLDOC ) = "/usr/bin/htmldoc"; # location of htmldoc executable
 -my( $ROUTERSCGI ) = "/u01/www/cgi-bin/routers2.cgi"; # location of routers2.cgi
 +my( $HTMLDOC ) = "%%LOCALBASE%%/bin/htmldoc"; # location of htmldoc executable
 +my( $ROUTERSCGI ) = "%%LOCALBASE%%/www/routers2/routers2.cgi"; # location of routers2.cgi
  my( $WORKDIR ) = "/tmp";             # temporary work directory
 -my( $WEBROOT ) = "/u01/www/html";    # docroot for your web server
 -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
Index: head/net-mgmt/routers2-extras/Makefile
===================================================================
--- head/net-mgmt/routers2-extras/Makefile	(revision 411616)
+++ head/net-mgmt/routers2-extras/Makefile	(revision 411617)
@@ -1,61 +1,60 @@
 # Created by: Xavier Beaudouin <kiwi@oav.net>
 # $FreeBSD$
 
 PORTNAME=	routers2-extras
-PORTVERSION=	2.19
-PORTREVISION=	3
+PORTVERSION=	2.23
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
 		ftp://ftp.oav.oav.net/routers2/
 DISTNAME=	routers2-v${PORTVERSION}
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Extra extensions and scripts for routers2 frontend
 
 RUN_DEPENDS=	${LOCALBASE}/www/routers2/routers2.cgi:${PORTSDIR}/net-mgmt/routers2 \
 		${LOCALBASE}/bin/mrtg-ping-probe:${PORTSDIR}/net-mgmt/mrtg-ping-probe
 
 WRKSRC=		${WRKDIR}/routers2-v${PORTVERSION}/extras
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	check_foundry check_vmware.pl \
 		checkagent gather.pl graphprune.pl \
 		mrtg-apache mrtg-nrpe.pl mrtg-pnsclient.pl \
 		mrtg-portsinuse.pl rrd-archive-clean.pl \
 		rrd-archive.pl rrdextend.pl \
 		winalert.pl
 NO_BUILD=	yes
 NO_ARCH=	yes
 PORTDOCS=	README *.txt
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e '1s|#!perl|#!${perl_CMD}|' \
 		${WRKSRC}/targetnames/targetnames.pl
 	${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/buildwan.pl \
 		${WRKSRC}/cfgmaker_host.pl \
 		${WRKSRC}/95.pl
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/routers2/extras/templates
 	cd ${WRKSRC}; ${INSTALL_SCRIPT} buildwan.pl cfgmaker_host.pl \
 		check_vmware.pl check_foundry checkagent gather.pl \
 		getstats.sh graphprune.pl mrtg-apache mrtg-nrpe.pl \
 		mrtg-nrpe.sh mrtg-pnsclient.pl mrtg-portsinuse.pl \
 		rrd-archive-clean.pl rrd-archive.pl rrdextend.pl \
 		winalert.pl targetnames/targetnames.pl \
 		${STAGEDIR}${PREFIX}/www/routers2/extras
 	cd ${WRKSRC}; ${INSTALL_DATA} mrtg-nrpe.cfg mrtg-pnsclient.cfg \
 		rrd-archive.conf winalert.conf \
 		${STAGEDIR}${PREFIX}/www/routers2/extras
 	cd ${WRKSRC}; ${INSTALL_DATA} mrtg-templates/* \
 		${STAGEDIR}${PREFIX}/www/routers2/extras/templates
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} README *.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net-mgmt/routers2-extras/distinfo
===================================================================
--- head/net-mgmt/routers2-extras/distinfo	(revision 411616)
+++ head/net-mgmt/routers2-extras/distinfo	(revision 411617)
@@ -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