2 files changed, 34 insertions, 15 deletions
diff --git a/development/valabind/valabind.SlackBuild b/development/valabind/valabind.SlackBuild
index ca860606b0..5a2e54b705 100644
--- a/development/valabind/valabind.SlackBuild
+++ b/development/valabind/valabind.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for valabind
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=valabind
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,12 +79,21 @@ 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 {} \;
 
-make \
-  CFLAGS="$SLKCFLAGS"
-
-make install \
-  MANDIR=/usr/man \
-  DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+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
@@ -90,4 +109,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/valabind/valabind.info b/development/valabind/valabind.info
index eac84a5288..c22a2cdac6 100644
--- a/development/valabind/valabind.info
+++ b/development/valabind/valabind.info
@@ -1,10 +1,10 @@
 PRGNAM="valabind"
-VERSION="1.4.0"
-HOMEPAGE="http://radare.org/"
-DOWNLOAD="https://github.com/radare/valabind/archive/1.4.0/valabind-1.4.0.tar.gz"
-MD5SUM="c710b99ac4c27f4ed45dc38eccbc8544"
+VERSION="1.8.0"
+HOMEPAGE="https://radare.org/n/"
+DOWNLOAD="https://github.com/radare/valabind/archive/1.8.0/valabind-1.8.0.tar.gz"
+MD5SUM="427c07a82902506c65101952af6bb2f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vala"
+REQUIRES=""
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"