--- ports/java/jdk15/Makefile	Sat Jun  9 01:14:56 2007
+++ ports/java/jdk15/Makefile	Tue Jun 12 18:52:18 2007
@@ -24,13 +24,9 @@
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 OPTIONS=	DEBUG	"Enable debugging support"	off \
-		IPV6	"Enable IPv6 support"		off
-.if ${MACHINE_ARCH} == "amd64"
-WITHOUT_WEB=	yes
-.else
-OPTIONS+=	WEB	"Enable the browser plugin and Java Web Start"	on
-.endif
-OPTIONS+=	POLICY	"Install the Unlimited Strength Policy Files"	off \
+		IPV6	"Enable IPv6 support"		off \
+		WEB	"Enable the browser plugin and Java Web Start"	on \
+		POLICY	"Install the Unlimited Strength Policy Files"	off \
 		TZUPDATE	"Update the time zone data"		on \
 		JAIL	"Port is being built within a jail"		off
 
@@ -53,10 +49,10 @@
 TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 
 JDK_VERSION=	1.5.0
-JDK_UPDATE_VERSION=	11
+JDK_UPDATE_VERSION=	12
 JDK_PATCHSET_VERSION=	5
-JDK_BUILD_NUMBER=	03
-JDK_BUILD_DATE=		15_dec_2006
+JDK_BUILD_NUMBER=	04
+JDK_BUILD_DATE=		02_may_2007
 LATEST_LINK=	jdk15
 
 TZUPDATE_VERSION=	1.2.1
@@ -184,7 +180,7 @@
 IGNORE=	:\n\
 Due to licensing restrictions, certain files must be fetched manually.\n\n
 .if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE})#{
-IGNORE += Please open http://download.java.net/tiger/archive/tiger_u${JDK_UPDATE_VERSION}/index.csp\n\
+IGNORE += Please open http://download.java.net/tiger/index.csp\n\
 in a web browser.  Download the\n
 .if !exists(${DISTDIR}/${JRL_SRCFILE})#{
 IGNORE += Update ${JDK_UPDATE_VERSION} Source, ${JRL_SRCFILE}
--- ports/java/jdk15/distinfo	Sat Jun  9 01:14:56 2007
+++ ports/java/jdk15/distinfo	Tue Jun 12 18:59:51 2007
@@ -1,9 +1,9 @@
-MD5 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = e6661cce9c94009e2fa909a151c0160c
-SHA256 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = f2dd285070a1c4d71077cbc28420e39628fc577ac4fb02e8617ebffeab8120eb
-SIZE (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = 57703958
-MD5 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 7c952fba37101c154f1636dc401aa093
-SHA256 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = c5cd6d195c1cb213546cd598da0c6d5295e1cf5fd5748e924628035b45874780
-SIZE (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 2211688
+MD5 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = deb204740d2f8a799ba8658c8c768ebe
+SHA256 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 8b93abe500d58a9b2d766ded6f9041e8bc457b785e6751e0e3d1d8308ed23a3f
+SIZE (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 57752561
+MD5 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 80996fbf2db79d9fa4a75e17bc1f6551
+SHA256 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 886c57a62f6691954269a84d4cd0a32c8d61eb4e04c4028933e0e9bfae2cf999
+SIZE (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 2211514
 MD5 (bsd-jdk15-patches-5.tar.bz2) = bc6339e072fabb20097eebbec0e5060f
 SHA256 (bsd-jdk15-patches-5.tar.bz2) = b996f0bc530e2c21c83598e5b3e2f86a264d50d755cb5037ee5cc38a88be9993
 SIZE (bsd-jdk15-patches-5.tar.bz2) = 772184
--- ports/java/jdk15/files/patch-setup_fpu	Wed Dec 31 19:00:00 1969
+++ ports/java/jdk15/files/patch-setup_fpu	Wed Jun 13 12:06:24 2007
@@ -0,0 +1,33 @@
+--- ../../hotspot/src/os_cpu/bsd_amd64/vm/os_bsd_amd64.hpp	Tue Jun  5 19:48:40 2007
++++ ../../hotspot/src/os_cpu/bsd_amd64/vm/os_bsd_amd64.hpp	Tue Jun  5 20:34:20 2007
+@@ -6,6 +6,7 @@
+  * SUN PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
+  */
+ 
++  static void setup_fpu() {}
+ 
+   // Used to register dynamic code cache area with the OS
+   // Note: Currently only used in 64 bit Windows implementations
+--- ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp	Tue Jun  5 19:48:40 2007
++++ ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp	Tue Jun  5 20:41:10 2007
+@@ -951,3 +951,9 @@
+ cmpxchg_long_func_t* os::atomic_cmpxchg_long_func = os::atomic_cmpxchg_long_bootstrap;
+ add_func_t*          os::atomic_add_func          = os::atomic_add_bootstrap;
+ fence_func_t*        os::fence_func               = os::fence_bootstrap;
++
++void os::setup_fpu() {
++  address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std();
++  __asm__ volatile (  "fldcw (%0)" :
++                      : "r" (fpu_cntrl) : "memory");
++}
+--- ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.hpp	Tue Jun  5 19:48:40 2007
++++ ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.hpp	Tue Jun  5 20:40:37 2007
+@@ -21,6 +21,8 @@
+   static jint  atomic_add_bootstrap         (jint,  volatile jint*);
+   static void  fence_bootstrap              ();
+ 
++  static void setup_fpu();
++
+   static bool supports_sse();
+   static bool is_allocatable(size_t bytes);
+ 
--- ports/java/jdk15/files/patch-version	Wed Dec 31 19:00:00 1969
+++ ports/java/jdk15/files/patch-version	Wed Jun 13 12:06:36 2007
@@ -0,0 +1,22 @@
+--- ../../control/make/common/Defs-bsd.gmk	Wed Jun  6 02:29:37 2007
++++ ../../control/make/common/Defs-bsd.gmk	Wed Jun  6 11:27:46 2007
+@@ -43,7 +43,7 @@
+ endif
+ 
+ # Versioning
+-JDK_UPDATE_VERSION=11
++JDK_UPDATE_VERSION=12
+ MILESTONE=p5
+ 
+ # define these to avoid picking up ones from aliases or from
+--- ../../j2se/make/common/Defs-bsd.gmk	Wed Jun  6 12:32:09 2007
++++ ../../j2se/make/common/Defs-bsd.gmk	Wed Jun  6 12:40:26 2007
+@@ -22,7 +22,7 @@
+ #   LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
+ 
+ # Versioning
+-JDK_UPDATE_VERSION=11
++JDK_UPDATE_VERSION=12
+ 
+ # statically link libstdc++ before C++ ABI is stablized on Linux
+ STATIC_CXX     = false