diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index a4fbab7966f0..18ab3db7edef 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2011/01/13 13:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2011/08/21 22:57:54 tnn Exp $
 
-DISTNAME=	openjdk-7-ea-src-b92-06_may_2010
-PKGNAME=	openjdk7-1.7.0.92.20100521
-PKGREVISION=	2
+DISTNAME=	openjdk-7-fcs-src-b147-27_jun_2011
+PKGNAME=	openjdk7-1.7.0.147.20110811
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 # diff between distfile and bsd-port branch. To check out, use:
 # "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/"
-PATCHFILES+=	jdk-7-bsd-port-92.20100521.diff.bz2
+PATCHFILES+=	jdk-7-bsd-port-147.20110811.diff.bz2
 PATCH_SITES+=	${MASTER_SITE_LOCAL:=openjdk7/}
 
 CACERTS=	cacerts-20091013.tar.bz2
@@ -50,12 +49,14 @@ BUILDLINK_PASSTHRU_DIRS+=	${ALT_BOOTDIR}
 PREPEND_PATH+=			${ALT_BOOTDIR}/bin
 
 MAKE_ENV+=	ALT_BOOTDIR=${ALT_BOOTDIR}
+MAKE_ENV+=	ALT_DROPS_DIR=${DISTDIR}/${DIST_SUBDIR}
 MAKE_ENV+=	ALT_FREETYPE_LIB_PATH=${BUILDLINK_PREFIX.freetype2}/lib
 MAKE_ENV+=	ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include
 MAKE_ENV+=	ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include
 MAKE_ENV+=	ALT_COMPILER_PATH=${WRAPPER_DIR}/bin
 MAKE_ENV+=	ALT_PACKAGE_PATH=${PREFIX}
 MAKE_ENV+=	ALT_X11_PATH=${X11BASE}
+MAKE_ENV+=	RHINO_JAR=${WRKDIR}/${RHINO}/js.jar
 
 MAKE_ENV+=	ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
 
@@ -103,13 +104,11 @@ PLIST.i386=	yes
 
 post-extract:
 	chmod +x ${ANT_BIN}/ant
-	cd ${WRKDIR}/${ICEDTEA}/plugin/icedteanp/java && pax -rw . \
+	cd ${WRKDIR}/${ICEDTEA_WEB}/plugin/icedteanp/java && pax -rw . \
 	  ${WRKSRC}/jdk/src/share/classes
-	cd ${WRKDIR}/${ICEDTEA}/netx && pax -rw . \
+	cd ${WRKDIR}/${ICEDTEA_WEB}/netx && pax -rw . \
 	  ${WRKSRC}/jdk/src/share/classes
-	${MKDIR} ${WRKSRC}/hotspot/make/bsd/makefiles
-	cp ${WRKSRC}/hotspot/make/linux/makefiles/build_vm_def.sh \
-	  ${WRKSRC}/hotspot/make/bsd/makefiles/build_vm_def.sh
+	cd ${WRKSRC} && patch -s -p1 < ${WRKDIR}/${ICEDTEA}/patches/rhino.patch
 
 do-build: ${WRKDIR}/stage3-done
 
diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST
index 7e53a46e592a..c83a6274b8e3 100644
--- a/lang/openjdk7/PLIST
+++ b/lang/openjdk7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2010/12/07 22:23:23 abs Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/08/21 22:57:54 tnn Exp $
 bin/openjdk7-jar
 bin/openjdk7-java
 bin/openjdk7-javac
@@ -22,7 +22,7 @@ java/openjdk7/bin/idlj
 java/openjdk7/bin/jar
 java/openjdk7/bin/jarsigner
 java/openjdk7/bin/java
-${PLIST.i386}java/openjdk7/bin/java-rmi.cgi
+java/openjdk7/bin/java-rmi.cgi
 java/openjdk7/bin/javac
 java/openjdk7/bin/javadoc
 java/openjdk7/bin/javah
@@ -51,6 +51,9 @@ java/openjdk7/bin/serialver
 java/openjdk7/bin/servertool
 java/openjdk7/bin/tnameserv
 java/openjdk7/bin/unpack200
