Index: branches/2019Q3/net/rtg/Makefile
===================================================================
--- branches/2019Q3/net/rtg/Makefile	(revision 509205)
+++ branches/2019Q3/net/rtg/Makefile	(revision 509206)
@@ -1,53 +1,53 @@
 # Created by: Brad Davis <so14k@so14k.com>
 # $FreeBSD$
 
 PORTNAME=	rtg
 PORTVERSION=	0.7.4
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	net
 MASTER_SITES=	SF \
 		ftp://ftpmirror.uk/freebsd-ports/rtg/
 
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Flexible, high-performance SNMP statistics monitoring system
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 USES=		mysql:client perl5 shebangfix ssl
 USE_RC_SUBR=	rtgpoll
 
 SHEBANG_FILES=	etc/95.pl etc/report.pl etc/rtgtargmkr.pl.in
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 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
 
 MYSQL_USES=	mysql:server
 
 WEB_USES=	php
 USE_PHP=	mysqli spl
 
 CFLAGS+=	-fstack-protector
 LDFLAGS+=	-fstack-protector
 
 post-patch:
 	@${MV} ${WRKSRC}/etc/rtg.conf ${WRKSRC}/etc/rtg.conf.sample
 	@${MV} ${WRKSRC}/etc/routers ${WRKSRC}/etc/routers.sample
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/etc/95.pl
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/etc/report.pl
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/etc/common.php.in
 
 .include <bsd.port.mk>
Index: branches/2019Q3/net/rtg/files/patch-etc_createdb.in
===================================================================
--- branches/2019Q3/net/rtg/files/patch-etc_createdb.in	(revision 509205)
+++ branches/2019Q3/net/rtg/files/patch-etc_createdb.in	(revision 509206)
@@ -1,146 +1,160 @@
---- etc/createdb.in.orig	2018-04-02 22:52:32 UTC
+--- etc/createdb.in.orig	2003-01-22 19:07:02 UTC
 +++ etc/createdb.in
-@@ -23,11 +23,8 @@ echo ""
+@@ -15,6 +15,8 @@
+ RTGPASS="rtgdefault"
+ DATABASE="rtg"
+ USER="snmp"
++MYSQL_FILE=`mktemp -q /tmp/mysql.XXXXXX`
++RTG_FILE=`mktemp -q /tmp/rtg.XXXXXX`
  
+ echo ""
+ echo "$0 setting up MySQL database for RTG."
+@@ -22,103 +24,98 @@
+ echo ""
+ 
  # Create the necessary SQL in two /tmp files
