summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING11
-rw-r--r--net-mgmt/icinga-classicweb/Makefile29
-rw-r--r--net-mgmt/icinga-classicweb/distinfo (renamed from net-mgmt/icinga/distinfo)0
-rw-r--r--net-mgmt/icinga-classicweb/files/patch-Makefile.in13
-rw-r--r--net-mgmt/icinga-classicweb/files/patch-include_config.h.in (renamed from net-mgmt/icinga/files/patch-include_config.h.in)0
-rw-r--r--net-mgmt/icinga-classicweb/files/pkg-message.in (renamed from net-mgmt/icinga/files/pkg-message.in)11
-rw-r--r--net-mgmt/icinga-classicweb/pkg-descr3
-rw-r--r--net-mgmt/icinga-classicweb/pkg-plist (renamed from net-mgmt/icinga/pkg-plist)162
-rw-r--r--net-mgmt/icinga-core/Makefile72
-rw-r--r--net-mgmt/icinga-core/Makefile.common70
-rw-r--r--net-mgmt/icinga-core/distinfo2
-rw-r--r--net-mgmt/icinga-core/files/icinga.in (renamed from net-mgmt/icinga/files/icinga.in)0
-rw-r--r--net-mgmt/icinga-core/files/ido2db.in (renamed from net-mgmt/icinga/files/ido2db.in)0
-rw-r--r--net-mgmt/icinga-core/files/patch-Makefile.in (renamed from net-mgmt/icinga/files/patch-Makefile.in)17
-rw-r--r--net-mgmt/icinga-core/files/patch-include_config.h.in16
-rw-r--r--net-mgmt/icinga-core/files/patch-module-idoutils-Makefile.in (renamed from net-mgmt/icinga/files/patch-module-idoutils-Makefile.in)0
-rw-r--r--net-mgmt/icinga-core/files/pkg-message.in13
-rw-r--r--net-mgmt/icinga-core/pkg-descr13
-rw-r--r--net-mgmt/icinga-core/pkg-plist156
-rw-r--r--net-mgmt/icinga/Makefile132
-rw-r--r--net-mgmt/icinga/pkg-descr15
21 files changed, 421 insertions, 314 deletions
diff --git a/UPDATING b/UPDATING
index 3aa3354365ce..17b2f62904ec 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,17 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20150812:
+ AFFECTS: users of net-mgmt/icinga and net-mgmt/icinga2
+ AUTHOR: lme@FreeBSD.org
+
+ The Icinga port has been split into two ports: net-mgmt/icinga-core
+ which contains the Icinga 1.x backend and net-mgmt/icinga-classicweb
+ which contains the Icinga classic web (CGI) interface. The latter can
+ be both used with Icinga 1.x and the Icinga 2 port (net-mgmt/icinga2).
+ A new meta-port net-mgmt/icinga was added which depends on both new
+ ports, so updating the Icinga port should be transparent.
+
+20150812:
AFFECTS: users of sysutils/moosefs-master and other moosefs packages
AUTHOR: feld@FreeBSD.org
diff --git a/net-mgmt/icinga-classicweb/Makefile b/net-mgmt/icinga-classicweb/Makefile
new file mode 100644
index 000000000000..19045c5469f9
--- /dev/null
+++ b/net-mgmt/icinga-classicweb/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME= icinga-classicweb
+DISTNAME= icinga-${PORTVERSION}
+
+MAINTAINER= lme@FreeBSD.org
+COMMENT= Classic web interface for Icinga 1 and 2
+
+.include "${.CURDIR}/../icinga-core/Makefile.common"
+
+LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd
+
+CONFIGURE_ARGS+=--disable-idoutils
+CFLAGS+= -I${LOCALBASE}/include
+
+ALL_TARGET= classicui-standalone
+INSTALL_TARGET= install-classicui-standalone install-classicui-standalone-conf
+
+post-patch:
+ @${REINPLACE_CMD} -e 's#775#755#g; s#664#644#g' \
+ ${WRKSRC}/html/Makefile.in
+# Use correct make(1) syntax to unbreak parallel builds
+ @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+ -E 's#cd (.+) && (make|\$$\(MAKE\))#$$(MAKE) -C \1#'
+
+post-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${ICINGAWWWDIR}/ssi
+
+.include <bsd.port.mk>
diff --git a/net-mgmt/icinga/distinfo b/net-mgmt/icinga-classicweb/distinfo
index 58061c7f884b..58061c7f884b 100644
--- a/net-mgmt/icinga/distinfo
+++ b/net-mgmt/icinga-classicweb/distinfo
diff --git a/net-mgmt/icinga-classicweb/files/patch-Makefile.in b/net-mgmt/icinga-classicweb/files/patch-Makefile.in
new file mode 100644
index 000000000000..5b5536e762b6
--- /dev/null
+++ b/net-mgmt/icinga-classicweb/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig 2015-07-26 15:18:51 UTC
++++ Makefile.in
+@@ -425,8 +425,8 @@ install-basic:
+
+ install-cgiconf:
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg
++ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.sample
++ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg.sample
+
+
+ install-config: install-cgiconf
diff --git a/net-mgmt/icinga/files/patch-include_config.h.in b/net-mgmt/icinga-classicweb/files/patch-include_config.h.in
index e98a7c130c9a..e98a7c130c9a 100644
--- a/net-mgmt/icinga/files/patch-include_config.h.in
+++ b/net-mgmt/icinga-classicweb/files/patch-include_config.h.in
diff --git a/net-mgmt/icinga/files/pkg-message.in b/net-mgmt/icinga-classicweb/files/pkg-message.in
index 1df473d198f5..6068c0114a9f 100644
--- a/net-mgmt/icinga/files/pkg-message.in
+++ b/net-mgmt/icinga-classicweb/files/pkg-message.in
@@ -1,9 +1,4 @@
*************************************************************************
-
- Enable Icinga in /etc/rc.conf with the following line:
-
- icinga_enable="YES"
-
Documentation is available in HTML form in
%%PREFIX%%/%%ICINGAWWWDIR%%/docs/.
@@ -13,10 +8,4 @@
A sample Apache 2.x configuration is installed as
%%PREFIX%%/%%EXAMPLESDIR%%/apache2/icinga.conf-sample
- If you like to use database backend with IDOutils the SQL scripts to
- setup the database have been installed in
- %%PREFIX%%/%%EXAMPLESDIR%%/idoutils/db/.
- You also need to install databases/libdbi-drivers to connect to a
- database.
-
*************************************************************************
diff --git a/net-mgmt/icinga-classicweb/pkg-descr b/net-mgmt/icinga-classicweb/pkg-descr
new file mode 100644
index 000000000000..23c6912f8b82
--- /dev/null
+++ b/net-mgmt/icinga-classicweb/pkg-descr
@@ -0,0 +1,3 @@
+This is the classic CGI web interface for Icinga 1.x and 2.x.
+
+WWW: https://www.icinga.org/
diff --git a/net-mgmt/icinga/pkg-plist b/net-mgmt/icinga-classicweb/pkg-plist
index 5adf41131403..4ea523dc370c 100644
--- a/net-mgmt/icinga/pkg-plist
+++ b/net-mgmt/icinga-classicweb/pkg-plist
@@ -1,161 +1,5 @@
-bin/icinga
-bin/icingastats
-%%IDOUTILS%%bin/ido2db
-%%IDOUTILS%%bin/log2ido
@sample %%ETCDIR%%/cgi.cfg.sample
@sample %%ETCDIR%%/cgiauth.cfg.sample
-@sample %%ETCDIR%%/icinga.cfg.sample
-@sample %%IDOUTILS%%%%ETCDIR%%/ido2db.cfg.sample
-@sample %%IDOUTILS%%%%ETCDIR%%/idomod.cfg.sample
-@sample %%IDOUTILS%%%%ETCDIR%%/modules/idoutils.cfg.sample
-@sample %%ETCDIR%%/modules/flapjack.cfg.sample
-@sample %%ETCDIR%%/modules/livestatus.cfg.sample
-@sample %%ETCDIR%%/modules/mod_gearman.cfg.sample
-@sample %%ETCDIR%%/modules/pnp4nagios.cfg.sample
-@sample %%ETCDIR%%/objects/commands.cfg.sample
-@sample %%ETCDIR%%/objects/contacts.cfg.sample
-@sample %%IDOUTILS%%%%ETCDIR%%/objects/ido2db_check_proc.cfg.sample
-@sample %%ETCDIR%%/objects/localhost.cfg.sample
-@sample %%ETCDIR%%/objects/notifications.cfg.sample
-@sample %%ETCDIR%%/objects/printer.cfg.sample
-@sample %%ETCDIR%%/objects/switch.cfg.sample
-@sample %%ETCDIR%%/objects/templates.cfg.sample
-@sample %%ETCDIR%%/objects/timeperiods.cfg.sample
-@sample %%ETCDIR%%/objects/windows.cfg.sample
-@sample %%ETCDIR%%/resource.cfg.sample
-%%IDOUTILS%%lib/idomod.so
-libexec/icinga/eventhandlers/disable_active_service_checks
-libexec/icinga/eventhandlers/disable_notifications
-libexec/icinga/eventhandlers/distributed-monitoring/obsessive_svc_handler
-libexec/icinga/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
-libexec/icinga/eventhandlers/enable_active_service_checks
-libexec/icinga/eventhandlers/enable_notifications
-libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-host-event
-libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-proc-event
-libexec/icinga/eventhandlers/submit_check_result
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache2/icinga.conf.sample
-%%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/config/updates/ido2db.cfg_added_1.12_to_1.13.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.7_to_1.8.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.8_to_1.9.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.9_to_1.10.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_removed_1.9_to_1.10.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/idomod.cfg_added_1.10_to_1.11.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/idomod.cfg_added_1.9_to_1.10.cfg
-%%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.10.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.3.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.6.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.7.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.12.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.13.0.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/mysql/upgrade/mysql-upgrade-1.8.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.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.10.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.3.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.6.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.7.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.12.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.13.0.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-upgrade-1.8.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.9.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.10.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.3.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.6.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.7.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.12.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.13.0.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/pgsql/upgrade/pgsql-upgrade-1.8.0.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.9.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/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
@mode 755
%%ICINGAWWWDIR%%/cgi-bin/avail.cgi
%%ICINGAWWWDIR%%/cgi-bin/cmd.cgi
@@ -2396,6 +2240,10 @@ libexec/icinga/eventhandlers/submit_check_result
%%ICINGAWWWDIR%%/stylesheets/tac.css
%%ICINGAWWWDIR%%/stylesheets/tacheader.css
%%ICINGAWWWDIR%%/stylesheets/trends.css
-@dir %%ETCDIR%%/conf.d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache2/icinga.conf
+@dir(%%ICINGAUSER%%,%%ICINGAGROUP%%) %%ICINGALOGDIR%%/archives
+@dir(%%ICINGAUSER%%,%%ICINGAGROUP%%) %%ICINGALOGDIR%%
+@dir(%%ICINGAUSER%%,%%WWWGRP%%) %%ICINGADIR%%/rw
+@dir(%%ICINGAUSER%%,%%ICINGAGROUP%%) %%ICINGADIR%%
@dir %%ICINGAWWWDIR%%/media
@dir %%ICINGAWWWDIR%%/ssi
diff --git a/net-mgmt/icinga-core/Makefile b/net-mgmt/icinga-core/Makefile
new file mode 100644
index 000000000000..2386425e4b43
--- /dev/null
+++ b/net-mgmt/icinga-core/Makefile
@@ -0,0 +1,72 @@
+# Created by: Chin-San Huang <chinsan@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= icinga-core
+DISTNAME= icinga-${PORTVERSION}
+
+COMMENT= Enterprise grade open source monitoring system based on Nagios
+
+.include "${.CURDIR}/Makefile.common"
+
+USE_RC_SUBR= icinga
+
+ALL_TARGET= icinga
+INSTALL_TARGET= install-base install-basic install-config install-eventhandlers
+
+SUB_FILES= pkg-message
+
+# XXX: Don't remove PREFIX from SUB_LIST here.
+SUB_LIST= PREFIX=${PREFIX} \
+ ${PLIST_SUB}
+
+OPTIONS_DEFINE= IDOUTILS
+OPTIONS_RADIO= PLUGINS
+OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS
+OPTIONS_DEFAULT= IDOUTILS MONPLUGINS
+
+IDOUTILS_DESC= Enable Icinga Data Objects support
+
+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
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MIDOUTILS}
+LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
+CONFIGURE_ARGS+= --enable-idoutils \
+ --enable-ssl \
+ --with-dbi-lib=${LOCALBASE}/lib \
+ --with-dbi-inc=${LOCALBASE}/include
+ALL_TARGET+= idoutils
+INSTALL_TARGET+= install-idoutils
+USE_OPENSSL= yes
+USE_RC_SUBR+= ido2db
+PLIST_SUB+= IDOUTILS=""
+.else
+PLIST_SUB+= IDOUTILS="@comment "
+CONFIGURE_ARGS+= --disable-idoutils
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's#775#755#g; s#664#644#g' \
+ ${WRKSRC}/html/Makefile.in
+# Use correct make(1) syntax to unbreak parallel builds
+ @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+ -E 's#cd (.+) && (make|\$$\(MAKE\))#$$(MAKE) -C \1#'
+
+pre-install:
+.if ${PORT_OPTIONS:MIDOUTILS}
+ @${STRIP_CMD} ${WRKSRC}/module/idoutils/src/ido2db \
+ ${WRKSRC}/module/idoutils/src/log2ido \
+ ${WRKSRC}/module/idoutils/src/idomod.so
+.endif
+
+post-install:
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/config/
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/db
+ cd ${WRKSRC}/module/idoutils/config && ${COPYTREE_SHARE} . \
+ ${STAGEDIR}${EXAMPLESDIR}/idoutils/config
+ cd ${WRKSRC}/module/idoutils/db && ${COPYTREE_SHARE} . \
+ ${STAGEDIR}${EXAMPLESDIR}/idoutils/db
+
+.include <bsd.port.mk>
diff --git a/net-mgmt/icinga-core/Makefile.common b/net-mgmt/icinga-core/Makefile.common
new file mode 100644
index 000000000000..7ea6a25d67c1
--- /dev/null
+++ b/net-mgmt/icinga-core/Makefile.common
@@ -0,0 +1,70 @@
+# $FreeBSD$
+
+PORTVERSION= 1.13.3
+CATEGORIES= net-mgmt
+MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/
+
+MAINTAINER= lme@FreeBSD.org
+
+LICENSE= GPLv2
+
+LIB_DEPENDS+= libltdl.so:${PORTSDIR}/devel/libltdl
+USES= cpe gmake iconv perl5
+
+GNU_CONFIGURE= yes
+
+ICINGAUSER?= icinga
+ICINGAGROUP?= icinga
+USERS= ${ICINGAUSER}
+GROUPS= ${ICINGAGROUP}
+ICINGADIR?= /var/spool/icinga
+ICINGALOGDIR?= /var/log/icinga
+
+ICINGAWWWDIR?= www/icinga
+ICINGAHTMURL?= /icinga
+ICINGACGIURL?= ${ICINGAHTMURL}/cgi-bin
+
+ETCDIR= ${PREFIX}/etc/icinga
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
+
+CONFIGURE_ARGS= --with-command-user=${ICINGAUSER} \
+ --with-command-group=${WWWGRP} \
+ --with-icinga-user=${ICINGAUSER} \
+ --with-icinga-group=${ICINGAGROUP} \
+ --with-htmurl=${ICINGAHTMURL} \
+ --with-cgiurl=${ICINGACGIURL} \
+ --sbindir=${PREFIX}/${ICINGAWWWDIR}/cgi-bin \
+ --datarootdir=${PREFIX}/${ICINGAWWWDIR} \
+ --datadir=${PREFIX}/${ICINGAWWWDIR} \
+ --sysconfdir=${PREFIX}/etc/icinga \
+ --localstatedir=${ICINGADIR} \
+ --with-checkresult-dir=${ICINGADIR}/checkresults \
+ --libexecdir=${PREFIX}/libexec/icinga \
+ --with-plugin-dir=${LOCALBASE}/libexec/nagios \
+ --with-log-dir=${ICINGALOGDIR} \
+ --with-httpd-conf=${EXAMPLESDIR}/apache2 \
+ --enable-event-broker \
+ --enable-nanosleep \
+
+CONFIGURE_ENV= PERL=${PERL} \
+ HOME=${WRKDIR} # prevent creation of .rnd file
+
+MAKE_ARGS= INSTALL_OPTS= INSTALL_OPTS_WEB= COMMAND_OPTS=
+
+PLIST_SUB= ICINGADIR=${ICINGADIR} \
+ ICINGALOGDIR=${ICINGALOGDIR} \
+ ICINGAWWWDIR=${ICINGAWWWDIR} \
+ ICINGAUSER=${ICINGAUSER} \
+ ICINGAGROUP=${ICINGAGROUP} \
+ ICINGAHTMURL=${ICINGAHTMURL} \
+ ICINGACGIURL=${ICINGACGIURL} \
+ WWWGRP=${WWWGRP}
+
+SUB_FILES= pkg-message
+
+# XXX: Don't remove PREFIX from SUB_LIST here.
+SUB_LIST= PREFIX=${PREFIX} \
+ ${PLIST_SUB}
+
diff --git a/net-mgmt/icinga-core/distinfo b/net-mgmt/icinga-core/distinfo
new file mode 100644
index 000000000000..58061c7f884b
--- /dev/null
+++ b/net-mgmt/icinga-core/distinfo
@@ -0,0 +1,2 @@
+SHA256 (icinga-1.13.3.tar.gz) = d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84
+SIZE (icinga-1.13.3.tar.gz) = 18738204
diff --git a/net-mgmt/icinga/files/icinga.in b/net-mgmt/icinga-core/files/icinga.in
index d7ccf2cc5d77..d7ccf2cc5d77 100644
--- a/net-mgmt/icinga/files/icinga.in
+++ b/net-mgmt/icinga-core/files/icinga.in
diff --git a/net-mgmt/icinga/files/ido2db.in b/net-mgmt/icinga-core/files/ido2db.in
index 745139884c4c..745139884c4c 100644
--- a/net-mgmt/icinga/files/ido2db.in
+++ b/net-mgmt/icinga-core/files/ido2db.in
diff --git a/net-mgmt/icinga/files/patch-Makefile.in b/net-mgmt/icinga-core/files/patch-Makefile.in
index 0460dd6acda8..3e6793c368cc 100644
--- a/net-mgmt/icinga/files/patch-Makefile.in
+++ b/net-mgmt/icinga-core/files/patch-Makefile.in
@@ -1,5 +1,5 @@
--- Makefile.in.orig 2015-07-15 13:04:09.000000000 +0200
-+++ Makefile.in 2015-07-25 16:26:11.654840000 +0200
++++ Makefile.in 2015-07-26 16:58:19.208026000 +0200
@@ -139,16 +139,16 @@ none:
###############################
@@ -189,12 +189,9 @@
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
-+ $(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-config: install-cgiconf
+-
+-
+-install-config: install-cgiconf
- $(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
@@ -216,6 +213,12 @@
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/modules/flapjack.cfg $(DESTDIR)$(CFGDIR)/modules/flapjack.cfg
-
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
++ $(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-config:
++ $(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
diff --git a/net-mgmt/icinga-core/files/patch-include_config.h.in b/net-mgmt/icinga-core/files/patch-include_config.h.in
new file mode 100644
index 000000000000..e98a7c130c9a
--- /dev/null
+++ b/net-mgmt/icinga-core/files/patch-include_config.h.in
@@ -0,0 +1,16 @@
+--- include/config.h.in.orig 2015-07-15 13:04:09.000000000 +0200
++++ include/config.h.in 2015-07-25 16:05:16.168060000 +0200
+@@ -217,10 +217,13 @@
+ #include <errno.h>
+ #endif
+
++/* remove inclusion of sys/timeb.h to suppress a lot of warnings during build */
++#if 0
+ #undef HAVE_SYS_TIMEB_H
+ #if HAVE_SYS_TIMEB_H
+ #include <sys/timeb.h>
+ #endif
++#endif
+
+ #undef HAVE_SYS_IPC_H
+ #ifdef HAVE_SYS_IPC_H
diff --git a/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in b/net-mgmt/icinga-core/files/patch-module-idoutils-Makefile.in
index 8ab159eb4457..8ab159eb4457 100644
--- a/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in
+++ b/net-mgmt/icinga-core/files/patch-module-idoutils-Makefile.in
diff --git a/net-mgmt/icinga-core/files/pkg-message.in b/net-mgmt/icinga-core/files/pkg-message.in
new file mode 100644
index 000000000000..338e020d815d
--- /dev/null
+++ b/net-mgmt/icinga-core/files/pkg-message.in
@@ -0,0 +1,13 @@
+*************************************************************************
+
+ Enable Icinga in /etc/rc.conf with the following line:
+
+ icinga_enable="YES"
+
+ If you like to use database backend with IDOutils the SQL scripts to
+ setup the database have been installed in
+ %%PREFIX%%/%%EXAMPLESDIR%%/idoutils/db/.
+ You also need to install databases/libdbi-drivers to connect to a
+ database.
+
+*************************************************************************
diff --git a/net-mgmt/icinga-core/pkg-descr b/net-mgmt/icinga-core/pkg-descr
new file mode 100644
index 000000000000..51b18138caa3
--- /dev/null
+++ b/net-mgmt/icinga-core/pkg-descr
@@ -0,0 +1,13 @@
+Icinga is an enterprise grade open source monitoring system which keeps
+watch over networks and any conceivable network resource, notifies the user
+of errors and recoveries and generates performance data for reporting.
+Scalable and extensible, Icinga can monitor complex, large environments
+across dispersed locations.
+
+Icinga is a fork of Nagios and is backward compatible. That said, Nagios
+configurations, plugins, and addons can all be used with Icinga. Though
+Icinga retains all the existing features of its predecessor, it builds on
+them to add many long awaited patches and features requested by the user
+community.
+
+WWW: http://www.icinga.org/
diff --git a/net-mgmt/icinga-core/pkg-plist b/net-mgmt/icinga-core/pkg-plist
new file mode 100644
index 000000000000..708e87d1ce4c
--- /dev/null
+++ b/net-mgmt/icinga-core/pkg-plist
@@ -0,0 +1,156 @@
+bin/icinga
+bin/icingastats
+%%IDOUTILS%%bin/ido2db
+%%IDOUTILS%%bin/log2ido
+@sample %%ETCDIR%%/icinga.cfg.sample
+@sample %%IDOUTILS%%%%ETCDIR%%/ido2db.cfg.sample
+@sample %%IDOUTILS%%%%ETCDIR%%/idomod.cfg.sample
+@sample %%IDOUTILS%%%%ETCDIR%%/modules/idoutils.cfg.sample
+@sample %%ETCDIR%%/modules/flapjack.cfg.sample
+@sample %%ETCDIR%%/modules/livestatus.cfg.sample
+@sample %%ETCDIR%%/modules/mod_gearman.cfg.sample
+@sample %%ETCDIR%%/modules/pnp4nagios.cfg.sample
+@sample %%ETCDIR%%/objects/commands.cfg.sample
+@sample %%ETCDIR%%/objects/contacts.cfg.sample
+@sample %%IDOUTILS%%%%ETCDIR%%/objects/ido2db_check_proc.cfg.sample
+@sample %%ETCDIR%%/objects/localhost.cfg.sample
+@sample %%ETCDIR%%/objects/notifications.cfg.sample
+@sample %%ETCDIR%%/objects/printer.cfg.sample
+@sample %%ETCDIR%%/objects/switch.cfg.sample
+@sample %%ETCDIR%%/objects/templates.cfg.sample
+@sample %%ETCDIR%%/objects/timeperiods.cfg.sample
+@sample %%ETCDIR%%/objects/windows.cfg.sample
+@sample %%ETCDIR%%/resource.cfg.sample
+%%IDOUTILS%%lib/idomod.so
+libexec/icinga/eventhandlers/disable_active_service_checks
+libexec/icinga/eventhandlers/disable_notifications
+libexec/icinga/eventhandlers/distributed-monitoring/obsessive_svc_handler
+libexec/icinga/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+libexec/icinga/eventhandlers/enable_active_service_checks
+libexec/icinga/eventhandlers/enable_notifications
+libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-host-event
+libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-proc-event
+libexec/icinga/eventhandlers/submit_check_result
+%%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/config/updates/ido2db.cfg_added_1.12_to_1.13.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.7_to_1.8.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.8_to_1.9.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.9_to_1.10.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_removed_1.9_to_1.10.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/idomod.cfg_added_1.10_to_1.11.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/idomod.cfg_added_1.9_to_1.10.cfg
+%%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.10.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.6.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.7.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.12.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.13.0.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/mysql/upgrade/mysql-upgrade-1.8.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.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.10.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.6.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.7.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.12.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.13.0.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-upgrade-1.8.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.9.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.10.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.6.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.7.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.12.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.13.0.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/pgsql/upgrade/pgsql-upgrade-1.8.0.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.9.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/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
+@dir %%ETCDIR%%/conf.d
diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index 8754c198c751..a2b577120b71 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -3,137 +3,15 @@
PORTNAME= icinga
PORTVERSION= 1.13.3
+PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/
MAINTAINER= lme@FreeBSD.org
-COMMENT= Enterprise grade open source monitoring system based on Nagios
+COMMENT= Metaport for Icinga 1.x and its classic web interface
-LICENSE= GPLv2
+RUN_DEPENDS= icinga-core>=1.13.3:${PORTSDIR}/net-mgmt/icinga-core \
+ ${LOCALBASE}/www/icinga/main.html:${PORTSDIR}/net-mgmt/icinga-classicweb
-LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \
- libgd.so:${PORTSDIR}/graphics/gd
-
-USES= cpe gmake perl5
-USE_RC_SUBR= icinga
-
-GNU_CONFIGURE= yes
-
-ICINGAUSER?= icinga
-ICINGAGROUP?= icinga
-USERS= ${ICINGAUSER}
-GROUPS= ${ICINGAGROUP}
-ICINGADIR?= /var/spool/icinga
-ICINGALOGDIR?= /var/log/icinga
-
-ICINGAWWWDIR?= www/icinga
-ICINGAHTMURL?= /icinga
-ICINGACGIURL?= ${ICINGAHTMURL}/cgi-bin
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-command-user=${ICINGAUSER} \
- --with-command-group=${WWWGRP} \
- --with-icinga-user=${ICINGAUSER} \
- --with-icinga-group=${ICINGAGROUP} \
- --with-htmurl=${ICINGAHTMURL} \
- --with-cgiurl=${ICINGACGIURL} \
- --sbindir=${PREFIX}/${ICINGAWWWDIR}/cgi-bin \
- --datarootdir=${PREFIX}/${ICINGAWWWDIR} \
- --datadir=${PREFIX}/${ICINGAWWWDIR} \
- --sysconfdir=${PREFIX}/etc/icinga \
- --localstatedir=${ICINGADIR} \
- --with-checkresult-dir=${ICINGADIR}/checkresults \
- --libexecdir=${PREFIX}/libexec/icinga \
- --with-plugin-dir=${LOCALBASE}/libexec/nagios \
- --with-log-dir=${ICINGALOGDIR} \
- --with-httpd-conf=${EXAMPLESDIR}/apache2 \
- --enable-event-broker \
- --enable-nanosleep \
- ac_cv_lib_iconv_main=no
-
-CONFIGURE_ENV= PERL=${PERL} \
- HOME=${WRKDIR} # prevent creation of .rnd file
-
-MAKE_ARGS= INSTALL_OPTS= INSTALL_OPTS_WEB=
-
-INSTALL_TARGET= install install-config install-eventhandlers install-webconf
-
-PLIST_SUB= ICINGADIR=${ICINGADIR} \
- ICINGALOGDIR=${ICINGALOGDIR} \
- ICINGAWWWDIR=${ICINGAWWWDIR} \
- ICINGAUSER=${ICINGAUSER} \
- ICINGAGROUP=${ICINGAGROUP} \
- ICINGAHTMURL=${ICINGAHTMURL} \
- ICINGACGIURL=${ICINGACGIURL} \
- WWWGRP=${WWWGRP}
-
-SUB_FILES= pkg-message
-
-# XXX: Don't remove PREFIX from SUB_LIST here.
-SUB_LIST= PREFIX=${PREFIX} \
- ${PLIST_SUB}
-
-OPTIONS_DEFINE= IDOUTILS
-OPTIONS_RADIO= PLUGINS
-OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS
-OPTIONS_DEFAULT= IDOUTILS MONPLUGINS
-
-IDOUTILS_DESC= Enable Icinga Data Objects support
-
-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
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIDOUTILS}
-LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
-CONFIGURE_ARGS+= --enable-idoutils \
- --enable-ssl \
- --with-dbi-lib=${LOCALBASE}/lib \
- --with-dbi-inc=${LOCALBASE}/include
-INSTALL_TARGET+= install-idoutils
-USE_OPENSSL= yes
-USE_RC_SUBR+= ido2db
-PLIST_SUB+= IDOUTILS=""
-.else
-PLIST_SUB+= IDOUTILS="@comment "
-CONFIGURE_ARGS+= --disable-idoutils
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's#/bin/ping#/sbin/ping#' \
- ${WRKSRC}/sample-config/cgi.cfg.in
-.for f in icinga.cfg.in \
- cgiauth.cfg.in \
- template-object/localhost.cfg.in \
- template-object/templates.cfg.in
- @${REINPLACE_CMD} -e 's#Linux#${OPSYS}#' \
- -e 's#linux#${OPSYS:tl}#' \
- ${WRKSRC}/sample-config/${f}
-.endfor
- @${REINPLACE_CMD} -e 's#775#755#g; s#664#644#g' \
- ${WRKSRC}/html/Makefile.in
-# Use correct make(1) syntax to unbreak parallel builds
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
- -E 's#cd (.+) && (make|\$$\(MAKE\))#$$(MAKE) -C \1#'
-
-pre-install:
-.if ${PORT_OPTIONS:MIDOUTILS}
- @${STRIP_CMD} ${WRKSRC}/module/idoutils/src/ido2db \
- ${WRKSRC}/module/idoutils/src/log2ido \
- ${WRKSRC}/module/idoutils/src/idomod.so
-.endif
-
-post-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${ICINGAWWWDIR}/ssi
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/config/
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/db
- cd ${WRKSRC}/module/idoutils/config && ${COPYTREE_SHARE} . \
- ${STAGEDIR}${EXAMPLESDIR}/idoutils/config
- cd ${WRKSRC}/module/idoutils/db && ${COPYTREE_SHARE} . \
- ${STAGEDIR}${EXAMPLESDIR}/idoutils/db
+USES= metaport
.include <bsd.port.mk>
diff --git a/net-mgmt/icinga/pkg-descr b/net-mgmt/icinga/pkg-descr
index 51b18138caa3..51d0afa3ca59 100644
--- a/net-mgmt/icinga/pkg-descr
+++ b/net-mgmt/icinga/pkg-descr
@@ -1,13 +1,4 @@
-Icinga is an enterprise grade open source monitoring system which keeps
-watch over networks and any conceivable network resource, notifies the user
-of errors and recoveries and generates performance data for reporting.
-Scalable and extensible, Icinga can monitor complex, large environments
-across dispersed locations.
+This is the meta port for Icinga 1.x including net-mgmt/icinga-core and
+net-mgmt/icinga-classicweb.
-Icinga is a fork of Nagios and is backward compatible. That said, Nagios
-configurations, plugins, and addons can all be used with Icinga. Though
-Icinga retains all the existing features of its predecessor, it builds on
-them to add many long awaited patches and features requested by the user
-community.
-
-WWW: http://www.icinga.org/
+WWW: http://www.icinga.org