Index: head/net-mgmt/icinga2/Makefile
===================================================================
--- head/net-mgmt/icinga2/Makefile	(revision 400208)
+++ head/net-mgmt/icinga2/Makefile	(revision 400209)
@@ -1,100 +1,100 @@
 # $FreeBSD$
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.10
+DISTVERSION=	2.3.11
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Monitoring and management system for hosts, services and networks
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		libyajl.so:${PORTSDIR}/devel/yajl \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 USES=		alias bison cmake
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_GROUP=		BACKEND
 OPTIONS_GROUP_BACKEND=	MYSQL PGSQL
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 
 OPTIONS_DEFAULT=	MYSQL PGSQL MONPLUGINS
 
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
 MYSQL_CMAKE_ON=	-DICINGA2_WITH_MYSQL:BOOL=true
 PGSQL_CMAKE_ON=	-DICINGA2_WITH_PGSQL:BOOL=true
 
 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 \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \
 		-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \
 
 SUB_LIST=	ICINGA2LOGDIR=${ICINGA2LOGDIR} \
 		ICINGA2USER=${ICINGA2USER} \
 		ICINGA2GROUP=${ICINGA2GROUP} \
 		WWWGRP=${WWWGRP}
 
 PLIST_SUB=	ICINGA2USER=${ICINGA2USER} \
 		ICINGA2GROUP=${ICINGA2GROUP} \
 		WWWGRP=${WWWGRP}
 
 # Config files with references to "Linux"
 LINUX_CONFIG=	groups.conf services.conf hosts.conf
 
 MYSQL_USE=	mysql=yes
 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
 
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	flex>=2.5.31:${PORTSDIR}/textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
 CXXFLAGS+=	-I${LOCALBASE}/include/flex
 .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}/itl -type f -name "*.conf" -exec ${MV} {} {}.sample \;
 	${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \
 		-exec ${MV} {} {}.sample \;
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icinga2/distinfo
===================================================================
--- head/net-mgmt/icinga2/distinfo	(revision 400208)
+++ head/net-mgmt/icinga2/distinfo	(revision 400209)
@@ -1,2 +1,2 @@
-SHA256 (icinga-icinga2-v2.3.10_GH0.tar.gz) = d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1
-SIZE (icinga-icinga2-v2.3.10_GH0.tar.gz) = 830680
+SHA256 (icinga-icinga2-v2.3.11_GH0.tar.gz) = b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152
+SIZE (icinga-icinga2-v2.3.11_GH0.tar.gz) = 843985
Index: head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt
===================================================================
--- head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt	(revision 400208)
+++ head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt	(revision 400209)
@@ -1,10 +1,10 @@
---- itl/plugins-contrib.d/CMakeLists.txt.orig	2015-07-13 22:15:59.084514000 +0200
-+++ itl/plugins-contrib.d/CMakeLists.txt	2015-07-13 22:16:44.501021000 +0200
+--- itl/plugins-contrib.d/CMakeLists.txt.orig	2015-10-19 11:14:40.000000000 +0200
++++ itl/plugins-contrib.d/CMakeLists.txt	2015-10-26 15:42:41.023004000 +0100
 @@ -16,6 +16,6 @@
  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  
  install(
--  FILES databases.conf ipmi.conf network-components.conf operating-system.conf virtualization.conf vmware.conf web.conf
-+  FILES databases.conf.sample ipmi.conf.sample network-components.conf.sample operating-system.conf.sample virtualization.conf.sample vmware.conf.sample web.conf.sample
+-  FILES databases.conf ipmi.conf network-components.conf operating-system.conf virtualization.conf vmware.conf web.conf hardware.conf
++  FILES databases.conf.sample ipmi.conf.sample network-components.conf.sample operating-system.conf.sample virtualization.conf.sample vmware.conf.sample web.conf.sample hardware.conf.sample
    DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include/plugins-contrib.d
  )
Index: head/net-mgmt/icinga2/pkg-plist
===================================================================
--- head/net-mgmt/icinga2/pkg-plist	(revision 400208)
+++ head/net-mgmt/icinga2/pkg-plist	(revision 400209)
@@ -1,134 +1,135 @@
 etc/bash_completion.d/icinga2
 @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/satellite.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/gelf.conf.sample
 @sample %%ETCDIR%%/features-available/graphite.conf.sample
 @sample %%ETCDIR%%/features-available/icingastatus.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/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%%/init.conf.sample
 %%ETCDIR%%/repository.d/README
 @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/libchecker.so
 lib/icinga2/libcli.so
 lib/icinga2/libcompat.so
 lib/icinga2/libconfig.so
 %%DBBACKEND%%lib/icinga2/libdb_ido.so
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
 lib/icinga2/libexecvpe.so
 lib/icinga2/libicinga.so
 lib/icinga2/liblivestatus.so
 lib/icinga2/libmethods.so
 lib/icinga2/libmmatch.so
 lib/icinga2/libnotification.so
 lib/icinga2/libperfdata.so
 lib/icinga2/libremote.so
 lib/icinga2/libsocketpair.so
 man/man8/icinga2.8.gz
 sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%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/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/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/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/3-monitoring-basics.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/4-configuring-icinga-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/8-cli-commands.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/9-monitoring-remote-systems.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
 %%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
 @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.conf.sample
 @sample %%DATADIR%%/include/command.conf.sample
 %%DATADIR%%/include/hangman
 %%DATADIR%%/include/itl
 %%DATADIR%%/include/manubulon
 %%DATADIR%%/include/nscp
 %%DATADIR%%/include/plugins
 %%DATADIR%%/include/plugins-contrib
 @sample %%DATADIR%%/include/plugins-contrib.d/databases.conf.sample
 @sample %%DATADIR%%/include/plugins-contrib.d/ipmi.conf.sample
+@sample %%DATADIR%%/include/plugins-contrib.d/hardware.conf.sample
 @sample %%DATADIR%%/include/plugins-contrib.d/network-components.conf.sample
 @sample %%DATADIR%%/include/plugins-contrib.d/operating-system.conf.sample
 @sample %%DATADIR%%/include/plugins-contrib.d/virtualization.conf.sample
 @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
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/repository
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api
 @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%%) /var/run/icinga2
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/perfdata
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/tmp
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2