svn commit: r373415 - in head/net-mgmt/icinga2: . files

[Lars Engels]

Author: lme
Date: Tue Nov 25 16:29:13 2014
New Revision: 373415
URL: https://svnweb.freebsd.org/changeset/ports/373415
QAT: https://qat.redports.org/buildarchive/r373415/

Log:
  - Fix build when not both database backends are selected
  - Fix plist
  - Bump PORTREVISION
  
  PR:		195186
  Submitted by:	ohartman at zedat.fu-berlin.de

Added:
  head/net-mgmt/icinga2/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/net-mgmt/icinga2/Makefile
  head/net-mgmt/icinga2/pkg-plist

Modified: head/net-mgmt/icinga2/Makefile
==============================================================================
--- head/net-mgmt/icinga2/Makefile	Tue Nov 25 16:24:13 2014	(r373414)
+++ head/net-mgmt/icinga2/Makefile	Tue Nov 25 16:29:13 2014	(r373415)
@@ -2,6 +2,7 @@
 
 PORTNAME=	icinga2
 DISTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/
 

Added: head/net-mgmt/icinga2/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/icinga2/files/patch-CMakeLists.txt	Tue Nov 25 16:29:13 2014	(r373415)
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2014-11-24 21:13:28.953855765 +0100
++++ CMakeLists.txt	2014-11-24 21:13:39.486871283 +0100
+@@ -28,8 +28,8 @@
+       FORCE)
+ endif()
+ 
+-option(ICINGA2_WITH_MYSQL "MySQL support" ON)
+-option(ICINGA2_WITH_PGSQL "PostgreSQL support" ON)
++option(ICINGA2_WITH_MYSQL "MySQL support" OFF)
++option(ICINGA2_WITH_PGSQL "PostgreSQL support" OFF)
+ 
+ file(STRINGS icinga2.spec VERSION_LINE REGEX "^Version: ")
+ string(REPLACE "Version: " "" ICINGA2_VERSION ${VERSION_LINE})

Modified: head/net-mgmt/icinga2/pkg-plist
==============================================================================
--- head/net-mgmt/icinga2/pkg-plist	Tue Nov 25 16:24:13 2014	(r373414)
+++ head/net-mgmt/icinga2/pkg-plist	Tue Nov 25 16:29:13 2014	(r373415)
@@ -72,14 +72,14 @@ sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/markdown/7-configuring-icinga-2.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/8-migration.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/9-appendix.md
-%%DATADIR%%-ido-mysql/schema/mysql.sql
-%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql
-%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql
-%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql
-%%DATADIR%%-ido-pgsql/schema/pgsql.sql
-%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql
-%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql
-%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/mysql.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/pgsql.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql
 %%DATADIR%%/include/command-icinga.conf
 %%DATADIR%%/include/command-plugins-manubulon.conf
 %%DATADIR%%/include/command-plugins.conf