3 files changed, 51 insertions, 46 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index d6daa07c6bb5..041df32299d1 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	icinga2
-DISTVERSION=	2.0.1
-PORTREVISION=	1
+DISTVERSION=	2.1.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/
 
@@ -11,11 +10,12 @@ COMMENT=	Monitoring and management system for hosts, services and networks
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
 LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
-USES=		bison cmake
+USES=		bison cmake python
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
@@ -46,6 +46,7 @@ CMAKE_ARGS+=	-DICINGA2_USER=${ICINGA2USER} \
 		-DICINGA2_GROUP=${ICINGA2GROUP} \
 		-DICINGA2_COMMAND_USER=${ICINGA2USER} \
 		-DICINGA2_COMMAND_GROUP=${ICINGA2USER} \
+		-DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \
 		-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \
 		-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \
@@ -83,8 +84,6 @@ PLIST_SUB+=	PGSQL="@comment "
 post-patch:
 	${REINPLACE_CMD} -e '/^add_subdirectory(initsystem)/d' \
 	                 -e '/logrotate\.d/d' ${WRKSRC}/etc/CMakeLists.txt
-	${REINPLACE_CMD} 's,/usr/lib/nagios/plugins,${LOCALBASE}/libexec/nagios,g' \
-	                 ${WRKSRC}/etc/icinga2/constants.conf
 .for f in ${LINUX_CONFIG}
 	${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f}
 .endfor
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index 9c0906457581..b874d9d864b3 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icinga2-2.0.1.tar.gz) = 7076ce1781454884b5b922cd7c0f1e7bf146435a7f3e49b2cc5887df28e179e5
-SIZE (icinga2-2.0.1.tar.gz) = 538638
+SHA256 (icinga2-2.1.1.tar.gz) = 57755272a32f6286632f07153225bb066cae07affe8731d4628cef7695de74a2
+SIZE (icinga2-2.1.1.tar.gz) = 574595
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 677c69a9a496..aeb0baae32d1 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -60,23 +60,35 @@ lib/icinga2/libmmatch.so
 lib/icinga2/libnotification.so
 lib/icinga2/libperfdata.so
 lib/icinga2/libremote.so
-man/man8/icinga2-build-ca.8.gz
-man/man8/icinga2-build-key.8.gz
-man/man8/icinga2-disable-feature.8.gz
-man/man8/icinga2-enable-feature.8.gz
-man/man8/icinga2-prepare-dirs.8.gz
-man/man8/icinga2-sign-key.8.gz
-man/man8/icinga2.8.gz
+%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/entry_points.txt
+%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/icinga2/__init__.py
+%%PYTHON_SITELIBDIR%%/icinga2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/icinga2/commands/__init__.py
+%%PYTHON_SITELIBDIR%%/icinga2/commands/__init__.pyc
+%%PYTHON_SITELIBDIR%%/icinga2/commands/list_objects.py
+%%PYTHON_SITELIBDIR%%/icinga2/commands/list_objects.pyc
+%%PYTHON_SITELIBDIR%%/icinga2/config.py
+%%PYTHON_SITELIBDIR%%/icinga2/config.pyc
+%%PYTHON_SITELIBDIR%%/icinga2/utils/__init__.py
+%%PYTHON_SITELIBDIR%%/icinga2/utils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/icinga2/utils/debug.py
+%%PYTHON_SITELIBDIR%%/icinga2/utils/debug.pyc
+%%PYTHON_SITELIBDIR%%/icinga2/utils/netstring.py
+%%PYTHON_SITELIBDIR%%/icinga2/utils/netstring.pyc
 sbin/icinga2
 sbin/icinga2-disable-feature
 sbin/icinga2-enable-feature
+sbin/icinga2-list-objects
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.Exceptions
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/1-about.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/2-getting-started.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/3-monitoring-basics.md
@@ -87,42 +99,36 @@ sbin/icinga2-enable-feature
 %%PORTDOCS%%%%DOCSDIR%%/markdown/8-migration.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/9-appendix.md
 %%DATADIR%%/include/command-icinga.conf
+%%DATADIR%%/include/command-plugins-manubulon.conf
 %%DATADIR%%/include/command-plugins.conf
 %%DATADIR%%/include/command.conf
 %%DATADIR%%/include/itl
+%%DATADIR%%/include/manubulon
 %%DATADIR%%/include/plugins
 %%DATADIR%%/include/timeperiod.conf
 %%DATADIR%%/pki/openssl-quiet.cnf
 %%DATADIR%%/pki/openssl.cnf
 %%DATADIR%%/pki/pkifuncs
 %%DATADIR%%/pki/vars
-@dirrmtry %%ETCDIR%%/conf.d/hosts/localhost
-@dirrmtry %%ETCDIR%%/conf.d/hosts
-@dirrmtry %%ETCDIR%%/conf.d
-@dirrmtry %%ETCDIR%%/features-available
-@dirrmtry %%ETCDIR%%/features-enabled
-@dirrmtry %%ETCDIR%%/pki
-@dirrmtry %%ETCDIR%%/scripts
-@dirrmtry %%ETCDIR%%/zones.d
-@dirrmtry %%ETCDIR%%
-@dirrmtry lib/icinga2
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/markdown
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/include
-@dirrmtry %%DATADIR%%/pki
-@dirrmtry %%DATADIR%%
-@unexec rmdir "/var/cache/icinga2" >/dev/null 2>&1 || :
-@unexec rmdir "/var/lib/icinga2/api/log" >/dev/null 2>&1 || :
-@unexec rmdir "/var/lib/icinga2/api/repository" >/dev/null 2>&1 || :
-@unexec rmdir "/var/lib/icinga2/api/zones" >/dev/null 2>&1 || :
-@unexec rmdir "/var/lib/icinga2/api" >/dev/null 2>&1 || :
-@unexec rmdir "/var/lib/icinga2" >/dev/null 2>&1 || :
-@unexec rmdir "/var/lib" >/dev/null 2>&1 || :
-@unexec rmdir "/var/log/icinga2/compat/archives" >/dev/null 2>&1 || :
-@unexec rmdir "/var/log/icinga2/compat" >/dev/null 2>&1 || :
-@unexec rmdir "/var/log/icinga2" >/dev/null 2>&1 || :
-@unexec rmdir "/var/run/icinga2/cmd" >/dev/null 2>&1 || :
-@unexec rmdir "/var/run/icinga2" >/dev/null 2>&1 || :
-@unexec rmdir "/var/spool/icinga2/perfdata" >/dev/null 2>&1 || :
-@unexec rmdir "/var/spool/icinga2/tmp" >/dev/null 2>&1 || :
-@unexec rmdir "/var/spool/icinga2" >/dev/null 2>&1 || :
+share/man/man8/icinga2-build-ca.8
+share/man/man8/icinga2-build-key.8
+share/man/man8/icinga2-disable-feature.8
+share/man/man8/icinga2-enable-feature.8
+share/man/man8/icinga2-prepare-dirs.8
+share/man/man8/icinga2-sign-key.8
+share/man/man8/icinga2.8
+@dir /var/cache/icinga2
+@dir /var/lib/icinga2/api/log
+@dir /var/lib/icinga2/api/repository
+@dir /var/lib/icinga2/api/zones
+@dir /var/lib/icinga2/api
+@dir /var/lib/icinga2
+@dir /var/lib
+@dir /var/log/icinga2/compat/archives
+@dir /var/log/icinga2/compat
+@dir /var/log/icinga2
+@dir /var/run/icinga2/cmd
+@dir /var/run/icinga2
+@dir /var/spool/icinga2/perfdata
+@dir /var/spool/icinga2/tmp
+@dir /var/spool/icinga2