- Update to 1.6.1

- Drop maintainership

Submitted by:	flo@
PR:		ports/164282

3 files changed, 32 insertions, 73 deletions

diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index f51f9d20d572..53a6145893d0 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icinga
-PORTVERSION=	1.5.1
+PORTVERSION=	1.6.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
diff --git a/net-mgmt/icinga/distinfo b/net-mgmt/icinga/distinfo
index 0b3ea1aad9a2..9bcec4657818 100644
--- a/net-mgmt/icinga/distinfo
+++ b/net-mgmt/icinga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icinga-1.5.1.tar.gz) = b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
-SIZE (icinga-1.5.1.tar.gz) = 16518659
+SHA256 (icinga-1.6.1.tar.gz) = 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
+SIZE (icinga-1.6.1.tar.gz) = 12880538
diff --git a/net-mgmt/icinga/pkg-plist b/net-mgmt/icinga/pkg-plist
index 423b1bd3bd64..ae58c0bc2dfb 100644
--- a/net-mgmt/icinga/pkg-plist
+++ b/net-mgmt/icinga/pkg-plist
@@ -128,6 +128,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/de/components.html
 %%ICINGAWWWDIR%%/docs/de/config.html
 %%ICINGAWWWDIR%%/docs/de/configcgi.html
+%%ICINGAWWWDIR%%/docs/de/configido.html
 %%ICINGAWWWDIR%%/docs/de/configmain.html
 %%ICINGAWWWDIR%%/docs/de/configobject.html
 %%ICINGAWWWDIR%%/docs/de/customobjectvars.html
@@ -196,6 +197,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/de/quickstart-idoutils.html
 %%ICINGAWWWDIR%%/docs/de/quickstart.html
 %%ICINGAWWWDIR%%/docs/de/redundancy.html
+%%ICINGAWWWDIR%%/docs/de/reporting_1.6.html
 %%ICINGAWWWDIR%%/docs/de/reporting.html
 %%ICINGAWWWDIR%%/docs/de/security.html
 %%ICINGAWWWDIR%%/docs/de/servicechecks.html
@@ -240,6 +242,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/en/clusters.html
 %%ICINGAWWWDIR%%/docs/en/config.html
 %%ICINGAWWWDIR%%/docs/en/configcgi.html
+%%ICINGAWWWDIR%%/docs/en/configido.html
 %%ICINGAWWWDIR%%/docs/en/configmain.html
 %%ICINGAWWWDIR%%/docs/en/configobject.html
 %%ICINGAWWWDIR%%/docs/en/customobjectvars.html
@@ -309,6 +312,7 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/en/quickstart-idoutils.html
 %%ICINGAWWWDIR%%/docs/en/quickstart.html
 %%ICINGAWWWDIR%%/docs/en/redundancy.html
+%%ICINGAWWWDIR%%/docs/en/reporting_1.6.html
 %%ICINGAWWWDIR%%/docs/en/reporting.html
 %%ICINGAWWWDIR%%/docs/en/security.html
 %%ICINGAWWWDIR%%/docs/en/servicechecks.html
@@ -392,55 +396,80 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/images/flags/um_gb.png
 %%ICINGAWWWDIR%%/docs/images/freshness.png
 %%ICINGAWWWDIR%%/docs/images/host-dependencies.png
+%%ICINGAWWWDIR%%/docs/images/icinga-reporting_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups1.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups1_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups2.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups2_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-admin_logs1.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-admin_principals.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-admin_tasks.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users1.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users1_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users2.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users2_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-commands_hst.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-commands_hst_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-commands_hst_1.5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_hst_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc.png
 %%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.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.3.png
 %%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-cronks2a_1.6.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-filter1.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.3.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-filter2.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-filter2_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-filter3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-host_1.5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-host_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-hostgroup_1.5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-hostgroup_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-log.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-log_1.3.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-log_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-login.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-main_bar.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen1.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen1_1.3.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen1_1.5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen1_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-open_problems.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-overview.png
 %%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-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-settings.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-settings_1.5.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.6.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-statuscronk.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-statuscronk_1.5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-statuscronk_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle1.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle2.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle3.png
+%%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-topmenu2.png
 %%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2_1.3.png
 %%ICINGAWWWDIR%%/docs/images/idoutils.png
@@ -512,68 +541,6 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/docs/images/upto.gif
 %%ICINGAWWWDIR%%/docs/index.html
 %%ICINGAWWWDIR%%/docs/robots.txt
