fix build and bump version

basically applied changes from the regular icinga2 PKGBUILD

2 files changed, 11 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a80314e1eca0..513796dd75c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = icinga2-git
 	pkgdesc = An open source host, service and network monitoring program
-	pkgver = 2.12.0.r414.gcb25be2d1
+	pkgver = 2.13.0.r681.g8228fae74
 	pkgrel = 1
-	url = http://www.icinga.org
+	url = https://github.com/icinga/icinga2
 	install = icinga2-git.install
 	arch = i686
 	arch = x86_64
@@ -13,12 +13,10 @@ pkgbase = icinga2-git
 	makedepends = libmariadbclient
 	makedepends = postgresql-libs
 	makedepends = systemd
-	makedepends = wxgtk
 	depends = boost-libs
 	depends = libedit
 	depends = libsystemd
 	depends = openssl
-	depends = yajl
 	optdepends = monitoring-plugins: plugins needed for icinga checks
 	optdepends = libmariadbclient: for MySQL support
 	optdepends = postgresql-libs: for PostgreSQL support
@@ -41,12 +39,13 @@ pkgbase = icinga2-git
 	backup = etc/icinga2/features-available/ido-mysql.conf
 	backup = etc/icinga2/features-available/ido-pgsql.conf
 	backup = etc/icinga2/features-available/influxdb.conf
+	backup = etc/icinga2/features-available/influxdb2.conf
+	backup = etc/icinga2/features-available/journald.conf
 	backup = etc/icinga2/features-available/livestatus.conf
 	backup = etc/icinga2/features-available/mainlog.conf
 	backup = etc/icinga2/features-available/notification.conf
 	backup = etc/icinga2/features-available/opentsdb.conf
 	backup = etc/icinga2/features-available/perfdata.conf
-	backup = etc/icinga2/features-available/statusdata.conf
 	backup = etc/icinga2/features-available/syslog.conf
 	backup = etc/icinga2/constants.conf
 	backup = etc/icinga2/icinga2.conf
@@ -62,4 +61,3 @@ pkgbase = icinga2-git
 	sha256sums = 2f946a33ea50a3c4400a81acd778e6411ffe5e2257a98004288b84a64f382810
 
 pkgname = icinga2-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a014fa7e4d9b..45a4bd350a70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,17 @@
 
 pkgname='icinga2-git'
 _pkgname=icinga2
-pkgver=2.12.0.r414.gcb25be2d1
+pkgver=2.13.0.r681.g8228fae74
 pkgrel=1
 pkgdesc="An open source host, service and network monitoring program"
 license=('GPL')
 arch=('i686' 'x86_64')
-url="http://www.icinga.org"
-depends=('boost-libs' 'libedit' 'libsystemd' 'openssl' 'yajl')
+url='https://github.com/icinga/icinga2'
+depends=('boost-libs' 'libedit' 'libsystemd' 'openssl')
 optdepends=('monitoring-plugins: plugins needed for icinga checks'
             'libmariadbclient: for MySQL support'
             'postgresql-libs: for PostgreSQL support')
-makedepends=('boost' 'cmake' 'git' 'libmariadbclient' 'postgresql-libs' 'systemd' 'wxgtk')
+makedepends=('boost' 'cmake' 'git' 'libmariadbclient' 'postgresql-libs' 'systemd')
 provides=('icinga2' 'icinga2-common')
 conflicts=('icinga2' 'icinga2-common' 'icinga2-common-git')
 replaces=('icinga2-common-git')
@@ -30,12 +30,13 @@ backup=(etc/default/icinga2
         etc/icinga2/features-available/ido-mysql.conf
         etc/icinga2/features-available/ido-pgsql.conf
         etc/icinga2/features-available/influxdb.conf
+        etc/icinga2/features-available/influxdb2.conf
+        etc/icinga2/features-available/journald.conf
         etc/icinga2/features-available/livestatus.conf
         etc/icinga2/features-available/mainlog.conf
         etc/icinga2/features-available/notification.conf
         etc/icinga2/features-available/opentsdb.conf
         etc/icinga2/features-available/perfdata.conf
-        etc/icinga2/features-available/statusdata.conf
         etc/icinga2/features-available/syslog.conf
         etc/icinga2/constants.conf
         etc/icinga2/icinga2.conf
@@ -60,9 +61,6 @@ build() {
   mkdir -p "$srcdir/$_pkgname/build"
   cd "$srcdir/$_pkgname/build"
 
-  # The four lines settings variables regarding boost are a workaround for the
-  # boost version not being detected properly, see also
-  # https://github.com/Icinga/icinga2/issues/7566
   cmake "$srcdir/$_pkgname" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
@@ -73,12 +71,7 @@ build() {
     -DICINGA2_SYSCONFIGFILE=/etc/default/icinga2 \
     -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins \
     -DUSE_SYSTEMD=ON \
-    -DLOGROTATE_HAS_SU=OFF \
-    -DBoost_NO_BOOST_CMAKE=TRUE \
-    -DBoost_NO_SYSTEM_PATHS=TRUE \
-    -DBOOST_LIBRARYDIR=/usr/lib \
-    -DBOOST_INCLUDEDIR=/usr/include
-
+    -DLOGROTATE_HAS_SU=OFF
 
   make
 }