svn commit: r431600 - in head/net-mgmt/librenms: . files

[Dan Langille]

Author: dvl
Date: Sun Jan 15 21:20:16 2017
New Revision: 431600
URL: https://svnweb.freebsd.org/changeset/ports/431600

Log:
  Upgrade to 1.23,1
  
  Be sure to set the following in my.cnf:
  
  [mysqld]
  innodb_file_per_table=1
  sql-mode=""

Deleted:
  head/net-mgmt/librenms/files/patch-config.php.default
Modified:
  head/net-mgmt/librenms/Makefile
  head/net-mgmt/librenms/distinfo
  head/net-mgmt/librenms/files/patch-includes_defaults.inc.php

Modified: head/net-mgmt/librenms/Makefile
==============================================================================
--- head/net-mgmt/librenms/Makefile	Sun Jan 15 21:08:05 2017	(r431599)
+++ head/net-mgmt/librenms/Makefile	Sun Jan 15 21:20:16 2017	(r431600)
@@ -2,9 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	librenms
-PORTVERSION=	201607
+PORTVERSION=	1.23
+PORTEPOCH=  1
+PORTREVISION=   1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.librenms.org/
+
+USE_GITHUB= yes
+GH_ACCOUNT= librenms
 
 MAINTAINER=	bofh at FreeBSD.org
 COMMENT=	Autodiscovering PHP/MySQL/SNMP based network monitoring
@@ -15,22 +19,16 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	librenms
 
 USES=		python shebangfix
-SHEBANG_FILES=	html/js/makemini.pl mibs/process.pl scripts/agent-local/bind \
-		scripts/agent-local/dmi scripts/agent-local/dpkg \
-		scripts/agent-local/drbd scripts/agent-local/hddtemp \
-		scripts/agent-local/memcached scripts/agent-local/mysql \
-		scripts/agent-local/rpm scripts/agent-local/temperature \
-		scripts/agent-local/tinydns scripts/apache-stats.py \
-		scripts/check_mk_agent scripts/cron.sh scripts/cron-hourly.sh \
-		scripts/cron-minute.sh scripts/get-geshi.sh \
-		scripts/get-jpgraph.sh scripts/ifAlias \
+SHEBANG_FILES=	html/js/makemini.pl mibs/process.pl \
+		scripts/cron-hourly.sh scripts/cron-minute.sh \
+		scripts/cron.sh scripts/deploy-docs.sh scripts/ifAlias \
 		scripts/Migration/Standard_Conversion/convert_no_xml.sh \
 		scripts/Migration/Standard_Conversion/destwork_no_xml.sh \
 		scripts/Migration/Standard_Conversion/mkdir.sh \
 		scripts/Migration/XML_Conversion/convert.sh \
 		scripts/Migration/XML_Conversion/destwork.sh \
 		scripts/Migration/XML_Conversion/mkdir.sh validate.php \
-		scripts/postfix-queues scripts/removespikes.php \
+		scripts/removespikes.php scripts/agent-local/nfs-stats.sh \
 		scripts/removespikes.pl scripts/watchmaillog/watchmaillog.pl
 USE_PHP=	ctype filter gd json mcrypt mysql session snmp tokenizer xml
 WANT_PHP_CLI=	yes
@@ -78,7 +76,7 @@ ROOT_FILES=	addhost.php adduser.php	aler
 		poll-billing.php poller.php poller-service.py poller-wrapper.py renamehost.php \
 		snmp-scan.php snmptrap.php syslog.php validate.php
 
-ROOT_DIRS=	contrib html includes lib mibs scripts sql-schema
+ROOT_DIRS=	LibreNMS contrib html includes lib mibs scripts sql-schema
 
 DOCS=		AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md
 PORTDOCS=	*
@@ -96,6 +94,8 @@ WANT_PHP_WEB=	yes
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	       ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php
+	${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' \
+	       ${WRKSRC}/includes/common.php
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${WWWDIR}
@@ -108,6 +108,7 @@ do-install:
 .endfor
 # Create empty rrd dir writable by www
 	@${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd
+	@${CHMOD} 0775 ${STAGEDIR}/${WWWDIR}/rrd
 # Files in scripts dir should be executable
 	@${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \;
 # Ensure PHP and Python scripts are executable

Modified: head/net-mgmt/librenms/distinfo
==============================================================================
--- head/net-mgmt/librenms/distinfo	Sun Jan 15 21:08:05 2017	(r431599)
+++ head/net-mgmt/librenms/distinfo	Sun Jan 15 21:20:16 2017	(r431600)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469519614
-SHA256 (librenms-librenms-201607_GH0.tar.gz) = b044d35824d6179f09d92500b873ba3cecb55dc0882f9f1f24e72b1802ecd5a7
-SIZE (librenms-librenms-201607_GH0.tar.gz) = 31554157
+TIMESTAMP = 1483966724
+SHA256 (librenms-librenms-1.23_GH0.tar.gz) = 68ca903e46d4ae62869fabb4ad4e8cb6da2cabdc16095808f29cdee03de2dfc1
+SIZE (librenms-librenms-1.23_GH0.tar.gz) = 31302664

Modified: head/net-mgmt/librenms/files/patch-includes_defaults.inc.php
==============================================================================
--- head/net-mgmt/librenms/files/patch-includes_defaults.inc.php	Sun Jan 15 21:08:05 2017	(r431599)
+++ head/net-mgmt/librenms/files/patch-includes_defaults.inc.php	Sun Jan 15 21:20:16 2017	(r431600)
@@ -1,17 +1,8 @@
---- includes/defaults.inc.php.orig	2015-10-16 23:09:41 UTC
-+++ includes/defaults.inc.php
-@@ -40,7 +40,7 @@ $config['project_name'] = 'LibreNMS';
- $config['project_id']   = strtolower($config['project_name']);
- 
- $config['temp_dir']    = '/tmp';
--$config['install_dir'] = '/opt/'.$config['project_id'];
-+$config['install_dir'] = '/usr/local/www/'.$config['project_id'];
- $config['log_dir']     = $config['install_dir'].'/logs';
- 
- // MySQL extension to use
-@@ -50,26 +50,26 @@ $config['db']['extension']       = 'mysq
+--- includes/defaults.inc.php.orig      2017-01-01 15:50:41.000000000 +0000
++++ includes/defaults.inc.php   2017-01-09 13:24:06.964918000 +0000
+@@ -36,26 +36,26 @@
  $config['own_hostname'] = 'localhost';
- 
+
  // Location of executables
 -$config['rrdtool']                  = '/usr/bin/rrdtool';
 +$config['rrdtool']                  = '/usr/local/bin/rrdtool';
@@ -47,6 +38,6 @@
 +$config['virsh']          = '/usr/local/bin/virsh';
 +$config['dot']            = '/usr/local/bin/dot';
 +$config['sfdp']           = '/usr/local/bin/sfdp';
- 
+
  // Memcached - Keep immediate statistics
  $config['memcached']['enable'] = false;