net-mgmt/icinga2:

Update to 2.8.2

5 files changed, 27 insertions, 32 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 0d7fa49e69a3..cbc77614c086 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.8.1
+DISTVERSION=	2.8.2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
@@ -26,7 +26,7 @@ USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
-OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_GROUP=		BACKEND
 OPTIONS_GROUP_BACKEND=	MYSQL PGSQL
 OPTIONS_RADIO=		PLUGINS
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index b37aaeb8cbe8..8aaf66f345ae 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516362862
-SHA256 (icinga-icinga2-v2.8.1_GH0.tar.gz) = 83930bf95a5c6562cc31c37ddb01b361665497ef7001e9cc8763fd499a4d709d
-SIZE (icinga-icinga2-v2.8.1_GH0.tar.gz) = 2501182
+TIMESTAMP = 1522240144
+SHA256 (icinga-icinga2-v2.8.2_GH0.tar.gz) = 508820905c86906117a616e90eb16b646007e178621b0df9f27fcaf1a491151c
+SIZE (icinga-icinga2-v2.8.2_GH0.tar.gz) = 2507304
diff --git a/net-mgmt/icinga2/files/patch-CMakeLists.txt b/net-mgmt/icinga2/files/patch-CMakeLists.txt
index 41f771a51cb1..7be455b0d398 100644
--- a/net-mgmt/icinga2/files/patch-CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2017-03-29 09:55:49.000000000 +0200
-+++ CMakeLists.txt	2017-05-30 16:24:26.672731000 +0200
+--- CMakeLists.txt.orig	2018-03-22 10:26:19 UTC
++++ CMakeLists.txt
 @@ -28,8 +28,8 @@ if(NOT CMAKE_BUILD_TYPE)
        FORCE)
  endif()
diff --git a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
index 43557c8f379d..634f9dfcf2d6 100644
--- a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
@@ -1,12 +1,8 @@
---- etc/CMakeLists.txt.orig	2017-11-16 10:44:26.000000000 +0100
-+++ etc/CMakeLists.txt	2017-11-20 17:15:33.564461000 +0100
-@@ -25,42 +25,42 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
-   configure_file(logrotate.d/icinga2.cmake ${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 @ONLY)
+--- etc/CMakeLists.txt.orig	2018-03-22 10:26:19 UTC
++++ etc/CMakeLists.txt
+@@ -24,39 +24,39 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
  endif()
  
--install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
-+install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
- 
  if(NOT WIN32)
 -  install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
 -	install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index aa6b37ae0f70..742609d45632 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -32,45 +32,44 @@ etc/bash_completion.d/icinga2
 %%ETCDIR%%/features-enabled/notification.conf
 @sample %%ETCDIR%%/constants.conf.sample
 @sample %%ETCDIR%%/icinga2.conf.sample
-@sample %%ETCDIR%%/init.conf.sample
 @sample %%ETCDIR%%/scripts/mail-host-notification.sh.sample
 @sample %%ETCDIR%%/scripts/mail-service-notification.sh.sample
 @sample %%ETCDIR%%/zones.conf.sample
 %%ETCDIR%%/zones.d/README
 lib/icinga2/libbase.so
-lib/icinga2/libbase.so.2.8.1
+lib/icinga2/libbase.so.2.8.2
 lib/icinga2/libchecker.so
-lib/icinga2/libchecker.so.2.8.1
+lib/icinga2/libchecker.so.2.8.2
 lib/icinga2/libcli.so
-lib/icinga2/libcli.so.2.8.1
+lib/icinga2/libcli.so.2.8.2
 lib/icinga2/libcompat.so
-lib/icinga2/libcompat.so.2.8.1
+lib/icinga2/libcompat.so.2.8.2
 lib/icinga2/libconfig.so
-lib/icinga2/libconfig.so.2.8.1
+lib/icinga2/libconfig.so.2.8.2
 %%DBBACKEND%%lib/icinga2/libdb_ido.so
-%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.8.1
+%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.8.2
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
-%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.8.1
+%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.8.2
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
-%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.8.1
+%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.8.2
 lib/icinga2/libexecvpe.so
-lib/icinga2/libexecvpe.so.2.8.1
+lib/icinga2/libexecvpe.so.2.8.2
 lib/icinga2/libicinga.so
-lib/icinga2/libicinga.so.2.8.1
+lib/icinga2/libicinga.so.2.8.2
 lib/icinga2/liblivestatus.so
-lib/icinga2/liblivestatus.so.2.8.1
+lib/icinga2/liblivestatus.so.2.8.2
 lib/icinga2/libmethods.so
-lib/icinga2/libmethods.so.2.8.1
+lib/icinga2/libmethods.so.2.8.2
 lib/icinga2/libmmatch.so
-lib/icinga2/libmmatch.so.2.8.1
+lib/icinga2/libmmatch.so.2.8.2
 lib/icinga2/libnotification.so
-lib/icinga2/libnotification.so.2.8.1
+lib/icinga2/libnotification.so.2.8.2
 lib/icinga2/libperfdata.so
-lib/icinga2/libperfdata.so.2.8.1
+lib/icinga2/libperfdata.so.2.8.2
 lib/icinga2/libremote.so
-lib/icinga2/libremote.so.2.8.1
+lib/icinga2/libremote.so.2.8.2
 lib/icinga2/libsocketpair.so
-lib/icinga2/libsocketpair.so.2.8.1
+lib/icinga2/libsocketpair.so.2.8.2
 lib/icinga2/sbin/icinga2
 libexec/nagios/check_nscp_api
 man/man8/icinga2.8.gz