4 files changed, 18 insertions, 8 deletions
diff --git a/office/multivalent-tool-pdf/README b/office/multivalent-tool-pdf/README
index 5edca84389..c858bef672 100644
--- a/office/multivalent-tool-pdf/README
+++ b/office/multivalent-tool-pdf/README
@@ -3,4 +3,5 @@ In particular, it allows impose, compress, uncompress, info, encrypt,
 decrypt, split, merge, validate PDF files.
 
 This is version 20060102 of Multivalent, the latest version that
-contains the PDF tools.  Hence, it is relevant to PDF manipulations only.
+contains the PDF tools. Hence, it is relevant to PDF manipulations
+only.
diff --git a/office/multivalent-tool-pdf/doinst.sh b/office/multivalent-tool-pdf/doinst.sh
index 7b5fb07db5..19a6ff6ac8 100644
--- a/office/multivalent-tool-pdf/doinst.sh
+++ b/office/multivalent-tool-pdf/doinst.sh
@@ -11,4 +11,3 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/bash_completion.d/multivalent-tool-pdf.new
diff --git a/office/multivalent-tool-pdf/multivalent-tool-pdf.SlackBuild b/office/multivalent-tool-pdf/multivalent-tool-pdf.SlackBuild
index e62bfbe6e1..b37ea0ad6e 100644
--- a/office/multivalent-tool-pdf/multivalent-tool-pdf.SlackBuild
+++ b/office/multivalent-tool-pdf/multivalent-tool-pdf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for multivalent-tool-pdf
 
@@ -22,13 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=multivalent-tool-pdf
 VERSION=${VERSION:-0.8.5.20060102}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -56,9 +66,9 @@ install -m 0755 -o root -g root $CWD/wrapper.multivalent-tool-pdf \
   $PKG/usr/bin/multivalent-tool-pdf
 sed --in-place "s/@VERSION@/$VERSION/g" $PKG/usr/bin/multivalent-tool-pdf
 
-mkdir -p $PKG/etc/bash_completion.d/
+mkdir -p $PKG/usr/share/bash-completion/completions
 install -m 0644 -o root -g root $CWD/multivalent-tool-pdf.bash_completion \
-  $PKG/etc/bash_completion.d/multivalent-tool-pdf.new
+  $PKG/usr/share/bash-completion/completions/multivalent-tool-pdf
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a research tool-pdf-doc HowToRun.html $PKG/usr/doc/$PRGNAM-$VERSION
@@ -71,4 +81,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.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/office/multivalent-tool-pdf/multivalent-tool-pdf.info b/office/multivalent-tool-pdf/multivalent-tool-pdf.info
index 728f20ef07..7b0bede66f 100644
--- a/office/multivalent-tool-pdf/multivalent-tool-pdf.info
+++ b/office/multivalent-tool-pdf/multivalent-tool-pdf.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/multivale
 MD5SUM="688b085ec0ea36a416ae0e34dae1f7e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"