4 files changed, 31 insertions, 24 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 4e4169bf94da..b0f2da20197a 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.11
+DISTVERSION=	2.4.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index c66f22243be6..659f69f9298a 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icinga-icinga2-v2.3.11_GH0.tar.gz) = b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152
-SIZE (icinga-icinga2-v2.3.11_GH0.tar.gz) = 843985
+SHA256 (icinga-icinga2-v2.4.0_GH0.tar.gz) = 928d6bfb64078ed4d8223a4b3db67ee8d8fb9d0065a43a10642b628181c52605
+SIZE (icinga-icinga2-v2.4.0_GH0.tar.gz) = 1338579
diff --git a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
index 942fcede3cd9..780aa6432dc5 100644
--- a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
@@ -1,6 +1,6 @@
---- etc/CMakeLists.txt.orig	2015-07-08 10:17:44.000000000 +0200
-+++ etc/CMakeLists.txt	2015-07-13 22:06:31.230363000 +0200
-@@ -26,43 +26,43 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
+--- etc/CMakeLists.txt.orig	2015-11-16 10:57:03.000000000 +0100
++++ etc/CMakeLists.txt	2015-11-16 15:20:49.216643000 +0100
+@@ -26,44 +26,44 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
    configure_file(logrotate.d/icinga2.cmake ${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 @ONLY)
  endif()
  
@@ -18,10 +18,12 @@
  endif()
  
 -install_if_not_exists(icinga2/zones.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
+-install_if_not_exists(icinga2/conf.d/app.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 -install_if_not_exists(icinga2/conf.d/commands.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 -install_if_not_exists(icinga2/conf.d/downtimes.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 -install_if_not_exists(icinga2/conf.d/groups.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 +install_if_not_exists(icinga2/zones.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
++install_if_not_exists(icinga2/conf.d/app.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 +install_if_not_exists(icinga2/conf.d/commands.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 +install_if_not_exists(icinga2/conf.d/downtimes.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 +install_if_not_exists(icinga2/conf.d/groups.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
@@ -60,8 +62,8 @@
  endif()
 -install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
 -install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
-+ install_if_not_exists(icinga2/scripts/mail-host-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
-+ install_if_not_exists(icinga2/scripts/mail-service-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
++install_if_not_exists(icinga2/scripts/mail-host-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
++install_if_not_exists(icinga2/scripts/mail-service-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
  install_if_not_exists(icinga2/zones.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/zones.d)
  install_if_not_exists(icinga2/repository.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/repository.d)
  
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 6717b6157050..0d3f22da4539 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -1,4 +1,5 @@
 etc/bash_completion.d/icinga2
+@sample %%ETCDIR%%/conf.d/app.conf.sample
 @sample %%ETCDIR%%/conf.d/commands.conf.sample
 @sample %%ETCDIR%%/conf.d/downtimes.conf.sample
 @sample %%ETCDIR%%/conf.d/groups.conf.sample
@@ -37,6 +38,7 @@ etc/bash_completion.d/icinga2
 @sample %%ETCDIR%%/scripts/mail-service-notification.sh.sample
 @sample %%ETCDIR%%/zones.conf.sample
 %%ETCDIR%%/zones.d/README
+lib/icinga2/sbin/icinga2
 lib/icinga2/libbase.so
 lib/icinga2/libchecker.so
 lib/icinga2/libcli.so
@@ -63,40 +65,44 @@ sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/1-about.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/10-icinga2-client.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/11-agent-based-checks.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/12-distributed-monitoring-ha.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/13-addons-plugins.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/14-alternative-frontends.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/15-livestatus.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/10-monitoring-remote-systems.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/11-%%ICINGA2USER%%2-client.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/12-agent-based-checks.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/13-distributed-monitoring-ha.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/14-addons-plugins.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/15-features.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/16-troubleshooting.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/17-upgrading-icinga-2.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/18-migrating-from-icinga-1x.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/19-language-reference.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/17-upgrading-%%ICINGA2USER%%-2.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/18-language-reference.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/19-library-reference.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/2-getting-started.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/20-library-reference.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/21-debug.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/22-appendix.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/20-script-debugger.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/21-development.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/22-migrating-from-%%ICINGA2USER%%-1x.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/23-appendix.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/3-monitoring-basics.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/4-configuring-icinga-2.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/4-configuring-%%ICINGA2USER%%-2.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/5-advanced-topics.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/6-object-types.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/7-icinga-template-library.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/7-%%ICINGA2USER%%-template-library.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/8-cli-commands.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/9-monitoring-remote-systems.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/9-icinga2-api.md
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/mysql.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.3.0.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.4.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/pgsql.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.3.0.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.4.0.sql
 @sample %%DATADIR%%/include/command-icinga.conf.sample
 @sample %%DATADIR%%/include/command-nscp-local.conf.sample
 @sample %%DATADIR%%/include/command-plugins-manubulon.conf.sample
+@sample %%DATADIR%%/include/command-plugins-windows.conf.sample
 @sample %%DATADIR%%/include/command-plugins.conf.sample
 @sample %%DATADIR%%/include/command.conf.sample
 %%DATADIR%%/include/hangman
@@ -114,7 +120,6 @@ sbin/icinga2
 @sample %%DATADIR%%/include/plugins-contrib.d/vmware.conf.sample
 @sample %%DATADIR%%/include/plugins-contrib.d/web.conf.sample
 @sample %%DATADIR%%/include/timeperiod.conf.sample
-@sample %%DATADIR%%/include/command-plugins-windows.conf.sample
 %%DATADIR%%/include/windows-plugins
 @dir %%ETCDIR%%/pki
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2