graphics/pqiv: Updated for version 2.12, new maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 26 insertions, 43 deletions

diff --git a/graphics/pqiv/README b/graphics/pqiv/README
index a66232a29b..ccbf49a87f 100644
--- a/graphics/pqiv/README
+++ b/graphics/pqiv/README
@@ -1,3 +1,5 @@
+pqiv (powerful image viewer with minimal UI)
+
 pqiv is a powerful GTK 3 based command-line image viewer with a
 minimal UI. It is highly customizable, can be fully controlled from
 scripts, and has support for various file formats including PDF,
diff --git a/graphics/pqiv/pqiv.SlackBuild b/graphics/pqiv/pqiv.SlackBuild
index 16debbf00e..7dda2c46ee 100644
--- a/graphics/pqiv/pqiv.SlackBuild
+++ b/graphics/pqiv/pqiv.SlackBuild
@@ -2,30 +2,20 @@
 
 # Slackware build script for pqiv
 
-# Copyright 2019 Leonardo Citrolo, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Originally written by Leonardo Citrolo, Italy.
+# Now maintained by B. Watson (urchlay@slackware.uk).
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230507 bkw:
+# - new maintainer.
+# - update for v2.12.
+# - relicense as WTFPL with original author's permission.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pqiv
-VERSION=${VERSION:-2.11}
+VERSION=${VERSION:-2.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +28,6 @@ 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -73,14 +60,12 @@ 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 640 -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 {} \+
 
 # --prefix is the only option that the ./configure script really takes into
 # account at present, but I'll leave the others, just in case.
+# 20230507 bkw: and --mandir (it complains, but works).
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -91,18 +76,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
+strip $PRGNAM
 make install DESTDIR=$PKG
+gzip $PKG/usr/man/man*/*
 
-find $PKG -print0 | xargs -0 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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.markdown \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a LICENSE README* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/pqiv/pqiv.info b/graphics/pqiv/pqiv.info
index b1015c6a1a..db30d6926b 100644
--- a/graphics/pqiv/pqiv.info
+++ b/graphics/pqiv/pqiv.info
@@ -1,8 +1,8 @@
 PRGNAM="pqiv"
-VERSION="2.11"
+VERSION="2.12"
 HOMEPAGE="http://www.pberndt.com/Programme/Linux/pqiv/index.html"
-DOWNLOAD="https://github.com/phillipberndt/pqiv/archive/2.11/pqiv-2.11.tar.gz"
-MD5SUM="47a15801c7917cf646bd87ed288b9955"
+DOWNLOAD="https://github.com/phillipberndt/pqiv/archive/2.12/pqiv-2.12.tar.gz"
+MD5SUM="44d7ba3f15368cbb0b817a41f4eb8b2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/pqiv/slack-desc b/graphics/pqiv/slack-desc
index b3066bf905..775af75df0 100644
--- a/graphics/pqiv/slack-desc
+++ b/graphics/pqiv/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-pqiv: pqiv (Powerful image viewer with minimal UI)
+pqiv: pqiv (powerful image viewer with minimal UI)
 pqiv:
 pqiv: pqiv is a powerful GTK 3 based command-line image viewer with a
 pqiv: minimal UI. It is highly customizable, can be fully controlled from
@@ -14,6 +14,6 @@ pqiv: scripts, and has support for various file formats including PDF,
 pqiv: Postscript, video files and archives. It is optimized to be quick and
 pqiv: responsive.
 pqiv:
-pqiv:
 pqiv: Homepage: http://www.pberndt.com/Programme/Linux/pqiv/index.html
 pqiv:
+pqiv: