Update to 11.39.5 and build with cmake/ninja

2 files changed, 45 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0a5b645d359..b5179f93f891 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,22 @@
 pkgbase = monetdb
 	pkgdesc = MonetDB: an open source database system
-	pkgver = 11.35.3
+	pkgver = 11.39.5
 	pkgrel = 1
 	url = http://www.monetdb.org/Home
 	install = monetdb.install
 	arch = i686
 	arch = x86_64
-	license = custom
-	makedepends = r
-	makedepends = python
-	makedepends = libatomic_ops
-	makedepends = snappy
-	makedepends = unixodbc
+	license = MPL
+	makedepends = cmake
+	makedepends = ninja
 	depends = r
 	depends = python
 	depends = libatomic_ops
 	depends = snappy
 	depends = unixodbc
-	source = http://dev.monetdb.org/downloads/sources/Latest/MonetDB-11.35.3.tar.xz
-	sha256sums = 54715eb6e33e1c9464c700cb30e143e00e549c344f410e1e424bbc61fea587cc
+	depends = libxml2
+	source = http://dev.monetdb.org/downloads/sources/Latest/MonetDB-11.39.5.tar.xz
+	sha256sums = 49654be66305cffa9c59959a6c17897e1f2cb4dbaecde66be76837cc7f01fd75
 
 pkgname = monetdb
 
diff --git a/PKGBUILD b/PKGBUILD
index 5afe8e215d0a..fa7556165943 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,30 +4,56 @@
 # Contributor: Thiago Perrotta <perrotta dot thiago at poli dot ufrj dot br>
 # Contributor: artemklevtsov
 # Contributor: Moritz Bruder <muesli4 at gmail dot com>
+# Contributor: Philipp Fent <philipp@fent.de>
 
 pkgname=monetdb
-pkgver=11.35.3
+pkgver=11.39.5
 pkgrel=1
 pkgdesc="MonetDB: an open source database system"
 arch=('i686' 'x86_64')
 url="http://www.monetdb.org/Home"
-license=('custom')
-makedepends=('r' 'python' 'libatomic_ops' 'snappy' 'unixodbc')
-depends=('r' 'python' 'libatomic_ops' 'snappy' 'unixodbc')
+license=(MPL)
+makedepends=('cmake' 'ninja')
+depends=('r' 'python' 'libatomic_ops' 'snappy' 'unixodbc' 'libxml2')
 install=monetdb.install
 source=("http://dev.monetdb.org/downloads/sources/Latest/MonetDB-$pkgver.tar.xz")
-sha256sums=('54715eb6e33e1c9464c700cb30e143e00e549c344f410e1e424bbc61fea587cc')
+sha256sums=('49654be66305cffa9c59959a6c17897e1f2cb4dbaecde66be76837cc7f01fd75')
 
-build() {
+prepare() {
     cd "$srcdir/MonetDB-$pkgver"
-    ./bootstrap
-    ./configure --libdir=/usr/lib --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-        --disable-assert --disable-testing --enable-optimize --enable-rintegration
-    make
+    mkdir -p build
+}
+
+build() {
+    cd "$srcdir/MonetDB-$pkgver/build"
+    cmake ".." -G Ninja \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DRELEASE_VERSION=ON \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DASSERT=OFF \
+      -DSTRICT=OFF \
+      -DTESTING=OFF \
+      -DFITS=OFF \
+      -DGEOM=OFF \
+      -DNETCDF=OFF \
+      -DODBC=OFF \
+      -DPY3INTEGRATION=OFF \
+      -DRINTEGRATION=OFF \
+      -DSHP=OFF \
+      -DWITH_BZ2=ON \
+      -DWITH_CMOCKA=OFF \
+      -DWITH_CURL=ON \
+      -DWITH_LZ4=ON \
+      -DWITH_LZMA=ON \
+      -DWITH_PCRE=ON \
+      -DWITH_PROJ=OFF \
+      -DWITH_SNAPPY=OFF \
+      -DWITH_XML2=ON
+    ninja all
 }
 
 package() {
-    cd "$srcdir/MonetDB-$pkgver"
-    make "DESTDIR=$pkgdir" install
+    cd "$srcdir/MonetDB-$pkgver/build"
+    DESTDIR="$pkgdir" ninja install
     mkdir -p "$pkgdir/var/log/monetdb"
 }