diff options
| author | Lars Engels <lme@FreeBSD.org> | 2014-11-26 00:29:13 +0800 |
|---|---|---|
| committer | Lars Engels <lme@FreeBSD.org> | 2014-11-26 00:29:13 +0800 |
| commit | 8664bae740cc9a6f5b783cf908443c8119a239ad (patch) | |
| tree | d8d0167bd7d02e2c91680bb6612327eb6f370700 | |
| parent | d64dd6833e7bfa17f7479da89ffa68fc69f02b3d (diff) | |
| download | freebsd-ports-gnome-8664bae740cc9a6f5b783cf908443c8119a239ad.tar.gz freebsd-ports-gnome-8664bae740cc9a6f5b783cf908443c8119a239ad.tar.zst freebsd-ports-gnome-8664bae740cc9a6f5b783cf908443c8119a239ad.zip | |
- Fix build when not both database backends are selected
- Fix plist
- Bump PORTREVISION
PR: 195186
Submitted by: ohartman@zedat.fu-berlin.de
| -rw-r--r-- | net-mgmt/icinga2/Makefile | 1 | ||||
| -rw-r--r-- | net-mgmt/icinga2/files/patch-CMakeLists.txt | 13 | ||||
| -rw-r--r-- | net-mgmt/icinga2/pkg-plist | 16 |
3 files changed, 22 insertions, 8 deletions
diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile index 05a33859273e..5cc2581d79dc 100644 --- a/net-mgmt/icinga2/Makefile +++ b/net-mgmt/icinga2/Makefile @@ -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=/ diff --git a/net-mgmt/icinga2/files/patch-CMakeLists.txt b/net-mgmt/icinga2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2a5b562abb2f --- /dev/null +++ b/net-mgmt/icinga2/files/patch-CMakeLists.txt @@ -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}) diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist index 5b8a1034c2f1..2c691f0916f0 100644 --- a/net-mgmt/icinga2/pkg-plist +++ b/net-mgmt/icinga2/pkg-plist @@ -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 |