4 files changed, 36 insertions, 32 deletions
diff --git a/development/openjdk/README b/development/openjdk/README
index de4628333fa91..8204b9d061e45 100644
--- a/development/openjdk/README
+++ b/development/openjdk/README
@@ -1,8 +1,7 @@
-OpenJDK is an open source implementation of the Java(TM) 2 Platform
-Standard Edition Development Kit. This package is built with the
-IcedTea build and integration project and is thus free software.
-It includes tools for developing, testing, and running programs
-written in the Java programming language.
+OpenJDK is an open source implementation of the Java(TM) 2 Platform Standard
+Edition Development Kit. This package is built with the IcedTea build
+project and includes tools for developing, testing, and running
+programs written in Java.
 
 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,
@@ -25,6 +24,13 @@ as it will add new files to the /etc/profile.d folder.
 
 This script may take a couple of hours to finish and will require
 about 11 GB of disk space for its temporary directory. It defaults to
-"/tmp/SBo" and you may redefine it by invoking the script like this:
+"/tmp/SBo" and you may redefine it like this:
 
 TMP=/your/temporary/dir ./openjdk.SlackBuild
+
+If you get an error like
+
+Internal compiler error: java.lang.NullPointerException at org.eclipse.jdt.internal.compiler.ReadManager.run(ReadManager.java:166)
+
+simply run the build again. This happens early so it shouldn't be that of a
+problem.  At least 1 out of 5 runs so far have always succeded.
diff --git a/development/openjdk/openjdk.SlackBuild b/development/openjdk/openjdk.SlackBuild
index e1bcf652656e2..1e38ffeb0d4df 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:-7u79b14}
+VERSION=${VERSION:-7u91b1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DVER=1.7.0_$(printf $VERSION | cut -du -f2)
-ICEDTEA=icedtea-2.5.5
+ICEDTEA=icedtea-2.6.2
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -72,6 +72,8 @@ JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/jvm PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH
   --without-rhino \
   --disable-system-kerberos \
   --disable-downloading \
+  --disable-system-pcsc \
+  --disable-system-sctp \
   --with-openjdk-src-zip="$CWD/openjdk.tar.bz2" \
   --with-corba-src-zip="$CWD/corba.tar.bz2" \
   --with-jaxp-src-zip="$CWD/jaxp.tar.bz2" \
@@ -120,9 +122,5 @@ cp -a $PKG/usr/lib${LIBDIRSUFFIX}/openjdk/{THIRD_PARTY_README,LICENSE,ASSEMBLY_E
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mv $PKG/usr/lib${LIBDIRSUFFIX}/openjdk/man/ $PKG/usr
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/openjdk/openjdk.info b/development/openjdk/openjdk.info
index 515b77462b6da..ff2b8f7225845 100644
--- a/development/openjdk/openjdk.info
+++ b/development/openjdk/openjdk.info
@@ -1,22 +1,22 @@
 PRGNAM="openjdk"
-VERSION="7u79b14"
+VERSION="7u91b1"
 HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.5.5.tar.xz \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/openjdk.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/corba.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jaxp.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jaxws.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jdk.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/langtools.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/hotspot.tar.bz2"
-MD5SUM="362ab805f8da0f85fa826e76a11e1727 \
-  6edc6aa04cb261ebc382d53e7072d946 \
-  999fa486ab1eaddaba220c19d24d1b33 \
-  139a569cf9d78ae7354fd407750a6fe2 \
-  7bc5e8735d9db574caf1c658d248f69a \
-  81ee4210f1c4315af9069f8153a8e7a1 \
-  117ae9e846a00e287060035b930c299d \
-  51b6547c4a27c4cf6a134dca0f59e3ae"
+DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.2.tar.xz \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/openjdk.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/corba.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jaxp.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jaxws.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jdk.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/langtools.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/hotspot.tar.bz2"
+MD5SUM="3932be2adca6ea40abf2cc0ea8a59094 \
+  d63c5b401aaa9ef76d1dbd87943aa387 \
+  500547dc50acde20fad18d0645be89c4 \
+  793fb78b5f51323e31785bb89292182f \
+  131e2f619455e37cea74ca710e6ada6d \
+  6e8061b2b7c22163ab149fb66553eda8 \
+  1cebffc6b56e9efdbe08eff018801cb1 \
+  5ffb731931226fbff870b80a377f6258"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant"
diff --git a/development/openjdk/slack-desc b/development/openjdk/slack-desc
index 4d5263d8f250c..17649944a06f4 100644
--- a/development/openjdk/slack-desc
+++ b/development/openjdk/slack-desc
@@ -10,9 +10,9 @@ openjdk: openjdk (Open Implementation of JDK)
 openjdk:
 openjdk: OpenJDK is an open source implementation of the Java(TM) 2 Platform 
 openjdk: Standard Edition Development Kit. This package is built using the 
-openjdk: IcedTea build and integration project and is thus free software. It 
-openjdk: includes tools for developing, testing, and running programs 
-openjdk: written in the Java programming language.
+openjdk: IcedTea build and integration project and includes tools for
+openjdk: developing, testing, and running programs written in the Java
+openjdk: programming language.
 openjdk:
 openjdk:
 openjdk: