# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1306450452 -7200
# Node ID 16413729582c9e723d293fd34675b4df8834e34e
# Parent  cc1782ebaa812615148c97ab264dda5aa2de722b
icedtea6-jdk: it build now (DONT touch this receipt or mail me or MAINTAINER)

diff -r cc1782ebaa81 -r 16413729582c icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Thu May 26 18:26:21 2011 +0000
+++ b/icedtea6-jdk/receipt	Fri May 27 00:54:12 2011 +0200
@@ -6,27 +6,25 @@
 CATEGORY="development"
 SHORT_DESC="A Free Software harness for OpenJDK."
 MAINTAINER="rcx@zoominternet.net"
-DEPENDS="icedtea6-jre glibc-base zlib xorg-libX11 xorg-libXau xorg-libXdmcp"
-BUILD_DEPENDS="gcc+gcj autoconf automake m4 diffutils gawk \
-coreutils-file-special coreutils-file-summarize alsa-lib-dev cups-dev \
-file patch findutils perl zip unzip bzip2 tar cpio glib-dev \
-fastjar rhino ecj apache-ant xalan-xerces-j wget \
-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 \
-nss jdk6-jaxws jdk6-jaxp jdk6-jaf openjdk-6-src"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.iced-tea.org/"
 WGET_URL="http://icedtea.classpath.org/download/source/$TARBALL"
 
+DEPENDS="icedtea6-jre xorg xorg-libXtst xorg-libXp cups"
+BUILD_DEPENDS="gcc+gcj autoconf automake m4 diffutils gawk cups-dev wget cpio \
+coreutils-file-special coreutils-file-summarize alsa-lib-dev file patch perl \
+zip unzip findutils  bzip2 tar glib-dev fastjar rhino ecj apache-ant jpeg-dev \
+xalan-xerces-j gtk+-dev giflib-dev libpng-dev xorg-dev xorg-libXtst-dev \
+xorg-libXp-dev xorg-dev-proto nss nss-dev jdk6-jaxws jdk6-jaxp jdk6-jaf \
+openjdk-6-src"
+
 # Note to icedtea6 updaters,
 # You should check version into receipts:
 # * jdk6-jaxws (version: $openjdk_version)
 # * jdk6-jaxp (version: $openjdk_version)
 # * jdk6-jaf (version: $openjdk_version)
 # * openjdk-6-src (version: $openjdk_version-$openjdk_date)
-# Theses receipts allow to have source tarballs managed by tazwok.
+# Theses receipts allow to have source tarballs in SRC.
 openjdk_version="b20"
 openjdk_date="21_jun_2010"
 
@@ -46,25 +44,14 @@
 	cd $src
 	mkdir drops
 	sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/'  Makefile*
-
-	report open-bloc
 	
 	# Check than all sources files are available, or exit.
 	for i in jdk6-jaxws jdk6-jaxp jdk6-jaf; do
-		tazwok get-src $i || { report close-bloc; return 1; }
 		cp $SOURCES_REPOSITORY/$i-$openjdk_version.zip drops
 	done
-	tazwok get-src openjdk-6-src || { report close-bloc; return 1; }
+	#tazwok get-src openjdk-6-src || { report close-bloc; return 1; }
 	cp $SOURCES_REPOSITORY/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz .
 
-	report step "Checking that all needed tools are OK"
-	[ -L /usr/bin/find ] && tazpkg get-install findutils --forced
-	[ -L /usr/bin/diff ] && tazpkg get-install diffutils --forced
-	[ "$(readlink /usr/bin/awk)" == "gawk" ] ||
-	tazpkg get-install gawk --forced
-	[ -L /usr/bin/sed ] && tazpkg get-install sed --forced
-
-	report step "Running compilation"
 	mem=$(free | awk '/Mem:/ { printf "%d\n",$2/1024 }')
 	cat > slitaz.sh <<EOT
 # Busybox compatibility
@@ -89,18 +76,18 @@
 		--with-rhino=/usr/share/java/js.jar \
 		--with-abs-install-dir=$JVM_PREFIX \
 		$CONFIGURE_ARGS &&
-	make -j 1 ARCH_PREFIX=  || { report close-bloc; return 1; }
+	make -j 1 ARCH_PREFIX=
 
 	# NOTE: don't build with -j 4. Only build with -j 1 or tank will crash
 	# NOTE: IcedTea6 does not define an "install" target
 	
-	report step "Copying needed files to install dir"
+	echo "Copying needed files to install dir"
 	rm -rf $DESTDIR
 
 	local JVM_BUILDDIR
 	JVM_BUILDDIR=$src/openjdk.build/j2sdk-image
 	local JVM_DESTDIR
-	JVM_DESTDIR=$DESTDIR$JVM_PREFIX
+	JVM_DESTDIR=${DESTDIR}$JVM_PREFIX
 
 	mkdir -p $JVM_DESTDIR
 	cp -a $JVM_BUILDDIR/bin $JVM_DESTDIR
@@ -127,7 +114,6 @@
 		ln -s $JVM_PREFIX/jre/bin/$jbin $JVM_DESTDIR/bin/$jbin
 		ln -s $JVM_PREFIX/jre/bin/$jbin $DESTDIR/usr/jre-bin
 	done
-	report close-bloc
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.