svn commit: r544645 - in head/net-mgmt/icingaweb2: . files

Lars Engels lme at FreeBSD.org
Mon Aug 10 20:21:31 UTC 2020 

Author: lme
Date: Mon Aug 10 20:21:30 2020
New Revision: 544645
URL: https://svnweb.freebsd.org/changeset/ports/544645

Log:
  net-mgmt/icingaweb2:
  - Update to 2.8.1
  - Pet portfmt
  
  PR:		248310
  Submitted by:	Jonas Palm <jonaspalm at posteo.de>

Deleted:
  head/net-mgmt/icingaweb2/files/patch-library_Icinga_Web_View.php
  head/net-mgmt/icingaweb2/files/patch-library_vendor_Zend_Registry.php
  head/net-mgmt/icingaweb2/files/patch-library_vendor_lessphp_lessc.inc.php
Modified:
  head/net-mgmt/icingaweb2/Makefile
  head/net-mgmt/icingaweb2/distinfo
  head/net-mgmt/icingaweb2/pkg-plist

Modified: head/net-mgmt/icingaweb2/Makefile
==============================================================================
--- head/net-mgmt/icingaweb2/Makefile	Mon Aug 10 19:46:21 2020	(r544644)
+++ head/net-mgmt/icingaweb2/Makefile	Mon Aug 10 20:21:30 2020	(r544645)
@@ -2,8 +2,7 @@
 
 PORTNAME=	icingaweb2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.7.3
-PORTREVISION=	3
+DISTVERSION=	2.8.1
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
@@ -14,10 +13,10 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		php:build,web,flavors
-USE_PHP=	bcmath bitset ctype curl dom gd gettext hash iconv \
-		json ldap mbstring mcrypt memcache memcached \
-		opcache openssl pcre pdo pdo_sqlite posix \
-		session simplexml soap sockets sqlite3 xml zlib
+USE_PHP=	bcmath bitset ctype curl dom gd gettext hash iconv json ldap \
+		mbstring mcrypt memcache memcached opcache openssl pcre pdo \
+		pdo_sqlite posix session simplexml soap sockets sqlite3 xml \
+		zlib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
@@ -26,25 +25,25 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
-SUB_LIST=	WWWDIR=${WWWDIR} \
-		ETCDIR=${ETCDIR} \
-		EXAMPLESDIR=${EXAMPLESDIR}
+SUB_LIST=	ETCDIR=${ETCDIR} \
+		EXAMPLESDIR=${EXAMPLESDIR} \
+		WWWDIR=${WWWDIR}
 
-PLIST_SUB=	WWWOWN=${WWWOWN} \
-		WWWGRP=${WWWGRP}
+PLIST_SUB=	WWWGRP=${WWWGRP} \
+		WWWOWN=${WWWOWN}
 
-OPTIONS_DEFINE=		NLS LDAP MYSQL PGSQL PDF SQLITE EXAMPLES
+OPTIONS_DEFINE=		EXAMPLES LDAP MYSQL NLS PDF PGSQL SQLITE
 OPTIONS_DEFAULT=	LDAP MYSQL PGSQL SQLITE
 
-PDF_DESC=	Export graphs as PDF
+PDF_DESC=		Export graphs as PDF
 PDF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 
 NLS_USES=	gettext
-NLS_USE=	php=intl
-PGSQL_USE=	php=pdo_pgsql,pgsql
-MYSQL_USE=	php=pdo_mysql,mysqli
-SQLITE_USE=	php=pdo_sqlite,sqlite3
-LDAP_USE=	php=ldap
+NLS_USE=	PHP=intl
+PGSQL_USE=	PHP=pdo_pgsql,pgsql
+MYSQL_USE=	PHP=mysqli,pdo_mysql
+SQLITE_USE=	PHP=pdo_sqlite,sqlite3
+LDAP_USE=	PHP=ldap
 
 post-patch:
 	${REINPLACE_CMD} 's%\(/etc/icingaweb2\)%${PREFIX}\1%g' \
@@ -67,9 +66,9 @@ do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 .for webserver in apache nginx
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${webserver}
-	# ICINGAWEB_CONFIGDIR is set to /nonexistent to allow staging as user.
-	# Once installed, ${ETCDIR} is not world-readable, so point icingacli to
-	# a non existing directory. The config files are generated correctly anyway.
+# ICINGAWEB_CONFIGDIR is set to /nonexistent to allow staging as user.
+# Once installed, ${ETCDIR} is not world-readable, so point icingacli to
+# a non existing directory. The config files are generated correctly anyway.
 	(cd ${STAGEDIR}${WWWDIR} && \
 	ICINGAWEB_CONFIGDIR=/nonexistent \
 	./bin/icingacli setup config webserver ${webserver} --path=/icingaweb2 \

Modified: head/net-mgmt/icingaweb2/distinfo
==============================================================================
--- head/net-mgmt/icingaweb2/distinfo	Mon Aug 10 19:46:21 2020	(r544644)
+++ head/net-mgmt/icingaweb2/distinfo	Mon Aug 10 20:21:30 2020	(r544645)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573144147
-SHA256 (icinga-icingaweb2-v2.7.3_GH0.tar.gz) = 956f07f5cce51a05d8e4afe7637138894fc7cf149523aea40c6f0a6204fb821f
-SIZE (icinga-icingaweb2-v2.7.3_GH0.tar.gz) = 8388950
+TIMESTAMP = 1597068029
+SHA256 (icinga-icingaweb2-v2.8.1_GH0.tar.gz) = ab7ee02d30cb4889eaa10303359c13523071c34661ccbf09006c6f3285a3f338
+SIZE (icinga-icingaweb2-v2.8.1_GH0.tar.gz) = 8513180

Modified: head/net-mgmt/icingaweb2/pkg-plist
==============================================================================
--- head/net-mgmt/icingaweb2/pkg-plist	Mon Aug 10 19:46:21 2020	(r544644)
+++ head/net-mgmt/icingaweb2/pkg-plist	Mon Aug 10 20:21:30 2020	(r544645)
@@ -2,7 +2,6 @@ bin/icingacli
 etc/bash_completion.d/icingacli
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache/icingaweb2.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx/icingaweb2.conf
-%%WWWDIR%%/.travis.yml
 %%WWWDIR%%/AUTHORS
 %%WWWDIR%%/CHANGELOG.md
 %%WWWDIR%%/CONTRIBUTING.md
@@ -121,7 +120,6 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/application/views/helpers/FormDateTime.php
 %%WWWDIR%%/application/views/helpers/FormNumber.php
 %%WWWDIR%%/application/views/helpers/FormTime.php
-%%WWWDIR%%/application/views/helpers/FormTriStateCheckbox.php
 %%WWWDIR%%/application/views/helpers/ProtectId.php
 %%WWWDIR%%/application/views/helpers/Util.php
 %%WWWDIR%%/application/views/scripts/about/index.phtml
@@ -470,7 +468,6 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/library/Icinga/Web/Form/Element/Number.php
 %%WWWDIR%%/library/Icinga/Web/Form/Element/Textarea.php
 %%WWWDIR%%/library/Icinga/Web/Form/Element/Time.php
-%%WWWDIR%%/library/Icinga/Web/Form/Element/TriStateCheckbox.php
 %%WWWDIR%%/library/Icinga/Web/Form/ErrorLabeller.php
 %%WWWDIR%%/library/Icinga/Web/Form/FormElement.php
 %%WWWDIR%%/library/Icinga/Web/Form/InvalidCSRFTokenException.php
@@ -480,7 +477,6 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/library/Icinga/Web/Form/Validator/InternalUrlValidator.php
 %%WWWDIR%%/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
 %%WWWDIR%%/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
-%%WWWDIR%%/library/Icinga/Web/Form/Validator/TriStateValidator.php
 %%WWWDIR%%/library/Icinga/Web/Form/Validator/UrlValidator.php
 %%WWWDIR%%/library/Icinga/Web/Form/Validator/WritablePathValidator.php
 %%WWWDIR%%/library/Icinga/Web/Helper/CookieHelper.php
@@ -522,7 +518,6 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/library/Icinga/Web/View/helpers/generic.php
 %%WWWDIR%%/library/Icinga/Web/View/helpers/string.php
 %%WWWDIR%%/library/Icinga/Web/View/helpers/url.php
-%%WWWDIR%%/library/Icinga/Web/ViewStream.php
 %%WWWDIR%%/library/Icinga/Web/Widget.php
 %%WWWDIR%%/library/Icinga/Web/Widget/AbstractWidget.php
 %%WWWDIR%%/library/Icinga/Web/Widget/Announcements.php
@@ -1873,6 +1868,7 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/modules/monitoring/application/views/scripts/list/servicegroups.phtml
 %%WWWDIR%%/modules/monitoring/application/views/scripts/list/services.phtml
 %%WWWDIR%%/modules/monitoring/application/views/scripts/object/detail-history.phtml
+%%WWWDIR%%/modules/monitoring/application/views/scripts/object/detail-tabhook.phtml
 %%WWWDIR%%/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
 %%WWWDIR%%/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
 %%WWWDIR%%/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
@@ -2012,6 +2008,7 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
+%%WWWDIR%%/modules/monitoring/library/Monitoring/Command/Object/CommandAuthor.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
@@ -2079,9 +2076,11 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/DataviewExtensionHook.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/DetailviewExtensionHook.php
+%%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/EventDetailsExtensionHook.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/HostActionsHook.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/IdoQueryExtensionHook.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/ObjectActionsHook.php
+%%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/ObjectDetailsTabHook.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/PluginOutputHook.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/ServiceActionsHook.php
 %%WWWDIR%%/modules/monitoring/library/Monitoring/Hook/TimelineProviderHook.php
@@ -2177,6 +2176,7 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/modules/setup/library/Setup/Requirement/PhpConfigRequirement.php
 %%WWWDIR%%/modules/setup/library/Setup/Requirement/PhpModuleRequirement.php
 %%WWWDIR%%/modules/setup/library/Setup/Requirement/PhpVersionRequirement.php
+%%WWWDIR%%/modules/setup/library/Setup/Requirement/WebModuleRequirement.php
 %%WWWDIR%%/modules/setup/library/Setup/RequirementSet.php
 %%WWWDIR%%/modules/setup/library/Setup/RequirementsRenderer.php
 %%WWWDIR%%/modules/setup/library/Setup/Setup.php
@@ -2230,6 +2230,7 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/public/css/icinga/main.less
 %%WWWDIR%%/public/css/icinga/menu.less
 %%WWWDIR%%/public/css/icinga/mixins.less
+%%WWWDIR%%/public/css/icinga/modal.less
 %%WWWDIR%%/public/css/icinga/nav.less
 %%WWWDIR%%/public/css/icinga/print.less
 %%WWWDIR%%/public/css/icinga/responsive.less
@@ -2252,6 +2253,7 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/public/font/ifont.woff
 %%WWWDIR%%/public/font/ifont.woff2
 %%WWWDIR%%/public/img/favicon.png
+%%WWWDIR%%/public/img/icinga-loader.gif
 %%WWWDIR%%/public/img/icinga-logo-big-dark.png
 %%WWWDIR%%/public/img/icinga-logo-big-dark.svg
 %%WWWDIR%%/public/img/icinga-logo-big.png
@@ -2372,10 +2374,10 @@ etc/bash_completion.d/icingacli
 %%WWWDIR%%/public/js/icinga/behavior/filtereditor.js
 %%WWWDIR%%/public/js/icinga/behavior/flyover.js
 %%WWWDIR%%/public/js/icinga/behavior/form.js
+%%WWWDIR%%/public/js/icinga/behavior/modal.js
 %%WWWDIR%%/public/js/icinga/behavior/navigation.js
 %%WWWDIR%%/public/js/icinga/behavior/selectable.js
 %%WWWDIR%%/public/js/icinga/behavior/sparkline.js
-%%WWWDIR%%/public/js/icinga/behavior/tristate.js
 %%WWWDIR%%/public/js/icinga/eventlistener.js
 %%WWWDIR%%/public/js/icinga/events.js
 %%WWWDIR%%/public/js/icinga/history.js

More information about the svn-ports-all mailing list