2 files changed, 12 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a9b1bb3169b..fd8a21c0af22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = castxml
 	pkgdesc = C-family abstract syntax tree XML output tool.
-	pkgver = 0.6.4
+	pkgver = 0.6.5
 	pkgrel = 1
 	url = https://github.com/CastXML/CastXML
 	arch = i686
@@ -10,7 +10,7 @@ pkgbase = castxml
 	makedepends = python-sphinx
 	depends = llvm
 	depends = clang
-	source = castxml-0.6.4.tar.gz::https://github.com/CastXML/CastXML/archive/v0.6.4.tar.gz
-	sha256sums = 86d02c7ed743122ce8c6d888c643da92fb7515da04577a933d33180fb7731872
+	source = castxml-0.6.5.tar.gz::https://github.com/CastXML/CastXML/archive/v0.6.5.tar.gz
+	sha256sums = fea4754bdb1fb4496fec12352e2bd07854843aa757e85d0553f224ff0111c482
 
 pkgname = castxml
diff --git a/PKGBUILD b/PKGBUILD
index a6b5dd0852b0..18500351a051 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,25 @@
 
 pkgname=castxml
 pkgdesc="C-family abstract syntax tree XML output tool."
-pkgver=0.6.4
+pkgver=0.6.5
 pkgrel=1
 arch=(i686 x86_64)
 url="https://github.com/CastXML/CastXML"
 license=(Apache)
 depends=(llvm clang)
 makedepends=(cmake python-sphinx)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/CastXML/CastXML/archive/v$pkgver.tar.gz")
-sha256sums=('86d02c7ed743122ce8c6d888c643da92fb7515da04577a933d33180fb7731872')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/CastXML/CastXML/archive/v${pkgver}.tar.gz")
+sha256sums=('fea4754bdb1fb4496fec12352e2bd07854843aa757e85d0553f224ff0111c482')
 
 prepare() {
-  cd "CastXML-$pkgver"
+  cd "CastXML-${pkgver}"
 
   # Fix build issue as reported by Kniyl here https://github.com/CastXML/CastXML/issues/102
   sed -i "s|\${llvm_libs}|LLVM|g" src/CMakeLists.txt
+}
 
-  cmake . \
+build() {
+  cmake -B build -S "CastXML-${pkgver}" -Wno-dev \
     -DCLANG_LINK_CLANG_DYLIB=1 \
     -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build \
     -DSPHINX_HTML=1 \
@@ -26,14 +28,10 @@ prepare() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCastXML_INSTALL_DOC_DIR=share/doc/castxml \
     -DCastXML_INSTALL_MAN_DIR=share/man
-}
 
-build() {
-  cd "CastXML-$pkgver"
-  make
+  cmake --build build
 }
 
 package(){
-  cd "CastXML-$pkgver"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="${pkgdir}" cmake --install build
 }