4 files changed, 37 insertions, 27 deletions
diff --git a/system/lzop/README b/system/lzop/README
index a3f0588e5a..01955a1cb2 100644
--- a/system/lzop/README
+++ b/system/lzop/README
@@ -1,5 +1,8 @@
-lzop is a LZO archiver. It uses the LZO data compression library
-for compression services, and its main advantages over gzip are
-much higher compression and decompression speed (at the cost of
-some compression ratio).
-lzop is the fastest (de)compresser around.
+lzop (LZO compressor/decompressor)
+
+lzop is an LZO compressor. It uses the LZO data compression library for
+compression services, and its main advantages over gzip are much higher
+compression and decompression speed (at the cost of some compression
+ratio).
+
+lzop is the fastest (de)compressor around.
diff --git a/system/lzop/lzop.SlackBuild b/system/lzop/lzop.SlackBuild
index 9b79e00db1..f961122123 100644
--- a/system/lzop/lzop.SlackBuild
+++ b/system/lzop/lzop.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lzop
 
 # Copyright (c) 2011-2017 LEVAI Daniel
+# Copyright (c) 2020 B. Watson
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -25,10 +26,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200129 bkw: take over maintenance, simplify build, remove some cruft.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lzop
 VERSION=${VERSION:-1.04}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +44,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}
@@ -66,11 +76,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -80,20 +87,20 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-DESTDIR=$PKG make install
-
-strip --strip-unneeded $PKG/usr/bin/lzop
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man?/*.?
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+# 20200129 bkw: We really don't need the docs in every possible format. We
+# already got a man page in /usr/man, and .tex is the source format. Leave
+# the HTML, plain text, and PostScript.
+for ext in pod tex man; do
+  rm -f $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.$ext
+done
 
-mkdir -p -m 755 $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS COPYING INSTALL NEWS README THANKS \
-    $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/system/lzop/lzop.info b/system/lzop/lzop.info
index 14f47d7864..849fc7ef4a 100644
--- a/system/lzop/lzop.info
+++ b/system/lzop/lzop.info
@@ -1,10 +1,10 @@
 PRGNAM="lzop"
 VERSION="1.04"
-HOMEPAGE="http://www.lzop.org/"
-DOWNLOAD="http://www.lzop.org/download/lzop-1.04.tar.gz"
+HOMEPAGE="https://www.lzop.org/"
+DOWNLOAD="https://www.lzop.org/download/lzop-1.04.tar.gz"
 MD5SUM="271eb10fde77a0a96b9cbf745e719ddf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="LEVAI Daniel"
-EMAIL="leva@ecentrum.hu"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/lzop/slack-desc b/system/lzop/slack-desc
index 37a5a0674d..489c8cac01 100644
--- a/system/lzop/slack-desc
+++ b/system/lzop/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-lzop: lzop (LZO archiver)
+lzop: lzop (LZO compressor/decompressor)
 lzop:
 lzop: lzop uses the LZO data compression library for compression services,
 lzop: and its main advantages over gzip are much higher compression and
 lzop: decompression speed (at the cost of some compression ratio).
-lzop: lzop is the fastest (de)compresser around.
+lzop: lzop is the fastest (de)compressor around.
 lzop:
 lzop: Homepage: http://www.lzop.org/
 lzop: