3 files changed, 22 insertions, 27 deletions
diff --git a/source/l/v4l-utils/slack-desc b/source/l/v4l-utils/slack-desc
index 1f235d18..ea32c368 100644
--- a/source/l/v4l-utils/slack-desc
+++ b/source/l/v4l-utils/slack-desc
@@ -1,19 +1,19 @@
 # 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
+# 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 leave one space after the ':'.
 
          |-----handy-ruler-----------------------------------------------------|
 v4l-utils: v4l-utils (libraries and utilities for video4linux)
 v4l-utils:
 v4l-utils: libv4l is a collection of libraries which adds a thin abstraction
-v4l-utils: layer on top of video4linux2 devices.  The purpose of this (thin)
+v4l-utils: layer on top of video4linux2 devices. The purpose of this (thin)
 v4l-utils: layer is to make it easy for application writers to support a wide
 v4l-utils: variety of devices without having to write separate code for
-v4l-utils: different devices in the same class.  Linux V4L2 and DVB API
+v4l-utils: different devices in the same class. Linux V4L2 and DVB API
 v4l-utils: utilities are also included.
 v4l-utils:
-v4l-utils: Homepage:  http://linuxtv.org
+v4l-utils: Homepage: http://linuxtv.org
 v4l-utils:
diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild
index 38bf8385..93673261 100755
--- a/source/l/v4l-utils/v4l-utils.SlackBuild
+++ b/source/l/v4l-utils/v4l-utils.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2010, 2011, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2013, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,11 @@
 # 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=v4l-utils
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -38,7 +39,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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -60,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
@@ -81,7 +89,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
@@ -90,20 +98,6 @@ make install DESTDIR=$PKG || exit 1
 # These shouldn't be used:
 rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
 
-# System udev files should go under /lib:
-if [ -r $PKG/etc/udev/rules.d/70-infrared.rules ]; then
-  mkdir -p $PKG/lib/udev/rules.d
-  mv $PKG/etc/udev/rules.d/70-infrared.rules $PKG/lib/udev/rules.d
-  rmdir $PKG/etc/udev/rules.d 2> /dev/null
-  rmdir $PKG/etc/udev 2> /dev/null
-  rmdir $PKG/etc 2> /dev/null
-  sed -i "s,/etc/udev/rules.d,/lib/udev/rules.d,g" $PKG/lib/udev/rules.d/70-infrared.rules
-fi
-
-# I'd rather see these remain in /etc where they have been:
-mv $PKG/lib/udev/rc_keymaps/* $PKG/etc/rc_keymaps
-rmdir $PKG/lib/udev/rc_keymaps
-
 # Strip binaries:
 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/v4l-utils/v4l-utils.url b/source/l/v4l-utils/v4l-utils.url
new file mode 100644
index 00000000..ba7e0927
--- /dev/null
+++ b/source/l/v4l-utils/v4l-utils.url
@@ -0,0 +1 @@
+https://linuxtv.org/downloads/v4l-utils/