# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1287602959 0
# Node ID 3e3e8aa68463852512c41e5938f87bd4c2005ce0
# Parent  2fd0972c0c886250497a6b04345e027c3e298aec
Fixed icedtea6-jdk to download the other sources. Updated java-jdk and java-jre to 1.9.1.

diff -r 2fd0972c0c88 -r 3e3e8aa68463 icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Wed Oct 20 23:28:42 2010 +0200
+++ b/icedtea6-jdk/receipt	Wed Oct 20 19:29:19 2010 +0000
@@ -14,11 +14,22 @@
 freetype-dev gtk+-dev giflib-dev jpeg-dev libpng-dev \
 xorg-inputproto xorg-kbproto xorg-libXi-dev xorg-libXinerama-dev \
 xorg-libXp-dev xorg-libXt-dev xorg-libXtst-dev xorg-printproto \
-xorg-recordproto xorg-renderproto xorg-xextproto xorg-xineramaproto xorg-xproto"
+xorg-recordproto xorg-renderproto xorg-xextproto xorg-xineramaproto xorg-xproto wget"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.iced-tea.org/"
 WGET_URL="http://icedtea.classpath.org/download/source/$TARBALL"
 
+openjdk_version="b20"
+openjdk_date="21_jun_2010"
+JAXWS="jdk6-jaxws-${openjdk_version}.zip"
+JAXP="jdk6-jaxp-${openjdk_version}.zip"
+JAF="jdk6-jaf-${openjdk_version}.zip"
+OPENJDK="openjdk-6-src-${openjdk_version}-${openjdk_date}.tar.gz"
+WGETJAXWS="https://jax-ws.dev.java.net/files/documents/4202/150724"
+WGETJAXP="https://jaxp.dev.java.net/files/documents/913/150648"
+WGETJAF="https://jax-ws.dev.java.net/files/documents/4202/150725"
+WGETOPENJDK="http://download.java.net/openjdk/jdk6/promoted/${openjdk_version}"
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -35,14 +46,23 @@
 	cd $src
 	mkdir drops
 	sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/'  Makefile*
-	for i in jdk6-jaxws-2009_10_27.zip jdk6-jaxp-2009_10_13.zip \
-		  jdk6-jaf-2009_10_27.zip ; do
-		[ -s $SOURCES_REPOSITORY/$i ] &&
-		cp $SOURCES_REPOSITORY/$i drops
-	done
-	for i in openjdk-6-src-b18-16_feb_2010.tar.gz ; do
-		[ -s $SOURCES_REPOSITORY/$i ] &&
-		cp $SOURCES_REPOSITORY/$i .
+	for i in $JAXWS $JAXP $JAF $OPENJDK ; do
+		if [ -f $SOURCES_REPOSITORY/$i ]; then
+			cp $SOURCES_REPOSITORY/$i drops
+		elif [ "$i" == "$JAXWS" ]; then
+			wget -O $SOURCES_REPOSITORY/$JAXWS --no-check-certificate "$WGETJAXWS/$JAXWS"
+			cp $SOURCES_REPOSITORY/$JAXWS drops
+		elif [ "$i" == "$JAXP" ]; then
+			wget -O $SOURCES_REPOSITORY/$JAXP --no-check-certificate "$WGETJAXP/$JAXP"
+			cp $SOURCES_REPOSITORY/$JAXP drops
+		elif [ "$i" == "$JAF" ]; then
+			wget -O $SOURCES_REPOSITORY/$JAF --no-check-certificate "$WGETJAF/$JAF"
+			cp $SOURCES_REPOSITORY/$JAF drops
+		elif [ "$i" == "$OPENJDK" ]; then
+			wget -O $SOURCES_REPOSITORY/$OPENJDK "$WGETOPENJDK/$OPENJDK"
+			cp $SOURCES_REPOSITORY/$OPENJDK .
+		fi
+		
 	done
 	[ -L /usr/bin/find ] && tazpkg get-install findutils --forced
 	[ -L /usr/bin/diff ] && tazpkg get-install diffutils --forced
diff -r 2fd0972c0c88 -r 3e3e8aa68463 java-jdk/receipt
--- a/java-jdk/receipt	Wed Oct 20 23:28:42 2010 +0200
+++ b/java-jdk/receipt	Wed Oct 20 19:29:19 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="java-jdk"
-VERSION="1.8.1"
+VERSION="1.9.1"
 CATEGORY="development"
 SHORT_DESC="Symlinks for the default Java Development Kit (icedtea6)."
 MAINTAINER="rcx@zoominternet.net"
diff -r 2fd0972c0c88 -r 3e3e8aa68463 java-jre/receipt
--- a/java-jre/receipt	Wed Oct 20 23:28:42 2010 +0200
+++ b/java-jre/receipt	Wed Oct 20 19:29:19 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="java-jre"
-VERSION="1.8.1"
+VERSION="1.9.1"
 CATEGORY="development"
 SHORT_DESC="Symlinks for the default Java Runtime Environment (icedtea6)."
 MAINTAINER="rcx@zoominternet.net"