diff -rN -u old-current/source/devel-extra/openjdk/FrugalBuild new-current/source/devel-extra/openjdk/FrugalBuild
--- old-current/source/devel-extra/openjdk/FrugalBuild	2007-05-11 20:12:08.000000000 +0200
+++ new-current/source/devel-extra/openjdk/FrugalBuild	2007-05-11 20:12:25.000000000 +0200
@@ -2,26 +2,32 @@
 # Maintainer: VMiklos <vmiklos@frugalware.org>
 
 pkgname=openjdk
-pkgver=1.6.0
-pkgrel=6
-build_id="09"
-rel_id="hotspot-7-ea-src-b$build_id-01_mar_2007"
+pkgver=1.7.0
+pkgrel=1
+build_id="12"
+build_date="06_may_2007"
+build_hash="40ec4ed263a6dfce13b8cf18fa046058"
+rel_id="openjdk-7-ea-src-b$build_id-$build_date"
+# TODO: x86_64 support
+plug_id="jdk-7-ea-plug-b$build_id-linux-i586-$build_date"
 pkgdesc="Sun's java development kit (GPL version)"
-url="http://openjdk.dev.java.net/"
+url="http://download.java.net/openjdk/jdk7/"
 # TODO: rebuild using openjdk itself
-makedepends=('j2sdk' 'unixodbc' 'libice' 'libxp' 'libxi' 'libsm' 'libxtst' 'libxt' 'alsa-lib')
+_subdepends=('alsa-lib' 'libx11' 'libxext' 'libxi' 'libxtst')
+makedepends=(${_subdepends[@]} 'openmotif' 'jdk7' 'libxmu' 'libxt' 'inputproto' 'xextproto' 'xproto' 'cups' 'zip' 'procps')
 rodepends=('openjre')
-conflicts=('j2sdk')
+conflicts=('jdk7')
 groups=('devel-extra')
 archs=('i686')
 # this is a bit hackish but at least we are notified when a new version is out
-up2date="elinks -dump https://openjdk.dev.java.net/hotspot/|grep zip$|sed 's|.*/\(.*\)\.zip|\1|;s/$rel_id/$pkgver/'"
-source=(http://www.java.net/download/openjdk/jdk7/promoted/b$build_id/$rel_id.zip \
+up2date="elinks -dump $url |grep zip$|sed 's|.*/\(.*\)\.zip|\1|;s/$rel_id/$pkgver/;q'"
+source=(http://www.java.net/download/openjdk/$build_hash/jdk7/promoted/b$build_id/\
+{$rel_id.zip,binaries/$plug_id.jar} \
 	openj{dk,re}.sh)
 
 subpkgs=('openjre')
 subdescs=("Sun's java runtime environment (GPL version)")
-subdepends=('unixodbc libice libxp libxi libsm libxtst libxt alsa-lib')
+subdepends=("$(echo ${_subdepends[@]})")
 subconflicts=('j2re')
 subgroups=('xlib-extra')
 subarchs=('i686')
@@ -32,14 +38,28 @@
 		export HOTSPOT_BUILD_JOBS="${MAKEFLAGS/-j}"
 		unset MAKEFLAGS
 	fi
-	Fcd hotspot
-	Fpatchall
-	cd make
-	export ALT_BOOTDIR="/usr/lib/java"
-	export ALT_JDK_IMPORT_PATH="$ALT_BOOTDIR"
-	export FULL_VERSION="$pkgver-$pkgrel"
+	Fcd openjdk
+	Fsed '$(UTILS_COMMAND_PATH)sed' '$(USRBIN_PATH)sed' j2se/make/common/shared/Defs-utils.gmk
+	. j2se/make/jdk_generic_profile.sh || return 1
+	cd control/make || return 1
+	export ALT_BOOTDIR=$JAVA_HOME
+	export ALT_CLOSED_JDK_IMPORT_PATH=$JAVA_HOME
+	export ALT_CLOSED_LIB_DIR=$JAVA_HOME/jre/lib/i386
+	export OPENJDK=true
+	export NOSTRIP=true
+	export BUILD_NUMBER=b$build_id
+	export ALT_CLOSED_JAR_FILE=$Fsrcdir/$plug_id.jar
+	unset CLASSPATH JAVA_HOME LD_LIBRARY_PATH
+	make sanity || return 1
+	make || return 1
+
+	echo lefordult
+	return 1
+	#export ALT_BOOTDIR="/usr/lib/java"
+	#export ALT_JDK_IMPORT_PATH="$ALT_BOOTDIR"
+	#export FULL_VERSION="$pkgver-$pkgrel"
 
-	make MAKE_VERBOSE="" world || return 1
+	#make MAKE_VERBOSE="" world || return 1
 
 	cd ..
 	# don't use Fdoc here since we want this to go to the jre subpkg