13 files changed, 349 insertions, 110 deletions

diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index 265fd8292b92..5c3523894970 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icinga
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
@@ -24,10 +23,13 @@ USE_PERL5_BUILD=	yes
 USE_AUTOTOOLS=	autoconf libltdl
 USE_RC_SUBR=	icinga
 
-OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8.0+]" off \
+OPTIONS=	EMBEDDED_PERL "Enable embedded Perl" on \
 		NANOSLEEP "Use nanosleep in event timing" off \
-		EVENT_BROKER "Enable event broker functionality" off \
 		UNHANDLED_HACK "Display passive checks in unhandled queries" off \
+		IDOUTILS "Enable IDOUtils" on \
+		MYSQL "Depend on MySQL" off \
+		PGSQL "Depend on PostgreSQL" off \
+		APACHE "Depend on Apache and install webconfig" off
 
 GNU_CONFIGURE=	yes
 
@@ -59,16 +61,15 @@ CONFIGURE_ARGS=	--with-command-user=${ICINGAUSER} \
 		--datadir=${PREFIX}/${ICINGAWWWDIR} \
 		--sysconfdir=${PREFIX}/etc/icinga \
 		--localstatedir=${ICINGADIR} \
-		--with-httpd-conf=${PREFIX}/etc \
 		--with-checkresult-dir=${ICINGADIR}/checkresults \
-		--disable-statuswrl
+		--enable-event-broker
 
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		PERL=${PERL}
 
 MAKE_JOBS_UNSAFE=	yes
 
-INSTALL_TARGET=	install install-commandmode install-config
+INSTALL_TARGET=	install install-commandmode install-config install-eventhandlers
 
 PLIST_SUB=	ICINGADIR=${ICINGADIR} \
 		ICINGAWWWDIR=${ICINGAWWWDIR} \
@@ -88,8 +89,6 @@ SUB_FILES=	pkg-install \
 SUB_LIST=	PREFIX=${PREFIX} \
 		${PLIST_SUB}
 
-USE_PHP=	yes
-
 .if defined(WITH_EMBEDDED_PERL)
 USE_PERL5=	5.8.0+
 CONFIGURE_ARGS+=	--enable-embedded-perl \
@@ -103,10 +102,34 @@ PLIST_SUB+=	EMBEDDED_PERL="@comment "
 CONFIGURE_ARGS+=	--enable-nanosleep
 .endif
 
-.if defined(WITH_EVENT_BROKER)
-CONFIGURE_ARGS+=	--enable-event-broker
+.if defined(WITH_IDOUTILS)
+LIB_DEPENDS+=		dbi.1:${PORTSDIR}/databases/libdbi-drivers
+CONFIGURE_ARGS+=	--enable-idoutils \
+			--enable-ssl \
+			--with-dbi-lib=${LOCALBASE}/lib \
+			--with-dbi-inc=${LOCALBASE}/include
+INSTALL_TARGET+=	install-idoutils
+USE_RC_SUBR+=		ido2db
+PLIST_SUB+=	IDOUTILS=""
 .else
-CONFIGURE_ARGS+=	--disable-event-broker
+PLIST_SUB+=	IDOUTILS="@comment "
+.endif
+
+.if defined(WITH_MYSQL)
+USE_MYSQL=		yes
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PGSQL=		yes
+.endif
+
+.if defined(WITH_APACHE)
+USE_APACHE=	22+
+CONFIGURE_ARGS+=	--with-httpd-conf=${LOCALBASE}/${APACHEETCDIR}/extra
+INSTALL_TARGET+=	install-webconf
+PLIST_SUB+=		APACHE=""
+.else
+PLIST_SUB+=		APACHE="@comment "
 .endif
 
 post-patch:
@@ -123,6 +146,13 @@ pre-su-install:
 	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
 
 post-install:
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}/idoutils/
+	${MKDIR} ${EXAMPLESDIR}/idoutils/config/
+	${MKDIR} ${EXAMPLESDIR}/idoutils/db
+	cd ${WRKSRC}/module/idoutils/config && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/idoutils/config
+	cd ${WRKSRC}/module/idoutils/db     && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/idoutils/db
+.endif
 	@${CHMOD} 775 ${ICINGADIR} ${ICINGADIR}/archives ${ICINGADIR}/checkresults ${ICINGADIR}/rw
 	@${CHOWN} ${ICINGAUSER}:${ICINGAGROUP} ${ICINGADIR} ${ICINGADIR}/archives ${ICINGADIR}/checkresults
 	@${CHOWN} ${ICINGAUSER}:${WWWGRP} ${ICINGADIR}/rw
diff --git a/net-mgmt/icinga/distinfo b/net-mgmt/icinga/distinfo
index 9bcec4657818..c1e2dd0b0df8 100644
--- a/net-mgmt/icinga/distinfo
+++ b/net-mgmt/icinga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icinga-1.6.1.tar.gz) = 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
-SIZE (icinga-1.6.1.tar.gz) = 12880538
+SHA256 (icinga-1.7.0.tar.gz) = e0d033e37bd3c4fb6a35151cc94aae4ca8e730510d9156ea755245728f8acb8b
+SIZE (icinga-1.7.0.tar.gz) = 12939198
diff --git a/net-mgmt/icinga/files/icinga.in b/net-mgmt/icinga/files/icinga.in
index 53d73f45cbcf..ba1b0ab767e1 100644
--- a/net-mgmt/icinga/files/icinga.in
+++ b/net-mgmt/icinga/files/icinga.in
@@ -4,10 +4,8 @@
 #
 
 # PROVIDE: icinga
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
+# REQUIRE: LOGIN
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable icinga:
 # icinga_enable (bool):    Set to "NO" by default.
@@ -23,11 +21,22 @@
 name="icinga"
 rcvar=icinga_enable
 
+load_rc_config "${name}"
+
+: ${icinga_enable:="NO"}
+: ${icinga_configfile="%%PREFIX%%/etc/icinga/icinga.cfg"}
+: ${icinga_precache:="NO"}
+
 command="%%PREFIX%%/bin/icinga"
 command_args="-d"
 extra_commands="reload"
 pidfile="%%ICINGADIR%%/icinga.lock"
 icinga_user="%%ICINGAUSER%%"
+icinga_group="%%ICINGAGROUP%%"
+
+icinga_logfile="%%ICINGADIR%%/${name}.log"
+icinga_statusfile="%%ICINGADIR%%/status.sav"
+icinga_cmdfile="%%ICINGADIR%%/rw/${name}.cmd"
 
 start_precmd="start_precmd"
 stop_postcmd="stop_postcmd"
@@ -35,12 +44,6 @@ restart_precmd="icinga_checkconfig"
 reload_precmd="reload_precmd"
 sig_reload=HUP
 
-[ -z "${icinga_enable}" ]       && icinga_enable="NO"
-[ -z "${icinga_configfile}" ]   && icinga_configfile="%%PREFIX%%/etc/icinga/icinga.cfg"
-[ -z "${icinga_precache}" ]     && icinga_precache="NO"
-
-load_rc_config "${name}"
-
 required_files="${icinga_configfile}"
 command_args="${command_args} ${icinga_configfile}"
 
@@ -92,12 +95,17 @@ start_precmd() {
     return 1
   fi
 
-  su -m "${icinga_user}" -c "touch \"%%ICINGADIR%%/icinga.log\" \"%%ICINGADIR%%/status.sav\""
-  rm -f "%%ICINGADIR%%/rw/icinga.cmd"
+  if [ ! -f "${icinga_logfile}" ]; then
+    install -o "${icinga_user}" -g "${icinga_group}" -m 644 /dev/null "${icinga_logfile}"
+  fi
+  if [ ! -f "${icinga_statusfile}" ]; then
+    install -o "${icinga_user}" -g "${icinga_group}" -m 644 /dev/null "${icinga_statusfile}"
+  fi
+  rm -f "${icinga_cmdfile}"
 }
 
 stop_postcmd() {
-  rm -f "%%ICINGADIR%%/icinga.tmp" "%%ICINGADIR%%/rw/icinga.cmd"
+  rm -f "%%ICINGADIR%%/icinga.tmp" "${icinga_cmdfile}"
 }
 
 run_rc_command "$1"
diff --git a/net-mgmt/icinga/files/ido2db.in b/net-mgmt/icinga/files/ido2db.in
new file mode 100644
index 000000000000..ea57976f5a12
--- /dev/null
+++ b/net-mgmt/icinga/files/ido2db.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ido2db 
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable ido2db:
+# ido2db_enable (bool):    Set to "NO" by default.
+#                          Set it to "YES" to enable ido2db.
+# icinga_configfile (str): Set to "%%PREFIX%%/etc/icinga/ido2db.cfg" by default.
+
+. /etc/rc.subr
+
+name="ido2db"
+rcvar=ido2db_enable
+
+load_rc_config "${name}"
+
+: ${ido2db_enable:="NO"}
+: ${ido2db_configfile="%%PREFIX%%/etc/icinga/ido2db.cfg"}
+
+command="%%PREFIX%%/bin/${name}"
+command_args="-c"
+
+required_files="${ido2db_configfile}"
+command_args="${command_args} ${ido2db_configfile}"
+
+run_rc_command "$1"
diff --git a/net-mgmt/icinga/files/patch-Makefile.in b/net-mgmt/icinga/files/patch-Makefile.in
index e013801c594b..ca319f03aaf5 100644
--- a/net-mgmt/icinga/files/patch-Makefile.in
+++ b/net-mgmt/icinga/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2011-08-24 13:57:57.000000000 +0000
-+++ Makefile.in	2011-09-06 00:15:49.832669725 +0000
-@@ -383,13 +383,13 @@
+--- Makefile.in.orig	2012-05-15 13:00:56.000000000 +0000
++++ Makefile.in	2012-05-16 21:00:54.567967366 +0000
+@@ -362,13 +362,13 @@
  	$(MAKE) install-basic
  
  install-basic:
@@ -20,12 +20,13 @@
  	fi;
  
  	@echo ""
-@@ -418,22 +418,22 @@
+@@ -405,23 +405,23 @@
  
  
  install-config:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg
 -	$(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
@@ -34,7 +35,7 @@
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
@@ -42,15 +43,16 @@
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg-sample
-+	$(INSTALL) -b -m 640 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
++	$(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg-sample
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg-sample
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg-sample
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg-sample
-+	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg-sample
++	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg-sample
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg-sample
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg-sample
 +	$(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg-sample
@@ -59,7 +61,7 @@
  
  	@echo ""
  	@echo "*** Config files installed ***"
-@@ -444,7 +444,7 @@
+@@ -432,7 +432,7 @@
  	@echo ""
  
  install-webconf:
@@ -68,11 +70,43 @@
  	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf
  
  	@echo ""
-@@ -497,7 +497,6 @@
+@@ -481,7 +481,7 @@
+ 
  
  install-commandmode:
- 	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
--	chmod g+s $(DESTDIR)$(EXTCMDFILEDIR)
+-	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
++	$(INSTALL) -m 755 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
+ 	chmod g+s $(DESTDIR)$(EXTCMDFILEDIR)
+ 
+ 	@echo ""
+@@ -489,18 +489,18 @@
+ 	@echo ""
+ 
+ install-eventhandlers:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event
+-	$(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event
++	$(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event
  
  	@echo ""
- 	@echo "*** External command directory configured ***"
+ 	@echo "*** Sample Eventhandlers installed ***"
diff --git a/net-mgmt/icinga/files/patch-base-Makefile.in b/net-mgmt/icinga/files/patch-base-Makefile.in
index 8585cc546a7e..9fa08e426a65 100644
--- a/net-mgmt/icinga/files/patch-base-Makefile.in
+++ b/net-mgmt/icinga/files/patch-base-Makefile.in
@@ -1,15 +1,13 @@
---- base/Makefile.in~	2010-10-23 01:22:32.000000000 +0800
-+++ base/Makefile.in	2011-02-16 13:42:58.000000000 +0800
-@@ -205,9 +205,9 @@
+--- base/Makefile.in.orig	2012-05-15 13:00:56.000000000 +0000
++++ base/Makefile.in	2012-05-16 19:18:25.684923160 +0000
+@@ -207,8 +207,8 @@
  	$(MAKE) install-basic
  
  install-basic:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 755 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 755 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
  
- strip-post-install:
- 	$(STRIP) $(DESTDIR)$(BINDIR)/@icinga_name@
diff --git a/net-mgmt/icinga/files/patch-cgi-Makefile.in b/net-mgmt/icinga/files/patch-cgi-Makefile.in
index 8dcd1ec590fc..1626b41fb8d9 100644
--- a/net-mgmt/icinga/files/patch-cgi-Makefile.in
+++ b/net-mgmt/icinga/files/patch-cgi-Makefile.in
@@ -1,6 +1,6 @@
---- cgi/Makefile.in.orig	2011-08-24 13:57:57.000000000 +0000
-+++ cgi/Makefile.in	2011-09-05 22:27:34.493376507 +0000
-@@ -198,10 +198,10 @@
+--- cgi/Makefile.in.orig	2012-05-15 13:00:56.000000000 +0000
++++ cgi/Makefile.in	2012-05-16 19:18:25.683923624 +0000
+@@ -199,10 +199,10 @@
  	$(MAKE) install-basic
  
  install-basic:
diff --git a/net-mgmt/icinga/files/patch-configure.in b/net-mgmt/icinga/files/patch-configure.in
index 551f0105754a..cf6515a5cbf3 100644
--- a/net-mgmt/icinga/files/patch-configure.in
+++ b/net-mgmt/icinga/files/patch-configure.in
@@ -1,19 +1,19 @@
---- configure.in.orig	2011-08-24 13:57:57.000000000 +0000
-+++ configure.in	2011-09-05 22:30:37.899355262 +0000
+--- configure.in.orig	2012-05-15 13:00:56.000000000 +0000
++++ configure.in	2012-05-16 21:05:28.973178226 +0000
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/icinga.c)
- AC_CONFIG_HEADER(include/config.h include/snprintf.h)
+ AC_CONFIG_HEADER(include/config.h)
 -AC_PREFIX_DEFAULT(/usr/local/icinga)
  
  PKG_NAME=icinga-core
- PKG_VERSION="1.5.0"
-@@ -144,7 +143,15 @@
+ PKG_VERSION="1.7.0"
+@@ -144,6 +143,15 @@
  dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
  THREADLIBS=""
  have_pthreads="no"
 +have_thr="no"
- 
++ 
 +dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues
 +AC_CHECK_LIB(thr,pthread_create)
 +if test $ac_cv_lib_thr_pthread_create = yes; then
@@ -21,10 +21,10 @@
 +	have_pthreads="yes"
 +	have_thr="yes"
 +else
+ 
  dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
  dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
- AC_DEFUN([AC_PTHREAD_FREEBSD],[
-@@ -205,6 +212,7 @@
+@@ -205,6 +213,7 @@
  if test $have_pthreads = "no"; then
  	AC_PTHREAD_FREEBSD
  fi
@@ -32,7 +32,7 @@
  
  AC_SUBST(THREADLIBS)
  
-@@ -223,7 +231,7 @@
+@@ -223,7 +232,7 @@
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$icinga_user",[user name to run nagios])
  AC_DEFINE_UNQUOTED(DEFAULT_ICINGA_GROUP,"$icinga_grp",[group name to run nagios])
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$icinga_grp",[group name to run nagios])
@@ -41,7 +41,16 @@
  AC_SUBST(INSTALL_OPTS)
  
  AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$icinga_user)
-@@ -950,6 +958,9 @@
+@@ -414,7 +423,7 @@
+ P1FILELOC=no
+ AC_ARG_WITH(p1-file-dir,AC_HELP_STRING([--with-p1-file-dir=<path>],[sets path to embedded perl p1.pl directory]),P1FILELOC=$withval,P1FILELOC=no)
+ if test x$P1FILELOC = xno; then
+-        P1FILELOC="$libdir"
++        P1FILELOC="$bindir"
+ fi
+ AC_SUBST(P1FILELOC)
+ 
+@@ -1033,6 +1042,9 @@
  
  	AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
  	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
diff --git a/net-mgmt/icinga/files/patch-contrib-Makefile.in b/net-mgmt/icinga/files/patch-contrib-Makefile.in
index 1e724db957b6..192d584be6df 100644
--- a/net-mgmt/icinga/files/patch-contrib-Makefile.in
+++ b/net-mgmt/icinga/files/patch-contrib-Makefile.in
@@ -1,6 +1,6 @@
---- contrib/Makefile.in.orig	2011-08-24 13:57:57.000000000 +0000
-+++ contrib/Makefile.in	2011-09-05 22:31:21.616521093 +0000
-@@ -51,10 +51,10 @@
+--- contrib/Makefile.in.orig	2012-05-15 13:00:56.000000000 +0000
++++ contrib/Makefile.in	2012-05-16 19:18:25.684923160 +0000
+@@ -52,10 +52,10 @@
  devclean: distclean
  
  install:
diff --git a/net-mgmt/icinga/files/patch-include-locations.h.in b/net-mgmt/icinga/files/patch-include-locations.h.in
index a8bffb11bcc0..6a25744887b5 100644
--- a/net-mgmt/icinga/files/patch-include-locations.h.in
+++ b/net-mgmt/icinga/files/patch-include-locations.h.in
@@ -1,11 +1,11 @@
---- include/locations.h.in.orig	Tue May  1 08:15:57 2007
-+++ include/locations.h.in	Fri Jul 20 15:52:49 2007
-@@ -20,7 +20,7 @@
+--- include/locations.h.in.orig	2012-05-15 13:00:56.000000000 +0000
++++ include/locations.h.in	2012-05-16 19:25:19.455922365 +0000
+@@ -21,7 +21,7 @@
  
- #define DEFAULT_TEMP_FILE			"@localstatedir@/tempfile"
+ #define DEFAULT_TEMP_FILE			"@STATEDIR@/tempfile"
  #define DEFAULT_TEMP_PATH                       "/tmp"
--#define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/spool/checkresults"
-+#define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/checkresults"
- #define DEFAULT_STATUS_FILE			"@localstatedir@/status.dat"
- #define DEFAULT_LOG_FILE			"@localstatedir@/nagios.log"
- #define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
+-#define DEFAULT_CHECK_RESULT_PATH		"@STATEDIR@/spool/checkresults"
++#define DEFAULT_CHECK_RESULT_PATH		"@STATEDIR@/checkresults"
+ #define DEFAULT_STATUS_FILE			"@STATEDIR@/status.dat"
+ #define DEFAULT_LOG_FILE			"@LOGDIR@/icinga.log"
+ #define DEFAULT_LOG_ARCHIVE_PATH		"@LOGDIR@/archives/"
diff --git a/net-mgmt/icinga/files/patch-module-idoutils-src-Makefile.in b/net-mgmt/icinga/files/patch-module-idoutils-src-Makefile.in
new file mode 100644
index 000000000000..cd351c24bfba
--- /dev/null
+++ b/net-mgmt/icinga/files/patch-module-idoutils-src-Makefile.in
@@ -0,0 +1,13 @@
+--- module/idoutils/src/Makefile.in.orig	2012-05-20 22:27:17.000000000 +0200
++++ module/idoutils/src/Makefile.in	2012-05-20 22:27:40.000000000 +0200
+@@ -112,8 +112,8 @@
+ 	@echo "Going to uninstall old idomod.o in $(DESTDIR)$(BINDIR)/idomod.o ..."
+ 	rm -f $(DESTDIR)$(BINDIR)/idomod.o
+ 	@echo "Resuming with install..."
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) ido2db $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) log2ido $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) idomod.so $(DESTDIR)$(LIBDIR)
diff --git a/net-mgmt/icinga/files/pkg-message.in b/net-mgmt/icinga/files/pkg-message.in
index 8ae89c4b9477..3685ca4e4ccb 100644
--- a/net-mgmt/icinga/files/pkg-message.in
+++ b/net-mgmt/icinga/files/pkg-message.in
@@ -1,4 +1,4 @@
-**********************************************************************
+*************************************************************************
 
  Enable Icinga in /etc/rc.conf with the following line:
 
@@ -11,22 +11,12 @@
 
  If you don't already have a web server running, you will need to
  install and configure one to finish off your Icinga installation.
- When used with Apache, the following should be sufficient to publish
- the web component of Icinga (modify the allow list to suit):
+ If you selected APACHE in Icinga's OPTION screen, the configuration
+ is already installed as %%LOCLABASE%%/%%APACHEETCDIR%%/extra/icinga.cfg
+ and you only need to source the configuration file in Apache's config.
 
-   <Directory %%PREFIX%%/%%ICINGAWWWDIR%%>
-     Order deny,allow
-     Deny from all
-     Allow from 127.0.0.1
-     php_flag engine on
-     php_admin_value open_basedir %%PREFIX%%/%%ICINGAWWWDIR%%/:%%ICINGADIR%%/
-   </Directory>
+ If you like to use database backend with IDOutils the SQL scripts to
+ setup the database have been installed in
+ %%EXAMPLESDIR%%/idoutils/db/.
 
-   <Directory %%PREFIX%%/%%ICINGAWWWDIR%%/cgi-bin>
-     Options ExecCGI
-   </Directory>
-
-   ScriptAlias %%ICINGACGIURL%%/ %%PREFIX%%/%%ICINGAWWWDIR%%/cgi-bin/
-   Alias %%ICINGAHTMURL%%/ %%PREFIX%%/%%ICINGAWWWDIR%%/
-
-**********************************************************************
+*************************************************************************
diff --git a/net-mgmt/icinga/pkg-plist b/net-mgmt/icinga/pkg-plist
index ae58c0bc2dfb..e45ba8c0dcb6 100644
--- a/net-mgmt/icinga/pkg-plist
+++ b/net-mgmt/icinga/pkg-plist
@@ -7,6 +7,11 @@
 @exec mkdir -p %D/%%ICINGAWWWDIR%%/ssi
 bin/icinga
 bin/icingastats
+%%IDOUTILS%%bin/ido2db
+%%IDOUTILS%%bin/log2ido
+%%IDOUTILS%%lib/idomod.so
+%%IDOUTILS%%etc/icinga/ido2db.cfg-sample
+%%IDOUTILS%%etc/icinga/idomod.cfg-sample
 etc/icinga/cgi.cfg-sample
 etc/icinga/cgiauth.cfg-sample
 etc/icinga/icinga.cfg-sample
@@ -19,8 +24,110 @@ etc/icinga/objects/switch.cfg-sample
 etc/icinga/objects/templates.cfg-sample
 etc/icinga/objects/timeperiods.cfg-sample
 etc/icinga/objects/windows.cfg-sample
+%%IDOUTILS%%etc/icinga/objects/ido2db_check_proc.cfg
+%%IDOUTILS%%etc/icinga/modules/idoutils.cfg-sample
 etc/icinga/resource.cfg-sample
+%%APACHE%%%%APACHEETCDIR%%/extra/icinga.conf
 %%EMBEDDED_PERL%%bin/p1.pl
+libexec/icinga/eventhandlers/distributed-monitoring/obsessive_svc_handler
+libexec/icinga/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-host-event
+libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-proc-event
+libexec/icinga/eventhandlers/submit_check_result
+libexec/icinga/eventhandlers/disable_active_service_checks
+libexec/icinga/eventhandlers/enable_active_service_checks
+libexec/icinga/eventhandlers/disable_notifications
+libexec/icinga/eventhandlers/enable_notifications
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db.cfg-sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db.cfg-sample.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db_check_proc.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/idomod.cfg-sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/idomod.cfg-sample.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/idoutils.cfg-sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/idoutils.cfg-sample.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/mysql.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-0.8.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.1.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2-fix-object-relations.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0rc.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.3.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.4.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.5.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.6.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.7.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/create_icinga_objects_oracle.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/create_oracle_sys.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/icinga_defines.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/oracle-delete.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/oracle-drop.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/oracle-truncate.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/oracle.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.1.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.2-fix-object-relations.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.3.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.4.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.5.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.6.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.7.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle_alter_icinga13_numbers.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle_alter_icinga13_objects.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle_recreate_icinga13_functions.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/fix/pgsql-fix-0.8.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/pgsql.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.7.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/comment_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/comments.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/contact_notification_methods.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/contact_notifications.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/contact_status.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/contactgroup_membership.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/contacts.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/downtime_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/event_handlers.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/flapping_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/host_comments.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/host_downtime_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/host_event_handlers.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/host_flapping_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/host_notifications.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/host_state_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/host_status.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/hostgroup_membership.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/hosts.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/notifications.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/scheduled_downtime.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/service_comments.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/service_downtime_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/service_event_handlers.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/service_flapping_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/service_notifications.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/service_state_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/service_status.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/servicegroup_membership.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/services.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/state_history.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/timed_event_queue.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/timed_events.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/create_mysqldb.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/create_oracledb.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/create_pgsqldb.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/installdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/installdb.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/prepsql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/prepsql.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/upgradedb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/upgradedb.in
 %%ICINGAWWWDIR%%/cgi-bin/avail.cgi
 %%ICINGAWWWDIR%%/cgi-bin/cmd.cgi
 %%ICINGAWWWDIR%%/cgi-bin/config.cgi
@@ -33,6 +140,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/cgi-bin/status.cgi
 %%ICINGAWWWDIR%%/cgi-bin/statusmap.cgi
 %%ICINGAWWWDIR%%/cgi-bin/statuswml.cgi
+%%ICINGAWWWDIR%%/cgi-bin/statuswrl.cgi
 %%ICINGAWWWDIR%%/cgi-bin/summary.cgi
 %%ICINGAWWWDIR%%/cgi-bin/tac.cgi
 %%ICINGAWWWDIR%%/cgi-bin/trends.cgi
@@ -170,8 +278,10 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/de/largeinstalltweaks.html
 %%ICINGAWWWDIR%%/docs/de/macrolist.html
 %%ICINGAWWWDIR%%/docs/de/macros.html
+%%ICINGAWWWDIR%%/docs/de/modified_attr.html
 %%ICINGAWWWDIR%%/docs/de/monitoring-linux.html
 %%ICINGAWWWDIR%%/docs/de/monitoring-netware.html
+%%ICINGAWWWDIR%%/docs/de/monitoring-overview.html
 %%ICINGAWWWDIR%%/docs/de/monitoring-printers.html
 %%ICINGAWWWDIR%%/docs/de/monitoring-publicservices.html
 %%ICINGAWWWDIR%%/docs/de/monitoring-routers.html
@@ -179,6 +289,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/de/mrtggraphs.html
 %%ICINGAWWWDIR%%/docs/de/networkreachability.html
 %%ICINGAWWWDIR%%/docs/de/notifications.html
+%%ICINGAWWWDIR%%/docs/de/notifications2.html
 %%ICINGAWWWDIR%%/docs/de/nrpe.html
 %%ICINGAWWWDIR%%/docs/de/nsca.html
 %%ICINGAWWWDIR%%/docs/de/objectdefinitions.html
@@ -196,6 +307,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/de/quickstart-idoutils-freebsd.html
 %%ICINGAWWWDIR%%/docs/de/quickstart-idoutils.html
 %%ICINGAWWWDIR%%/docs/de/quickstart.html
+%%ICINGAWWWDIR%%/docs/de/recurring_downtimes.html
 %%ICINGAWWWDIR%%/docs/de/redundancy.html
 %%ICINGAWWWDIR%%/docs/de/reporting_1.6.html
 %%ICINGAWWWDIR%%/docs/de/reporting.html
@@ -285,8 +397,10 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/en/largeinstalltweaks.html
 %%ICINGAWWWDIR%%/docs/en/macrolist.html
 %%ICINGAWWWDIR%%/docs/en/macros.html
+%%ICINGAWWWDIR%%/docs/en/modified_attr.html
 %%ICINGAWWWDIR%%/docs/en/monitoring-linux.html
 %%ICINGAWWWDIR%%/docs/en/monitoring-netware.html
+%%ICINGAWWWDIR%%/docs/en/monitoring-overview.html
 %%ICINGAWWWDIR%%/docs/en/monitoring-printers.html
 %%ICINGAWWWDIR%%/docs/en/monitoring-publicservices.html
 %%ICINGAWWWDIR%%/docs/en/monitoring-routers.html
@@ -294,6 +408,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/en/mrtggraphs.html
 %%ICINGAWWWDIR%%/docs/en/networkreachability.html
 %%ICINGAWWWDIR%%/docs/en/notifications.html
+%%ICINGAWWWDIR%%/docs/en/notifications2.html
 %%ICINGAWWWDIR%%/docs/en/nrpe.html
 %%ICINGAWWWDIR%%/docs/en/nsca.html
 %%ICINGAWWWDIR%%/docs/en/objectdefinitions.html
@@ -311,6 +426,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/en/quickstart-idoutils-freebsd.html
 %%ICINGAWWWDIR%%/docs/en/quickstart-idoutils.html
 %%ICINGAWWWDIR%%/docs/en/quickstart.html
+%%ICINGAWWWDIR%%/docs/en/recurring_downtimes.html
 %%ICINGAWWWDIR%%/docs/en/redundancy.html
 %%ICINGAWWWDIR%%/docs/en/reporting_1.6.html
 %%ICINGAWWWDIR%%/docs/en/reporting.html
@@ -328,6 +444,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/en/verifyconfig.html
 %%ICINGAWWWDIR%%/docs/en/volatileservices.html
 %%ICINGAWWWDIR%%/docs/en/whatsnew.html
+%%ICINGAWWWDIR%%/docs/images/Architecture_1.5_800px.png
 %%ICINGAWWWDIR%%/docs/images/MyServiceStatus.png
 %%ICINGAWWWDIR%%/docs/images/activechecks.png
 %%ICINGAWWWDIR%%/docs/images/cachedcheckgraphs.png
@@ -416,6 +533,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.5.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.7.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.5.png
@@ -425,11 +543,14 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.5.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.7.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.7.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.5.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.7.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-filter1.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.6.png
@@ -454,9 +575,11 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.5.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.7.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-search1.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.7.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-settings.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-settings_1.5.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.5.png
@@ -470,6 +593,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/images/icinga-web-tackle4.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.7.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2_1.3.png
 %%ICINGAWWWDIR%%/docs/images/idoutils.png
@@ -583,6 +707,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/images/icinga-logo.png
 %%ICINGAWWWDIR%%/images/icon_collapse.gif
 %%ICINGAWWWDIR%%/images/icon_expand.gif
+%%ICINGAWWWDIR%%/images/icon_reload.png
 %%ICINGAWWWDIR%%/images/info.png
 %%ICINGAWWWDIR%%/images/interface/bar.gif
 %%ICINGAWWWDIR%%/images/interface/menu_blank.gif
@@ -593,9 +718,12 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/images/interface/menu_more.gif
 %%ICINGAWWWDIR%%/images/left.gif
 %%ICINGAWWWDIR%%/images/logofullsize.png
+%%ICINGAWWWDIR%%/images/logos/Stats1.gif
+%%ICINGAWWWDIR%%/images/logos/Stats2.png
 %%ICINGAWWWDIR%%/images/logos/icinga.gd2
 %%ICINGAWWWDIR%%/images/logos/icinga.gif
 %%ICINGAWWWDIR%%/images/logos/icingavrml.png
+%%ICINGAWWWDIR%%/images/logos/s.gif
 %%ICINGAWWWDIR%%/images/logos/unknown.gd2
 %%ICINGAWWWDIR%%/images/logos/unknown.gif
 %%ICINGAWWWDIR%%/images/logrotate.png
@@ -646,6 +774,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/js/jquery-1.6.2.min.js
 %%ICINGAWWWDIR%%/js/jquery.dd.js
 %%ICINGAWWWDIR%%/js/menu.js
+%%ICINGAWWWDIR%%/js/page_refresh.js
 %%ICINGAWWWDIR%%/js/skinnytip.js
 %%ICINGAWWWDIR%%/log/.htaccess
 %%ICINGAWWWDIR%%/log/index.htm
@@ -675,9 +804,26 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/stylesheets/tac.css
 %%ICINGAWWWDIR%%/stylesheets/tacheader.css
 %%ICINGAWWWDIR%%/stylesheets/trends.css
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/scripts
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/queries
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/pgsql/fix
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/pgsql
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/oracle/upgrade
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/oracle
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/mysql/upgrade
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/mysql
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/config
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+@dirrmtry libexec/icinga/eventhandlers/redundancy-scenario1
+@dirrmtry libexec/icinga/eventhandlers/distributed-monitoring
+@dirrmtry libexec/icinga/eventhandlers
 @dirrmtry libexec/icinga
 @dirrmtry etc/icinga/objects
 @dirrmtry etc/icinga/modules
+@dirrmtry etc/icinga/conf.d
 @dirrmtry etc/icinga
 @dirrmtry %%ICINGAWWWDIR%%/stylesheets/interface
 @dirrmtry %%ICINGAWWWDIR%%/stylesheets
@@ -688,26 +834,6 @@ etc/icinga/resource.cfg-sample
 @dirrmtry %%ICINGAWWWDIR%%/images/logos
 @dirrmtry %%ICINGAWWWDIR%%/images/interface
 @dirrmtry %%ICINGAWWWDIR%%/images
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testDatabases
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/tests/idoTests/apiSearchDefinitions
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/tests/idoTests
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/tests
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/search/filter
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/search/data_interfaces
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/search
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/result
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/ociPDO/PDO
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/ociPDO
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/debug/debugTargets
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/debug
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/conversion
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/connection
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects/command
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/objects
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/log
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/contrib/ido2dbparser
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api/contrib
-@dirrmtry %%ICINGAWWWDIR%%/icinga-api
 @dirrmtry %%ICINGAWWWDIR%%/docs/images/flags
 @dirrmtry %%ICINGAWWWDIR%%/docs/images
 @dirrmtry %%ICINGAWWWDIR%%/docs/en