Index: head/net-mgmt/icinga2/Makefile
===================================================================
--- head/net-mgmt/icinga2/Makefile	(revision 545095)
+++ head/net-mgmt/icinga2/Makefile	(revision 545096)
@@ -1,108 +1,108 @@
 # $FreeBSD$
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.11.3
+DISTVERSION=	2.12.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Monitoring and management system for hosts, services and networks
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		alias bison cmake:insource compiler:c++0x libedit ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES UNITY
 OPTIONS_GROUP=		BACKEND
 OPTIONS_GROUP_BACKEND=	MYSQL PGSQL
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 
-OPTIONS_DEFAULT=	MYSQL PGSQL MONPLUGINS UNITY
+OPTIONS_DEFAULT=	MONPLUGINS MYSQL PGSQL UNITY
 
-UNITY_DESC=		Use icinga unity build system (faster, memory intensive)
+UNITY_DESC=	Use icinga unity build system (faster, memory intensive)
 
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
-MYSQL_CMAKE_ON=	-DICINGA2_WITH_MYSQL:BOOL=true
-PGSQL_CMAKE_ON=	-DICINGA2_WITH_PGSQL:BOOL=true
+MYSQL_CMAKE_ON=		-DICINGA2_WITH_MYSQL:BOOL=true
+PGSQL_CMAKE_ON=		-DICINGA2_WITH_PGSQL:BOOL=true
 UNITY_CMAKE_OFF=	-DICINGA2_UNITY_BUILD=OFF
 
 ICINGA2USER?=	icinga
 ICINGA2GROUP?=	icinga
 USERS=		${ICINGA2USER}
 GROUPS=		${ICINGA2GROUP}
 
 LOCALSTATEDIR?=	/var
 ICINGA2LOGDIR?=	/var/log/${PORTNAME}
 
-CMAKE_ARGS+=	-DICINGA2_USER=${ICINGA2USER} \
-		-DICINGA2_GROUP=${ICINGA2GROUP} \
-		-DICINGA2_COMMAND_USER=${ICINGA2USER} \
-		-DICINGA2_COMMAND_GROUP=${ICINGA2USER} \
-		-DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \
-		-DICINGA2_RUNDIR=/var/run \
-		-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \
+CMAKE_ARGS+=	-DCMAKE_EXE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \
 		-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \
-		-DCMAKE_EXE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
+		-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \
 		-DCMAKE_MODULE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
 		-DCMAKE_SHARED_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
-		-DCMAKE_STATIC_LINKER_FLAGS=${PREFIX}/lib/icinga2
+		-DCMAKE_STATIC_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
+		-DICINGA2_COMMAND_GROUP=${ICINGA2USER} \
+		-DICINGA2_COMMAND_USER=${ICINGA2USER} \
+		-DICINGA2_GROUP=${ICINGA2GROUP} \
+		-DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \
+		-DICINGA2_RUNDIR=/var/run \
+		-DICINGA2_USER=${ICINGA2USER}
 
-SUB_LIST=	ICINGA2LOGDIR=${ICINGA2LOGDIR} \
+SUB_LIST=	ICINGA2GROUP=${ICINGA2GROUP} \
+		ICINGA2LOGDIR=${ICINGA2LOGDIR} \
 		ICINGA2USER=${ICINGA2USER} \
-		ICINGA2GROUP=${ICINGA2GROUP} \
 		WWWGRP=${WWWGRP}
 
-PLIST_SUB=	ICINGA2USER=${ICINGA2USER} \
-		ICINGA2GROUP=${ICINGA2GROUP} \
+PLIST_SUB=	ICINGA2GROUP=${ICINGA2GROUP} \
+		ICINGA2USER=${ICINGA2USER} \
 		WWWGRP=${WWWGRP}
 
