Index: head/net-mgmt/librenms/Makefile
===================================================================
--- head/net-mgmt/librenms/Makefile	(revision 434855)
+++ head/net-mgmt/librenms/Makefile	(revision 434856)
@@ -1,146 +1,139 @@
 # Created by: Muhammad Moinur Rahman<bofh@FreeBSD.org>
 # $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
 
 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 \
 		scripts/Migration/XML_Conversion/convert.sh \
 		scripts/Migration/XML_Conversion/destwork.sh \
 		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
 
 RUN_DEPENDS+=	rrdtool:databases/rrdtool \
 		dot:graphics/graphviz \
 		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4 \
 		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6 \
 		snmpget:net-mgmt/net-snmp \
 		bash:shells/bash
 
 OPTIONS_DEFINE=	APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES X11
 OPTIONS_DEFAULT=	APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC
 APACHEMOD_DESC=	Use PHP with Apache 2.2+ module
 FPING_DESC=	Enable fping support ping monitoring
 IPMITOOL_DESC=	Enable support for monitoring hardware IPMI
 MYSQLD_DESC=	Use local MySQL server
 WMIC_DESC=	Enable support for WMI polling
 PYPOLLER_DESC=	Enable Python Poller Wrapper
 
 FPING_RUN_DEPENDS=	fping:net/fping
 IPMITOOL_RUN_DEPENDS=	ipmitool:sysutils/ipmitool
 LIBVIRT_RUN_DEPENDS=	virsh:devel/libvirt
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 NMAP_RUN_DEPENDS=	nmap:security/nmap
 PYPOLLER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
 X11_RUN_DEPENDS=	Magick-config:graphics/ImageMagick \
 			mtr:net/mtr
 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}
 
 ROOT_FILES=	addhost.php adduser.php	alerts.php build-base.php build.sql \
 		billing-calculate.php \
 		check-services.php config_to_json.php daily.php daily.sh \
 		delhost.php discovery.php dist-pollers.php irc.php \
 		poll-billing.php poller.php poller-service.py poller-wrapper.py renamehost.php \
 		snmp-scan.php snmptrap.php syslog.php validate.php
 
 ROOT_DIRS=	LibreNMS contrib html includes lib mibs scripts sql-schema
 
 DOCS=		AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md
 PORTDOCS=	*
 PORTEXAMPLES=	snmp.conf.example snmpd.conf.example
 NO_ARCH=	yes
 
 .if !defined(PACKAGE_BUILDING)
 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:
 	${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}
 .for dir in ${ROOT_DIRS}
 	@${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir}
 	@cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir}
 .endfor
 .for f in ${ROOT_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR}
 .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
 	@${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \
 	       '*.php' -exec ${CHMOD} +x {} \;
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
 	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR}
 .endfor
 
 post-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${INSTALL_DATA} ${WRKSRC}/config.php.default \
 	       ${STAGEDIR}/${WWWDIR}/config.php.sample
 	@${ECHO} @sample ${WWWDIR}/config.php.sample >> ${TMPPLIST}
 	@${ECHO} @dir ${WWWDIR}/rrd >> ${TMPPLIST}
 	@${ECHO} @dir ${WWWDIR}/lib/influxdb-php/vendor/guzzlehttp/guzzle/build >> ${TMPPLIST}
 	@${ECHO} @dir ${WWWDIR}/lib/influxdb-php/vendor/guzzlehttp/guzzle/docs >> ${TMPPLIST}
 	@${ECHO} @dir ${WWWDIR}/lib/influxdb-php/vendor/guzzlehttp/guzzle/tests >> ${TMPPLIST}
 	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/net-mgmt/librenms/distinfo
===================================================================
--- head/net-mgmt/librenms/distinfo	(revision 434855)
+++ head/net-mgmt/librenms/distinfo	(revision 434856)
@@ -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
Index: head/net-mgmt/librenms/files/patch-includes-common.php
===================================================================
--- head/net-mgmt/librenms/files/patch-includes-common.php	(revision 434855)
+++ head/net-mgmt/librenms/files/patch-includes-common.php	(nonexistent)
@@ -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();

Property changes on: head/net-mgmt/librenms/files/patch-includes-common.php
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/librenms/files/patch-validate.php
===================================================================
--- head/net-mgmt/librenms/files/patch-validate.php	(revision 434855)
+++ head/net-mgmt/librenms/files/patch-validate.php	(nonexistent)
@@ -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']);

Property changes on: head/net-mgmt/librenms/files/patch-validate.php
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/librenms/files/patch-includes_common.php
===================================================================
--- head/net-mgmt/librenms/files/patch-includes_common.php	(nonexistent)
+++ head/net-mgmt/librenms/files/patch-includes_common.php	(revision 434856)
@@ -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();

Property changes on: head/net-mgmt/librenms/files/patch-includes_common.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property