1 files changed, 20 insertions, 9 deletions
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild
index 157a86e4..7289500d 100755
--- a/source/xap/gimp/gimp.SlackBuild
+++ b/source/xap/gimp/gimp.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,10 @@
 #  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)
 
 PKGNAM=gimp
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -35,9 +36,16 @@ if [ -z "$ARCH" ]; then
   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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-gimp
 rm -rf $PKG
@@ -59,7 +67,7 @@ fi
 
 cd $TMP
 rm -rf gimp-$VERSION
-tar xvf $CWD/gimp-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/gimp-$VERSION.tar.?z || exit 1
 cd gimp-$VERSION || exit 1
 
 chown -R root:root .
@@ -79,16 +87,19 @@ CFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/gimp-$VERSION \
   --disable-static \
-  --with-libcurl \
-  --with-lcms=lcms2 \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 mkdir -p $PKG/usr/share/applications $PKG/usr/share/application-registry
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Add a manpage symlink for POLA-compliance
-( cd $PKG/usr/man/man1 ; ln -sf gimptool-2.?.1 gimptool.1 )
+if [ -r $PKG/usr/man/man1/gimptool-2.?.1 -a ! -r $PKG/usr/man/man1/gimptool.1 ]; then
+  ( cd $PKG/usr/man/man1 ; ln -sf gimptool-2.?.1 gimptool.1 )
+fi
 
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then