3 files changed, 35 insertions, 21 deletions
diff --git a/development/apache-jmeter/README b/development/apache-jmeter/README
index 6317b03271..abeb36fab4 100644
--- a/development/apache-jmeter/README
+++ b/development/apache-jmeter/README
@@ -1,10 +1,11 @@
 Apache JMeter is a Java-based load testing tool.
 
-JMeter is pure Java application designed to load test functional behavior
-and measure performance. It was originally designed for testing web 
-applications but has since expanded to other test functions. 
+JMeter is pure Java application designed to load test functional
+behavior and measure performance. It was originally designed for
+testing web applications but has since expanded to other test
+functions.
 
-The directory /usr/share/jmeter/bin contains additional scripts for 
+The directory /usr/share/jmeter/bin contains additional scripts for
 managing JMeter.
 
 Set API_DOCS=yes to include the full documentation. This will make the
diff --git a/development/apache-jmeter/apache-jmeter.SlackBuild b/development/apache-jmeter/apache-jmeter.SlackBuild
index 488b33784e..66609e632e 100644
--- a/development/apache-jmeter/apache-jmeter.SlackBuild
+++ b/development/apache-jmeter/apache-jmeter.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for apache-jmeter
 # Original author: Benjamin Trigona-Harany
-# Copyright 2016-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -21,14 +21,26 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220407 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install docs to correct dir (/usr/doc/$PRGNAM-$VERSION).
+# - fix permissions in doc dir (dirs => 0755).
+# - use relative symlinks in /usr/bin.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=apache-jmeter
-VERSION=${VERSION:-5.1.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-5.4.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-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}
@@ -54,22 +66,23 @@ cp -a bin extras lib $PKG/$JMETER_HOME/
 sed -i "s_\`dirname \\\"\$0\\\"\`_/$JMETER_HOME/bin_" $PKG/$JMETER_HOME/bin/jmeter
 sed -i "s_\`dirname \"\$0\"\`_/$JMETER_HOME/bin_" $PKG/$JMETER_HOME/bin/jmeter-server
 cd $PKG/usr/bin
-  ln -s /$JMETER_HOME/bin/jmeter
-  ln -s /$JMETER_HOME/bin/jmeter-server
+  ln -s ../../$JMETER_HOME/bin/jmeter
+  ln -s ../../$JMETER_HOME/bin/jmeter-server
 cd $TMP/$PRGNAM-$VERSION
 
-mkdir -p $PKG/usr/share/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/jmeter/bin/examples $PKG/usr/share/doc/$PRGNAM-$VERSION
-cp -a LICENSE NOTICE README.md printable_docs/* $PKG/usr/share/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/jmeter/bin/examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NOTICE README.md printable_docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0755 $PKG/usr/doc/$PRGNAM-$VERSION/{*,*/*}/
 
 if [ "$API_DOCS" = "yes" ]; then
-  cp -a docs/* $PKG/usr/share/doc/$PRGNAM-$VERSION
+  cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 fi
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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/development/apache-jmeter/apache-jmeter.info b/development/apache-jmeter/apache-jmeter.info
index c9aebe7015..504c28ac8c 100644
--- a/development/apache-jmeter/apache-jmeter.info
+++ b/development/apache-jmeter/apache-jmeter.info
@@ -1,10 +1,10 @@
 PRGNAM="apache-jmeter"
-VERSION="5.1.1"
+VERSION="5.4.3"
 HOMEPAGE="http://jmeter.apache.org/"
-DOWNLOAD="https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-5.1.1.tgz"
-MD5SUM="197b71d7f3691a4347300cda83099965"
+DOWNLOAD="https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-5.4.3.tgz"
+MD5SUM="2cf3fe9edf8eea6cddd25bcaf9348154"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"