5 files changed, 25 insertions, 86 deletions

diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
index e78cd25d2254..17ec4572429b 100644
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -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@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/process.pl \
 		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:graphics/ImageMagick-nox11 \
 			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:
diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo
index 9d6dab97eef6..621ea0bf2beb 100644
--- a/net-mgmt/librenms/distinfo
+++ b/net-mgmt/librenms/distinfo
@@ -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
diff --git a/net-mgmt/librenms/files/patch-includes-common.php b/net-mgmt/librenms/files/patch-includes-common.php
deleted file mode 100644
index 1e4b51814018..000000000000
--- a/net-mgmt/librenms/files/patch-includes-common.php
+++ /dev/null
@@ -1,16 +0,0 @@
---- includes/common.php.orig	2017-01-15 20:50:30.075142000 +0000
-+++ includes/common.php	2017-01-15 20:42:35.634055000 +0000
-@@ -1110,10 +1110,10 @@
-         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;
-+#    list($local_sha, $local_date) = explode('|', rtrim(`git show --pretty='%H|%ct' -s HEAD`));
-+    $output['local_sha']    = '%%PORTVERSION%%';
-     $output['local_date']   = $local_date;
--    $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
-+#    $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
- 
-     $output['db_schema']   = dbFetchCell('SELECT version FROM dbSchema');
-     $output['php_ver']     = phpversion();
diff --git a/net-mgmt/librenms/files/patch-includes_common.php b/net-mgmt/librenms/files/patch-includes_common.php
new file mode 100644
index 000000000000..7ff08bbc4c82
--- /dev/null
+++ b/net-mgmt/librenms/files/patch-includes_common.php
@@ -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();
diff --git a/net-mgmt/librenms/files/patch-validate.php b/net-mgmt/librenms/files/patch-validate.php
deleted file mode 100644
index 5f7ff26beec5..000000000000
--- a/net-mgmt/librenms/files/patch-validate.php
+++ /dev/null
@@ -1,52 +0,0 @@
---- validate.php.orig	2017-01-15 20:10:36.344602000 +0000
-+++ validate.php	2017-01-15 20:04:36.094612000 +0000
-@@ -103,10 +103,10 @@
-     print_fail('You need to run this script as root' . (isset($config['user']) ? ' or '.$config['user'] : ''));
- }
- 
--if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) {
--    $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get()));
--    print_warn("Your install is out of date, last update: " . $commit_date->format('r'));
--}
-+#if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) {
-+#    $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get()));
-+#    print_warn("Your install is out of date, last update: " . $commit_date->format('r'));
-+#}
- 
- // Check php modules we use to make sure they are loaded
- $extensions = array('pcre','curl','session','snmp','mcrypt');
-@@ -250,20 +250,20 @@
-     print_list($devices, "\t %s\n");
- }
- 
--if ($versions['local_branch'] != 'master') {
--    print_warn("Your local git branch is not master, this will prevent automatic updates.");
--}
--
--// check for modified files
--$modifiedcmd = 'git diff --name-only --exit-code';
--if ($username === 'root') {
--    $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
--}
--exec($modifiedcmd, $cmdoutput, $code);
--if ($code !== 0 && !empty($cmdoutput)) {
--    print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
--    print_list($cmdoutput, "\t %s\n");
--}
-+#if ($versions['local_branch'] != 'master') {
-+#    print_warn("Your local git branch is not master, this will prevent automatic updates.");
-+#}
-+#
-+#// check for modified files
-+#$modifiedcmd = 'git diff --name-only --exit-code';
-+#if ($username === 'root') {
-+#    $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
-+#}
-+#exec($modifiedcmd, $cmdoutput, $code);
-+#if ($code !== 0 && !empty($cmdoutput)) {
-+#    print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
-+#    print_list($cmdoutput, "\t %s\n");
-+#}
- 
- // Modules test
- $modules = explode(',', $options['m']);