development/openjdk: Updated for version 7u60.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 33 insertions, 40 deletions

diff --git a/development/openjdk/README b/development/openjdk/README
index fda24b5da1..a1c715243c 100644
--- a/development/openjdk/README
+++ b/development/openjdk/README
@@ -8,9 +8,6 @@ apache-ant is a required dependency and you have to install it before
 you build openjdk. However, you do not need to install Oracle's jdk,
 since it's only a runtime dependency.
 
-pulseaudio is an optional dependency. It is needed for features such
-as voice streaming and playback.
-
 This script imports the security certificates also found in Oracle's
 jdk. You can override this behavior by invoking the script like this:
 
diff --git a/development/openjdk/openjdk.SlackBuild b/development/openjdk/openjdk.SlackBuild
index 6afff16696..e67dfd556e 100644
--- a/development/openjdk/openjdk.SlackBuild
+++ b/development/openjdk/openjdk.SlackBuild
@@ -23,12 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openjdk
-VERSION=${VERSION:-7u55}
+VERSION=${VERSION:-7u60}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DVER=1.7.0_$(printf $VERSION | cut -du -f2)
-HOTSPOT_SRC=69b542696e5b.tar.gz
+ICEDTEA=icedtea-2.5.0
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -58,30 +58,27 @@ rm -rf $BUILD_DIR $PKG
 mkdir -p $TMP $BUILD_DIR $PKG $OUTPUT
 cd $BUILD_DIR
 
-tar -xvf $CWD/icedtea-2.4.7.tar.xz
-
-sed "s#cacao /usr/lib/jvm#cacao /usr/lib${LIBDIRSUFFIX}/jvm#" "$CWD/configure.patch" > configure.patch
-patch ./icedtea-2.4.7/configure configure.patch
+tar -xvf $CWD/${ICEDTEA}.tar.xz
 
 mkdir icedtea-build
 cd icedtea-build
 
-if pkg-config --atleast-version=0.9.11 libpulse ; then ENABLE_PULSE_JAVA=--enable-pulse-java ; fi
-
+#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 \
-  ../icedtea-2.4.7/configure \
+  ../$ICEDTEA/configure \
+  --with-jdk-home=/usr/lib${LIBDIRSUFFIX}/jvm \
+  --disable-docs \
   --without-rhino \
   --disable-system-kerberos \
-  --disable-system-lcms \
   --disable-downloading \
-  --with-openjdk-src-zip="$CWD/13970e76b784.tar.gz" \
-  --with-hotspot-src-zip="$CWD/$HOTSPOT_SRC" \
-  --with-corba-src-zip="$CWD/e6ad5b912691.tar.gz" \
-  --with-jaxp-src-zip="$CWD/94b7e8e0d96f.tar.gz" \
-  --with-jaxws-src-zip="$CWD/bd9a50a78d04.tar.gz" \
-  --with-jdk-src-zip="$CWD/9448fff93286.tar.gz" \
-  --with-langtools-src-zip="$CWD/8c26a3c39128.tar.gz" \
-  $ENABLE_PULSE_JAVA
+  --with-openjdk-src-zip="$CWD/openjdk.tar.bz2" \
+  --with-corba-src-zip="$CWD/corba.tar.bz2" \
+  --with-jaxp-src-zip="$CWD/jaxp.tar.bz2" \
+  --with-jaxws-src-zip="$CWD/jaxws.tar.bz2" \
+  --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
 
 cd $PKG
@@ -118,7 +115,6 @@ cd $PKG/usr/lib${LIBDIRSUFFIX}
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Java may not expect compressed manpages, so don't compress them.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $PKG/usr/lib${LIBDIRSUFFIX}/openjdk/{THIRD_PARTY_README,LICENSE,ASSEMBLY_EXCEPTION} \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/openjdk/openjdk.info b/development/openjdk/openjdk.info
index a8ef59e1cd..5d74cfa1d7 100644
--- a/development/openjdk/openjdk.info
+++ b/development/openjdk/openjdk.info
@@ -1,24 +1,24 @@
 PRGNAM="openjdk"
-VERSION="7u55"
+VERSION="7u60"
 HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.4.7.tar.xz \
-	  http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/13970e76b784.tar.gz \
-	  http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/69b542696e5b.tar.gz \
-	  http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/e6ad5b912691.tar.gz \
-	  http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/94b7e8e0d96f.tar.gz \
-	  http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/bd9a50a78d04.tar.gz \
-	  http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/9448fff93286.tar.gz \
-	  http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archive/8c26a3c39128.tar.gz"
-MD5SUM="f6b28633b9978fadc724247cfc264ff0 \
-	b0295fd54825d3f47d47de81d81a475a \
-	0381ef3920f1ff5c8ac6c8860974d8cc \
-	0a8f2235307b68553865ac38192690c7 \
-	ba7a21a3ef2ce5d0d47c7015e43c5dcf \
-	9ef2ea5b1e87777c75a72e1dca6fab1d \
-	cea74e96852bf017f73222fa7045daee \
-	449cec19b80ab70935d02d03e3cbc568"
+DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.5.0.tar.xz \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.5/openjdk.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.5/corba.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.5/jaxp.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.5/jaxws.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.5/jdk.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.5/langtools.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.5/hotspot.tar.bz2"
+MD5SUM="a14305c61f704b33369c433955572362 \
+  5a32302cc14e7bb113d399bc9a017b23 \
+  bfcdcf4d91e511056fc81a0d771fbdff \
+  34ce2eab91aaba3efb500a3b02051cca \
+  590460868b1c4911d3f57c4f5a80ecc7 \
+  2f2e28645f2203576d416115d5cdbd85 \
+  83a383d30ebc7edaa857430ec997091b \
+  964b7e610177db849dbe0b2483a564a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-ant %README%"
+REQUIRES="apache-ant"
 MAINTAINER="Strahil Yordanov"
 EMAIL="strahilski@yahoo.com"