4 files changed, 49 insertions, 33 deletions
diff --git a/multimedia/mjpegtools/README b/multimedia/mjpegtools/README
index 733a91ee78..33fe89ef0b 100644
--- a/multimedia/mjpegtools/README
+++ b/multimedia/mjpegtools/README
@@ -1,13 +1,13 @@
-The mjpeg programs are a set of tools that can do recording of videos and
-playback, simple cut-and-paste editing and the MPEG compression of audio
-and video under Linux.
+The mjpeg programs are a set of tools that can do recording of videos
+and playback, simple cut-and-paste editing and the MPEG compression of
+audio and video under Linux.
 
-Recording is supported for the Zoran based cards like the Buz (Iomega),
-DC10 (MIRO, Pinnacle), Matrox Marvel cards and the LML33 (Linux Media Labs).
-See related pages to the right to find the right driver for your card.
-The recorded videos can be converted to MPEG streams. The software playback
-of MPEG streams works with almost every player and every OS.
-You can produce special forms of MPEG streams like VCD (Video CD) and SVCD
-for hardware playback.
+Recording is supported for the Zoran based cards like the Buz
+(Iomega), DC10 (MIRO, Pinnacle), Matrox Marvel cards and the LML33
+(Linux Media Labs). See related pages to the right to find the right
+driver for your card. The recorded videos can be converted to MPEG
+streams. The software playback of MPEG streams works with almost every
+player and every OS. You can produce special forms of MPEG streams
+like VCD (Video CD) and SVCD for hardware playback.
 
 This optionally depends on libquicktime, libdv and SDL_gfx.
diff --git a/multimedia/mjpegtools/doinst.sh b/multimedia/mjpegtools/doinst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/multimedia/mjpegtools/doinst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild
index eea2b44c82..efd32532f9 100644
--- a/multimedia/mjpegtools/mjpegtools.SlackBuild
+++ b/multimedia/mjpegtools/mjpegtools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mjpegtools 11/01/2009
 
@@ -22,10 +22,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230701 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add doinst/douninst to handle /usr/info/dir.
+# - rm INSTALL from doc dir (compile instructions only).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mjpegtools
-VERSION=${VERSION:-2.1.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.2.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
@@ -65,9 +76,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 # Fix for x86_64
 sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
@@ -86,26 +97,25 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
 
 rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
+gzip -9 $PKG/usr/info/* $PKG/usr/man/man*/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
 cp -a \
-  AUTHORS BUGS CHANGES COPYING ChangeLog HINTS INSTALL* \
+  AUTHORS BUGS CHANGES COPYING ChangeLog HINTS \
   NEWS PLANS README TODO docs/FAQ.txt \
-    $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+    $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+rm -f $PKG/usr/lib*/*.la
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/douninst.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/multimedia/mjpegtools/mjpegtools.info b/multimedia/mjpegtools/mjpegtools.info
index b47c750bde..085aec9a10 100644
--- a/multimedia/mjpegtools/mjpegtools.info
+++ b/multimedia/mjpegtools/mjpegtools.info
@@ -1,10 +1,10 @@
 PRGNAM="mjpegtools"
-VERSION="2.1.0"
+VERSION="2.2.1"
 HOMEPAGE="http://mjpeg.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-2.1.0.tar.gz"
-MD5SUM="57bf5dd78976ca9bac972a6511b236f3"
+DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-2.2.1.tar.gz"
+MD5SUM="168e0131c0b8a2e31df7a73eb602fc32"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"