4 files changed, 36 insertions, 39 deletions
diff --git a/gis/libspatialindex/README b/gis/libspatialindex/README
index f5c891e73a..d120164e2d 100644
--- a/gis/libspatialindex/README
+++ b/gis/libspatialindex/README
@@ -1,6 +1,6 @@
-libspatialindex provides an extensible framework that support robust spatial
-indexing methods and sophisticated spatial queries. Main features are:
-generic main memory and disk based storage managers, R*-tree index (also
-supports linear and quadratic splitting), MVR-tree index (a.k.a. PPR-tree),
-TPR-tree index, advanced query capabilities, using Strategy and Visitor
-patterns, STR packing / bulk loading etc.
+libspatialindex provides an extensible framework that support robust
+spatial indexing methods and sophisticated spatial queries. Main
+features are: generic main memory and disk based storage managers,
+R*-tree index (also supports linear and quadratic splitting), MVR-tree
+index (a.k.a. PPR-tree), TPR-tree index, advanced query capabilities,
+using Strategy and Visitor patterns, STR packing / bulk loading etc.
diff --git a/gis/libspatialindex/libspatialindex.SlackBuild b/gis/libspatialindex/libspatialindex.SlackBuild
index 6377902af3..c7471bbed3 100644
--- a/gis/libspatialindex/libspatialindex.SlackBuild
+++ b/gis/libspatialindex/libspatialindex.SlackBuild
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 # Slackware build script for libspatialindex
+#
 # Copyright 2012 Alexander Bruy <alexander.bruy@gmail.com>
+# Copyright 2023 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,23 +26,21 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libspatialindex
-TARBALLNAME=spatialindex
-VERSION=${VERSION:-1.7.1}
+VERSION=${VERSION:-1.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
+SRCNAM=spatialindex
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-# 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
@@ -50,8 +50,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"
@@ -69,9 +69,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$TARBALLNAME-src-$VERSION.tar.bz2
-cd $TARBALLNAME-src-$VERSION
+rm -rf $SRCNAM-src-$VERSION
+tar xjvf $CWD/$SRCNAM-src-$VERSION.tar.bz2
+cd $SRCNAM-src-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -79,26 +79,23 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL INSTALL.WIN NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/gis/libspatialindex/libspatialindex.info b/gis/libspatialindex/libspatialindex.info
index add4a3cdb9..7ec4edc0f2 100644
--- a/gis/libspatialindex/libspatialindex.info
+++ b/gis/libspatialindex/libspatialindex.info
@@ -1,10 +1,10 @@
 PRGNAM="libspatialindex"
-VERSION="1.7.1"
-HOMEPAGE="http://libspatialindex.github.com/"
-DOWNLOAD="http://download.osgeo.org/libspatialindex/spatialindex-src-1.7.1.tar.bz2"
-MD5SUM="15e5fcff393a56ab9aa7553e4a9cd64a"
+VERSION="1.9.3"
+HOMEPAGE="https://libspatialindex.github.io/"
+DOWNLOAD="https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2"
+MD5SUM="db89182e1ac9cb12a88db958de2797df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Alexander Bruy"
-EMAIL="alexander.bruy@gmail.com"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/gis/libspatialindex/slack-desc b/gis/libspatialindex/slack-desc
index 9056eb9703..361862a004 100644
--- a/gis/libspatialindex/slack-desc
+++ b/gis/libspatialindex/slack-desc
@@ -11,7 +11,7 @@ libspatialindex:
 libspatialindex: This library provides and An extensible framework that will support
 libspatialindex: robust spatial indexing methods and sophisticated spatial queries.
 libspatialindex:
-libspatialindex: Homepage: http://libspatialindex.github.com/
+libspatialindex: Homepage: http://libspatialindex.github.io/
 libspatialindex:
 libspatialindex:
 libspatialindex: