3 files changed, 37 insertions, 36 deletions
diff --git a/development/jdk11/README b/development/jdk11/README
index 13748cb75b..2b77c7fb6f 100644
--- a/development/jdk11/README
+++ b/development/jdk11/README
@@ -15,7 +15,8 @@ This SlackBuild will repackage official Oracle JDK archive.
 You must accept the Oracle Technology Network License Agreement
 for Oracle Java SE to download this software
 
-https://www.oracle.com/technetwork/java/javase/downloads/jdk11-downloads-5066655.html
+https://www.oracle.com/java/technologies/javase-jdk11-downloads.html
 
-After installation you will need to log out from the system and log in back
-for environment variables get updated.
+After installation you will need to log out from the system and log
+in back for environment variables get updated. Or just run "source
+/etc/profile"
diff --git a/development/jdk11/jdk11.SlackBuild b/development/jdk11/jdk11.SlackBuild
index c0656846d6..272f86d660 100644
--- a/development/jdk11/jdk11.SlackBuild
+++ b/development/jdk11/jdk11.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jdk11
 
-# Copyright 2019 Igor Alexandrov <igor.s.alexandrov@gmail.com>
+# Copyright 2019-2021 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  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=jdk11
-VERSION=${VERSION:-11.0.4}
+VERSION=${VERSION:-11.0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
@@ -35,46 +38,49 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-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
+
+set -eu
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  echo "$ARCH port is not supported"
-  exit -1
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH is not supported for $PRGNAM-$VERSION"
+  exit 1
 fi
-
-set -e
+LIBDIRSUFFIX=64
 
 rm -rf $PKG
-mkdir -p $TMP $OUTPUT \
-         $PKG/{install,etc/profile.d,usr/{lib${LIBDIRSUFFIX},doc/$PRGNAM-$VERSION}}
-
+mkdir -p $TMP $OUTPUT $PKG/{install,etc/profile.d,usr/{bin,lib${LIBDIRSUFFIX},doc/$PRGNAM-$VERSION,man/man1}}
 cd $PKG/usr/lib${LIBDIRSUFFIX}
-tar -xvf $CWD/jdk-$VERSION?linux*.tar.gz
-mv $(tar -tf $CWD/jdk-$VERSION?linux*.tar.gz | head -1 | cut -d/ -f1) $PRGNAM-$VERSION
-
+tar -xvf $CWD/jdk-${VERSION}_linux*.tar.gz
+mv $(tar -tf $CWD/jdk-${VERSION}_linux*.tar.gz | head -1 | cut -d/ -f1) $PRGNAM-$VERSION
 chown -R root:root $PRGNAM-$VERSION
 find -L $PRGNAM-$VERSION \
   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+    -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 {} \;
+    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 find $PRGNAM-$VERSION -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 $PRGNAM-$VERSION/man -type f -exec gzip -9q {} \; 2> /dev/null || true
-for i in $(find $PRGNAM-$VERSION/man -type l 2> /dev/null); do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+(cd ../bin; find ../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/bin -type f -exec ln -s {} \;)
 
 ln -sf $PRGNAM-$VERSION/lib/libjawt.so
 ln -sf $PRGNAM-$VERSION/lib/server/libjvm.so
 ln -sf $PRGNAM-$VERSION/lib/libjava.so
 ln -sf $PRGNAM-$VERSION/lib/libawt.so
 ln -sf $PRGNAM-$VERSION/lib/libawt_xawt.so
+ln -sf $PRGNAM-$VERSION/lib/jli/libjli.so
 ln -sf $PRGNAM-$VERSION/lib/libverify.so
 
 cd ../doc/$PRGNAM-$VERSION
@@ -82,25 +88,19 @@ ln -s ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/legal
 ln -s ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/README.html
 ln -s ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/release
 cat $CWD/$PRGNAM.SlackBuild > $PRGNAM.SlackBuild
-cat $CWD/slack-desc > slack-desc
 
 cd $PKG
 cat > etc/profile.d/$PRGNAM.sh << EOF
 #!/bin/sh
 export JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION
-export MANPATH=\${MANPATH}:\${JAVA_HOME}/man
-export PATH=\${PATH}:\${JAVA_HOME}/bin
 EOF
 
 cat > etc/profile.d/$PRGNAM.csh << EOF
 #!/bin/csh
 setenv JAVA_HOME /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION
-setenv MANPATH \${MANPATH}:\${JAVA_HOME}/man
-setenv PATH \${PATH}:\${JAVA_HOME}/bin
 EOF
 
 chmod 755 etc/profile.d/*
 cat $CWD/slack-desc > install/slack-desc
 
-/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/jdk11/jdk11.info b/development/jdk11/jdk11.info
index 99010f22ce..61610c0225 100644
--- a/development/jdk11/jdk11.info
+++ b/development/jdk11/jdk11.info
@@ -1,10 +1,10 @@
 PRGNAM="jdk11"
-VERSION="11.0.4"
-HOMEPAGE="https://www.oracle.com/technetwork/java/javase/downloads/index.html"
+VERSION="11.0.12"
+HOMEPAGE="https://developer.oracle.com/java"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/11.0.4+10/cf1bbcbf431a474eb9fc550051f4ee78/jdk-11.0.4_linux-x64_bin.tar.gz"
-MD5SUM_x86_64="10badb89c60b0932ced8f41079d30e60"
+DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/11.0.12+8/f411702ca7704a54a79ead0c2e0942a3/jdk-11.0.12_linux-x64_bin.tar.gz?AuthParam=1630328792_80e3bfc8ea574dfdd3391fd65ea454d3"
+MD5SUM_x86_64="ce9d5fecc743ab9f808415132938addb"
 REQUIRES=""
 MAINTAINER="Igor Alexandrov"
-EMAIL="igor.s.alexandrov@gmail.com"
+EMAIL="igor.alexandrov@outlook.com"