Index: net/rtg/Makefile =================================================================== --- net/rtg/Makefile +++ net/rtg/Makefile @@ -3,7 +3,7 @@ PORTNAME= rtg PORTVERSION= 0.7.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net MASTER_SITES= SF \ ftp://ftpmirror.uk/freebsd-ports/rtg/ @@ -18,9 +18,8 @@ p5-DBD-mysql>=0:databases/p5-DBD-mysql USE_RC_SUBR= rtgpoll -USE_MYSQL= client WANT_PERL= yes -USES= shebangfix +USES= shebangfix mysql:client SHEBANG_FILES= etc/95.pl etc/report.pl etc/rtgtargmkr.pl.in SUB_FILES= pkg-message GNU_CONFIGURE= yes @@ -27,21 +26,19 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/${PORTNAME} \ --with-mysql=${LOCALBASE} \ --with-snmp=${LOCALBASE} + +USERS= rtg +GROUPS= rtg + OPTIONS_DEFINE= WEB MYSQL OPTIONS_DEFAULT=WEB MYSQL_DESC= Pull MySQL server in as a dependancy for local setups WEB_DESC= Include PHP-based web client interface pre-requisites -.include +MYSQL_USES= mysql:server -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -.endif - -.if ${PORT_OPTIONS:MWEB} -WANT_PHP_WEB= yes +WEB_USES= php USE_PHP= mysqli spl -.endif CFLAGS+= -fstack-protector LDFLAGS+= -fstack-protector Index: net/rtg/files/patch-config-config.h.in =================================================================== --- net/rtg/files/patch-config-config.h.in +++ net/rtg/files/patch-config-config.h.in @@ -1,5 +1,5 @@ ---- config/config.h.in.orig Thu Sep 25 08:21:14 2003 -+++ config/config.h.in Sat May 14 01:31:47 2005 +--- config/config.h.in.orig 2003-09-25 15:21:14 UTC ++++ config/config.h.in @@ -91,19 +91,19 @@ #undef PACKAGE Index: net/rtg/files/patch-configure =================================================================== --- net/rtg/files/patch-configure +++ net/rtg/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.ori Tue Jan 6 22:43:17 2004 -+++ configure Tue Jan 6 22:47:06 2004 -@@ -328,6 +328,8 @@ +--- configure.orig 2003-10-02 15:59:33 UTC ++++ configure +@@ -328,6 +328,8 @@ sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' datadir='${prefix}/share' sysconfdir='${prefix}/etc' @@ -9,7 +9,7 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' libdir='${exec_prefix}/lib' -@@ -558,6 +560,12 @@ +@@ -558,6 +560,12 @@ do | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) sysconfdir=$ac_optarg ;; @@ -22,7 +22,7 @@ -target | --target | --targe | --targ | --tar | --ta | --t) ac_prev=target_alias ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -@@ -654,7 +662,8 @@ +@@ -654,7 +662,8 @@ done # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ @@ -32,7 +32,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in -@@ -5310,6 +5319,8 @@ +@@ -5310,6 +5319,8 @@ s,@sbindir@,$sbindir,;t t s,@libexecdir@,$libexecdir,;t t s,@datadir@,$datadir,;t t s,@sysconfdir@,$sysconfdir,;t t Index: net/rtg/files/patch-etc-95.php =================================================================== --- net/rtg/files/patch-etc-95.php +++ net/rtg/files/patch-etc-95.php @@ -1,5 +1,5 @@ ---- etc/95.php.orig 2014-06-22 15:27:55.587467922 +0100 -+++ etc/95.php 2014-06-22 15:28:47.947474934 +0100 +--- etc/95.php.orig 2003-09-24 20:40:57 UTC ++++ etc/95.php @@ -4,10 +4,8 @@ print "\n\n\n"; @@ -12,7 +12,7 @@ if ($PHP_SELF == "") { $PHP_SELF = "95.php"; -@@ -50,8 +48,8 @@ +@@ -50,8 +48,8 @@ function int_stats($statement, $dbc) { $max = $avg = $nintyfifth = 0; $rate = array(); @@ -23,7 +23,7 @@ $counter = $selectRow->counter; $sample_secs = $selectRow->unixtime; $total += $counter; -@@ -89,9 +87,8 @@ +@@ -89,9 +87,8 @@ Report: 95th percentile
\n"; if (($bt || $smonth)) { @@ -35,7 +35,7 @@ /* Format into GNU date syntax */ if ($bt == "") { $bt = strtotime("$syear-$smonth-$sday $shour:$smin:00"); -@@ -104,11 +101,11 @@ +@@ -104,11 +101,11 @@ Report: 95th percentile
$range="dtime>FROM_UNIXTIME($bt) AND dtime<=FROM_UNIXTIME($et)"; $selectQuery="SELECT id, name, description, rid FROM interface WHERE description LIKE \"%$customer%\""; @@ -50,7 +50,7 @@ $ids[$selectRow->id] = $selectRow->name; $rids[$selectRow->id] = $selectRow->rid; $desc[$selectRow->id] = $selectRow->description; -@@ -127,8 +124,8 @@ +@@ -127,8 +124,8 @@ Report: 95th percentile
foreach($ids as $iid=>$name) { $selectQuery="SELECT name FROM router WHERE rid=$rids[$iid]"; @@ -61,7 +61,7 @@ $router = $selectRow->name; if ($yellow) $yellow = 0; -@@ -201,7 +198,7 @@ +@@ -201,7 +198,7 @@ Report: 95th percentile
echo "

"; } Index: net/rtg/files/patch-etc-Makefile.in =================================================================== --- net/rtg/files/patch-etc-Makefile.in +++ net/rtg/files/patch-etc-Makefile.in @@ -1,6 +1,6 @@ ---- etc/Makefile.in.orig 2003-10-02 16:59:32.000000000 +0100 -+++ etc/Makefile.in 2014-05-10 17:29:11.995407415 +0100 -@@ -84,19 +84,19 @@ +--- etc/Makefile.in.orig 2003-10-02 15:59:32 UTC ++++ etc/Makefile.in +@@ -84,19 +84,19 @@ am__quote = @am__quote@ install_sh = @install_sh@ top_builddir = .. @@ -26,7 +26,7 @@ subdir = etc mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -@@ -220,14 +220,14 @@ +@@ -220,14 +220,14 @@ uninstall-am: uninstall-info-am all: install: installdirs Index: net/rtg/files/patch-etc-rtg.php =================================================================== --- net/rtg/files/patch-etc-rtg.php +++ net/rtg/files/patch-etc-rtg.php @@ -1,5 +1,5 @@ ---- etc/rtg.php.orig 2003-09-24 21:42:03.000000000 +0100 -+++ etc/rtg.php 2014-06-22 15:25:22.471477252 +0100 +--- etc/rtg.php.orig 2003-09-24 20:42:03 UTC ++++ etc/rtg.php @@ -4,10 +4,8 @@ print "\n\n\n"; @@ -35,7 +35,7 @@ $router = $selectRow->router; } -@@ -71,8 +69,8 @@ +@@ -71,8 +69,8 @@ echo "

\n"; $selectQuery="SELECT DISTINCT name, rid FROM router ORDER BY name"; @@ -46,7 +46,7 @@ echo "