4 files changed, 38 insertions, 26 deletions
diff --git a/source/l/libraw1394/libraw1394-2.1.1.tar.sign b/source/l/libraw1394/libraw1394-2.1.1.tar.sign
deleted file mode 100644
index 8a3b96b3..00000000
--- a/source/l/libraw1394/libraw1394-2.1.1.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABAgAGBQJVP/7BAAoJEHnzb7JUXXnQxS8P/iQ4DJ0tpClDNLvWaLuvR1g7
-w38hqQm6l1jO7Mvy0OdIY047kwkWOK4G2a+Fb6r3KRyyRvUD5eJNaJypjEJHvDVV
-CAP9nJ/eZXnUwrWyZcoet3JyzD3K5bG415zzU/lE8c6jB0xEfxhrBN/CwipI8p4X
-Z74t3cE7Sns9FdDBer038W1LKaRyK7PvU2qsGQjol50gOfjYmD7dpbzfPrbfoX0Q
-EuttAu6VUGLtLMTITsA5dND5PjA0Eazc6CdLaQKJy9+6K0xV/Tnt7EVL1T+by+Y6
-rzfrQ0JUWOJ5R1dO9poxXcVtL5pJleQ1gwlXSg4Z2UlKRCq4vBRnFoclMrVzIgvt
-eYLcEJgiwPDIUtMdspwGhyifsMktzuGAhqG1arEJE5i4++ZFdhPx3D1A2AubN5Ok
-E1CcmrNp76rEqbTGTOxncn/QMgcZ7SMhku5THY+VBYfKkHRpBBn9pEg2VtTfsRSQ
-1Eou/Xvsu/p3YvB8Eq2bUImS4mqfFIvMVM1shBCfGErd76T/QcVuuGko0M1+CaHB
-BP24/JZy347G814z5Ba6Svxd0++vatxZLNDW9FWiOuETQSEgyM9iYDSYRfEjxfSy
-vw1rtQ251P85govvwXG3Fe+1qEgVadZDTTI+BvbHlJs9mRYzficxbbuUEGNHqxfi
-O8kMr9ajegZYJ44plGxo
-=xvJk
------END PGP SIGNATURE-----
diff --git a/source/l/libraw1394/libraw1394-2.1.2.tar.sign b/source/l/libraw1394/libraw1394-2.1.2.tar.sign
new file mode 100644
index 00000000..c9a5add0
--- /dev/null
+++ b/source/l/libraw1394/libraw1394-2.1.2.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJXAS4VAAoJEHnzb7JUXXnQeLcQAOQE/BvJg2ODhsXxIaah2EqO
+4MZ2xYN+UO+I1y/ij6EMHpFSZqdkFo4EphytY3jRl628KEZRBbQVn9hcvZgmLH6b
+uIgrxBPATrBz20AWNTreb7cURJYf+5o3u5dps5Xf3SQjFING3I2sPueNkTqI11aM
+lYu0/ggD8nAGLQDV43xahgr6f+f6/VvwViGb873yQCuaF/6uhaTHDzTrh0H5fpgC
+ilWxGSuE6fuStPCOoxALpC1uILEQq6UGD+RVkF0fDV4Ri2RMJ5K9Ve1SFq/CatUO
+lAsjXpezDXC15KyYVoM+XSf8sj8C6z5jvqBpIGkwBSxRqfto2xkXDJWRWvA3twxy
+rdX8YA30P4vhjAExpKle4MivMhwN2NWILzSnZEqSP6xNEyKdgLNGRWo5AsZ/Jc/F
+inH1gOHibFjdAWL3d6x//t5Paf7axgCZwMqH7msYLheuWxZWIuxP2sxXc7jEbl2Z
+Y1BUEknjUA9W0WhJ/PgwFdBjhY0p+93ozDGXX+JSem2EjCC3TrUNHGsk9HRAzTA8
+TnW/ifASvpMx8bNf7p6D5P1V9nD3bsWXDG8W61VUrEnkVYMqp0iGxGes0DD9wwpt
+ShD9tMxy/FuMAaKANiKmaXQLR0v9CYURS5lz/lRDfGBEYxTu6Fy84BGH6MRBjf+/
+WrRWelXOXel3zqJgOhb8
+=i6Af
+-----END PGP SIGNATURE-----
diff --git a/source/l/libraw1394/libraw1394.SlackBuild b/source/l/libraw1394/libraw1394.SlackBuild
index 47f684d1..540992c9 100755
--- a/source/l/libraw1394/libraw1394.SlackBuild
+++ b/source/l/libraw1394/libraw1394.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2007  Pierre Cazenave <pwcazenave@gmail.com>
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,11 @@
 
 # Modified by Robby Workman <rworkman at slackware.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=libraw1394
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -37,6 +39,14 @@ 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}
 
 if [ "$ARCH" = "i586" ]; then
@@ -53,7 +63,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-libraw1394
 rm -rf $PKG
@@ -78,11 +87,14 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/l/libraw1394/slack-desc b/source/l/libraw1394/slack-desc
index d1c7aa0d..345121e0 100644
--- a/source/l/libraw1394/slack-desc
+++ b/source/l/libraw1394/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
@@ -11,7 +11,7 @@ libraw1394:
 libraw1394: libraw1394 provides direct access to the IEEE 1394 bus through
 libraw1394: the Linux 1394 subsystem's raw1394 user space interface.
 libraw1394:
-libraw1394: Homepage:  http://www.kernel.org/pub/linux/libs/ieee1394/
+libraw1394: Homepage: http://www.kernel.org/pub/linux/libs/ieee1394/
 libraw1394:
 libraw1394:
 libraw1394: