7 files changed, 102 insertions, 49 deletions
diff --git a/development/adoptopenjdk/LICENSE b/development/adoptopenjdk/LICENSE
new file mode 100644
index 0000000000..9a044f3f67
--- /dev/null
+++ b/development/adoptopenjdk/LICENSE
@@ -0,0 +1,7 @@
+Copyright 2018 Sukma Wardana <sukma.wardana>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/development/adoptopenjdk/README b/development/adoptopenjdk/README
index 30dcaf123c..c7b412e765 100644
--- a/development/adoptopenjdk/README
+++ b/development/adoptopenjdk/README
@@ -1,5 +1,5 @@
-This is a SlackBuild to repackage OpenJDK 11 binary from the AdoptOpenJDK
-community.
+This is a SlackBuild to repackage OpenJDK 11 binary from AdoptOpenJDK
+community with HotSpot JVM.
 
 Before installing this package please consider any other jdk's / jre's that
 you have already installed as they may cause conflicts with the PATH, JAVA_HOME
@@ -7,3 +7,5 @@ and MANPATH variables.
 
 After installing the package you will need to logout / reboot your machine
 as it will add files to the /etc/profile.d folder.
+
+To enable JavaFX / OpenJFX support currently you need to add IcedTea-Web.
diff --git a/development/adoptopenjdk/adoptopenjdk.SlackBuild b/development/adoptopenjdk/adoptopenjdk.SlackBuild
index 8858c182ec..b72142f929 100644
--- a/development/adoptopenjdk/adoptopenjdk.SlackBuild
+++ b/development/adoptopenjdk/adoptopenjdk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for adoptopenjdk
 
-# Copyright 2018 Sukma Wardana <sukma.wardana>
+# Copyright 2018 Sukma Wardana <sukma.wardana@mail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software
 # and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -21,61 +21,97 @@
 # THE SOFTWARE.
 
 PRGNAM=adoptopenjdk
-VERSION=${VERSION:-11+28}
+VERSION=${VERSION:-11.0.1+13}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+ARCH=${ARCH:-$(uname -m)}
+TAG=${TAG:=_SBo}             # Submission for SlackBuilds.org
+
+MAJORVER=${VERSION%+*}
+MINORVER=${VERSION#*+}
+
+# The name of openjdk provided by AdoptOpenJDK has structured :
+#
+# OpenJDK11-jdk_x64_linux_hotspot_11_28
+#
+# The extracted openjdk archive will show directory named :
+#
+# jdk-11+28
+
+TARNAM=OpenJDK11U-jdk_x64_linux_hotspot_${MAJORVER}_${MINORVER}.tar.gz
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "${ARCH:-$(uname -m)}" != "x86_64" ]; then
+if [ "${ARCH}" != "x86_64" ]; then
   echo "Architecture ${ARCH} is not supported."
   exit 1
 fi
 LIBDIRSUFFIX="64"
 
+# Exit on most errors.
 set -e
 
-MAJORVER=${VERSION%+*}
-MINORVER=${VERSION#*+}
+rm -rf ${PKG}
+mkdir -p ${TMP} ${PKG} ${OUTPUT}
 
-TARNAM=OpenJDK${MAJORVER}-jdk_x64_linux_hotspot_${MAJORVER}_${MINORVER}
+mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}${MAJORVER}
+# Extract start from sub-directory 1 level beneath
+cd ${PKG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}${MAJORVER}
+tar -xvzf ${CWD}/${TARNAM} --strip-components=1
 
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}${MAJORVER}
-cd $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}${MAJORVER}
-tar xvf $CWD/$TARNAM.tar.gz --strip-components=2
 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 $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
