development/openjdk: Updated for version 7u111b01.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

1 files changed, 19 insertions, 19 deletions

diff --git a/development/openjdk/openjdk.SlackBuild b/development/openjdk/openjdk.SlackBuild
index 1e38ffeb0d..15aef53db7 100644
--- a/development/openjdk/openjdk.SlackBuild
+++ b/development/openjdk/openjdk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OpenJDK
 
-# Copyright 2015 Strahil Yordanov, Sofia, Bulgaria
+# Copyright 2016 Strahil Yordanov, Sofia, Bulgaria
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openjdk
-VERSION=${VERSION:-7u91b1}
+VERSION=${VERSION:-7u111b01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DVER=1.7.0_$(printf $VERSION | cut -du -f2)
-ICEDTEA=icedtea-2.6.2
+ICEDTEA=icedtea-2.6.7
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +40,7 @@ fi
 
 CWD="$(pwd)"
 TMP=${TMP:-/tmp/SBo}
-BUILD_DIR=$TMP/openjdk
+BUILD_DIR=$TMP/$PRGNAM
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -52,6 +52,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+BOOT_JAVA=/usr/lib${LIBDIRSUFFIX}/jvm
+
 set -e
 
 rm -rf $BUILD_DIR $PKG
@@ -63,17 +65,19 @@ tar -xvf $CWD/${ICEDTEA}.tar.xz
 mkdir icedtea-build
 cd icedtea-build
 
-#Set JAVA_HOME in order to avoid conflictis with other already installed JVMs.
-#Needed for ./make and probably not for ./configure but better be safe.
-JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/jvm PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH \
+# Set JAVA_HOME in order to avoid conflictis with other already installed JVMs.
+# cacerts taken from this CentOS package:
+# http://mirror.centos.org/centos/6/os/x86_64/Packages/ca-certificates-2015.2.4-65.0.1.el6_6.noarch.rpm
+JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH \
   ../$ICEDTEA/configure \
-  --with-jdk-home=/usr/lib${LIBDIRSUFFIX}/jvm \
+  --with-jdk-home=${BOOT_JAVA} \
   --disable-docs \
+  --disable-downloading \
   --without-rhino \
   --disable-system-kerberos \
-  --disable-downloading \
   --disable-system-pcsc \
   --disable-system-sctp \
+  --with-cacerts-file="$CWD/cacerts" \
   --with-openjdk-src-zip="$CWD/openjdk.tar.bz2" \
   --with-corba-src-zip="$CWD/corba.tar.bz2" \
   --with-jaxp-src-zip="$CWD/jaxp.tar.bz2" \
@@ -81,17 +85,13 @@ JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/jvm PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH
   --with-jdk-src-zip="$CWD/jdk.tar.bz2" \
   --with-langtools-src-zip="$CWD/langtools.tar.bz2" \
   --with-hotspot-src-zip="$CWD/hotspot.tar.bz2"
-JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/jvm PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH make
+
+JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH LOG=trace make
 
 cd $PKG
 mkdir -p usr/lib${LIBDIRSUFFIX}
 cd usr/lib${LIBDIRSUFFIX}
-cp -av $BUILD_DIR/icedtea-build/openjdk.build/j2sdk-image/ openjdk
-
-if [ -z "$KEYSTORE_NO_IMPORT" ] ; then
-  #copy some trust/security certificates (can be viewed with keytool, -storepass changeit)
-  cp "$CWD/cacerts" ./openjdk/jre/lib/security
-fi
+cp -av $BUILD_DIR/icedtea-build/openjdk.build/j2sdk-image/ $PRGNAM
 
 chown -R root.root $PKG
 find -L . \
@@ -108,17 +108,17 @@ done
 chmod 755 $PKG/etc/profile.d/*
 
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf openjdk ${PRGNAM}${DVER}
+  ln -sf $PRGNAM ${PRGNAM}${DVER}
 )
 
 cd $PKG/usr/lib${LIBDIRSUFFIX}
-    ln -sf ./openjdk/jre/lib/${LIB_ARCH}/server/libjvm.so .
+    ln -sf ./$PRGNAM/jre/lib/${LIB_ARCH}/server/libjvm.so .
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/usr/lib${LIBDIRSUFFIX}/openjdk/{THIRD_PARTY_README,LICENSE,ASSEMBLY_EXCEPTION} \
+cp -a $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/{THIRD_PARTY_README,LICENSE,ASSEMBLY_EXCEPTION} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild