development/zulu-openjdk-lts: Moved to zulu-openjdk11 and updated for version 11.0.13

Signed-off-by: Gustavo Brondani Schenkel <gustavo.schenkel@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

8 files changed, 51 insertions, 47 deletions

diff --git a/development/zulu-openjdk-lts/slack-desc b/development/zulu-openjdk-lts/slack-desc
deleted file mode 100644
index e9c5126d18..0000000000
--- a/development/zulu-openjdk-lts/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                |-----handy-ruler------------------------------------------------------|
-zulu-openjdk-lts: zulu-openjdk-lts (Open Implementation of JDK)
-zulu-openjdk-lts:
-zulu-openjdk-lts: Prebuild binary of ZuluOpenJDK LTS (Long Term Support) from Azul
-zulu-openjdk-lts: that is compliant with the latest Java SE standard.
-zulu-openjdk-lts:
-zulu-openjdk-lts: Zulu has been verified by passing all tests in the latest Java
-zulu-openjdk-lts: SE version of the OpenJDK Community TCK (Technology Compatibility
-zulu-openjdk-lts: Kit).
-zulu-openjdk-lts:
-zulu-openjdk-lts: https://www.azul.com/downloads/zulu/zulu-linux/
-zulu-openjdk-lts:
diff --git a/development/zulu-openjdk-lts/zulu-openjdk-lts.info b/development/zulu-openjdk-lts/zulu-openjdk-lts.info
deleted file mode 100644
index 18b57deeac..0000000000
--- a/development/zulu-openjdk-lts/zulu-openjdk-lts.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="zulu-openjdk-lts"
-VERSION="11.0.5"
-HOMEPAGE="https://www.azul.com/downloads/zulu/zulu-linux/"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu11.35.15-ca-jdk11.0.5-linux_x64.tar.gz"
-MD5SUM_x86_64="6a419b594cfd07660656a26898398b74"
-REQUIRES=""
-MAINTAINER="Sébastien Ballet"
-EMAIL="slacker6896@gmail.com"
diff --git a/development/zulu-openjdk-lts/README b/development/zulu-openjdk11/README
index c2d267ddc8..472fba34af 100644
--- a/development/zulu-openjdk-lts/README
+++ b/development/zulu-openjdk11/README
@@ -1,4 +1,4 @@
-This is a SlackBuild to repackage the Azul's build of the OpenJDK 
+This is a SlackBuild to repackage the Azul's build of the OpenJDK 11
 LTS (Long Term Support) that is compliant with the latest Java SE
 standard.
 
diff --git a/development/zulu-openjdk11/slack-desc b/development/zulu-openjdk11/slack-desc
new file mode 100644
index 0000000000..cd63735189
--- /dev/null
+++ b/development/zulu-openjdk11/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+zulu-openjdk11: zulu-openjdk11 (Open Implementation of JDK)
+zulu-openjdk11:
+zulu-openjdk11: Prebuild binary of ZuluOpenJDK11 LTS (Long Term Support) from Azul
+zulu-openjdk11: that is compliant with the latest Java SE standard.
+zulu-openjdk11:
+zulu-openjdk11: Zulu has been verified by passing all tests in the latest Java
+zulu-openjdk11: SE version of the OpenJDK Community TCK (Technology Compatibility
+zulu-openjdk11: Kit).
+zulu-openjdk11:
+zulu-openjdk11: https://www.azul.com/downloads/
+zulu-openjdk11:
diff --git a/development/zulu-openjdk-lts/zulu-openjdk-lts.SlackBuild b/development/zulu-openjdk11/zulu-openjdk11.SlackBuild
index 208021f8c6..377daa2754 100644
--- a/development/zulu-openjdk-lts/zulu-openjdk-lts.SlackBuild
+++ b/development/zulu-openjdk11/zulu-openjdk11.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Slackware build script for zulu-openjdk-lts
+# Slackware build script for zulu-openjdk11
 
 # Copyright (c) 2018, Sébastien Ballet <slacker6896 at gmail.com>
 # All rights reserved.
@@ -24,24 +24,20 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PRGNAM=zulu-openjdk-lts
-VERSION=${VERSION:-11.0.5}
-ZULUVERSION=${ZULUVERSION:-11.35.15}
-
-# SRCNAM is the name (without extension) of the source archive and
-# of the top directory in that archive.
-#
-SRCNAM=zulu${ZULUVERSION}-ca-jdk${VERSION}-linux_x64
-
+PRGNAM=zulu-openjdk11
+VERSION=${VERSION:-11.0.13}
+ZULUVERSION=${ZULUVERSION:-11.52.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-ARCH=${ARCH:-$(uname -m)}
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i686 ;;
+    x86_64) ARCH=x64 ;;
+  esac
+fi
 
-# 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
@@ -51,11 +47,19 @@ TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ ! "${ARCH}" = "x86_64" ] ; then
+if [ "$ARCH" = "i686" ]; then
+  LIB_ARCH=i686
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x64" ]; then
+  LIB_ARCH=amd64
+  LIBDIRSUFFIX="64"
+else
   echo "Architecture ${ARCH} is not supported."
   exit 1
 fi
 
+SRCNAM=zulu${ZULUVERSION}-ca-jdk${VERSION}-linux_$ARCH
+
 set -e
 
 rm -rf ${PKG}
diff --git a/development/zulu-openjdk-lts/zulu-openjdk-lts.csh b/development/zulu-openjdk11/zulu-openjdk11.csh
index ffc78c0706..a8bab21b57 100644
--- a/development/zulu-openjdk-lts/zulu-openjdk-lts.csh
+++ b/development/zulu-openjdk11/zulu-openjdk11.csh
@@ -1,5 +1,5 @@
 #!/bin/csh
-setenv JAVA_HOME /usr/lib64/zulu-openjdk-lts
+setenv JAVA_HOME /usr/lib64/zulu-openjdk11
 setenv MANPATH ${MANPATH}:${JAVA_HOME}/man
 setenv PATH ${PATH}:${JAVA_HOME}/bin
 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${JAVA_HOME}/lib/server
diff --git a/development/zulu-openjdk11/zulu-openjdk11.info b/development/zulu-openjdk11/zulu-openjdk11.info
new file mode 100644
index 0000000000..a07fbb9b15
--- /dev/null
+++ b/development/zulu-openjdk11/zulu-openjdk11.info
@@ -0,0 +1,10 @@
+PRGNAM="zulu-openjdk11"
+VERSION="11.0.13"
+HOMEPAGE="https://www.azul.com/downloads/"
+DOWNLOAD="https://cdn.azul.com/zulu/bin/zulu11.52.13-ca-jdk11.0.13-linux_i686.tar.gz"
+MD5SUM="ac1e03880a580c81a36f58d491c17475"
+DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu11.52.13-ca-jdk11.0.13-linux_x64.tar.gz"
+MD5SUM_x86_64="86a7d35e4077c94ea3d250f6a5bf650e"
+REQUIRES=""
+MAINTAINER="Sébastien Ballet"
+EMAIL="slacker6896@gmail.com"
diff --git a/development/zulu-openjdk-lts/zulu-openjdk-lts.sh b/development/zulu-openjdk11/zulu-openjdk11.sh
index 9c4a1d221b..8b05a565fc 100644
--- a/development/zulu-openjdk-lts/zulu-openjdk-lts.sh
+++ b/development/zulu-openjdk11/zulu-openjdk11.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export JAVA_HOME=/usr/lib64/zulu-openjdk-lts
+export JAVA_HOME=/usr/lib64/zulu-openjdk11
 export MANPATH="${MANPATH}:${JAVA_HOME}/man"
 export PATH="${PATH}:${JAVA_HOME}/bin"
 export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_HOME}/lib/server"