office/pdf2djvu: New maintainer.

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

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

3 files changed, 32 insertions, 41 deletions

diff --git a/office/pdf2djvu/README b/office/pdf2djvu/README
index e5aa3560490e..7981479c8b0c 100644
--- a/office/pdf2djvu/README
+++ b/office/pdf2djvu/README
@@ -1,3 +1,5 @@
+pdf2djvu (creates DjVu files from PDF files)
+
 pdf2djvu creates DjVu files from PDF files.
 
 It's able to extract:
diff --git a/office/pdf2djvu/pdf2djvu.SlackBuild b/office/pdf2djvu/pdf2djvu.SlackBuild
index f685c6720190..db3fc9dc4e99 100644
--- a/office/pdf2djvu/pdf2djvu.SlackBuild
+++ b/office/pdf2djvu/pdf2djvu.SlackBuild
@@ -2,33 +2,22 @@
 
 # Slackware build script for pdf2djvu
 
-# Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
-# Copyright 2015-2018 Brenton Earl <brent@exitstatusone.com>
-# Copyright 2023 Alexander Verbovetsky, Moscow, Russia
-# 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.
+# Original author: Alexander Verbovetsky, Moscow, Russia.
+# Modified and now maintained by B. Watson <urchlay@slackware.uk>.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20241008 bkw: v0.9.19, BUILD=2:
+# - take over maintenance.
+# - disable -Werror.
+# - simplify script.
+# - tweak README.
+# - add COPYING and credits to doc dir.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pdf2djvu
 VERSION=${VERSION:-0.9.19}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -69,15 +58,21 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z
+tar xvf $CWD/${PRGNAM}-${VERSION}.tar.xz
 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 {} +
+
+# 20241008 bkw: Future-proofing: get rid of -Werror= completely.
+# This isn't needed on Slackware 15.0, but who knows what the future
+# may bring...
+sed -i '/\[-Werror=/d' configure.ac
+autoreconf -if
+
+# 20241008 bkw: no install-strip, so use LDFLAGS to pre-strip the bin.
 
+LDFLAGS="-Wl,-s" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -92,18 +87,12 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
+gzip -9 $PKG/usr/man/{man1,??/man1}/*
 
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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 doc/README doc/djvudigital doc/changelog $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 doc/{COPYING,README,djvudigital,changelog,credits} $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/pdf2djvu/pdf2djvu.info b/office/pdf2djvu/pdf2djvu.info
index a0c8a1d7f3ef..7b15ef4a3b55 100644
--- a/office/pdf2djvu/pdf2djvu.info
+++ b/office/pdf2djvu/pdf2djvu.info
@@ -6,5 +6,5 @@ MD5SUM="b1059b9a915efc81aabcb19fabcbcbcf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="GraphicsMagick"
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"