Index: head/net-mgmt/nagvis/Makefile =================================================================== --- head/net-mgmt/nagvis/Makefile (revision 459736) +++ head/net-mgmt/nagvis/Makefile (revision 459737) @@ -1,72 +1,73 @@ # Created by: Andrew 'derfi' Sidorov # $FreeBSD$ PORTNAME= nagvis PORTVERSION= 1.8.5 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.nagvis.org/share/ MAINTAINER= derfi@vei.ru COMMENT= Visualization addon for Nagios LICENSE= GPLv2 OPTIONS_DEFINE= GRAPHVIZ OPTIONS_SINGLE= BROKER OPTIONS_SINGLE_BROKER= MKLIVESTATUS NDO2DB OPTIONS_DEFAULT= MKLIVESTATUS MKLIVESTATUS_DESC= Depend on mk-livestatus broker (preferred) NDO2DB_DESC= Depend on ndo2db broker GRAPHVIZ_DESC= Graphviz is needed for automaps USES= gettext NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls NO_BUILD= yes USE_PHP= gd gettext mbstring session json pdo pdo_sqlite WANT_PHP_WEB= yes .include WWW_OWNER?= ${WWWOWN} WWW_GROUP?= ${WWWGRP} DIRMODE?= 750 FILEMODE?= 640 SUB_LIST+= WWW_OWNER=${WWW_OWNER} WWW_GROUP=${WWW_GROUP} \ DIRMODE=${DIRMODE} FILEMODE=${FILEMODE} SUB_FILES+= pkg-install pkg-deinstall PLIST_SUB+= WWWDIR="${WWWDIR}" .if ${PORT_OPTIONS:MNDO2DB} USE_PHP+= mysql RUN_DEPENDS+= ndo2db-3x:net-mgmt/ndoutils .endif .if ${PORT_OPTIONS:MMKLIVESTATUS} RUN_DEPENDS+= mk-livestatus>=0:net-mgmt/mk-livestatus .endif .if ${PORT_OPTIONS:MGRAPHVIZ} RUN_DEPENDS+= dot:graphics/graphviz .endif post-extract: @${RM} ${WRKSRC}/.gitignore ${WRKSRC}/install.sh ${WRKSRC}/INSTALL post-patch: @${REINPLACE_CMD} -i '' -e 's|@NAGVIS_WEB@|/nagvis|g' \ -e 's|@NAGVIS_PATH@|${WWWDIR}|g' \ ${WRKSRC}/etc/apache2-nagvis.conf-sample @${REINPLACE_CMD} -i '' -e 's|/usr/local/nagvis/|${WWWDIR}/|' \ ${WRKSRC}/etc/nagvis.ini.php-sample do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/ ${MKDIR} ${STAGEDIR}${WWWDIR}/etc/automaps \ ${STAGEDIR}${WWWDIR}/share/var \ ${STAGEDIR}${WWWDIR}/var/tmpl/cache \ ${STAGEDIR}${WWWDIR}/var/tmpl/compile .include Index: head/net-mgmt/nagvis/files/patch-share_server_core_classes_objects_NagVisService.php =================================================================== --- head/net-mgmt/nagvis/files/patch-share_server_core_classes_objects_NagVisService.php (nonexistent) +++ head/net-mgmt/nagvis/files/patch-share_server_core_classes_objects_NagVisService.php (revision 459737) @@ -0,0 +1,22 @@ +--- share/server/core/classes/objects/NagVisMapObj.php.orig 2017-12-21 20:54:27.936999000 +0100 ++++ share/server/core/classes/objects/NagVisMapObj.php 2017-12-21 20:54:31.229491000 +0100 +@@ -187,7 +187,7 @@ + * + * @author Lars Michelsen + */ +- public function queueState($_unused_flag = true, $_unused_flag = true) { ++ public function queueState($_unused_flag = true, $_unused_flag2 = true) { + // Get state of all member objects + foreach($this->getStateRelevantMembers() AS $OBJ) { + // The states of the map objects members only need to be fetched when this +--- share/server/core/classes/objects/NagVisService.php.orig 2017-12-21 20:55:07.358180000 +0100 ++++ share/server/core/classes/objects/NagVisService.php 2017-12-21 20:55:31.487418000 +0100 +@@ -56,7 +56,7 @@ + /** + * Queues state fetching for this object + */ +- public function queueState($_unused_flag = true, $_unused_flag = true) { ++ public function queueState($_unused_flag = true, $_unused_flag2 = true) { + global $_BACKEND; + $_BACKEND->queue(Array('serviceState' => true), $this); + } Property changes on: head/net-mgmt/nagvis/files/patch-share_server_core_classes_objects_NagVisService.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 Index: head/net-mgmt/nagvis/files/patch-share_server_core_ext_php_gettext.php =================================================================== --- head/net-mgmt/nagvis/files/patch-share_server_core_ext_php_gettext.php (nonexistent) +++ head/net-mgmt/nagvis/files/patch-share_server_core_ext_php_gettext.php (revision 459737) @@ -0,0 +1,40 @@ +--- share/server/core/ext/php-gettext-1.0.9/gettext.php.orig 2017-12-21 20:52:04.548840000 +0100 ++++ share/server/core/ext/php-gettext-1.0.9/gettext.php 2017-12-21 20:52:26.904652000 +0100 +@@ -98,7 +98,7 @@ + * @param object Reader the StreamReader object + * @param boolean enable_cache Enable or disable caching of strings (default on) + */ +- function gettext_reader($Reader, $enable_cache = true) { ++ function __construct($Reader, $enable_cache = true) { + // If there isn't a StreamReader, turn on short circuit mode. + if (! $Reader || isset($Reader->error) ) { + $this->short_circuit = true; +--- share/server/core/ext/php-gettext-1.0.9/streams.php.orig 2017-12-21 20:52:12.507752000 +0100 ++++ share/server/core/ext/php-gettext-1.0.9/streams.php 2017-12-21 20:53:08.533635000 +0100 +@@ -49,7 +49,7 @@ + var $_pos; + var $_str; + +- function StringReader($str='') { ++ function __construct($str='') { + $this->_str = $str; + $this->_pos = 0; + } +@@ -86,7 +86,7 @@ + var $_fd; + var $_length; + +- function FileReader($filename) { ++ function __construct($filename) { + if (file_exists($filename)) { + + $this->_length=filesize($filename); +@@ -143,7 +143,7 @@ + // Preloads entire file in memory first, then creates a StringReader + // over it (it assumes knowledge of StringReader internals) + class CachedFileReader extends StringReader { +- function CachedFileReader($filename) { ++ function __construct($filename) { + if (file_exists($filename)) { + + $length=filesize($filename); Property changes on: head/net-mgmt/nagvis/files/patch-share_server_core_ext_php_gettext.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