Updated build

2 files changed, 70 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6c5eb6e8344..ce68ca0b9dac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,44 @@
 pkgbase = casacore-git
 	pkgdesc = Suite of c++ libraries for radio astronomy data processing
-	pkgver = r23271.a4231ee8b
+	pkgver = r23274.adc7333f9
 	pkgrel = 1
 	url = http://casacore.github.io/casacore/
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = make
-	makedepends = pkg-config
-	makedepends = binutils
-	makedepends = boost
-	makedepends = boost-libs
+	makedepends = git
 	makedepends = cmake
 	makedepends = gcc-fortran
-	makedepends = gcc
-	makedepends = flex
-	makedepends = git
-	makedepends = bison
-	makedepends = blas-openblas
-	makedepends = cfitsio
-	makedepends = wcslib
-	makedepends = python-numpy
+	makedepends = gsl
+	makedepends = boost
+	depends = boost-libs
+	depends = fftw
+	depends = gsl
+	depends = openblas
+	depends = lapack
+	depends = cfitsio
+	depends = wcslib
+	depends = python-numpy
 	optdepends = sofa: only for testing casacore measures
-	optdepends = fftw
-	optdepends = hdf5
-	optdepends = ncurses
+	optdepends = fftw: a library for computing the discrete Fourier transform
+	optdepends = hdf5: general purpose library and file format for storing scientific data
+	optdepends = ncurses: curses emulation library
 	provides = casacore-git
+	provides = libcasa_casa.so=7
+	provides = libcasa_coordinates.so=7
+	provides = libcasa_derivedmscal.so=7
+	provides = libcasa_fits.so=7
+	provides = libcasa_images.so=7
+	provides = libcasa_lattices.so=7
+	provides = libcasa_meas.so=7
+	provides = libcasa_measures.so=7
+	provides = libcasa_mirlib.so=7
+	provides = libcasa_msfits.so=7
+	provides = libcasa_ms.so=7
+	provides = libcasa_python3.so=7
+	provides = libcasa_scimath_f.so=7
+	provides = libcasa_scimath.so=7
+	provides = libcasa_tables.so=7
 	conflicts = casacore
 	source = casacore-git::git+https://github.com/casacore/casacore.git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 18f43fb08e12..7a3558271c0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,35 @@
-# Maintainer: fdiblen <fdiblen at gmail dot com>
+# Contibutor fdiblen <fdiblen at gmail dot com>
 #
 pkgname="casacore-git"
-pkgver=r23271.a4231ee8b
+pkgver=r23274.adc7333f9
 pkgrel=1
 pkgdesc="Suite of c++ libraries for radio astronomy data processing"
 arch=('i686' 'x86_64')
 url="http://casacore.github.io/casacore/"
 license=('GPL2')
-makedepends=('make' 'pkg-config' 'binutils' 'boost' 'boost-libs' 'cmake' 'gcc-fortran' 'gcc' 'flex' 'git'
-     	     'bison' 'blas-openblas' 'cfitsio' 'wcslib' 'python-numpy')
-depends=()
+depends=('boost-libs' 'fftw' 'gsl' 'openblas' 'lapack' 'cfitsio' 'wcslib' 'python-numpy')
+makedepends=('git' 'cmake' 'gcc-fortran' 'gsl' 'boost')
 optdepends=('sofa: only for testing casacore measures'
-     	    'fftw' 'hdf5' 'ncurses')
+     	    'fftw: a library for computing the discrete Fourier transform'
+            'hdf5: general purpose library and file format for storing scientific data'
+	    'ncurses: curses emulation library')
 conflicts=('casacore')
-provides=("${pkgname}")
+provides=("${pkgname}"
+  'libcasa_casa.so=7'
+  'libcasa_coordinates.so=7'
+  'libcasa_derivedmscal.so=7'
+  'libcasa_fits.so=7'
+  'libcasa_images.so=7'
+  'libcasa_lattices.so=7'
+  'libcasa_meas.so=7'
+  'libcasa_measures.so=7'
+  'libcasa_mirlib.so=7'
+  'libcasa_msfits.so=7'
+  'libcasa_ms.so=7'
+  'libcasa_python3.so=7'
+  'libcasa_scimath_f.so=7'
+  'libcasa_scimath.so=7'
+  'libcasa_tables.so=7')
 source=("$pkgname::git+https://github.com/casacore/casacore.git")
 md5sums=('SKIP')
 
@@ -23,16 +39,25 @@ pkgver() {
 }
 
 build() {
-    	cd "${srcdir}/${pkgname}"
-    	[[ -d build ]] && rm -rf build
-    	mkdir build && cd build
+	cd "${srcdir}/${pkgname}"
 
-    	cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-    	make
+	[[ -d build ]] && rm -rf build
+	
+	export CXXFLAGS="${CFLAGS}"
+	cmake \
+	  -S casacore \
+	  -B build \
+	  -DCMAKE_BUILD_TYPE=None \
+	  -DCMAKE_INSTALL_PREFIX=/usr \
+	  -DBUILD_SHARED_LIBS=TRUE \
+	  -DBUILD_PYTHON=OFF \
+	  -DBUILD_PYTHON3=ON \
+	  -Wno-dev
+	cmake --build build --target all
 }
 
 package() {
-    	cd "${srcdir}/${pkgname}/build"
-    	install -d ${pkgdir}/usr/share/licenses/${pkgname}
-    	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}/${pkgname}"
+	DESTDIR="${pkgdir}" cmake --build build --target install
+	install -Dm 644 casacore/COPYING -t "${pkgdir}/usr/share/licenses/casacore"
 }