-SUB_FILES=	pkg-message ${PORTNAME}-newsyslog.conf
+SUB_FILES=	${PORTNAME}-newsyslog.conf pkg-message
 
 # Config files with references to "Linux"
 LINUX_CONFIG=	groups.conf services.conf hosts.conf
 
 MYSQL_USES=	mysql
 PGSQL_USES=	pgsql
 
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
 PLIST_SUB+=	DBBACKEND="@comment "
 .else
 PLIST_SUB+=	DBBACKEND=""
 .endif
 
 post-patch:
 .for f in ${LINUX_CONFIG}
 	${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f}
 .endfor
 
 pre-install:
 	${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \;
 	${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \
 		-exec ${MV} {} {}.sample \;
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/newsyslog/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-newsyslog.conf ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME}.conf
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	(cd ${WRKSRC}/tools/syntax/vim && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles)
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icinga2/distinfo
===================================================================
--- head/net-mgmt/icinga2/distinfo	(revision 545095)
+++ head/net-mgmt/icinga2/distinfo	(revision 545096)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588188729
-SHA256 (icinga-icinga2-v2.11.3_GH0.tar.gz) = 03c46c9af9cb8763ec02428f87a38ab3d7876f56cc10dc5eac5bda0c182f6a76
-SIZE (icinga-icinga2-v2.11.3_GH0.tar.gz) = 7475785
+TIMESTAMP = 1597091051
+SHA256 (icinga-icinga2-v2.12.0_GH0.tar.gz) = 47b409755ded2752a13c3f5fd62dab0411c3e1069653b3c099e8276528d96f7c
+SIZE (icinga-icinga2-v2.12.0_GH0.tar.gz) = 7530104
Index: head/net-mgmt/icinga2/files/patch-CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-CMakeLists.txt	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-CMakeLists.txt	(revision 545096)
@@ -1,26 +1,26 @@
---- CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
+--- CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
 +++ CMakeLists.txt
-@@ -28,8 +28,8 @@ if(NOT CMAKE_BUILD_TYPE)
+@@ -13,8 +13,8 @@ if(NOT CMAKE_BUILD_TYPE)
      FORCE)
  endif()
  
 -option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON)
 -option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON)
 +option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" OFF)
 +option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" OFF)
  option(ICINGA2_WITH_CHECKER "Build the checker module" ON)
  option(ICINGA2_WITH_COMPAT "Build the compat module" ON)
  option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ON)
-@@ -241,6 +241,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+@@ -260,6 +260,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -pthread")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pthread")
    endif()
- endif()
- 
++endif()
++
 +if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD.*")
 +    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lexecinfo")
 +    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lexecinfo")
 +    set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lexecinfo")
-+endif()
-+
- include(CheckCXXCompilerFlag)
+ endif()
  
- function(check_cxx_linker_flag flag var)
+ include(CheckCXXCompilerFlag)
Index: head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf
===================================================================
--- head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf	(revision 545096)
@@ -1,13 +1,13 @@
---- itl/command-plugins.conf.orig	2018-10-11 12:01:05 UTC
+--- itl/command-plugins.conf.orig	2020-08-03 13:43:47 UTC
 +++ itl/command-plugins.conf
-@@ -1628,6 +1628,10 @@ object CheckCommand "procs" {
+@@ -1616,6 +1616,10 @@ object CheckCommand "procs" {
  			set_if = "$procs_nokthreads$"
  			description = "Only scan for non kernel threads"
  		}
 +		"-j" = {
 +			value = "$procs_jid$"
 +			description = "Only scan for processes within that jail ID"
 +		}
  	}
  
  	vars.procs_traditional = false
Index: head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt	(revision 545096)
@@ -1,11 +1,11 @@
---- lib/checker/CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
+--- lib/checker/CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
 +++ lib/checker/CMakeLists.txt
-@@ -35,7 +35,7 @@ set_target_properties (
+@@ -20,7 +20,7 @@ set_target_properties (
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/checker.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/checker.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
Index: head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt	(revision 545096)
@@ -1,23 +1,23 @@
---- lib/compat/CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
+--- lib/compat/CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
 +++ lib/compat/CMakeLists.txt
-@@ -41,17 +41,17 @@ set_target_properties (
+@@ -26,17 +26,17 @@ set_target_properties (
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/command.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/command.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/compatlog.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/compatlog.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
Index: head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt	(revision 545096)
@@ -1,11 +1,11 @@
---- lib/db_ido_mysql/CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
+--- lib/db_ido_mysql/CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
 +++ lib/db_ido_mysql/CMakeLists.txt
-@@ -37,7 +37,7 @@ set_target_properties (
+@@ -22,7 +22,7 @@ set_target_properties (
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-mysql.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-mysql.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
Index: head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt	(revision 545096)
@@ -1,11 +1,11 @@
---- lib/db_ido_pgsql/CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
+--- lib/db_ido_pgsql/CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
 +++ lib/db_ido_pgsql/CMakeLists.txt
-@@ -37,7 +37,7 @@ set_target_properties (
+@@ -22,7 +22,7 @@ set_target_properties (
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-pgsql.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-pgsql.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
Index: head/net-mgmt/icinga2/files/patch-lib_icingadb_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-lib_icingadb_CMakeLists.txt	(nonexistent)
+++ head/net-mgmt/icinga2/files/patch-lib_icingadb_CMakeLists.txt	(revision 545096)
@@ -0,0 +1,11 @@
+--- lib/icingadb/CMakeLists.txt.orig	2020-08-16 09:41:13 UTC
++++ lib/icingadb/CMakeLists.txt
+@@ -22,7 +22,7 @@ set_target_properties (
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/icingadb.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/icingadb.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 

Property changes on: head/net-mgmt/icinga2/files/patch-lib_icingadb_CMakeLists.txt
___________________________________________________________________
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/icinga2/files/patch-lib_livestatus_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt	(revision 545096)
@@ -1,11 +1,11 @@
---- lib/livestatus/CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
+--- lib/livestatus/CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
 +++ lib/livestatus/CMakeLists.txt
-@@ -71,7 +71,7 @@ set_target_properties (
+@@ -56,7 +56,7 @@ set_target_properties (
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/livestatus.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/livestatus.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
Index: head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt	(revision 545096)
@@ -1,11 +1,11 @@
---- lib/notification/CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
+--- lib/notification/CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
 +++ lib/notification/CMakeLists.txt
-@@ -35,7 +35,7 @@ set_target_properties (
+@@ -20,7 +20,7 @@ set_target_properties (
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/notification.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/notification.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
Index: head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt	(revision 545095)
+++ head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt	(revision 545096)
@@ -1,41 +1,41 @@
---- lib/perfdata/CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
+--- lib/perfdata/CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
 +++ lib/perfdata/CMakeLists.txt
-@@ -45,32 +45,32 @@ set_target_properties (
+@@ -30,32 +30,32 @@ set_target_properties (
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/gelf.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/gelf.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/graphite.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/graphite.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/elasticsearch.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/elasticsearch.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/opentsdb.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/opentsdb.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
  install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/perfdata.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/perfdata.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
  )
  
Index: head/net-mgmt/icinga2/pkg-plist
===================================================================
--- head/net-mgmt/icinga2/pkg-plist	(revision 545095)
+++ head/net-mgmt/icinga2/pkg-plist	(revision 545096)
@@ -1,201 +1,204 @@
 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
 @sample %%ETCDIR%%/conf.d/hosts.conf.sample
 @sample %%ETCDIR%%/conf.d/notifications.conf.sample
 @sample %%ETCDIR%%/conf.d/services.conf.sample
 @sample %%ETCDIR%%/conf.d/templates.conf.sample
 @sample %%ETCDIR%%/conf.d/timeperiods.conf.sample
 @sample %%ETCDIR%%/conf.d/users.conf.sample
 @sample %%ETCDIR%%/constants.conf.sample
 @sample %%ETCDIR%%/features-available/api.conf.sample
 @sample %%ETCDIR%%/features-available/checker.conf.sample
 @sample %%ETCDIR%%/features-available/command.conf.sample
 @sample %%ETCDIR%%/features-available/compatlog.conf.sample
 @sample %%ETCDIR%%/features-available/debuglog.conf.sample
 @sample %%ETCDIR%%/features-available/elasticsearch.conf.sample
 @sample %%ETCDIR%%/features-available/gelf.conf.sample
 @sample %%ETCDIR%%/features-available/graphite.conf.sample
+@sample %%ETCDIR%%/features-available/icingadb.conf.sample
 %%MYSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample
 %%PGSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-pgsql.conf.sample
 @sample %%ETCDIR%%/features-available/influxdb.conf.sample
 @sample %%ETCDIR%%/features-available/livestatus.conf.sample
 @sample %%ETCDIR%%/features-available/mainlog.conf.sample
 @sample %%ETCDIR%%/features-available/notification.conf.sample
 @sample %%ETCDIR%%/features-available/opentsdb.conf.sample
 @sample %%ETCDIR%%/features-available/perfdata.conf.sample
 @sample %%ETCDIR%%/features-available/statusdata.conf.sample
 @sample %%ETCDIR%%/features-available/syslog.conf.sample
 %%ETCDIR%%/features-enabled/checker.conf
 %%ETCDIR%%/features-enabled/mainlog.conf
 %%ETCDIR%%/features-enabled/notification.conf
 @sample %%ETCDIR%%/icinga2.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
 %%MYSQL%%lib/icinga2/libmysql_shim.so
-%%MYSQL%%lib/icinga2/libmysql_shim.so.2.11.3
+%%MYSQL%%lib/icinga2/libmysql_shim.so.2.12.0
 %%PGSQL%%lib/icinga2/libpgsql_shim.so
-%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.11.3
+%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.12.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%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/01-about.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/02-installation.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/03-monitoring-basics.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/04-configuration.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
 %%PORTDOCS%%%%DOCSDIR%%/markdown/13-addons.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/14-features.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/15-troubleshooting.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/16-upgrading-icinga-2.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/17-language-reference.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/18-library-reference.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/19-technical-concepts.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/20-script-debugger.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/21-development.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/22-selinux.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/23-migrating-from-icinga-1x.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/24-appendix.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/dashing_icinga2.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icinga_certificate_monitoring.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icinga_reporting.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_businessprocess.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_grafana.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_graphite.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_maps.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/flapping-state-graph.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icinga2_external_checks_freshness_icingaweb2.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icingaweb2_downtime_handled.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/api/icinga2_api_powershell_ise.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/configuration/icinga_web_local_server.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_boost_build_dev_cmd.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_builds_gitlab_pipeline.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_powershell_posh_git.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_01.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_02.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_03.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_tabs_c++.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_agent_checks_command_endpoint.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_endpoints.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_roles.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_satellite_config_sync.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenario_ha_masters_with_agents.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenarios_master_satellites_agents.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenarios_master_with_agents.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_zones.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_client_disk_icingaweb2.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_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_02_global_zone.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_finish_no_ticket.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_with_ticket.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/installation/mariadb-centos7.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/installation/nano-syntax.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/installation/postgr-import-ido.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/installation/vim-syntax.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsyslog/icinga2.conf
 %%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.11.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
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.5.0.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.6.0.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.0.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.1.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
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.5.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.6.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.1.sql
 %%DATADIR%%/include/command-icinga.conf
 %%DATADIR%%/include/command-nscp-local.conf
 %%DATADIR%%/include/command-plugins-manubulon.conf
 %%DATADIR%%/include/command-plugins-windows.conf
 %%DATADIR%%/include/command-plugins.conf
 %%DATADIR%%/include/hangman
 %%DATADIR%%/include/itl
 %%DATADIR%%/include/manubulon
 %%DATADIR%%/include/nscp
 %%DATADIR%%/include/plugins
 %%DATADIR%%/include/plugins-contrib
 %%DATADIR%%/include/plugins-contrib.d/big-data.conf
 %%DATADIR%%/include/plugins-contrib.d/databases.conf
 %%DATADIR%%/include/plugins-contrib.d/hardware.conf
 %%DATADIR%%/include/plugins-contrib.d/icingacli.conf
 %%DATADIR%%/include/plugins-contrib.d/ipmi.conf
 %%DATADIR%%/include/plugins-contrib.d/logmanagement.conf
 %%DATADIR%%/include/plugins-contrib.d/metrics.conf
 %%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
 %%DATADIR%%/include/plugins-contrib.d/web.conf
 %%DATADIR%%/include/windows-plugins
 share/vim/vimfiles/ftdetect/icinga2.vim
 share/vim/vimfiles/syntax/icinga2.vim
+@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) %%ETCDIR%%
+@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) %%ETCDIR%%/conf.d
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) %%ETCDIR%%/features-enabled
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones-stage
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certificate-requests
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certs
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2
 @dir /var/lib
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat/archives
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/crash
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2
 @dir(%%ICINGA2USER%%,%%WWWGRP%%,2750) /var/run/icinga2/cmd
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0775) /var/run/icinga2
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/perfdata
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/tmp
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0775) /var/spool/icinga2