1 files changed, 15 insertions, 19 deletions
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