office/MasterPDFEditor4: New maintainer, various tweaks.

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

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

5 files changed, 55 insertions, 66 deletions

diff --git a/office/MasterPDFEditor4/MasterPDFEditor4.SlackBuild b/office/MasterPDFEditor4/MasterPDFEditor4.SlackBuild
index ccf179c382..7a26388bea 100644
--- a/office/MasterPDFEditor4/MasterPDFEditor4.SlackBuild
+++ b/office/MasterPDFEditor4/MasterPDFEditor4.SlackBuild
@@ -1,34 +1,25 @@
 #!/bin/bash
 
-# Slackware build script for <MasterPDFEditor4>
-
-# Copyright 2023 Petar Petrov slackalaxy at gmail dot com
-# 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.
+# Slackware build script for MasterPDFEditor4
 
+# Originally written by Petar Petrov.
+# Modified and now maintained by B. Watson <urchlay@slackware.uk>.
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240821 bkw: BUILD=3.
+# - new maintainer.
+# - relicense as WTFPL.
+# - use upstream's .desktop and directory name under /opt.
+# - extract directly to $PKG (no copying).
+# - fix spelling, grammar, punctuation in README, slack-desc.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=MasterPDFEditor4
 SRCNAM=master-pdf-editor
 VERSION=${VERSION:-4.3.89}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -56,36 +47,35 @@ fi
 
 set -e
 
+# 20240822 bkw: no "build" or "source" dir, extract straight to $PKG.
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-${VERSION%.*.*}
+mkdir -p $PKG/opt $OUTPUT
+cd $PKG/opt
 tar xvf $CWD/$SRCNAM-${VERSION}_qt5.amd64.tar.gz
-cd $SRCNAM-${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 {} +
 
-mkdir -p $PKG/opt/$PRGNAM
-cp -a --no-preserve=ownership * $PKG/opt/$PRGNAM
+# 20240822 bkw: shipped binary is already stripped.
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cp masterpdfeditor${VERSION%.*.*}.png $PKG/usr/share/pixmaps/$PRGNAM.png
-cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-
-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
+EXE=${PRGNAM,,}
+DIR=${SRCNAM}-4
+mkdir -p $PKG/usr/share/applications
+mv $DIR/$EXE.desktop $PKG/usr/share/applications
 
+# 20240822 bkw: for us command-line junkies:
 mkdir -p $PKG/usr/bin
-cd $PKG/usr/bin
-ln -s ../../opt/$PRGNAM/masterpdfeditor4 $PRGNAM
+ln -s ../../opt/$DIR/$EXE $PKG/usr/bin/$EXE
+
+# 20240822 bkw: not really needed, but do this for compatibility with
+# previous version of this build.
+ln -s ../../opt/$DIR/$EXE $PKG/usr/bin/$PRGNAM
 
-mkdir -p $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
+mv $DIR/license.txt $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/MasterPDFEditor4/MasterPDFEditor4.desktop b/office/MasterPDFEditor4/MasterPDFEditor4.desktop
deleted file mode 100644
index 832f9db24f..0000000000
--- a/office/MasterPDFEditor4/MasterPDFEditor4.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=MasterPDFEditor4
-Comment=Edit PDF files
-Exec=MasterPDFEditor4
-Icon=MasterPDFEditor4
-StartupNotify=false
-Type=Application
-Categories=Office
diff --git a/office/MasterPDFEditor4/MasterPDFEditor4.info b/office/MasterPDFEditor4/MasterPDFEditor4.info
index 40855c2a87..9e1dea8c0f 100644
--- a/office/MasterPDFEditor4/MasterPDFEditor4.info
+++ b/office/MasterPDFEditor4/MasterPDFEditor4.info
@@ -3,8 +3,8 @@ VERSION="4.3.89"
 HOMEPAGE="https://code-industry.net/free-pdf-editor/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://code-industry.net/public/master-pdf-editor-4.3.89_qt5.amd64.tar.gz"
+DOWNLOAD_x86_64="https://code-industry.net/public/master-pdf-editor-4.3.89_qt5.amd64.tar.gz"
 MD5SUM_x86_64="51a6f2963b79ebf0125faa9285f5456c"
 REQUIRES=""
-MAINTAINER="Petar Petrov"
-EMAIL="slackalaxy@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/office/MasterPDFEditor4/README b/office/MasterPDFEditor4/README
index a3b06a0de2..4747952070 100644
--- a/office/MasterPDFEditor4/README
+++ b/office/MasterPDFEditor4/README
@@ -1,12 +1,19 @@
+MasterPDFEditor4 (PDF editor)
+
 Master PDF Editor allows you to create, edit, preview, encrypt, sign
 and print XPS and interactive PDF documents.
-It's powerful editing features allow you to convert between PDF and
-XPS formats, add interactive controls such as buttons, text fields,
-check boxes, and event handlers to your documents, split and merge
+
+Its powerful editing features allow you to convert between PDF and
+XPS formats; add interactive controls such as buttons, text fields,
+check boxes, and event handlers to your documents; split and merge
 PDF files.
 
 The Linux-based version is free for non-commercial use.
 
-This is version 4, which still saving without a watermark from the trial
-version. If you are looking for the latest version of the program, look
-for "MaterPDFEditor", instead.
+This is version 4, which still saves without a watermark from the
+trial version.
+
+The first time you run MasterPDFEditor4, it will tell you a new
+version is available and offer to download it for you. You should
+answer No to this prompt; if you are looking for the latest version of
+the program, look for the "MasterPDFEditor" SlackBuild, instead.
diff --git a/office/MasterPDFEditor4/slack-desc b/office/MasterPDFEditor4/slack-desc
index cb21ac2afa..689ce5fdc4 100644
--- a/office/MasterPDFEditor4/slack-desc
+++ b/office/MasterPDFEditor4/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                 |-----handy-ruler------------------------------------------------------|
-MasterPDFEditor4: MasterPDFEditor4 (PDF Editor)
+MasterPDFEditor4: MasterPDFEditor4 (PDF editor)
 MasterPDFEditor4:
 MasterPDFEditor4: Master PDF Editor allows you to create, edit, preview, encrypt, sign
 MasterPDFEditor4: and print XPS and interactive PDF documents.
-MasterPDFEditor4: It's powerful editing features allow you to convert between PDF and
-MasterPDFEditor4: XPS formats, add interactive controls such as buttons, text fields,
-MasterPDFEditor4: check boxes, and event handlers to your documents, split and merge
-MasterPDFEditor4: PDF files.
 MasterPDFEditor4:
-MasterPDFEditor4: Project URL: https://code-industry.net/
+MasterPDFEditor4: Its powerful editing features allow you to convert between PDF and
+MasterPDFEditor4: XPS formats; add interactive controls such as buttons, text fields,
+MasterPDFEditor4: check boxes, and event handlers to your documents; split and merge
+MasterPDFEditor4: PDF files.
 MasterPDFEditor4:
+MasterPDFEditor4: Homepage: https://code-industry.net/free-pdf-editor/