-%%ICINGAWWWDIR%%/icinga-api/IcingaApi.php
-%%ICINGAWWWDIR%%/icinga-api/contrib/ido2dbparser/Ido2dbParser.php
-%%ICINGAWWWDIR%%/icinga-api/log/PLACEHOLDER
-%%ICINGAWWWDIR%%/icinga-api/objects/IcingaApiConstantsInterface.php
-%%ICINGAWWWDIR%%/icinga-api/objects/command/IcingaApiCommand.php
-%%ICINGAWWWDIR%%/icinga-api/objects/command/IcingaApiCommandCollection.php
-%%ICINGAWWWDIR%%/icinga-api/objects/command/IcingaApiCommandDispatcher.php
-%%ICINGAWWWDIR%%/icinga-api/objects/command/IcingaApiCommandInterface.php
-%%ICINGAWWWDIR%%/icinga-api/objects/command/IcingaApiCommandSend.php
-%%ICINGAWWWDIR%%/icinga-api/objects/command/IcingaApiCommandSendPipe.php
-%%ICINGAWWWDIR%%/icinga-api/objects/command/IcingaApiCommandSendSsh.php
-%%ICINGAWWWDIR%%/icinga-api/objects/connection/IcingaApiConnection.php
-%%ICINGAWWWDIR%%/icinga-api/objects/connection/IcingaApiConnectionDatabase.php
-%%ICINGAWWWDIR%%/icinga-api/objects/connection/IcingaApiConnectionFile.php
-%%ICINGAWWWDIR%%/icinga-api/objects/connection/IcingaApiConnectionIdo.php
-%%ICINGAWWWDIR%%/icinga-api/objects/connection/IcingaApiConnectionInterface.php
-%%ICINGAWWWDIR%%/icinga-api/objects/connection/IcingaApiConnectionLivestatus.php
-%%ICINGAWWWDIR%%/icinga-api/objects/conversion/IcingaApiConversionTime.php
-%%ICINGAWWWDIR%%/icinga-api/objects/debug/debugTargets/icingaApiDebuggerTargetInterface.php
-%%ICINGAWWWDIR%%/icinga-api/objects/debug/debugTargets/icingaApiEchoDebugger.php
-%%ICINGAWWWDIR%%/icinga-api/objects/debug/debugTargets/icingaApiFileDebugger.php
-%%ICINGAWWWDIR%%/icinga-api/objects/debug/icingaApiDebugger.php
-%%ICINGAWWWDIR%%/icinga-api/objects/ociPDO/PDO/ociPDO.php
-%%ICINGAWWWDIR%%/icinga-api/objects/ociPDO/PDO/ociPDOStatement.php
-%%ICINGAWWWDIR%%/icinga-api/objects/ociPDO/icingaApiPDO.php
-%%ICINGAWWWDIR%%/icinga-api/objects/result/IcingaApiResult.php
-%%ICINGAWWWDIR%%/icinga-api/objects/result/IcingaApiResultFile.php
-%%ICINGAWWWDIR%%/icinga-api/objects/result/IcingaApiResultIdo.php
-%%ICINGAWWWDIR%%/icinga-api/objects/result/IcingaApiResultInterface.php
-%%ICINGAWWWDIR%%/icinga-api/objects/result/IcingaApiResultLivestatus.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/IcingaApiSearch.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/IcingaApiSearchColumnsFile.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/IcingaApiSearchFile.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/IcingaApiSearchIdo.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/IcingaApiSearchInterface.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/IcingaApiSearchLivestatus.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoInterface.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoMysql.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoOci.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoOci8.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/data_interfaces/IcingaApiSearchIdoPgsql.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/data_interfaces/IcingaApiSearchLivestatusSocket.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/filter/IcingaApiSearchFilter.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/filter/IcingaApiSearchFilterGroup.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/filter/IcingaApiSearchFilterGroupIdo.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/filter/IcingaApiSearchFilterIdo.php
-%%ICINGAWWWDIR%%/icinga-api/objects/search/filter/IcingaApiSearchFilterInterface.php
-%%ICINGAWWWDIR%%/icinga-api/tests/icingaApiTests.php
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/apiSearchDefinitions/custom.ini
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/apiSearchDefinitions/icinga-web.ini
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/apiSearchDefinitions/objectsearch.ini
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/dbConfig.php
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/idoConnectionTest.php
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/idoCreateSearchTest.php
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testDatabases/mysql_delete.sql
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testDatabases/mysql_dump.sql
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testDatabases/mysql_schema.sql
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testDatabases/oci8_delete.sql
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testDatabases/oci8_schema.sql
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testDatabases/oracle_dump.sql
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testDatabases/pgsql.sql
-%%ICINGAWWWDIR%%/icinga-api/tests/idoTests/testSuite.php
 %%ICINGAWWWDIR%%/images/Icinga_Header_Webinterface.jpg
 %%ICINGAWWWDIR%%/images/Icinga_Header_Webinterface_Pixel.jpg
 %%ICINGAWWWDIR%%/images/Icinga_TAC_Header_Webinterface.jpg
@@ -675,19 +642,11 @@ etc/icinga/resource.cfg-sample
 %%ICINGAWWWDIR%%/images/zoom1.gif
 %%ICINGAWWWDIR%%/images/zoom2.gif
 %%ICINGAWWWDIR%%/index.html
-%%ICINGAWWWDIR%%/js/builder.js
 %%ICINGAWWWDIR%%/js/checkbox_functions.js
-%%ICINGAWWWDIR%%/js/controls.js
-%%ICINGAWWWDIR%%/js/dragdrop.js
-%%ICINGAWWWDIR%%/js/effects.js
-%%ICINGAWWWDIR%%/js/htable.js
 %%ICINGAWWWDIR%%/js/jquery-1.6.2.min.js
 %%ICINGAWWWDIR%%/js/jquery.dd.js
 %%ICINGAWWWDIR%%/js/menu.js
-%%ICINGAWWWDIR%%/js/mootools.js
 %%ICINGAWWWDIR%%/js/skinnytip.js
-%%ICINGAWWWDIR%%/js/slider.js
-%%ICINGAWWWDIR%%/js/sound.js
 %%ICINGAWWWDIR%%/log/.htaccess
 %%ICINGAWWWDIR%%/log/index.htm
 %%ICINGAWWWDIR%%/main.html