+${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
+${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
+${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
 java/openjdk7/bin/wsgen
 java/openjdk7/bin/wsimport
 java/openjdk7/bin/xjc
@@ -78,6 +81,8 @@ java/openjdk7/demo/applets/Clock/example1.html
 java/openjdk7/demo/applets/DitherTest/CardinalTextField.class
 java/openjdk7/demo/applets/DitherTest/DitherCanvas.class
 java/openjdk7/demo/applets/DitherTest/DitherControls.class
+java/openjdk7/demo/applets/DitherTest/DitherMethod.class
+java/openjdk7/demo/applets/DitherTest/DitherTest$1.class
 java/openjdk7/demo/applets/DitherTest/DitherTest.class
 java/openjdk7/demo/applets/DitherTest/DitherTest.java
 java/openjdk7/demo/applets/DitherTest/example1.html
@@ -171,6 +176,7 @@ java/openjdk7/demo/jfc/CodePointIM/src.zip
 java/openjdk7/demo/jfc/FileChooserDemo/FileChooserDemo.jar
 java/openjdk7/demo/jfc/FileChooserDemo/README.txt
 java/openjdk7/demo/jfc/FileChooserDemo/src.zip
+java/openjdk7/demo/jfc/Font2DTest/Font2DTest.html
 java/openjdk7/demo/jfc/Font2DTest/Font2DTest.jar
 java/openjdk7/demo/jfc/Font2DTest/README.txt
 java/openjdk7/demo/jfc/Font2DTest/src.zip
@@ -184,13 +190,17 @@ java/openjdk7/demo/jfc/SampleTree/README.txt
 java/openjdk7/demo/jfc/SampleTree/SampleTree.jar
 java/openjdk7/demo/jfc/SampleTree/src.zip
 java/openjdk7/demo/jfc/SwingApplet/README.txt
+java/openjdk7/demo/jfc/SwingApplet/SwingApplet.html
 java/openjdk7/demo/jfc/SwingApplet/SwingApplet.jar
 java/openjdk7/demo/jfc/SwingApplet/src.zip
 java/openjdk7/demo/jfc/TableExample/README.txt
 java/openjdk7/demo/jfc/TableExample/TableExample.jar
 java/openjdk7/demo/jfc/TableExample/src.zip
+java/openjdk7/demo/jfc/TransparentRuler/README.txt
+java/openjdk7/demo/jfc/TransparentRuler/TransparentRuler.jar
+java/openjdk7/demo/jfc/TransparentRuler/src.zip
 java/openjdk7/demo/jpda/com/sun/tools/example/README
-java/openjdk7/demo/jpda/jpda.jar
+java/openjdk7/demo/jpda/examples.jar
 java/openjdk7/demo/jpda/src.zip
 java/openjdk7/demo/jvmti/compiledMethodLoad/README.txt
 java/openjdk7/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
@@ -279,6 +289,12 @@ java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml
 java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/jdk.xml
 java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
 java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/project.xml
+java/openjdk7/demo/nbproject/jfc/TransparentRuler/build.properties
+java/openjdk7/demo/nbproject/jfc/TransparentRuler/build.xml
+java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml
+java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml
+java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
+java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/project.xml
 java/openjdk7/demo/nbproject/management/FullThreadDump/build.properties
 java/openjdk7/demo/nbproject/management/FullThreadDump/build.xml
 java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml
@@ -310,6 +326,10 @@ java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xm
 java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml
 java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml
 java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/project.xml
+java/openjdk7/demo/nio/zipfs/Demo.java
+java/openjdk7/demo/nio/zipfs/README.txt
+java/openjdk7/demo/nio/zipfs/src.zip
+java/openjdk7/demo/nio/zipfs/zipfs.jar
 java/openjdk7/demo/scripting/jconsole-plugin/README.txt
 java/openjdk7/demo/scripting/jconsole-plugin/build.xml
 java/openjdk7/demo/scripting/jconsole-plugin/jconsole-plugin.jar
@@ -336,9 +356,6 @@ java/openjdk7/jre/bin/rmiregistry
 java/openjdk7/jre/bin/servertool
 java/openjdk7/jre/bin/tnameserv
 java/openjdk7/jre/bin/unpack200
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
 java/openjdk7/jre/lib/${ARCH}/headless/libmawt.so
 java/openjdk7/jre/lib/${ARCH}/jexec
 java/openjdk7/jre/lib/${ARCH}/jli/libjli.so
@@ -374,7 +391,6 @@ java/openjdk7/jre/lib/${ARCH}/libsunec.so
 java/openjdk7/jre/lib/${ARCH}/libunpack.so
 java/openjdk7/jre/lib/${ARCH}/libverify.so
 java/openjdk7/jre/lib/${ARCH}/libzip.so
-java/openjdk7/jre/lib/${ARCH}/native_threads/libhpi.so
 java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt
 java/openjdk7/jre/lib/${ARCH}/server/libjsig.so
 java/openjdk7/jre/lib/${ARCH}/server/libjvm.so
@@ -396,11 +412,10 @@ java/openjdk7/jre/lib/ext/meta-index
 java/openjdk7/jre/lib/ext/sunec.jar
 java/openjdk7/jre/lib/ext/sunjce_provider.jar
 java/openjdk7/jre/lib/ext/sunpkcs11.jar
+java/openjdk7/jre/lib/ext/zipfs.jar
 java/openjdk7/jre/lib/flavormap.properties
 java/openjdk7/jre/lib/fontconfig.bfc
 java/openjdk7/jre/lib/fontconfig.properties.src
-java/openjdk7/jre/lib/im/indicim.jar
-java/openjdk7/jre/lib/im/thaiim.jar
 java/openjdk7/jre/lib/images/cursors/cursors.properties
 java/openjdk7/jre/lib/images/cursors/invalid32x32.gif
 java/openjdk7/jre/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -423,8 +438,8 @@ java/openjdk7/jre/lib/net.properties
 java/openjdk7/jre/lib/psfont.properties.ja
 java/openjdk7/jre/lib/psfontj2d.properties
 java/openjdk7/jre/lib/resources.jar
+java/openjdk7/jre/lib/rhino.jar
 java/openjdk7/jre/lib/rt.jar
-${PLIST.jce}java/openjdk7/jre/lib/security/COPYRIGHT.html
 ${PLIST.jce}java/openjdk7/jre/lib/security/README.txt
 java/openjdk7/jre/lib/security/US_export_policy.jar
 java/openjdk7/jre/lib/security/cacerts
@@ -505,6 +520,7 @@ java/openjdk7/jre/lib/zi/America/Aruba
 java/openjdk7/jre/lib/zi/America/Asuncion
 java/openjdk7/jre/lib/zi/America/Atikokan
 java/openjdk7/jre/lib/zi/America/Bahia
+java/openjdk7/jre/lib/zi/America/Bahia_Banderas
 java/openjdk7/jre/lib/zi/America/Barbados
 java/openjdk7/jre/lib/zi/America/Belem
 java/openjdk7/jre/lib/zi/America/Belize
@@ -570,6 +586,7 @@ java/openjdk7/jre/lib/zi/America/Matamoros
 java/openjdk7/jre/lib/zi/America/Mazatlan
 java/openjdk7/jre/lib/zi/America/Menominee
 java/openjdk7/jre/lib/zi/America/Merida
+java/openjdk7/jre/lib/zi/America/Metlakatla
 java/openjdk7/jre/lib/zi/America/Mexico_City
 java/openjdk7/jre/lib/zi/America/Miquelon
 java/openjdk7/jre/lib/zi/America/Moncton
@@ -582,6 +599,7 @@ java/openjdk7/jre/lib/zi/America/New_York
 java/openjdk7/jre/lib/zi/America/Nipigon
 java/openjdk7/jre/lib/zi/America/Nome
 java/openjdk7/jre/lib/zi/America/Noronha
+java/openjdk7/jre/lib/zi/America/North_Dakota/Beulah
 java/openjdk7/jre/lib/zi/America/North_Dakota/Center
 java/openjdk7/jre/lib/zi/America/North_Dakota/New_Salem
 java/openjdk7/jre/lib/zi/America/Ojinaga
@@ -605,6 +623,7 @@ java/openjdk7/jre/lib/zi/America/Santiago
 java/openjdk7/jre/lib/zi/America/Santo_Domingo
 java/openjdk7/jre/lib/zi/America/Sao_Paulo
 java/openjdk7/jre/lib/zi/America/Scoresbysund
+java/openjdk7/jre/lib/zi/America/Sitka
 java/openjdk7/jre/lib/zi/America/St_Johns
 java/openjdk7/jre/lib/zi/America/St_Kitts
 java/openjdk7/jre/lib/zi/America/St_Lucia
@@ -830,6 +849,7 @@ java/openjdk7/jre/lib/zi/PST8PDT
 java/openjdk7/jre/lib/zi/Pacific/Apia
 java/openjdk7/jre/lib/zi/Pacific/Auckland
 java/openjdk7/jre/lib/zi/Pacific/Chatham
+java/openjdk7/jre/lib/zi/Pacific/Chuuk
 java/openjdk7/jre/lib/zi/Pacific/Easter
 java/openjdk7/jre/lib/zi/Pacific/Efate
 java/openjdk7/jre/lib/zi/Pacific/Enderbury
@@ -855,14 +875,13 @@ java/openjdk7/jre/lib/zi/Pacific/Noumea
 java/openjdk7/jre/lib/zi/Pacific/Pago_Pago
 java/openjdk7/jre/lib/zi/Pacific/Palau
 java/openjdk7/jre/lib/zi/Pacific/Pitcairn
-java/openjdk7/jre/lib/zi/Pacific/Ponape
+java/openjdk7/jre/lib/zi/Pacific/Pohnpei
 java/openjdk7/jre/lib/zi/Pacific/Port_Moresby
 java/openjdk7/jre/lib/zi/Pacific/Rarotonga
 java/openjdk7/jre/lib/zi/Pacific/Saipan
 java/openjdk7/jre/lib/zi/Pacific/Tahiti
 java/openjdk7/jre/lib/zi/Pacific/Tarawa
 java/openjdk7/jre/lib/zi/Pacific/Tongatapu
-java/openjdk7/jre/lib/zi/Pacific/Truk
 java/openjdk7/jre/lib/zi/Pacific/Wake
 java/openjdk7/jre/lib/zi/Pacific/Wallis
 java/openjdk7/jre/lib/zi/SystemV/AST4
@@ -886,43 +905,44 @@ java/openjdk7/lib/jconsole.jar
 java/openjdk7/lib/orb.idl
 java/openjdk7/lib/sa-jdi.jar
 java/openjdk7/lib/tools.jar
-java/openjdk7/man/ja/man1/appletviewer.1
-java/openjdk7/man/ja/man1/extcheck.1
-java/openjdk7/man/ja/man1/idlj.1
-java/openjdk7/man/ja/man1/jar.1
-java/openjdk7/man/ja/man1/jarsigner.1
-java/openjdk7/man/ja/man1/java.1
-java/openjdk7/man/ja/man1/javac.1
-java/openjdk7/man/ja/man1/javadoc.1
-java/openjdk7/man/ja/man1/javah.1
-java/openjdk7/man/ja/man1/javap.1
-java/openjdk7/man/ja/man1/jconsole.1
-java/openjdk7/man/ja/man1/jdb.1
-java/openjdk7/man/ja/man1/jhat.1
-java/openjdk7/man/ja/man1/jinfo.1
-java/openjdk7/man/ja/man1/jmap.1
-java/openjdk7/man/ja/man1/jps.1
-java/openjdk7/man/ja/man1/jrunscript.1
-java/openjdk7/man/ja/man1/jsadebugd.1
-java/openjdk7/man/ja/man1/jstack.1
-java/openjdk7/man/ja/man1/jstat.1
-java/openjdk7/man/ja/man1/jstatd.1
-java/openjdk7/man/ja/man1/keytool.1
-java/openjdk7/man/ja/man1/native2ascii.1
-java/openjdk7/man/ja/man1/orbd.1
-java/openjdk7/man/ja/man1/pack200.1
-java/openjdk7/man/ja/man1/policytool.1
-java/openjdk7/man/ja/man1/rmic.1
-java/openjdk7/man/ja/man1/rmid.1
-java/openjdk7/man/ja/man1/rmiregistry.1
-java/openjdk7/man/ja/man1/schemagen.1
-java/openjdk7/man/ja/man1/serialver.1
-java/openjdk7/man/ja/man1/servertool.1
-java/openjdk7/man/ja/man1/tnameserv.1
-java/openjdk7/man/ja/man1/unpack200.1
-java/openjdk7/man/ja/man1/wsgen.1
-java/openjdk7/man/ja/man1/wsimport.1
-java/openjdk7/man/ja/man1/xjc.1
+java/openjdk7/man/ja
+java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1
+java/openjdk7/man/ja_JP.UTF-8/man1/extcheck.1
+java/openjdk7/man/ja_JP.UTF-8/man1/idlj.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jar.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jarsigner.1
+java/openjdk7/man/ja_JP.UTF-8/man1/java.1
+java/openjdk7/man/ja_JP.UTF-8/man1/javac.1
+java/openjdk7/man/ja_JP.UTF-8/man1/javadoc.1
+java/openjdk7/man/ja_JP.UTF-8/man1/javah.1
+java/openjdk7/man/ja_JP.UTF-8/man1/javap.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jconsole.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jdb.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jhat.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jinfo.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jmap.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jps.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jrunscript.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jsadebugd.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jstack.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jstat.1
+java/openjdk7/man/ja_JP.UTF-8/man1/jstatd.1
+java/openjdk7/man/ja_JP.UTF-8/man1/keytool.1
+java/openjdk7/man/ja_JP.UTF-8/man1/native2ascii.1
+java/openjdk7/man/ja_JP.UTF-8/man1/orbd.1
+java/openjdk7/man/ja_JP.UTF-8/man1/pack200.1
+java/openjdk7/man/ja_JP.UTF-8/man1/policytool.1
+java/openjdk7/man/ja_JP.UTF-8/man1/rmic.1
+java/openjdk7/man/ja_JP.UTF-8/man1/rmid.1
+java/openjdk7/man/ja_JP.UTF-8/man1/rmiregistry.1
+java/openjdk7/man/ja_JP.UTF-8/man1/schemagen.1
+java/openjdk7/man/ja_JP.UTF-8/man1/serialver.1
+java/openjdk7/man/ja_JP.UTF-8/man1/servertool.1
+java/openjdk7/man/ja_JP.UTF-8/man1/tnameserv.1
+java/openjdk7/man/ja_JP.UTF-8/man1/unpack200.1
+java/openjdk7/man/ja_JP.UTF-8/man1/wsgen.1
+java/openjdk7/man/ja_JP.UTF-8/man1/wsimport.1
+java/openjdk7/man/ja_JP.UTF-8/man1/xjc.1
 java/openjdk7/man/man1/appletviewer.1
 java/openjdk7/man/man1/extcheck.1
 java/openjdk7/man/man1/idlj.1
@@ -960,6 +980,9 @@ java/openjdk7/man/man1/unpack200.1
 java/openjdk7/man/man1/wsgen.1
 java/openjdk7/man/man1/wsimport.1
 java/openjdk7/man/man1/xjc.1
+java/openjdk7/release
+java/openjdk7/sample/forkjoin/mergesort/MergeDemo.java
+java/openjdk7/sample/forkjoin/mergesort/MergeSort.java
 java/openjdk7/sample/jmx/jmx-scandir/build.properties
 java/openjdk7/sample/jmx/jmx-scandir/build.xml
 java/openjdk7/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg
@@ -1007,6 +1030,13 @@ java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils
 java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java
 java/openjdk7/sample/jmx/jmx-scandir/truststore
 java/openjdk7/sample/nbproject/project.xml
+java/openjdk7/sample/nio/chatserver/ChatServer.java
+java/openjdk7/sample/nio/chatserver/Client.java
+java/openjdk7/sample/nio/chatserver/ClientReader.java
+java/openjdk7/sample/nio/chatserver/DataReader.java
+java/openjdk7/sample/nio/chatserver/MessageReader.java
+java/openjdk7/sample/nio/chatserver/NameReader.java
+java/openjdk7/sample/nio/chatserver/README.txt
 java/openjdk7/sample/nio/file/AclEdit.java
 java/openjdk7/sample/nio/file/Chmod.java
 java/openjdk7/sample/nio/file/Copy.java
diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk
index 3f99450bdfb8..63e6b3a3a702 100644
--- a/lang/openjdk7/bootstrap.mk
+++ b/lang/openjdk7/bootstrap.mk
@@ -1,27 +1,14 @@
-# $NetBSD: bootstrap.mk,v 1.3 2011/03/14 06:31:29 rumko Exp $
+# $NetBSD: bootstrap.mk,v 1.4 2011/08/21 22:57:54 tnn Exp $
 
-ONLY_FOR_PLATFORM=	NetBSD-[456].*-i386 NetBSD-[456].*-x86_64
-ONLY_FOR_PLATFORM+=	DragonFly-2.4.*-i386 DragonFly-2.9-i386
+ONLY_FOR_PLATFORM=	NetBSD-[56].*-i386 NetBSD-[56].*-x86_64
+ONLY_FOR_PLATFORM+=	DragonFly-2.*-i386
 
-BOOT.nb4-i386=		bootstrap-jdk-7-bin-netbsd-4-i386-20091012.tar.bz2
-# not yet
-#BOOT.nb4-amd64=		bootstrap-jdk-7-bin-netbsd-4-amd64-20091013.tar.bz2
-BOOT.nb5-i386=		bootstrap-jdk-7-bin-netbsd-5-i386-20090926.tar.bz2
-BOOT.nb5-amd64=		bootstrap-jdk-7-bin-netbsd-5-amd64-20090925.tar.bz2
-BOOT.nb6-i386=		bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2
-BOOT.nb6-amd64=		bootstrap-jdk-7-bin-netbsd-6-amd64-20091013.tar.bz2
-BOOT.df24-i386=		bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2
-BOOT.df29-i386=		bootstrap-jdk-7-bin-dragonfly-2.9-i386-20110128.tar.bz2
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-4.[0-8]*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.nb4-i386}
-EXTRACT_ONLY+=		${BOOT.nb4-i386}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-4.[0-8]*-amd64) || make(distinfo)
-DISTFILES+=		${BOOT.nb4-amd64}
-EXTRACT_ONLY+=		${BOOT.nb4-amd64}
-.endif
+BOOT.nb5-i386=		bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2
+BOOT.nb5-amd64=		bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2
+BOOT.nb6-i386=		bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2
+BOOT.nb6-amd64=		bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2
+BOOT.df210-i386=	bootstrap-jdk7-bin-dragonfly-2.10-i386-20110811.tar.bz2
+BOOT.common-20110811=	bootstrap-jdk7-bin-common-20110811.tar.bz2
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb5-i386}
@@ -45,14 +32,14 @@ DISTFILES+=		${BOOT.nb6-amd64}
 EXTRACT_ONLY+=		${BOOT.nb6-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-2.4.*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.df24-i386}
