2 files changed, 21 insertions, 21 deletions
diff --git a/development/uncrustify/uncrustify.SlackBuild b/development/uncrustify/uncrustify.SlackBuild
index 9df803573e115..31f1b4767ecdd 100644
--- a/development/uncrustify/uncrustify.SlackBuild
+++ b/development/uncrustify/uncrustify.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Aleksandar Samardzic <asamardzic@gmail.com>
 
 PRGNAM=uncrustify
-VERSION=${VERSION:-0.63}
+VERSION=${VERSION:-0.64}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -37,9 +37,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -47,26 +47,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+ cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+mv $PKG/usr/share/man $PKG/usr
+rmdir $PKG/usr/share
+gzip -9 $PKG/usr/man/man1/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS ChangeLog documentation \
+cp -a AUTHORS COPYING ChangeLog documentation \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/uncrustify/uncrustify.info b/development/uncrustify/uncrustify.info
index f627fd46f67f3..6070d89a4eeae 100644
--- a/development/uncrustify/uncrustify.info
+++ b/development/uncrustify/uncrustify.info
@@ -1,8 +1,8 @@
 PRGNAM="uncrustify"
-VERSION="0.63"
+VERSION="0.64"
 HOMEPAGE="http://uncrustify.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/uncrustify/files/uncrustify/uncrustify-0.63/uncrustify-0.63.tar.gz"
-MD5SUM="791ffa57ac6a301d16463c1a97c77c0c"
+DOWNLOAD="https://github.com/uncrustify/uncrustify/archive/uncrustify-0.64.tar.gz"
+MD5SUM="fce85d5e6824b308f413085687b868fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""