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

[Muhammad Moinur Rahman]

Author: bofh
Date: Sun Feb 26 11:01:41 2017
New Revision: 434856
URL: https://svnweb.freebsd.org/changeset/ports/434856

Log:
  net-mgmt/librenms: Update version 1.23=>1.24
  
  - Add PHP 7.0 support [1]
  - Pet portlint
  
  PR:		213376[1]
  Submitted by:	fredrik.eriksson at loopia.se[1]

Added:
  head/net-mgmt/librenms/files/patch-includes_common.php   (contents, props changed)
Deleted:
  head/net-mgmt/librenms/files/patch-includes-common.php
  head/net-mgmt/librenms/files/patch-validate.php
Modified:
  head/net-mgmt/librenms/Makefile
  head/net-mgmt/librenms/distinfo

Modified: head/net-mgmt/librenms/Makefile
==============================================================================
--- head/net-mgmt/librenms/Makefile	Sun Feb 26 10:35:03 2017	(r434855)
+++ head/net-mgmt/librenms/Makefile	Sun Feb 26 11:01:41 2017	(r434856)
@@ -2,14 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	librenms
-PORTVERSION=	1.23
-PORTEPOCH=  1
-PORTREVISION=   3
+PORTVERSION=	1.24
+PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 
-USE_GITHUB= yes
-GH_ACCOUNT= librenms
-
 MAINTAINER=	bofh at FreeBSD.org
 COMMENT=	Autodiscovering PHP/MySQL/SNMP based network monitoring
 
@@ -18,10 +14,8 @@ LICENSE=	GPLv3
 USE_GITHUB=	yes
 GH_ACCOUNT=	librenms
 
-USES=		python shebangfix
-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 \
+USES=		php:cli python shebangfix
+SHEBANG_FILES=	mibs/process.pl 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 \
@@ -30,8 +24,7 @@ SHEBANG_FILES=	html/js/makemini.pl mibs/
 		scripts/Migration/XML_Conversion/mkdir.sh validate.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
+USE_PHP=	ctype filter gd json mcrypt mysqli session snmp tokenizer xml
 
 NO_BUILD=	yes
 
@@ -63,8 +56,8 @@ X11_RUN_DEPENDS_OFF=	Magick-config:graph
 			mtr:net/mtr-nox11
 
 WMIC_RUN_DEPENDS=	wmic:net-mgmt/wmi-client
-MYSQLD_USE=		MYSQL=server
-MYSQLD_USE_OFF=		MYSQL=client
+MYSQLD_USES=		mysql:server
+MYSQLD_USES_OFF=	mysql:client
 
 SUB_FILES+=	pkg-message
 SUB_LIST+=	PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD}
@@ -88,7 +81,7 @@ APACHEMOD_VARS_ON=	WANT_PHP_MOD=yes
 APACHEMOD_USE=		APACHE_RUN=22+
 .else
 # Package builder doesn't create php5 with module
-WANT_PHP_WEB=	yes
+USES=		php:web
 .endif
 
 post-patch:

Modified: head/net-mgmt/librenms/distinfo
==============================================================================
--- head/net-mgmt/librenms/distinfo	Sun Feb 26 10:35:03 2017	(r434855)
+++ head/net-mgmt/librenms/distinfo	Sun Feb 26 11:01:41 2017	(r434856)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483966724
-SHA256 (librenms-librenms-1.23_GH0.tar.gz) = 68ca903e46d4ae62869fabb4ad4e8cb6da2cabdc16095808f29cdee03de2dfc1
-SIZE (librenms-librenms-1.23_GH0.tar.gz) = 31302664
+TIMESTAMP = 1488056726
+SHA256 (librenms-librenms-1.24_GH0.tar.gz) = 4f8744b06f2808c3aef1d736b30fc2fbe1a16efaf9e793d5f0d47ab73713a3d4
+SIZE (librenms-librenms-1.24_GH0.tar.gz) = 54959245

Added: head/net-mgmt/librenms/files/patch-includes_common.php
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/librenms/files/patch-includes_common.php	Sun Feb 26 11:01:41 2017	(r434856)
@@ -0,0 +1,14 @@
+--- includes/common.php.orig	2017-01-29 06:54:29 UTC
++++ includes/common.php
+@@ -1095,10 +1095,8 @@ function version_info($remote = true)
+             curl_setopt($api, CURLOPT_RETURNTRANSFER, 1);
+             $output['github'] = json_decode(curl_exec($api), true);
+         }
+-        list($local_sha, $local_date) = explode('|', rtrim(`git show --pretty='%H|%ct' -s HEAD`));
+-        $output['local_sha']    = $local_sha;
++        $output['local_sha']    = '%%PORTVERSION%%';
+         $output['local_date']   = $local_date;
+-        $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
+     }
+     $output['db_schema']   = dbFetchCell('SELECT version FROM dbSchema');
+     $output['php_ver']     = phpversion();