4 files changed, 21 insertions, 20 deletions
diff --git a/desktop/sgsearch/README b/desktop/sgsearch/README
index ff18e489e3..6a26c35f55 100644
--- a/desktop/sgsearch/README
+++ b/desktop/sgsearch/README
@@ -1,4 +1 @@
 SGSearch is a simple frontend for find and grep file search tools.
-
-By default, the SlackBuild builds the gtk3 interface. If you want
-instead to build the gtk2 interface pass GTK2=yes to the SlackBuild.
diff --git a/desktop/sgsearch/sgsearch.SlackBuild b/desktop/sgsearch/sgsearch.SlackBuild
index f7c01e5a3c..ebae1e417b 100644
--- a/desktop/sgsearch/sgsearch.SlackBuild
+++ b/desktop/sgsearch/sgsearch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sgsearch
 
@@ -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=sgsearch
-VERSION=${VERSION:-1.1.9}
+VERSION=${VERSION:-1.2.3}
 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}
@@ -56,13 +66,6 @@ fi
 
 set -e
 
-# Use GTK3 as default.
-if [ "${GTK2:-no}" == "yes" ]; then
-	OPT1="$OPT -DGTK3=OFF"
-else
-	OPT2="$OPT -DGTK3=ON"
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -82,7 +85,8 @@ cmake \
        -DCMAKE_C_FLAGS="$SLKCFLAGS" \
        -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
        -DCMAKE_INSTALL_PREFIX=/usr \
-       $OPT1$OPT2 ..
+       -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+       ..
 make
 make install DESTDIR=$PKG
 
@@ -100,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/desktop/sgsearch/sgsearch.info b/desktop/sgsearch/sgsearch.info
index 7854c6b18c..9661db7831 100644
--- a/desktop/sgsearch/sgsearch.info
+++ b/desktop/sgsearch/sgsearch.info
@@ -1,8 +1,8 @@
 PRGNAM="sgsearch"
-VERSION="1.1.9"
-HOMEPAGE="http://sallu.tuxfamily.org/-Utilities-"
-DOWNLOAD="http://sallu.tuxfamily.org/IMG/gz/sgsearch-1.1.9.tar.gz"
-MD5SUM="31d6ae9dee6c1e099a164e4d06513bf1"
+VERSION="1.2.3"
+HOMEPAGE="https://sgsearch.tuxfamily.org"
+DOWNLOAD="https://download.tuxfamily.org/sgsearch/sgsearch-1.2.3.tar.gz"
+MD5SUM="29ded202e7ec61fadde3751c1b3d3a48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/sgsearch/slack-desc b/desktop/sgsearch/slack-desc
index a4d7c41807..575c098426 100644
--- a/desktop/sgsearch/slack-desc
+++ b/desktop/sgsearch/slack-desc
@@ -11,7 +11,7 @@ sgsearch:
 sgsearch: sgsearch is a simple simple frontend for find
 sgsearch: and grep file search tools.
 sgsearch:
-sgsearch: homepage: http://sallu.tuxfamily.org/-Utilities-
+sgsearch: homepage: https://sgsearch.tuxfamily.org
 sgsearch:
 sgsearch:
 sgsearch: