libraries/raptor: Updated for version 2.0.15.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 19 insertions, 25 deletions

diff --git a/libraries/raptor/raptor.SlackBuild b/libraries/raptor/raptor.SlackBuild
index debe82a606ef..d5258faf3e87 100644
--- a/libraries/raptor/raptor.SlackBuild
+++ b/libraries/raptor/raptor.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for raptor
-# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012
+
+# Copyright 2012-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,17 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# some stuff is "inspired" by the official ex-raptor.SlackBuild
-# http://slackware.osuosl.org/slackware64-13.37/source/l/raptor/raptor.SlackBuild
+# some stuff is "inspired" by the official ex-raptor{,2}.SlackBuild
 
 PRGNAM=raptor
-VERSION=${VERSION:-1.4.21}
+VERSION=${VERSION:-2.0.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -63,18 +63,15 @@ 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}2-$VERSION
+tar xvf $CWD/${PRGNAM}2-$VERSION.tar.gz
+cd ${PRGNAM}2-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Remove a deprecated curl header
-sed -i "s|#include <curl/types\.h>||" src/raptor_internal.h
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -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" \
@@ -85,15 +82,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-static \
+  --with-icu-config=/usr/bin/icu-config \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-# rapper is already included in raptor2, so rename it
-mv $PKG/usr/bin/{rapper,rapper1}
-mv $PKG/usr/man/man1/{rapper,rapper1}.1
-
 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
 
@@ -102,7 +96,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc/raptor-$VERSION ; ln -s /usr/share/gtk-doc/html/raptor html )
+( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s /usr/share/gtk-doc/html/${PRGNAM}2 html )
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/raptor/raptor.info b/libraries/raptor/raptor.info
index 08c91e3304fe..0cabc8099221 100644
--- a/libraries/raptor/raptor.info
+++ b/libraries/raptor/raptor.info
@@ -1,8 +1,8 @@
 PRGNAM="raptor"
-VERSION="1.4.21"
+VERSION="2.0.15"
 HOMEPAGE="http://librdf.org"
-DOWNLOAD="http://download.librdf.org/source/raptor-1.4.21.tar.gz"
-MD5SUM="992061488af7a9e2d933df6b694bb876"
+DOWNLOAD="http://download.librdf.org/source/raptor2-2.0.15.tar.gz"
+MD5SUM="a39f6c07ddb20d7dd2ff1f95fa21e2cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""