-
-find ./man -type f -exec gzip -9 {} \;
-for i in $( find ./man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/etc/profile.d
-for SCRIPT in $PRGNAM.sh $PRGNAM.csh ; do
-  sed -e "s;@MAJORVER@;$MAJORVER;" \
-    < $CWD/${SCRIPT} \
-    > $PKG/etc/profile.d/${SCRIPT}
-  chmod 755 $PKG/etc/profile.d/${SCRIPT}
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a release $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  \( -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 {} \;
+
+# Define whether or not a symlink to libjvm.so library must
+# be created into /usr/lib${LIBDIRSUFFIX}. Can be set to "yes"
+# or "no". Default to "yes".
+if [ "${CREATE_LIBJVM_SYMLINK:-yes}" = "yes" ]; then
+  # Important Note:
+  # --------------
+  # This will create symlink under /usr/lib${LIBDIRSUFFIX}
+  cd ${PKG}/usr/lib${LIBDIRSUFFIX}
+  ln -sf ./${PRGNAM}${MAJORVER}/lib/server/libjvm.so \
+    ${PKG}/usr/lib${LIBDIRSUFFIX}/libjvm.so
+fi
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+# Add profile scripts.
+mkdir -p ${PKG}/etc/profile.d
+for SCRIPT in $(ls "${CWD}/profile.d/${PRGNAM}"*) ; do
+    sed -e "s;@MAJORVER@;${MAJORVER};" \
+      < ${SCRIPT} \
+      > ${PKG}/etc/profile.d/$(basename ${SCRIPT})
+  chmod 755 ${PKG}/etc/profile.d/*
+done
 
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+# Create documentation directory.
+mkdir -p ${PKG}/usr/doc/${PRGNAM}-${MAJORVER}
+# Copy documentation within OpenJDK binary.
+cd ${PKG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}${MAJORVER}
+cp -a release ${PKG}/usr/doc/${PRGNAM}-${MAJORVER}
+# Copy SlackBuild docfile.
+cat ${CWD}/${PRGNAM}.SlackBuild > \
+  ${PKG}/usr/doc/${PRGNAM}-${MAJORVER}/${PRGNAM}.SlackBuild
+
+# Create install directory.
+mkdir -p ${PKG}/install
+# Copy slack-desc into install directory.
+cat ${CWD}/slack-desc > ${PKG}/install/slack-desc
+
+# Strip some libraries and binaries
+(
+  cd $PKG
+    find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+      xargs strip --strip-unneeded 2> /dev/null
+    find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+      xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Build the package.
+cd ${PKG}
+/sbin/makepkg -l y -c n ${OUTPUT}/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}
diff --git a/development/adoptopenjdk/adoptopenjdk.info b/development/adoptopenjdk/adoptopenjdk.info
index 381318e654..31994eb60e 100644
--- a/development/adoptopenjdk/adoptopenjdk.info
+++ b/development/adoptopenjdk/adoptopenjdk.info
@@ -1,10 +1,10 @@
 PRGNAM="adoptopenjdk"
-VERSION="11+28"
+VERSION="11.0.1+13"
 HOMEPAGE="https://adoptopenjdk.net"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11+28/OpenJDK11-jdk_x64_linux_hotspot_11_28.tar.gz"
-MD5SUM_x86_64="001584fa7c4dee54ef7834668ca3e4e3"
+DOWNLOAD_x86_64="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1+13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
+MD5SUM_x86_64="22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2"
 REQUIRES=""
 MAINTAINER="Sukma Wardana"
 EMAIL="sukma.wardana@mail.com"
diff --git a/development/adoptopenjdk/profile.d/adoptopenjdk.csh b/development/adoptopenjdk/profile.d/adoptopenjdk.csh
new file mode 100644
index 0000000000..1e9ef50051
--- /dev/null
+++ b/development/adoptopenjdk/profile.d/adoptopenjdk.csh
@@ -0,0 +1,4 @@
+#!/bin/csh
+setenv JAVA_HOME /usr/lib64/adoptopenjdk@MAJORVER@
+setenv MANPATH ${MANPATH}:${JAVA_HOME}/man
+setenv PATH ${PATH}:${JAVA_HOME}/bin
diff --git a/development/adoptopenjdk/profile.d/adoptopenjdk.sh b/development/adoptopenjdk/profile.d/adoptopenjdk.sh
new file mode 100644
index 0000000000..0d0ffb2500
--- /dev/null
+++ b/development/adoptopenjdk/profile.d/adoptopenjdk.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export JAVA_HOME=/usr/lib64/adoptopenjdk@MAJORVER@
+export MANPATH="${MANPATH}:${JAVA_HOME}/man"
+export PATH="${PATH}:${JAVA_HOME}/bin"
diff --git a/development/adoptopenjdk/slack-desc b/development/adoptopenjdk/slack-desc
index b63b871a2d..a5560ba048 100644
--- a/development/adoptopenjdk/slack-desc
+++ b/development/adoptopenjdk/slack-desc
@@ -8,11 +8,11 @@
             |-----handy-ruler------------------------------------------------------|
 adoptopenjdk: adoptopenjdk (Open Implementation of JDK)
 adoptopenjdk:
-adoptopenjdk: OpenJDK 11 is an open source implementation of version 11 of the Java
-adoptopenjdk: Development Kit, Standard Edition. It includes tools for developing
-adoptopenjdk: testing, and running programs written in java.
+adoptopenjdk: OpenJDK 11 is an open source implementation of version 11 of the
+adoptopenjdk: Java Development Kit, Standard Edition. It includes tools for
+adoptopenjdk: developing testing, and running programs written in java.
 adoptopenjdk:
-adoptopenjdk: OpenJDK 11 binary provided by AdoptOpenJDK, a community of Java user
+adoptopenjdk: OpenJDK 11 binary provided by AdoptOpenJDK, community of Java user
 adoptopenjdk: group members who are advocates of OpenJDK. Part of the group's
 adoptopenjdk: activities occur at the Adoption Group on the OpenJDK project.
 adoptopenjdk: