Date: Mon, 21 Mar 2016 20:41:05 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411617 - in head/net-mgmt: routers2 routers2-extensions routers2-extensions/files routers2-extras routers2/files Message-ID: <201603212041.u2LKf5PG014641@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Mar 21 20:41:05 2016 New Revision: 411617 URL: https://svnweb.freebsd.org/changeset/ports/411617 Log: net-mgmt/routers2: 2.19 -> 2.23, also for -extras and -extensions - Approx. 200 lines of changelog in approx. 5 years PR: 206902 Submitted by: Dan Lukes <dan@obluda.cz> Approved by: kiwi@oav.net (maintainer) Deleted: head/net-mgmt/routers2-extensions/files/patch-routingtable.cgi head/net-mgmt/routers2-extensions/files/patch-showcfg.cgi head/net-mgmt/routers2-extensions/files/patch-tonagios.cgi head/net-mgmt/routers2-extensions/files/patch-trend.cgi Modified: head/net-mgmt/routers2-extensions/Makefile head/net-mgmt/routers2-extensions/distinfo head/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi head/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi head/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi head/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi head/net-mgmt/routers2-extras/Makefile head/net-mgmt/routers2-extras/distinfo head/net-mgmt/routers2/Makefile head/net-mgmt/routers2/distinfo head/net-mgmt/routers2/files/patch-routers2.conf Modified: head/net-mgmt/routers2-extensions/Makefile ============================================================================== --- head/net-mgmt/routers2-extensions/Makefile Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2-extensions/Makefile Mon Mar 21 20:41:05 2016 (r411617) @@ -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/r 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 Modified: head/net-mgmt/routers2-extensions/distinfo ============================================================================== --- head/net-mgmt/routers2-extensions/distinfo Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2-extensions/distinfo Mon Mar 21 20:41:05 2016 (r411617) @@ -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 Modified: head/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi ============================================================================== --- head/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2-extensions/files/patch-ifrouter.cgi Mon Mar 21 20:41:05 2016 (r411617) @@ -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 Modified: head/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi ============================================================================== --- head/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2-extensions/files/patch-ifstatus.cgi Mon Mar 21 20:41:05 2016 (r411617) @@ -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 Modified: head/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi ============================================================================== --- head/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2-extensions/files/patch-ifswitch.cgi Mon Mar 21 20:41:05 2016 (r411617) @@ -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 Modified: head/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi ============================================================================== --- head/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2-extensions/files/patch-pdfreport.cgi Mon Mar 21 20:41:05 2016 (r411617) @@ -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 Modified: head/net-mgmt/routers2-extras/Makefile ============================================================================== --- head/net-mgmt/routers2-extras/Makefile Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2-extras/Makefile Mon Mar 21 20:41:05 2016 (r411617) @@ -2,8 +2,7 @@ # $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/ Modified: head/net-mgmt/routers2-extras/distinfo ============================================================================== --- head/net-mgmt/routers2-extras/distinfo Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2-extras/distinfo Mon Mar 21 20:41:05 2016 (r411617) @@ -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 Modified: head/net-mgmt/routers2/Makefile ============================================================================== --- head/net-mgmt/routers2/Makefile Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2/Makefile Mon Mar 21 20:41:05 2016 (r411617) @@ -2,8 +2,7 @@ # $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/ Modified: head/net-mgmt/routers2/distinfo ============================================================================== --- head/net-mgmt/routers2/distinfo Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2/distinfo Mon Mar 21 20:41:05 2016 (r411617) @@ -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 Modified: head/net-mgmt/routers2/files/patch-routers2.conf ============================================================================== --- head/net-mgmt/routers2/files/patch-routers2.conf Mon Mar 21 20:35:13 2016 (r411616) +++ head/net-mgmt/routers2/files/patch-routers2.conf Mon Mar 21 20:41:05 2016 (r411617) @@ -1,7 +1,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 +--- 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 @@ -9,7 +9,7 @@ #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. @@ -18,7 +18,7 @@ # # 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 @@ -39,7 +39,7 @@ # 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 @@ -66,15 +66,16 @@ # 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: @@ -83,13 +84,13 @@ # 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 @@ -101,7 +102,7 @@ # 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. @@ -109,22 +110,23 @@ -#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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603212041.u2LKf5PG014641>