3 files changed, 75 insertions, 33 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 4e1e5e3e7cfd..a88b44774681 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.6.3
-PORTREVISION=	2
+DISTVERSION=	2.7.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
@@ -18,10 +17,11 @@ RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 BROKEN_powerpc64=	does not build: Your version of GCC (4.2.1) is too old for building Icinga 2 (GCC >= 4.6.0)
 
+USES=		alias bison cmake execinfo libedit
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
-USES=		alias bison cmake execinfo libedit
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index a32b76fe6bd7..a6fde99f448c 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490879205
-SHA256 (icinga-icinga2-v2.6.3_GH0.tar.gz) = 83d44871a70d1b368b1af717873ff9b1b185344d23fc79b83118e47a85da6d90
-SIZE (icinga-icinga2-v2.6.3_GH0.tar.gz) = 2360602
+TIMESTAMP = 1501690207
+SHA256 (icinga-icinga2-v2.7.0_GH0.tar.gz) = 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980
+SIZE (icinga-icinga2-v2.7.0_GH0.tar.gz) = 2435398
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 87efedda3ab3..fbdd95035440 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -39,49 +39,58 @@ etc/bash_completion.d/icinga2
 @sample %%ETCDIR%%/zones.conf.sample
 %%ETCDIR%%/zones.d/README
 lib/icinga2/libbase.so
-lib/icinga2/libbase.so.2.6.3
+lib/icinga2/libbase.so.2.7.0
 lib/icinga2/libchecker.so
-lib/icinga2/libchecker.so.2.6.3
+lib/icinga2/libchecker.so.2.7.0
 lib/icinga2/libcli.so
-lib/icinga2/libcli.so.2.6.3
+lib/icinga2/libcli.so.2.7.0
 lib/icinga2/libcompat.so
-lib/icinga2/libcompat.so.2.6.3
+lib/icinga2/libcompat.so.2.7.0
 lib/icinga2/libconfig.so
-lib/icinga2/libconfig.so.2.6.3
+lib/icinga2/libconfig.so.2.7.0
 %%DBBACKEND%%lib/icinga2/libdb_ido.so
-%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.6.3
+%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.7.0
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
-%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.6.3
+%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.7.0
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
-%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.6.3
+%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.7.0
 lib/icinga2/libexecvpe.so
-lib/icinga2/libexecvpe.so.2.6.3
+lib/icinga2/libexecvpe.so.2.7.0
 lib/icinga2/libicinga.so
-lib/icinga2/libicinga.so.2.6.3
+lib/icinga2/libicinga.so.2.7.0
 lib/icinga2/liblivestatus.so
-lib/icinga2/liblivestatus.so.2.6.3
+lib/icinga2/liblivestatus.so.2.7.0
 lib/icinga2/libmethods.so
-lib/icinga2/libmethods.so.2.6.3
+lib/icinga2/libmethods.so.2.7.0
 lib/icinga2/libmmatch.so
-lib/icinga2/libmmatch.so.2.6.3
+lib/icinga2/libmmatch.so.2.7.0
 lib/icinga2/libnotification.so
-lib/icinga2/libnotification.so.2.6.3
+lib/icinga2/libnotification.so.2.7.0
 lib/icinga2/libperfdata.so
-lib/icinga2/libperfdata.so.2.6.3
+lib/icinga2/libperfdata.so.2.7.0
 lib/icinga2/libremote.so
-lib/icinga2/libremote.so.2.6.3
+lib/icinga2/libremote.so.2.7.0
 lib/icinga2/libsocketpair.so
-lib/icinga2/libsocketpair.so.2.6.3
+lib/icinga2/libsocketpair.so.2.7.0
 lib/icinga2/sbin/icinga2
+libexec/nagios/check_nscp_api
 man/man8/icinga2.8.gz
 sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.Exceptions
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/1-about.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/01-about.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/02-getting-started.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/03-monitoring-basics.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/04-configuring-icinga-2.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/05-service-monitoring.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/06-distributed-monitoring.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/07-agent-based-monitoring.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/08-advanced-topics.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/09-object-types.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/10-icinga-template-library.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/11-cli-commands.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/12-icinga2-api.md
@@ -92,18 +101,49 @@ sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/markdown/17-language-reference.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/18-library-reference.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/19-script-debugger.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/2-getting-started.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/20-development.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/21-selinux.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/22-migrating-from-icinga-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/5-service-monitoring.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/6-distributed-monitoring.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/7-agent-based-monitoring.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/8-advanced-topics.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/9-object-types.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_bottom_up.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_endpoints.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_roles.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_ha_master_clients.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_clients.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_satellite_client.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_top_down_command_endpoint.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_top_down_config_sync.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_client_disk_icingaweb2.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_api_drivesize_icingaweb2.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_counter_icingaweb2.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_zones.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_cmd_admin_net_start_stop.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_running_service.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_01.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_02.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_03.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_04.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_05.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_04.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/mariadb-centos7.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/nano-syntax.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/postgr-import-ido.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/vim-syntax.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/icinga2-api/icinga2_api_icinga_studio_connect.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/icinga2-api/icinga2_api_icinga_studio_overview.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsyslog/icinga2
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/mysql.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql
@@ -141,6 +181,8 @@ sbin/icinga2
 %%DATADIR%%/include/plugins-contrib.d/network-components.conf
 %%DATADIR%%/include/plugins-contrib.d/network-services.conf
 %%DATADIR%%/include/plugins-contrib.d/operating-system.conf
+%%DATADIR%%/include/plugins-contrib.d/raid-controller.conf
+%%DATADIR%%/include/plugins-contrib.d/smart-attributes.conf
 %%DATADIR%%/include/plugins-contrib.d/storage.conf
 %%DATADIR%%/include/plugins-contrib.d/virtualization.conf
 %%DATADIR%%/include/plugins-contrib.d/vmware.conf