-EXTRACT_ONLY+=		${BOOT.df24-i386}
+.if !empty(MACHINE_PLATFORM:MDragonFly-*-i386) || make(distinfo)
+DISTFILES+=		${BOOT.df210-i386}
+EXTRACT_ONLY+=		${BOOT.df210-i386}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-2.9-i386) || make(distinfo)
-DISTFILES+=		${BOOT.df29-i386}
-EXTRACT_ONLY+=		${BOOT.df29-i386}
+.if !empty(DISTFILES:M*20110811*) || make(distinfo)
+DISTFILES+=		${BOOT.common-20110811}
+EXTRACT_ONLY+=		${BOOT.common-20110811}
 .endif
 
 ALT_BOOTDIR=		${WRKDIR}/bootstrap
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 30f11c46b7c0..863aa1596100 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,77 +1,84 @@
-$NetBSD: distinfo,v 1.12 2011/03/14 06:31:29 rumko Exp $
+$NetBSD: distinfo,v 1.13 2011/08/21 22:57:54 tnn Exp $
 
-SHA1 (openjdk7/8dc6e1ff8ccf.tar.bz2) = 280e3a66c737c928facdeeb2533215e084513088
-RMD160 (openjdk7/8dc6e1ff8ccf.tar.bz2) = 50d96c6c81deff07016649498e6efd7f950108cf
-Size (openjdk7/8dc6e1ff8ccf.tar.bz2) = 4581125 bytes
+SHA1 (openjdk7/61e08e67b176.tar.bz2) = 3db5488f3c0ea1b9c83a74632d300d8717c9b478
+RMD160 (openjdk7/61e08e67b176.tar.bz2) = c0dd67a6ae982f09b3675c164b5decab4f7e140f
+Size (openjdk7/61e08e67b176.tar.bz2) = 609340 bytes
+SHA1 (openjdk7/8ac25d11a9e5.tar.bz2) = 3c31d1d850b833fcaf01ecec542257eba0de4343
+RMD160 (openjdk7/8ac25d11a9e5.tar.bz2) = 8ac6d3415014192b775dadb1f8296aa04e929352
+Size (openjdk7/8ac25d11a9e5.tar.bz2) = 3566464 bytes
+SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
+RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
+Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
 SHA1 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
 RMD160 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 2666bd4ca16228a09a7c696cdb7c6108404f21b5
 Size (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 6702817 bytes
-SHA1 (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = e51aafb9711a0a6b050d31ad4143b5799b20c88f
-RMD160 (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = 81b97b27f40fdb29004004e799af80a52504c378
-Size (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = 24354825 bytes
-SHA1 (openjdk7/bootstrap-jdk-7-bin-dragonfly-2.9-i386-20110128.tar.bz2) = f79deb40e3793229b69390816f9fd074974bb32d
-RMD160 (openjdk7/bootstrap-jdk-7-bin-dragonfly-2.9-i386-20110128.tar.bz2) = ca5728982368c070a5fdb9953d157c0108f86c06
-Size (openjdk7/bootstrap-jdk-7-bin-dragonfly-2.9-i386-20110128.tar.bz2) = 36609438 bytes
-SHA1 (openjdk7/bootstrap-jdk-7-bin-netbsd-4-i386-20091012.tar.bz2) = 51cbd9fc1a97fc40cf61391933b082f8eee17abb
-RMD160 (openjdk7/bootstrap-jdk-7-bin-netbsd-4-i386-20091012.tar.bz2) = c2e2e0a17ae6d53eee1b91948a6d39080b07cafd
-Size (openjdk7/bootstrap-jdk-7-bin-netbsd-4-i386-20091012.tar.bz2) = 24186222 bytes
-SHA1 (openjdk7/bootstrap-jdk-7-bin-netbsd-5-amd64-20090925.tar.bz2) = 7d41c0c68835e831d0ff612df74b4a612329a450
-RMD160 (openjdk7/bootstrap-jdk-7-bin-netbsd-5-amd64-20090925.tar.bz2) = 15c98327d4b5d62a73b837f1401be3b4d40acd1d
-Size (openjdk7/bootstrap-jdk-7-bin-netbsd-5-amd64-20090925.tar.bz2) = 24284982 bytes
-SHA1 (openjdk7/bootstrap-jdk-7-bin-netbsd-5-i386-20090926.tar.bz2) = 7c2d04344d764e04e711a07e43aa9690419bad1c
-RMD160 (openjdk7/bootstrap-jdk-7-bin-netbsd-5-i386-20090926.tar.bz2) = 7d38fdd1f5a977e03c4d5ffe88c3df22e79371e1
-Size (openjdk7/bootstrap-jdk-7-bin-netbsd-5-i386-20090926.tar.bz2) = 24156646 bytes
-SHA1 (openjdk7/bootstrap-jdk-7-bin-netbsd-6-amd64-20091013.tar.bz2) = 3b64ed7022dc80a79442c5c628ec45541a0db4c3
-RMD160 (openjdk7/bootstrap-jdk-7-bin-netbsd-6-amd64-20091013.tar.bz2) = 8272fce9729db7b3d35443861ef3a523da8805e3
-Size (openjdk7/bootstrap-jdk-7-bin-netbsd-6-amd64-20091013.tar.bz2) = 24266209 bytes
-SHA1 (openjdk7/bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2) = abf359bfdc78d41c3bfae1258be9d5137259bfd6
-RMD160 (openjdk7/bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2) = bca2310ee5e2e83fabf6288d62004f690aa828ae
-Size (openjdk7/bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2) = 24168404 bytes
+SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2
+RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7
+Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes
+SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.10-i386-20110811.tar.bz2) = ae75cba6f67b262f459fa9d28dc01fba150a95d4
+RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.10-i386-20110811.tar.bz2) = 8b807f2f880603b40e90af88dcee73acd0be6240
+Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.10-i386-20110811.tar.bz2) = 3590193 bytes
+SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = f7578bfdfc7a952cd83306c97fa87ebf921a0461
+RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 74c570fa6ab6e175871229acc45edbb1e9c759ce
+Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 3837091 bytes
+SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = e9153bab724d415b30b42e320a878aeceb71ed64
+RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 8d9742b9288ed5eb965bc7fd50fe709f047665af
+Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 3486566 bytes
+SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 60ff45ed4c027209fc855919227bb175c60ede08
+RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = e98c534a6804ecd794d1ffd8975e0c705cf8938c
+Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 4082640 bytes
+SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = baa7e0b2010c1cf918a88654b36db39935e532a4
+RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 791f8db986905f2477adcb1784fea957cd9501d2
+Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 3622007 bytes
 SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
-SHA1 (openjdk7/jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
-RMD160 (openjdk7/jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
-Size (openjdk7/jce_policy-6.zip) = 9101 bytes
-SHA1 (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = 91b181ffa4b1f4a36500bccce07e4a4569f5340d
-RMD160 (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = fb6c1c1215025bc5157148817acaea647b771771
-Size (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = 561059 bytes
-SHA1 (openjdk7/openjdk-7-ea-src-b92-06_may_2010.tar.bz2) = 4667055d18b76cd33c8e2cae48eebfe82b24c295
-RMD160 (openjdk7/openjdk-7-ea-src-b92-06_may_2010.tar.bz2) = 272cd9e7bb83e70efafee62bb9c779c098eb2783
-Size (openjdk7/openjdk-7-ea-src-b92-06_may_2010.tar.bz2) = 47211391 bytes
-SHA1 (openjdk7/rhino1_7R2.zip) = 3bb380cfb7f6febb87a64b2dee7fa308042f37e4
-RMD160 (openjdk7/rhino1_7R2.zip) = 58ae321829ac701e442bfbfed3d6f87b2bb6ba4c
-Size (openjdk7/rhino1_7R2.zip) = 2996867 bytes
-SHA1 (openjdk7/xalan-j_2_7_1-bin.zip) = 681f04e180de88264bd3df68946001efb0bc2ff1
-RMD160 (openjdk7/xalan-j_2_7_1-bin.zip) = d7174fcc9dd8b3876b5a9c8cde021953475b57f8
-Size (openjdk7/xalan-j_2_7_1-bin.zip) = 17336979 bytes
-SHA1 (patch-aa) = c11951d2957f24352ddedada9ef4edc72e7b7382
-SHA1 (patch-ab) = 001f676c0232f76ff49ac3ec248f696af1e2397b
-SHA1 (patch-ac) = 7e6c0fcfe0b9eaa756eba361d8f9b35d08d17111
+SHA1 (openjdk7/jaxp145_01.zip) = 106db88c8e53abb1a064e83d41cc7acd16b7713c
+RMD160 (openjdk7/jaxp145_01.zip) = af91b95e7eb7a68fc62f450dc7b5fe5c2be4a228
+Size (openjdk7/jaxp145_01.zip) = 6389175 bytes
+SHA1 (openjdk7/jdk-7-bsd-port-147.20110811.diff.bz2) = c5c00843aef811dd49538384b170a6a74b7fb05d
+RMD160 (openjdk7/jdk-7-bsd-port-147.20110811.diff.bz2) = 04fde578a17a09a88a94b5bd933eeccff93492b3
+Size (openjdk7/jdk-7-bsd-port-147.20110811.diff.bz2) = 585718 bytes
+SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0
+RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128
+Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes
+SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be
+RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818
+Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes
+SHA1 (openjdk7/openjdk-7-fcs-src-b147-27_jun_2011.tar.bz2) = 82d83a845646327fc998603eaa077bb07dea78af
+RMD160 (openjdk7/openjdk-7-fcs-src-b147-27_jun_2011.tar.bz2) = 9ab589511891e63b867c9ae0db1a1a4c07e6c846
+Size (openjdk7/openjdk-7-fcs-src-b147-27_jun_2011.tar.bz2) = 44635821 bytes
+SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
+RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
+Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
+SHA1 (patch-aa) = fe3ebd1626d5170182bc11ee54c9c7c77361d032
+SHA1 (patch-ab) = ff032cf67ea66d93d7faad7f5ea40373fd4f6f01
+SHA1 (patch-ac) = c845134b3f7912b69c7773ca939f70d2dcd78fec
 SHA1 (patch-ad) = ab68ff2db078628069c925287c119c4cac6657f3
-SHA1 (patch-ae) = 6fa5076b78b3456266d744846ec376c0ed36cb86
+SHA1 (patch-ae) = d3aa3e2522cfee59cfb69c7d92e511560fca78c2
 SHA1 (patch-af) = 3d14a176c89e021afe99ad1b1e7505b56f4e8db0
 SHA1 (patch-ag) = 6287960055a79d05dc193e31d29ffc0158b33cdd
 SHA1 (patch-ah) = 2632580f92b27506c33df8714ed163ef3ed9844f
 SHA1 (patch-ai) = 6d6c394c3de7578754b901686b88142cbc524ef7
-SHA1 (patch-aj) = e370b618f4417d5ca19164c8eb59075123179b5a
+SHA1 (patch-aj) = bd12ccefa0044f4686b800a61989909c286cd96a
 SHA1 (patch-ak) = 5803f43746463db843108b2104a222690614d5b6
-SHA1 (patch-al) = 2885c3bd4972a3bed8b2c3ca5c64fc4d6d9c713d
-SHA1 (patch-am) = 7e0ffa317a83d5b1e34c3f3e76b7a3de26980df6
+SHA1 (patch-al) = abd6cb67266ebfed437379f10ed79fcf747543b5
+SHA1 (patch-am) = 6caa02c10d0f231a26a16888cb4401f25d184986
 SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362
 SHA1 (patch-ao) = 87ee9dd450d0b4e7cbd2302466a2e9f586fa6df1
 SHA1 (patch-ap) = 1cdd568c89e0525ed17e55300a51af15e9f19e08
+SHA1 (patch-aq) = b1a296ffff3006671120d9812d71f557cf0f490e
 SHA1 (patch-ar) = fe90aacc85fca6d0940d30c2457fff9787b3ecab
 SHA1 (patch-as) = d78c44af2e412da65239a8339e00d79eca881e2f
 SHA1 (patch-at) = 3b6c2268747c62f0008f67e8f3d5478e1905c551
 SHA1 (patch-au) = ac6f8997f3411c068d58f53ad4064d3ffff1ff74
-SHA1 (patch-av) = be5bb72a3dd251f2a2822f7a1bea3b461b38d016
+SHA1 (patch-av) = f26b059432565de670bc19b3c5a7c8b10a657db3
 SHA1 (patch-aw) = e99a485051ef4b749e5402364fccd8a328df7a68
 SHA1 (patch-ba) = 2c56f89ea6297689fec7a7620f64ced752ed34c6
-SHA1 (patch-bc) = 301ba93a42ff228254ecb3c9748aa2555dfd601d
-SHA1 (patch-bd) = 8dc567964e0e47e091043936af540fad6e067583
+SHA1 (patch-bc) = 91223f23dcc27f1c26242654458e2f27ea9ffbf9
+SHA1 (patch-bd) = 991b0ad5b325f7dd8a0141d5d9089be5d85df805
 SHA1 (patch-be) = e89f8420a9cf97c416ef6d1343d837c16623e02f
-SHA1 (patch-bf) = 7a84c0f0681669537afa50e870c7215e6e7572c1
+SHA1 (patch-bf) = a793cacf3fd92f49f24228ea8034d13007e47e0c
 SHA1 (patch-bg) = 393c1bac2e83078bc02810eefd79ab8f0dd25170
 SHA1 (patch-bh) = 52b01c8b418efff5f3cc628b305a6d25ef4d13b3
 SHA1 (patch-bi) = c733f906c23a37aeb5ca93f136205563cc5fab64
diff --git a/lang/openjdk7/icedtea-extras.mk b/lang/openjdk7/icedtea-extras.mk
index 694605e9df7f..434e387442d9 100644
--- a/lang/openjdk7/icedtea-extras.mk
+++ b/lang/openjdk7/icedtea-extras.mk
@@ -1,23 +1,23 @@
-# $NetBSD: icedtea-extras.mk,v 1.9 2011/03/13 14:18:33 abs Exp $
+# $NetBSD: icedtea-extras.mk,v 1.10 2011/08/21 22:57:54 tnn Exp $
 
 # Needed to extract icedtea
 EXTRACT_USING=			bsdtar
 
 DIST_SUBDIR=			openjdk7
 
-ICEDTEA=			icedtea-8dc6e1ff8ccf
-ICEDTEA_TGZ=			8dc6e1ff8ccf.tar.bz2
-SITES.${ICEDTEA_TGZ}=		http://icedtea.classpath.org/hg/icedtea/archive/
+ICEDTEA=			icedtea7-8ac25d11a9e5
+ICEDTEA_TGZ=			8ac25d11a9e5.tar.bz2
+SITES.${ICEDTEA_TGZ}=		http://icedtea.classpath.org/hg/icedtea7/archive/
 DISTFILES+=			${ICEDTEA_TGZ}
 EXTRACT_ONLY+=			${ICEDTEA_TGZ}
 
-XALAN=				xalan-j_2_7_1
-XALAN_TGZ=			${XALAN}-bin.zip
-SITES.${XALAN_TGZ}=		${MASTER_SITE_APACHE:=xml/xalan-j/}
-DISTFILES+=			${XALAN_TGZ}
-EXTRACT_ONLY+=			${XALAN_TGZ}
+ICEDTEA_WEB=			icedtea-web-61e08e67b176
+ICEDTEA_WEB_TGZ=		61e08e67b176.tar.bz2
+SITES.${ICEDTEA_WEB_TGZ}=	http://icedtea.classpath.org/hg/icedtea-web/archive/
+DISTFILES+=			${ICEDTEA_WEB_TGZ}
+EXTRACT_ONLY+=			${ICEDTEA_WEB_TGZ}
 
-RHINO=				rhino1_7R2
+RHINO=				rhino1_7R3
 RHINO_TGZ=			${RHINO}.zip
 SITES.${RHINO_TGZ}=		${MASTER_SITE_MOZILLA:=js/}
 DISTFILES+=			${RHINO_TGZ}
@@ -32,43 +32,14 @@ EXTRACT_ONLY+=			${ANT_TGZ}
 ANT_BIN=			${WRKDIR}/${ANT}/bin
 PREPEND_PATH+=			${ANT_BIN}
 
-ICEDTEA_CONFIGURE_ARGS=	\
-	  --with-xalan2-jar=${WRKDIR}/${XALAN}/xalan.jar \
-	  --with-xalan2-serializer-jar=${WRKDIR}/${XALAN}/serializer.jar \
-	  --with-xerces2-jar=${WRKDIR}/${XALAN}/xercesImpl.jar \
-	  --with-rhino=${WRKDIR}/${RHINO}/js.jar \
-	  --with-jdk-home=${PREFIX}/java/openjdk7
+JAXP_TGZ=			jaxp145_01.zip
+SITES.${JAXP_TGZ}=		http://icedtea.classpath.org/download/drops/
+DISTFILES+=			${JAXP_TGZ}
 
-.if defined(ICEDTEA_PACKAGE)
-CONFIGURE_ARGS+=	${ICEDTEA_CONFIGURE_ARGS}
+JAXWS_TGZ=			jdk7-jaxws2_2_4-b03-2011_05_27.zip
+SITES.${JAXWS_TGZ}=		http://icedtea.classpath.org/download/drops/
+DISTFILES+=			${JAXWS_TGZ}
 
-USE_LANGUAGES=		c c++
-USE_TOOLS+=	gawk gmake pkg-config autoconf automake
-BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
-CONFIGURE_ENV+=	ac_cv_path_MD5SUM=/usr/bin/true
-CONFIGURE_ENV+=	ac_cv_path_SHA256SUM=/usr/bin/true
-CONFIGURE_ENV+=	ac_cv_path_WGET=/usr/bin/true
-
-pre-configure: icedtea-autoconf
-.PHONY: icedtea-autoconf
-icedtea-autoconf:
-	cd ${WRKDIR}/${ICEDTEA} && ${SETENV} ${CONFIGURE_ENV} autoreconf -if
-
-post-extract: icedtea-post-extract
-.PHONY: icedtea-post-extract
-icedtea-post-extract:
-	chmod +x ${ANT_BIN}/ant
-
-BUILDLINK_DEPMETHOD.cups?=     build
-.include "../../print/cups/buildlink3.mk"
-.include "../../lang/openjdk7/buildlink3.mk"
-.include "../../devel/xulrunner/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXp?=	build
-.include "../../x11/libXp/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXt?=	build
-.include "../../x11/libXt/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXtst?=	build
-.include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
+JAF_TGZ=			jdk7-jaf-2010_08_19.zip
+SITES.${JAF_TGZ}=		http://icedtea.classpath.org/download/drops/
+DISTFILES+=			${JAF_TGZ}
diff --git a/lang/openjdk7/options.mk b/lang/openjdk7/options.mk
index ff93784b4b96..28b1e025431f 100644
--- a/lang/openjdk7/options.mk
+++ b/lang/openjdk7/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2011/08/03 13:28:35 obache Exp $
+# $NetBSD: options.mk,v 1.3 2011/08/21 22:57:54 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openjdk7
-PKG_SUPPORTED_OPTIONS=		sun-jre-jce
+PKG_SUPPORTED_OPTIONS=		sun-jre-jce # jdk-zero-vm
 PKG_SUGGESTED_OPTIONS=		#
 
 .include "../../mk/bsd.options.mk"
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=		#
 ### Java(TM) Cryptography Extension (JCE)
 ###
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
-JCE_DISTFILE=jce_policy-6.zip
+JCE_DISTFILE=	UnlimitedJCEPolicyJDK7.zip
 DISTFILES+=	${JCE_DISTFILE}
 EXTRACT_ONLY+=	${JCE_DISTFILE}
 PLIST.jce=	yes
@@ -18,8 +18,8 @@ USE_TOOLS+=	pax
 #
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE})
 FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited"
-FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 6 '${JCE_DISTFILE}' from:"
-FETCH_MESSAGE+= "	http://java.sun.com/javase/downloads/"
+FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 7 '${JCE_DISTFILE}' from:"
+FETCH_MESSAGE+= "	http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
 FETCH_MESSAGE+= " and place it in:"
 FETCH_MESSAGE+= "       ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}"
 FETCH_MESSAGE+= ""
@@ -27,5 +27,12 @@ FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again."
 .endif
 #
 post-install:
-	cd ${WRKDIR}/jce ; pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security
+	cd ${WRKDIR}/UnlimitedJCEPolicy && pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security
+.endif
+
+# this option builds a JVM without assembly optimisation. Useful for porting.
+# NOTE: This is work in progress.
+.if !empty(PKG_OPTIONS:Mjdk-zero-vm)
+MAKE_ENV+=	ZERO_BUILD=true
+.include "../../devel/libffi/buildlink3.mk"
 .endif
diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa
index 950c3b7e1ceb..9943d115b614 100644
--- a/lang/openjdk7/patches/patch-aa
+++ b/lang/openjdk7/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2009/11/07 14:48:50 tnn Exp $
+$NetBSD: patch-aa,v 1.4 2011/08/21 22:57:55 tnn Exp $
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2009-11-07 14:25:33.000000000 +0100
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2011-08-11 12:31:36.000000000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
-@@ -63,7 +63,7 @@
- # include <link.h>
- #endif
+@@ -131,7 +131,7 @@
+ # include <inttypes.h>
+ # include <sys/ioctl.h>
  
 -#if defined(__FreeBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  # include <elf.h>
  #endif
  
-@@ -1921,7 +1921,9 @@ void * os::dll_load(const char *filename
+@@ -2039,7 +2039,9 @@ void * os::dll_load(const char *filename
      {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
      {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
      {EM_ARM,         EM_ARM,     ELFCLASS32,   ELFDATA2LSB, (char*)"ARM"},
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.3 2009/11/07 14:48:50 tnn Exp $
      {EM_ALPHA,       EM_ALPHA,   ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
      {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
      {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
-@@ -3278,7 +3280,7 @@ OSReturn os::set_native_priority(Thread*
+@@ -3559,7 +3561,7 @@ OSReturn os::set_native_priority(Thread*
  #ifdef __OpenBSD__
    // OpenBSD pthread_setprio starves low priority threads
    return OS_OK;
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.3 2009/11/07 14:48:50 tnn Exp $
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
  #elif defined(__APPLE__) || defined(__NetBSD__)
    struct sched_param sp;
-@@ -3306,7 +3308,7 @@ OSReturn os::get_native_priority(const T
+@@ -3587,7 +3589,7 @@ OSReturn os::get_native_priority(const T
    }
  
    errno = 0;
diff --git a/lang/openjdk7/patches/patch-ab b/lang/openjdk7/patches/patch-ab
index 265ecff6ab66..a218fb444ef3 100644
--- a/lang/openjdk7/patches/patch-ab
+++ b/lang/openjdk7/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-ab,v 1.3 2011/08/21 22:57:55 tnn Exp $
 
---- jdk/make/common/shared/Sanity.gmk.orig	2008-12-21 21:41:14.000000000 +0100
+--- jdk/make/common/shared/Sanity.gmk.orig	2011-08-11 12:31:36.000000000 +0000
 +++ jdk/make/common/shared/Sanity.gmk
-@@ -787,7 +787,8 @@ $(TEMPDIR)/freetypeinfo: FRC
+@@ -809,7 +809,8 @@ ifdef OPENJDK
  	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
  	    $(ECHO) "Failed to build freetypecheck." ) > $@
  
--sane-freetype: $(TEMPDIR)/freetypeinfo
-+sane-freetype:
-+sane-freetype_: $(TEMPDIR)/freetypeinfo
+-    sane-freetype: $(TEMPDIR)/freetypeinfo
++    sane-freetype:
++    sane-freetype_: $(TEMPDIR)/freetypeinfo
  	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
  	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
  	          " or higher is required. \n" \
diff --git a/lang/openjdk7/patches/patch-ac b/lang/openjdk7/patches/patch-ac
index feb442411d77..636c212b7305 100644
--- a/lang/openjdk7/patches/patch-ac
+++ b/lang/openjdk7/patches/patch-ac
@@ -1,21 +1,12 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ac,v 1.2 2011/08/21 22:57:55 tnn Exp $
 
---- jdk/src/solaris/native/java/net/PlainSocketImpl.c.orig	2009-10-06 20:21:27.000000000 +0200
-+++ jdk/src/solaris/native/java/net/PlainSocketImpl.c
-@@ -212,6 +212,16 @@ Java_java_net_PlainSocketImpl_socketCrea
-     } else {
-         (*env)->SetIntField(env, fdObj, IO_fd_fdID, fd);
-     }
-+#if defined(__NetBSD__)
-+    if (ipv6_available()) {
-+        int rv, opt = 0;
-+        rv = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &opt, sizeof(opt));
-+        if (rv == -1) {
-+            /* XXX if this happens I guess we leak the socket? */
-+            NET_ThrowNew(env, errno, "setsockopt");
-+        }
-+    }
-+#endif
- 
-     /*
-      * If this is a server socket then enable SO_REUSEADDR
+--- jdk/make/java/main/java/mapfile-i586.orig	2011-06-27 17:18:37.000000000 +0000
++++ jdk/make/java/main/java/mapfile-i586
+@@ -31,6 +31,7 @@ SUNWprivate_1.1 {
+ 	global:
+ 		main;		# Provides basic adb symbol offsets
+ 		environ;	# Public symbols and required by Java run time
++		__progname;
+ 		_environ;
+ 		__environ_lock;
+ 		___Argv;	# The following are private, but as they are
diff --git a/lang/openjdk7/patches/patch-ae b/lang/openjdk7/patches/patch-ae
index c5e8d115a9c6..24f7054bada1 100644
--- a/lang/openjdk7/patches/patch-ae
+++ b/lang/openjdk7/patches/patch-ae
@@ -1,16 +1,19 @@
-$NetBSD: patch-ae,v 1.2 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-ae,v 1.3 2011/08/21 22:57:55 tnn Exp $
 
---- hotspot/make/bsd/makefiles/gcc.make.orig	2009-10-18 02:16:47.000000000 +0200
+--- hotspot/make/bsd/makefiles/gcc.make.orig	2011-08-20 10:42:27.000000000 +0000
 +++ hotspot/make/bsd/makefiles/gcc.make
-@@ -153,6 +153,12 @@ MAPFLAG = -Xlinker --version-script=FILE
+@@ -201,6 +201,15 @@ MAPFLAG = -Xlinker --version-script=FILE
  #
  # Shared Library
  #
 +
 +ifeq ($(OS_VENDOR), NetBSD)
 +# XXX tnn fixme: -lgcc_s seems to be needed on NetBSD.
-+LFLAGS+=	-lgcc_s
++LFLAGS += -lgcc_s
 +endif
++
++# XXX tnn fixme: this probably should go someplace else.
++CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 +
  ifeq ($(OS_VENDOR), Darwin)
    # Standard linker flags
diff --git a/lang/openjdk7/patches/patch-aj b/lang/openjdk7/patches/patch-aj
index 65926ab0f071..37d3a1d1ba2a 100644
--- a/lang/openjdk7/patches/patch-aj
+++ b/lang/openjdk7/patches/patch-aj
@@ -1,11 +1,11 @@
-$NetBSD: patch-aj,v 1.2 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-aj,v 1.3 2011/08/21 22:57:55 tnn Exp $
 
---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2009-10-17 16:49:37.000000000 +0200
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2011-08-11 12:31:36.000000000 +0000
 +++ jdk/src/solaris/native/java/net/NetworkInterface.c
-@@ -50,13 +50,11 @@
- #if defined(_ALLBSD_SOURCE)
+@@ -60,13 +60,11 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
+ #include <sys/sockio.h>
 -#if defined(__FreeBSD__) || defined(__APPLE__)
 +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
  #include <net/ethernet.h>
diff --git a/lang/openjdk7/patches/patch-al b/lang/openjdk7/patches/patch-al
index 86db5dc94bac..2236fad84a3f 100644
--- a/lang/openjdk7/patches/patch-al
+++ b/lang/openjdk7/patches/patch-al
@@ -1,400 +1,13 @@
-$NetBSD: patch-al,v 1.1 2010/01/15 19:18:42 tnn Exp $
+$NetBSD: patch-al,v 1.2 2011/08/21 22:57:55 tnn Exp $
 
-This patch reverts the functional part of the following commit:
-http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/de45eac5670e
-
-pkgsrc does not deal well with -rpath \$ORIGIN so we need to
-do the LD_LIBRARY_PATH + reexec dance for now.
-
---- jdk/src/solaris/bin/java_md.c.xxx	2010-01-11 19:26:45.000000000 +0000
-+++ jdk/src/solaris/bin/java_md.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -63,9 +63,9 @@
-  * two data models and cohabitation of jre/jdk bits with both data
-  * models is supported, then DUAL_MODE is defined.  When DUAL_MODE is
-  * defined, the architecture names for the narrow and wide version of
-- * the architecture are defined in LIBARCH64NAME and LIBARCH32NAME.
-- * Currently  only Solaris on sparc/sparcv9 and i586/amd64 is DUAL_MODE;
-- * linux i586/amd64 could be defined as DUAL_MODE but that is not the
-+ * the architecture are defined in LIBARCH64NAME and LIBARCH32NAME.  Currently
-+ * only Solaris on sparc/sparcv9 and i586/amd64 is DUAL_MODE; linux
-+ * i586/amd64 could be defined as DUAL_MODE but that is not the
-  * current policy.
-  */
- 
-@@ -132,56 +132,49 @@ static char *execname = NULL;
-  * platform independent routine SelectVersion.  This may result in
-  * the exec of the specified launcher version.
-  *
-- * Previously the launcher modified the LD_LIBRARY_PATH appropriately for the
-- * desired data model path, regardless if data models matched or not. The
-- * launcher subsequently exec'ed the desired executable, in order to make the
-- * LD_LIBRARY_PATH path available for the runtime linker. This is no longer the
-- * case, the launcher dlopens the target libjvm.so. All other required
-- * libraries are loaded by the runtime linker, by virtue of the $ORIGIN paths
-- * baked into the shared libraries, by the build infrastructure at compile time.
-+ * Typically, the launcher execs at least once to ensure a suitable
-+ * LD_LIBRARY_PATH is in effect for the process.  The first exec
-+ * screens out all the data model options; leaving the choice of data
-+ * model implicit in the binary selected to run.  However, in case no
-+ * exec is done, the data model options are screened out before the vm
-+ * is invoked.
-  *
-- *  Main
-- *  (incoming argv)
-- *  |
-- * \|/
-- * SelectVersion
-- * (selects the JRE version, note: not data model)
-- *  |
-- * \|/
-- * CreateExecutionEnvironment
-- * (determines desired data model)
-- *  |
-+ *  incoming argv ------------------------------
-+ *  |                                          |
-+ * \|/                                         |
-+ * CheckJVMType                                |
-+ * (removes -client, -server, etc.)            |
-+ *                                            \|/
-+ *                                            CreateExecutionEnvironment
-+ *                                            (removes -d32 and -d64,
-+ *                                             determines desired data model,
-+ *                                             sets up LD_LIBRARY_PATH,
-+ *                                             and exec's)
-+ *                                             |
-+ *  --------------------------------------------
-  *  |
-  * \|/
-- *  Have Desired Model ? --> NO --> Is Dual-Mode ? --> NO --> Exit(with error)
-- *  |                                          |
-- *  |                                          |
-- *  |                                         \|/
-- *  |                                         YES
-- *  |                                          |
-+ * exec child 1 incoming argv -----------------
-  *  |                                          |
-+ * \|/                                         |
-+ * CheckJVMType                                |
-+ * (removes -client, -server, etc.)            |
-  *  |                                         \|/
-- *  |                                CheckJvmType
-- *  |                               (removes -client, -server etc.)
-- *  |                                          |
-- *  |                                          |
-- * \|/                                        \|/
-- * YES                              (find the desired executable and exec child)
-- *  |                                          |
-- *  |                                          |
-- * \|/                                        \|/
-- * CheckJvmType                                Main
-- * (removes -client, -server, etc.)
-- *  |
-+ *  |                                          CreateExecutionEnvironment
-+ *  |                                          (verifies desired data model
-+ *  |                                           is running and acceptable
-+ *  |                                           LD_LIBRARY_PATH;
-+ *  |                                           no-op in child)
-  *  |
-  * \|/
-  * TranslateDashJArgs...
-  * (Prepare to pass args to vm)
-  *  |
-  *  |
-+ *  |
-  * \|/
-  * ParseArguments
-- * (removes -d32 and -d64 if any,
-+ * (ignores -d32 and -d64,
-  *  processes version options,
-  *  creates argument list for vm,
-  *  etc.)
-@@ -235,13 +228,17 @@ CreateExecutionEnvironment(int *_argcp,
-     /* Compute/set the name of the executable */
-     SetExecname(*_argvp);
- 
--    /* Check data model flags, and exec process, if needed */
-+    /* Set the LD_LIBRARY_PATH environment variable, check data model
-+       flags, and exec process, if needed */
-     {
-       char *arch        = (char *)GetArch(); /* like sparc or sparcv9 */
-       char * jvmtype    = NULL;
-       int argc          = *_argcp;
-       char **argv       = original_argv;
- 
-+      char *runpath     = NULL; /* existing effective LD_LIBRARY_PATH
-+                                   setting */
-+
-       int running       = CURRENT_DATA_MODEL;
- 
-       int wanted        = running;      /* What data mode is being
-@@ -249,8 +246,18 @@ CreateExecutionEnvironment(int *_argcp,
-                                            fine unless another model
-                                            is asked for */
- 
-+      char* new_runpath = NULL; /* desired new LD_LIBRARY_PATH string */
-+      char* newpath     = NULL; /* path on new LD_LIBRARY_PATH */
-+      char* lastslash   = NULL;
-+
-+      char** newenvp    = NULL; /* current environment */
-+
-       char** newargv    = NULL;
-       int    newargc    = 0;
-+#ifdef __solaris__
-+      char*  dmpath     = NULL;  /* data model specific LD_LIBRARY_PATH,
-+                                    Solaris only */
-+#endif
- 
-       /*
-        * Starting in 1.5, all unix platforms accept the -d32 and -d64
-@@ -328,11 +335,6 @@ CreateExecutionEnvironment(int *_argcp,
-           JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath);
-           exit(4);
-         }
--        /*
--         * we seem to have everything we need, so without further ado
--         * we return back.
--         */
--        return;
-       } else {  /* do the same speculatively or exit */
- #ifdef DUAL_MODE
-         if (running != wanted) {
-@@ -362,6 +364,190 @@ CreateExecutionEnvironment(int *_argcp,
- #endif
-       }
- 
-+      /*
-+       * We will set the LD_LIBRARY_PATH as follows:
-+       *
-+       *     o          $JVMPATH (directory portion only)
-+       *     o          $JRE/lib/$LIBARCHNAME
-+       *     o          $JRE/../lib/$LIBARCHNAME
-+       *
-+       * followed by the user's previous effective LD_LIBRARY_PATH, if
-+       * any.
-+       */
-+
-+#ifdef __solaris__
-+      /*
-+       * Starting in Solaris 7, ld.so.1 supports three LD_LIBRARY_PATH
-+       * variables:
-+       *
-+       * 1. LD_LIBRARY_PATH -- used for 32 and 64 bit searches if
-+       * data-model specific variables are not set.
-+       *
-+       * 2. LD_LIBRARY_PATH_64 -- overrides and replaces LD_LIBRARY_PATH
-+       * for 64-bit binaries.
-+       *
-+       * 3. LD_LIBRARY_PATH_32 -- overrides and replaces LD_LIBRARY_PATH
-+       * for 32-bit binaries.
-+       *
-+       * The vm uses LD_LIBRARY_PATH to set the java.library.path system
-+       * property.  To shield the vm from the complication of multiple
-+       * LD_LIBRARY_PATH variables, if the appropriate data model
-+       * specific variable is set, we will act as if LD_LIBRARY_PATH had
-+       * the value of the data model specific variant and the data model
-+       * specific variant will be unset.  Note that the variable for the
-+       * *wanted* data model must be used (if it is set), not simply the
-+       * current running data model.
-+       */
-+
-+      switch(wanted) {
-+      case 0:
-+        if(running == 32) {
-+          dmpath = getenv("LD_LIBRARY_PATH_32");
-+          wanted = 32;
-+        }
-+        else {
-+          dmpath = getenv("LD_LIBRARY_PATH_64");
-+          wanted = 64;
-+        }
-+        break;
-+
-+      case 32:
-+        dmpath = getenv("LD_LIBRARY_PATH_32");
-+        break;
-+
-+      case 64:
-+        dmpath = getenv("LD_LIBRARY_PATH_64");
-+        break;
-+
-+      default:
-+        JLI_ReportErrorMessage(JRE_ERROR3, __LINE__);
-+        exit(1); /* unknown value in wanted */
-+        break;
-+      }
-+
-+      /*
-+       * If dmpath is NULL, the relevant data model specific variable is
-+       * not set and normal LD_LIBRARY_PATH should be used.
-+       */
-+      if( dmpath == NULL) {
-+        runpath = getenv("LD_LIBRARY_PATH");
-+      }
-+      else {
-+        runpath = dmpath;
-+      }
-+#else
-+      /*
-+       * If not on Solaris, assume only a single LD_LIBRARY_PATH
-+       * variable.
-+       */
-+      runpath = getenv("LD_LIBRARY_PATH");
-+#endif /* __solaris__ */
-+
-+#ifdef __linux
-+      /*
-+       * On linux, if a binary is running as sgid or suid, glibc sets
-+       * LD_LIBRARY_PATH to the empty string for security purposes.  (In
-+       * contrast, on Solaris the LD_LIBRARY_PATH variable for a
-+       * privileged binary does not lose its settings; but the dynamic
-+       * linker does apply more scrutiny to the path.) The launcher uses
-+       * the value of LD_LIBRARY_PATH to prevent an exec loop.
-+       * Therefore, if we are running sgid or suid, this function's
-+       * setting of LD_LIBRARY_PATH will be ineffective and we should
-+       * return from the function now.  Getting the right libraries to
-+       * be found must be handled through other mechanisms.
-+       */
-+      if((getgid() != getegid()) || (getuid() != geteuid()) ) {
-+        return;
-+      }
-+#endif
-+
-+      /* runpath contains current effective LD_LIBRARY_PATH setting */
-+
-+      jvmpath = JLI_StringDup(jvmpath);
-+      new_runpath = JLI_MemAlloc( ((runpath!=NULL)?JLI_StrLen(runpath):0) +
-+                              2*JLI_StrLen(jrepath) + 2*JLI_StrLen(arch) +
-+                              JLI_StrLen(jvmpath) + 52);
-+      newpath = new_runpath + JLI_StrLen("LD_LIBRARY_PATH=");
-+
-+
-+      /*
-+       * Create desired LD_LIBRARY_PATH value for target data model.
-+       */
-+      {
-+        /* remove the name of the .so from the JVM path */
-+        lastslash = JLI_StrRChr(jvmpath, '/');
-+        if (lastslash)
-+          *lastslash = '\0';
-+
-+
-+        /* jvmpath, ((running != wanted)?((wanted==64)?"/"LIBARCH64NAME:"/.."):""), */
-+
-+        sprintf(new_runpath, "LD_LIBRARY_PATH="
-+                "%s:"
-+                "%s/lib/%s:"
-+                "%s/../lib/%s",
-+                jvmpath,
-+#ifdef DUAL_MODE
-+                jrepath, GetArchPath(wanted),
-+                jrepath, GetArchPath(wanted)
-+#else
-+                jrepath, arch,
-+                jrepath, arch
-+#endif
-+                );
-+
-+
-+        /*
-+         * Check to make sure that the prefix of the current path is the
-+         * desired environment variable setting.
-+         */
-+        if (runpath != NULL &&
-+            JLI_StrNCmp(newpath, runpath, JLI_StrLen(newpath))==0 &&
-+            (runpath[JLI_StrLen(newpath)] == 0 || runpath[JLI_StrLen(newpath)] == ':') &&
-+            (running == wanted) /* data model does not have to be changed */
-+#ifdef __solaris__
-+            && (dmpath == NULL)    /* data model specific variables not set  */
-+#endif
-+            ) {
-+
-+          return;
-+
-+        }
-+      }
-+
-+      /*
-+       * Place the desired environment setting onto the prefix of
-+       * LD_LIBRARY_PATH.  Note that this prevents any possible infinite
-+       * loop of execv() because we test for the prefix, above.
-+       */
-+      if (runpath != 0) {
-+        JLI_StrCat(new_runpath, ":");
-+        JLI_StrCat(new_runpath, runpath);
-+      }
-+
-+      if( putenv(new_runpath) != 0) {
-+        exit(1); /* problem allocating memory; LD_LIBRARY_PATH not set
-+                    properly */
-+      }
-+
-+      /*
-+       * Unix systems document that they look at LD_LIBRARY_PATH only
-+       * once at startup, so we have to re-exec the current executable
-+       * to get the changed environment variable to have an effect.
-+       */
-+
-+#ifdef __solaris__
-+      /*
-+       * If dmpath is not NULL, remove the data model specific string
-+       * in the environment for the exec'ed child.
-+       */
-+
-+      if( dmpath != NULL)
-+        (void)UnsetEnv((wanted==32)?"LD_LIBRARY_PATH_32":"LD_LIBRARY_PATH_64");
-+#endif
-+
-+      newenvp = environ;
-+
-       {
-         char *newexec = execname;
- #ifdef DUAL_MODE
-@@ -392,16 +578,17 @@ CreateExecutionEnvironment(int *_argcp,
-           argv[0] = newexec;
-         }
- #endif
--        JLI_TraceLauncher("TRACER_MARKER:About to EXEC\n");
-+
-         (void)fflush(stdout);
-         (void)fflush(stderr);
--        execv(newexec, argv);
-+        execve(newexec, argv, newenvp);
-         JLI_ReportErrorMessageSys(JRE_ERROR4, newexec);
- 
- #ifdef DUAL_MODE
-         if (running != wanted) {
-           JLI_ReportErrorMessage(JRE_ERROR5, wanted, running);
- #  ifdef __solaris__
-+
- #    ifdef __sparc
-           JLI_ReportErrorMessage(JRE_ERROR6);
- #    else
-@@ -412,11 +599,13 @@ CreateExecutionEnvironment(int *_argcp,
- #endif
- 
-       }
-+
-       exit(1);
+--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig	2011-08-20 11:24:21.000000000 +0000
++++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
+@@ -68,7 +68,7 @@ public class DefaultFileSystemProvider {
+             return createProvider("sun.nio.fs.SolarisFileSystemProvider");
+         if (osname.equals("Linux"))
+             return createProvider("sun.nio.fs.LinuxFileSystemProvider");
+-        if (osname.endsWith("BSD") || osname.equals("Darwin"))
++        if (osname.endsWith("BSD") || osname.equals("Darwin") || osname.equals("DragonFly"))
+             return createProvider("sun.nio.fs.BsdFileSystemProvider");
+         throw new AssertionError("Platform not recognized");
      }
- 
- }
- 
-+
- /*
-  * On Solaris VM choosing is done by the launcher (java.c).
-  */
-@@ -963,7 +1152,6 @@ ExecJRE(char *jre, char **argv)
-             printf(" %s", argv[i]);
-         printf("\n");
-     }
--    JLI_TraceLauncher("TRACER_MARKER:About to EXEC\n");
-     (void)fflush(stdout);
-     (void)fflush(stderr);
-     execv(wanted, argv);
diff --git a/lang/openjdk7/patches/patch-am b/lang/openjdk7/patches/patch-am
index c8acb443e4b7..3942ea2c325d 100644
--- a/lang/openjdk7/patches/patch-am
+++ b/lang/openjdk7/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-am,v 1.2 2011/08/21 22:57:55 tnn Exp $
 
---- jdk/make/common/shared/Defs.gmk.orig	2008-12-21 21:41:14.000000000 +0100
+--- jdk/make/common/shared/Defs.gmk.orig	2011-06-27 17:18:31.000000000 +0000
 +++ jdk/make/common/shared/Defs.gmk
-@@ -268,7 +268,7 @@ ifdef BUILD_NUMBER
- else
+@@ -290,7 +290,7 @@ else
    BUILD_NUMBER = b00
-   BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
--  CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]')
-+  CLEAN_USERNAME := pkgsrc
-   USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
-   FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
- endif
+   ifndef USER_RELEASE_SUFFIX
+     BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
+-    CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]')
++    CLEAN_USERNAME := pkgsrc
+     USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
+   endif
+   export USER_RELEASE_SUFFIX
diff --git a/lang/openjdk7/patches/patch-aq b/lang/openjdk7/patches/patch-aq
new file mode 100644
index 000000000000..b20aeb80940e
--- /dev/null
+++ b/lang/openjdk7/patches/patch-aq
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.4 2011/08/21 22:57:55 tnn Exp $
+
+--- jdk/make/java/main/java/mapfile-amd64.orig	2011-06-27 17:18:36.000000000 +0000
++++ jdk/make/java/main/java/mapfile-amd64
+@@ -31,6 +31,7 @@ SUNWprivate_1.1 {
+ 	global:
+ 		main;		# Provides basic adb symbol offsets
+ 		environ;	# Public symbols and required by Java run time
++		__progname;
+ 		_environ;
+ 		__environ_lock;
+ 
diff --git a/lang/openjdk7/patches/patch-av b/lang/openjdk7/patches/patch-av
index 22e72708a72b..649213756de5 100644
--- a/lang/openjdk7/patches/patch-av
+++ b/lang/openjdk7/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-av,v 1.2 2011/08/21 22:57:55 tnn Exp $
 
---- jdk/make/net/sourceforge/jnlp/Makefile.orig	2009-10-09 14:48:41.000000000 +0200
+--- jdk/make/net/sourceforge/jnlp/Makefile.orig	2011-08-19 21:44:33.000000000 +0000
 +++ jdk/make/net/sourceforge/jnlp/Makefile
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,19 @@
 +BUILDDIR = ../../..
 +PACKAGE = net.sourceforge.jnlp
 +PRODUCT = jnlp
@@ -14,6 +14,8 @@ $NetBSD: patch-av,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
 +
 +OTHER_PROPERTIES += $(PKGDIR)/resources/Messages.properties
 +
++OTHER_JAVACFLAGS += -classpath $(RHINO_JAR)
++
 +build: $(CLASSDESTDIR)/$(PKGDIR)/resources/Messages.properties
 +
 +$(CLASSDESTDIR)/$(PKGDIR)/resources/Messages.properties: $(SHARE_SRC)/classes/$(PKGDIR)/resources/Messages.properties
diff --git a/lang/openjdk7/patches/patch-bc b/lang/openjdk7/patches/patch-bc
index 4e161b0ac819..801e82cb5cdd 100644
--- a/lang/openjdk7/patches/patch-bc
+++ b/lang/openjdk7/patches/patch-bc
@@ -1,13 +1,14 @@
-$NetBSD: patch-bc,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-bc,v 1.2 2011/08/21 22:57:55 tnn Exp $
 
---- jdk/src/solaris/hpi/native_threads/src/threads_bsd.c.orig	2009-10-17 16:49:37.000000000 +0200
-+++ jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
-@@ -42,7 +42,7 @@
- #include <sys/sysctl.h>
+--- hotspot/src/share/vm/utilities/globalDefinitions.hpp.orig	2011-08-18 19:00:26.000000000 +0000
++++ hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -25,7 +25,9 @@
+ #ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+ #define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
  
- #include <pthread.h>
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <pthread_np.h>
- #endif
- #ifdef __NetBSD__
++#ifndef __STDC_FORMAT_MACROS
+ #define __STDC_FORMAT_MACROS
++#endif
+ 
+ #ifdef TARGET_COMPILER_gcc
+ # include "utilities/globalDefinitions_gcc.hpp"
diff --git a/lang/openjdk7/patches/patch-bd b/lang/openjdk7/patches/patch-bd
index 6dfa84a3a12f..a68f98528971 100644
--- a/lang/openjdk7/patches/patch-bd
+++ b/lang/openjdk7/patches/patch-bd
@@ -1,13 +1,13 @@
-$NetBSD: patch-bd,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-bd,v 1.2 2011/08/21 22:57:55 tnn Exp $
 
---- jdk/src/solaris/hpi/include/interrupt.h.orig	2009-10-17 16:49:37.000000000 +0200
-+++ jdk/src/solaris/hpi/include/interrupt.h
-@@ -75,7 +75,7 @@ void intrDispatch(int interrupt, void *s
-  *      N_INTERRUPTS  - The number of interrupt channels.  These
-  *                      are numbered from 0 to (N_INTERRUPTS - 1).
-  */
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #define       N_INTERRUPTS    NSIG    /* 0 to NSIG - 1*/
- #else
- #define N_INTERRUPTS    32      /* 0 to 31 */
+--- jdk/make/com/sun/java/pack/mapfile-vers.orig	2011-06-27 17:18:17.000000000 +0000
++++ jdk/make/com/sun/java/pack/mapfile-vers
+@@ -28,6 +28,8 @@
+ 
+ SUNWprivate_1.1 {
+ 	global:
++            __progname;
++            environ;
+ 	    Java_com_sun_java_util_jar_pack_NativeUnpack_finish;
+ 	    Java_com_sun_java_util_jar_pack_NativeUnpack_getNextFile;
+ 	    Java_com_sun_java_util_jar_pack_NativeUnpack_getOption;
diff --git a/lang/openjdk7/patches/patch-bf b/lang/openjdk7/patches/patch-bf
index 2122a6a711eb..5c34a1abacc1 100644
--- a/lang/openjdk7/patches/patch-bf
+++ b/lang/openjdk7/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-bf,v 1.2 2011/08/21 22:57:55 tnn Exp $
 
---- jdk/src/solaris/bin/java_md.c.orig	2009-10-17 16:49:37.000000000 +0200
+--- jdk/src/solaris/bin/java_md.c.orig	2011-08-20 11:24:21.000000000 +0000
 +++ jdk/src/solaris/bin/java_md.c
-@@ -96,7 +96,7 @@ extern char **environ;
+@@ -100,7 +100,7 @@ extern char **environ;
   *      A collection of useful strings. One should think of these as #define
   *      entries, but actual strings can be more efficient (with many compilers).
   */
@@ -11,3 +11,14 @@ $NetBSD: patch-bf,v 1.1 2009/10/18 10:21:01 tnn Exp $
  static const char *system_dir	= PACKAGE_PATH "/openjdk7";
  static const char *user_dir	= "/java";
  #elif defined(__NetBSD__)
+@@ -335,6 +335,10 @@ RequiresSetenv(int wanted, const char *j
+     char *dmllp = NULL;
+     char *p; /* a utility pointer */
+ 
++#if defined(__NetBSD__) || defined(__DragonFly__)
++    /* We always need this, since there's no $ORIGIN support in rtld. */
++    return JNI_TRUE;
++#endif
+     llp = getenv("LD_LIBRARY_PATH");
+ #ifdef __solaris__
+     dmllp = (CURRENT_DATA_MODEL == 32)