- cat <<EOT >/tmp/mysql.sql
+-cat <<EOT >/tmp/mysql.sql
 -INSERT INTO user (Host, User, Password) VALUES ('$HOST','$USER',PASSWORD("$RTGPASS"));
 -INSERT INTO db (Host, Db, User, Select_priv, Insert_priv, Update_priv, Delete_priv, 
 -Create_priv, Drop_priv, Grant_priv, References_priv, Index_priv, Alter_priv) 
 -VALUES ('$HOST','$DATABASE','$USER','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
 -FLUSH PRIVILEGES;
++cat <<EOT >$MYSQL_FILE
 +CREATE USER '$USER'@'$HOST' IDENTIFIED BY '$RTG_PASS';
 +GRANT ALL ON '$DATABASE'.* TO '$USER'@'$HOST';
  EOT
  
- cat <<EOT >/tmp/rtg.sql
-@@ -35,81 +32,81 @@ cat <<EOT >/tmp/rtg.sql
+-cat <<EOT >/tmp/rtg.sql
++cat <<EOT >$RTG_FILE
+ #
  # Table structure for table 'router'
  #
  
 -CREATE TABLE router (
 -  rid int(11) unsigned NOT NULL auto_increment,
 -  name char(120) NOT NULL default '',
 -  pop char(10) NOT NULL default '',
 -  popid tinyint(3) unsigned NOT NULL default '0',
 -  PRIMARY KEY  (rid)
 +CREATE TABLE `router` (
 +  `rid` int(11) unsigned NOT NULL auto_increment,
 +  `name` char(120) NOT NULL default '',
 +  `pop` char(10) NOT NULL default '',
 +  `popid` tinyint(3) unsigned NOT NULL default '0',
 +  PRIMARY KEY (`rid`)
  );
  
  #
  # Table structure for table 'interface'
  #
  
 -CREATE TABLE interface (
 -  id int(11) unsigned NOT NULL auto_increment,
 -  name char(255) NOT NULL default '',
 -  rid int(11) NOT NULL default '0',
 -  speed bigint(11) default NULL,
 -  description char(255) default NULL,
 -  status enum('active','inactive') default 'active',
 -  PRIMARY KEY  (id)
 +CREATE TABLE `interface` (
 +  `id` int(11) unsigned NOT NULL auto_increment,
 +  `name` char(255) NOT NULL default '',
 +  `rid` int(11) NOT NULL default '0',
 +  `speed` bigint(11) default NULL,
 +  `description` char(255) default NULL,
 +  `status` enum('active','inactive') default 'active',
 +  PRIMARY KEY (`id`)
  );
  
  #
  # Table structure for table 'ifInOctets'
  #
  
 -CREATE TABLE ifInOctets (
 -  id int(11) NOT NULL default '0',
 -  dtime datetime NOT NULL default '0000-00-00 00:00:00',
 -  counter bigint(20) NOT NULL default '0',
 -  KEY ifInOctets_idx (dtime)
 +CREATE TABLE `ifInOctets` (
 +  `id` int(11) NOT NULL default '0',
 +  `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
 +  `counter` bigint(20) NOT NULL default '0',
 +  KEY `ifInOctets_idx` (`dtime`)
  );
  
  #
  # Table structure for table 'ifOutOctets'
  #
  
 -CREATE TABLE ifOutOctets (
 -  id int(11) NOT NULL default '0',
 -  dtime datetime NOT NULL default '0000-00-00 00:00:00',
 -  counter bigint(20) NOT NULL default '0',
 -  KEY ifOutOctets_idx (dtime)
 +CREATE TABLE `ifOutOctets` (
 +  `id` int(11) NOT NULL default '0',
 +  `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
 +  `counter` bigint(20) NOT NULL default '0',
 +  KEY `ifOutOctets_idx` (`dtime`)
  );
  
  #
  # Table structure for table 'ifInUcastPkts'
  #
  
 -CREATE TABLE ifInUcastPkts (
 -  id int(11) NOT NULL default '0',
 -  dtime datetime NOT NULL default '0000-00-00 00:00:00',
 -  counter bigint(20) NOT NULL default '0',
 -  KEY ifInUcastPkts_idx (dtime)
 +CREATE TABLE `ifInUcastPkts` (
 +  `id` int(11) NOT NULL default '0',
 +  `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
 +  `counter` bigint(20) NOT NULL default '0',
 +  KEY `ifInUcastPkts_idx` (`dtime`)
  );
  
  #
  # Table structure for table 'ifOutUcastPkts'
  #
  
 -CREATE TABLE ifOutUcastPkts (
 -  id int(11) NOT NULL default '0',
 -  dtime datetime NOT NULL default '0000-00-00 00:00:00',
 -  counter bigint(20) NOT NULL default '0',
 -  KEY ifOutUcastPkts_idx (dtime)
 +CREATE TABLE `ifOutUcastPkts` (
 +  `id` int(11) NOT NULL default '0',
 +  `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
 +  `counter` bigint(20) NOT NULL default '0',
 +  KEY `ifOutUcastPkts_idx` (`dtime`)
  );
  
  #
  # Table structure for table 'ifInErrors'
  #
  
 -CREATE TABLE ifInErrors (
 -  id int(11) NOT NULL default '0',
 -  dtime datetime NOT NULL default '0000-00-00 00:00:00',
 -  counter bigint(20) NOT NULL default '0',
 -  KEY ifInErrors_idx (dtime)
 +CREATE TABLE `ifInErrors` (
 +  `id` int(11) NOT NULL default '0',
 +  `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
 +  `counter` bigint(20) NOT NULL default '0',
 +  KEY `ifInErrors_idx` (`dtime`)
  );
  EOT
  
-@@ -117,8 +114,6 @@ echo "Adding user \"$USER\" to MySQL dat
- cat /tmp/mysql.sql | $MYSQLBIN/mysql -u root -p$ROOTPASS mysql
+ echo "Adding user \"$USER\" to MySQL database..."
+-cat /tmp/mysql.sql | $MYSQLBIN/mysql -u root -p$ROOTPASS mysql
++cat $MYSQL_FILE | $MYSQLBIN/mysql -u root -p$ROOTPASS mysql
  echo "Creating RTG database \"$DATABASE\"..."
  $MYSQLBIN/mysqladmin -u root -p$ROOTPASS create $DATABASE
 -echo "Reloading MySQL privileges..."
 -$MYSQLBIN/mysqladmin -u root -p$ROOTPASS flush-privileges
  echo "Creating RTG tables..."
- cat /tmp/rtg.sql | $MYSQLBIN/mysql -u $USER -p$RTGPASS $DATABASE
+-cat /tmp/rtg.sql | $MYSQLBIN/mysql -u $USER -p$RTGPASS $DATABASE
++cat $RTG_FILE | $MYSQLBIN/mysql -u $USER -p$RTGPASS $DATABASE
  echo "Done."
Index: branches/2019Q3
===================================================================
--- branches/2019Q3	(revision 509205)
+++ branches/2019Q3	(revision 509206)

Property changes on: branches/2019Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r507219