- update from early access b43 to b59

- sync patches with OpenJDK's bsd_port project - require a pre-installed package for native_bootstrap - The new 1.7 class java.nio.channels.spi.AsynchronousChannelProvider is not implemented yet on BSD. - The new 1.7 package java.nio.sctp is not included and not supported on OpenBD
2009-05-23 03:03:24 +00:00 · 2009-05-23 03:03:24 +00:00 · 52f73c42e7
commit 52f73c42e7
parent 5c7d0319cb
181 changed files with 4746 additions and 2477 deletions
--- a/devel/jdk/1.7/Makefile
+++ b/devel/jdk/1.7/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2009/03/15 09:25:04 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2009/05/23 03:03:24 kurt Exp $

 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	i386 amd64
@ -6,12 +6,13 @@ ONLY_FOR_ARCHS=	i386 amd64
 COMMENT-main=	Java2(TM) SE Dev Kit v${V} Early Access ${B}
 COMMENT-jre=	Java2(TM) SE Runtime Environment v${V} Early Access ${B}
 V=		1.7.0.00
-B=		b43
-DISTFILES=	openjdk-7-ea-src-${B}-15_jan_2009.zip \
-		jdk-7-icedtea-plugs-1.6a.tar.gz:0
+B=		b59
+DISTFILES=	openjdk-7-ea-src-${B}-14_may_2009.zip \
+		jdk-7-icedtea-plugs-1.6b.tar.gz:0 \
+		jibx_1_1_5.zip:1 
 PKGNAME=	jdk-${V}
-PKGNAME-main=	jdk-${V}${B}p0
-PKGNAME-jre=	jre-${V}${B}p0
+PKGNAME-main=	jdk-${V}${B}
+PKGNAME-jre=	jre-${V}${B}

 CATEGORIES=	devel/jdk java

@ -21,10 +22,11 @@ FLAVORS=	with_ipv6
 PSEUDO_FLAVORS=	native_bootstrap
 FLAVOR?=

-HOMEPAGE=	https://jdk7.dev.java.net/
+HOMEPAGE=	http://openjdk.java.net/

 MASTER_SITES=	http://www.java.net/download/openjdk/jdk7/promoted/${B}/
 MASTER_SITES0=	http://www.intricatesoftware.com/distfiles/
+MASTER_SITES1=	${MASTER_SITE_SOURCEFORGE:=jibx/}

 MAINTAINER=	Kurt Miller <kurt@openbsd.org>

@ -37,6 +39,10 @@ PERMIT_DISTFILES_FTP=	Yes
 NO_REGRESS=	Yes

 .if ${FLAVOR:L:Mnative_bootstrap}
+INSTALLED!= (pkg_info -e "jdk->=1.7,<1.8" -q && echo yes) || echo no
+.if ${INSTALLED:L} != "yes"
+ERRORS += "Fatal: This flavor requires an installed 1.7 jdk package"
+.endif
 BUILD_DEPENDS+=	:jdk->=1.7,<1.8:devel/jdk/1.7
 ALT_BOOTDIR=	${LOCALBASE}/jdk-1.7.0
 .else
@ -50,7 +56,7 @@ BUILD_DEPENDS+=	::devel/apache-ant \
 		::archivers/unzip \
 		::print/cups
 MODULES=	converters/libiconv
-WANTLIB=	X11 Xext Xi Xtst c freetype m ossaudio pthread stdc++ z
+WANTLIB=	X11 Xext Xi Xtst c freetype m pthread stdc++ z

 USE_GMAKE=	Yes

@ -58,7 +64,9 @@ MAKE_ENV=	ALT_BOOTDIR=${ALT_BOOTDIR} \
 		ALT_FREETYPE_HEADERS_PATH=${X11BASE}/include \
 		ALT_FREETYPE_LIB_PATH=${X11BASE}/lib \
 		ALT_BINARY_PLUGS_PATH=${WRKDIR}/jdk-7-icedtea-plugs \
-		ALT_DEVTOOLS_PATH=${LOCALBASE}/bin \
+		ALT_JIBX_LIBS_PATH=${WRKDIR}/jibx/lib \
+		ALT_PACKAGE_PATH=${LOCALBASE} \
+		ALT_X11_PATH=${X11BASE} \
 		ANT_HOME=${LOCALBASE} \
 		DEFAULT_LIBPATH="/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib" \
 		NO_DOCS=true \
@ -95,10 +103,12 @@ COPYDIRS=	hotspot/src/os/linux/launcher \
 		hotspot/src/os_cpu/linux_x86/vm \
 		hotspot/make/linux \
 		hotspot/make/linux/makefiles \
-		jdk/src/linux/doc/man
+		jdk/src/linux/doc/man \
+		jdk/src/linux/doc/man/ja

 COPYFILES=	corba/make/common/Defs-linux.gmk \
 		corba/make/common/shared/Defs-linux.gmk \
+		jdk/make/com/sun/tools/attach/mapfile-linux \
 		jdk/make/common/Defs-linux.gmk \
 		jdk/make/common/shared/Defs-linux.gmk \
 		jdk/make/java/nio/mapfile-linux \
@ -107,11 +117,16 @@ COPYFILES=	corba/make/common/Defs-linux.gmk \
 		jdk/make/tools/sharing/classlist.linux \
 		jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux \
 		jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \
+		jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java \
+		jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java \
+		jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java \
 		jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \
-		jdk/src/solaris/hpi/include/largefile_linux.h
+		jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java \
+		jdk/src/solaris/hpi/include/largefile_linux.h \
+		jdk/src/solaris/native/java/net/linux_close.c

 # create initial bsd src from linux src (except for threads_solaris.c)
-pre-patch:
+post-extract:
 	@for d in ${COPYDIRS}; do \
 		mkdir -p `echo ${WRKDIST}/$$d | sed 's/linux/bsd/g;'`; \
 		cd ${WRKDIST}/$$d; \
@ -129,14 +144,11 @@ pre-patch:
 	@sed 's/solaris/bsd/g; s/Solaris/Bsd/g' \
 		< ${WRKDIST}/jdk/src/solaris/hpi/native_threads/src/threads_solaris.c \
 		> ${WRKDIST}/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
+	@cp ${WRKDIST}/jdk/src/share/lib/security/java.security \
+		${WRKDIST}/jdk/src/share/lib/security/java.security-openbsd

 post-build:
 	@rm -rf ${JDKIMAGEDIR}/man/ja ${JREIMAGEDIR}/man/ja
-	@rm -f ${BUILDDIR}/democlasses/demo/jvmti/hprof/src/hprof_md.c.orig \
-		${BUILDDIR}/impsrc/com/sun/tools/javah/Util.java.orig \
-		${BUILDDIR}/langtools/build/bootstrap/classes/com/sun/tools/javah/Util.java.orig \
-		${BUILDDIR}/langtools/build/classes/com/sun/tools/javah/Util.java.orig \
-		${BUILDDIR}/classes/com/sun/tools/javah/Util.java.orig

 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${JDKHOME}
--- a/devel/jdk/1.7/distinfo
+++ b/devel/jdk/1.7/distinfo
@ -1,10 +1,15 @@
-MD5 (jdk-7-icedtea-plugs-1.6a.tar.gz) = lh6B1+T6Isb1o6OGufbK4g==
-MD5 (openjdk-7-ea-src-b43-15_jan_2009.zip) = cdaA6rCo6Cump29mMi/yqw==
-RMD160 (jdk-7-icedtea-plugs-1.6a.tar.gz) = xfN51TYwgBeV3HhlUZgf3HtQTYQ=
-RMD160 (openjdk-7-ea-src-b43-15_jan_2009.zip) = 9xtWMB2boBL1kLjyyZPT0NZYxuE=
-SHA1 (jdk-7-icedtea-plugs-1.6a.tar.gz) = A3qIJwYAfjM0JUCOAG9VZVT9pRQ=
-SHA1 (openjdk-7-ea-src-b43-15_jan_2009.zip) = zdHC0tZ6Rem0Al8BS3pDV1Fj31c=
-SHA256 (jdk-7-icedtea-plugs-1.6a.tar.gz) = dXe+50eFCjVr0Y2we2APrhOTycQNS81Psy6yyWbIaNc=
-SHA256 (openjdk-7-ea-src-b43-15_jan_2009.zip) = THQ7uNapXxXkbEuLw084VVDM5CPHQCmVC57vG/s6aA0=
-SIZE (jdk-7-icedtea-plugs-1.6a.tar.gz) = 64679
-SIZE (openjdk-7-ea-src-b43-15_jan_2009.zip) = 87658938
+MD5 (jdk-7-icedtea-plugs-1.6b.tar.gz) = huV12mIJFXtITQ6R5Bz/yA==
+MD5 (jibx_1_1_5.zip) = TPKb03SeWFUXse6cYgiBWA==
+MD5 (openjdk-7-ea-src-b59-14_may_2009.zip) = 91AO6ha7q81GFDolgxKJ8g==
+RMD160 (jdk-7-icedtea-plugs-1.6b.tar.gz) = max4P9/1XzHRqxFiQlXkD8JP6to=
+RMD160 (jibx_1_1_5.zip) = 3BhilCjejkwjDl8f6+EG0LiES50=
+RMD160 (openjdk-7-ea-src-b59-14_may_2009.zip) = eSdzi386suiuZIUZhRt51wkWLV8=
+SHA1 (jdk-7-icedtea-plugs-1.6b.tar.gz) = JmckP3A7iUEleubUcSc4vCVIDwQ=
+SHA1 (jibx_1_1_5.zip) = Brcns4OQOq7pIyh9kK1MEG42L9I=
+SHA1 (openjdk-7-ea-src-b59-14_may_2009.zip) = 7nLPiCHOMD4VN2XTMNRNiKjoFZc=
+SHA256 (jdk-7-icedtea-plugs-1.6b.tar.gz) = AW1kQWvf4dZpAdFpstfqr0Ch7wCqHZZDv1EwOZYZ2aA=
+SHA256 (jibx_1_1_5.zip) = Eh2+W3M4CB/78JzRF1r+XhhipjZz9GfVYOCrTCf7Pxc=
+SHA256 (openjdk-7-ea-src-b59-14_may_2009.zip) = 85/i4wjoRbkKsVZwu8SiDfO0/x79ax93wvlSRaMut1E=
+SIZE (jdk-7-icedtea-plugs-1.6b.tar.gz) = 49633
+SIZE (jibx_1_1_5.zip) = 6788994
+SIZE (openjdk-7-ea-src-b59-14_may_2009.zip) = 90904666
--- a/devel/jdk/1.7/patches/patch-corba_make_common_Defs-bsd_gmk
+++ b/devel/jdk/1.7/patches/patch-corba_make_common_Defs-bsd_gmk
@ -1,6 +1,6 @@
-$OpenBSD: patch-corba_make_common_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/common/Defs-bsd.gmk.orig	Thu Nov  8 11:48:52 2007
-+++ corba/make/common/Defs-bsd.gmk	Thu Nov  8 11:57:52 2007
+$OpenBSD: patch-corba_make_common_Defs-bsd_gmk,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- corba/make/common/Defs-bsd.gmk.orig	Sat May 16 23:21:11 2009
+++ corba/make/common/Defs-bsd.gmk	Mon May 18 08:24:28 2009
@@ -40,18 +40,12 @@
 # Get shared JDK settings
 include $(BUILDDIR)/common/shared/Defs.gmk
@ -21,7 +21,24 @@ $OpenBSD: patch-corba_make_common_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:43 kurt Ex
 PLATFORM_INCLUDE      = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
 
 # suffix used for make dependencies files.
-@@ -168,7 +162,7 @@ ifeq ($(FASTDEBUG), true)
+@@ -92,8 +86,14 @@ endif
+ #    We need this frame pointer to make it easy to walk the stacks.
+ #    This should be the default on X86, but ia64 and amd64 may not have this
+ #    as the default.
+-CFLAGS_REQUIRED_amd64   += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+-CFLAGS_REQUIRED_i586    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_amd64   += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+LDFLAGS_COMMON_amd64    += -m64
+CFLAGS_REQUIRED_i586    += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+LDFLAGS_COMMON_i586     += -m32
+ifeq ($(OS_VENDOR),Apple)
+  # 16-byte stack re-alignment on 32-bit Darwin
+  CFLAGS_REQUIRED_i586 += -mstackrealign
+endif
+ CFLAGS_REQUIRED_ia64    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
+@@ -168,7 +168,7 @@ ifeq ($(FASTDEBUG), true)
   CXXFLAGS_DBG	+= $(CC_LOWER_OPT)
 endif
 
@ -30,7 +47,7 @@ $OpenBSD: patch-corba_make_common_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:43 kurt Ex
 		  -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
 
 ifeq ($(ARCH_DATA_MODEL), 64)
-@@ -178,27 +172,6 @@ endif
+@@ -178,33 +178,15 @@ endif
 CPPFLAGS_OPT    = 
 CPPFLAGS_DBG    = -DDEBUG
 
@ -58,42 +75,54 @@ $OpenBSD: patch-corba_make_common_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:43 kurt Ex
 #
 # -L paths for finding and -ljava
 #
-@@ -236,15 +209,6 @@ endif
- LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
+-LDFLAGS_OPT     = -Xlinker -O1
+ LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
+
+ifneq ($(OS_VENDOR), Apple)
+LDFLAGS_OPT     = -Xlinker -O1
+ LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
+endif
 
 #
+ # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
+@@ -235,13 +217,9 @@ endif
+ #
+ LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
+ 
+-#
 -# Support for Quantify.
 -#
 -ifdef QUANTIFY
 -QUANTIFY_CMD = quantify
 -QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
 -LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
-endif
-
-#
- # Path and option to link against the VM, if you have to.  Note that
- # there are libraries that link against only -ljava, but they do get
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
-@@ -270,7 +234,9 @@ override HAVE_ALTZONE            = false
+# Darwin does not support linker map files.
+ifeq ($(OS_VENDOR), Apple)
+LDNOMAP=true
+ endif
+ 
+ #
+@@ -270,7 +248,9 @@ override HAVE_ALTZONE            = false
 override HAVE_FILIOH             = false
 override HAVE_GETHRTIME          = false
 override HAVE_GETHRVTIME         = false
-+ifeq ($(OS_VENDOR),NetBSD)
+ifeq ($(OS_VENDOR),Apple)
 override HAVE_SIGIGNORE          = true
 +endif
 override LEX_LIBRARY             = -lfl
 ifeq ($(STATIC_CXX),true)
 override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-@@ -281,13 +247,9 @@ override LIBPOSIX4               =
+@@ -281,13 +261,9 @@ override LIBPOSIX4               =
 override LIBSOCKET               =
 override LIBTHREAD               =
 override MOOT_PRIORITIES         = true
 -override NO_INTERRUPTIBLE_IO     = true
-+override NO_INTERRUPTIBLE_IO     = false
- override OPENWIN_HOME            = /usr/X11R6
+-override OPENWIN_HOME            = /usr/X11R6
 -ifeq ($(ARCH), amd64)
 -override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
 -else
+override NO_INTERRUPTIBLE_IO     = false
+override OPENWIN_HOME            = $(X11_PATH)
 override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
 -endif
 override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
--- a/devel/jdk/1.7/patches/patch-corba_make_common_Defs-linux_gmk
+++ b/devel/jdk/1.7/patches/patch-corba_make_common_Defs-linux_gmk
@ -0,0 +1,12 @@
+$OpenBSD: patch-corba_make_common_Defs-linux_gmk,v 1.1 2009/05/23 03:03:24 kurt Exp $
+--- corba/make/common/Defs-linux.gmk.orig	Thu May 14 23:22:22 2009
+++ corba/make/common/Defs-linux.gmk	Thu May 14 23:15:04 2009
+@@ -282,7 +282,7 @@ override LIBSOCKET               =
+ override LIBTHREAD               =
+ override MOOT_PRIORITIES         = true
+ override NO_INTERRUPTIBLE_IO     = true
+-override OPENWIN_HOME            = /usr/X11R6
+override OPENWIN_HOME            = $(X11_PATH)
+ ifeq ($(ARCH), amd64)
+ override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
+ else
--- a/devel/jdk/1.7/patches/patch-corba_make_common_Defs_gmk
+++ b/devel/jdk/1.7/patches/patch-corba_make_common_Defs_gmk
@ -1,7 +1,7 @@
-$OpenBSD: patch-corba_make_common_Defs_gmk,v 1.2 2009/01/16 16:49:29 kurt Exp $
--- corba/make/common/Defs.gmk.orig	Fri Dec 19 03:41:17 2008
-+++ corba/make/common/Defs.gmk	Sun Jan 11 21:40:13 2009
-@@ -53,6 +53,24 @@ endif
+$OpenBSD: patch-corba_make_common_Defs_gmk,v 1.3 2009/05/23 03:03:24 kurt Exp $
+--- corba/make/common/Defs.gmk.orig	Fri May  8 03:29:39 2009
+++ corba/make/common/Defs.gmk	Thu May 14 23:15:04 2009
+@@ -53,6 +53,28 @@ endif
 
 _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
 
@ -18,7 +18,11 @@ $OpenBSD: patch-corba_make_common_Defs_gmk,v 1.2 2009/01/16 16:49:29 kurt Exp $
 +    ifeq ($(PLATFORM), linux)
 +      PACKAGE_PATH = /usr
 +    else
-+      PACKAGE_PATH = /usr/local
+      ifeq ($(OS_VENDOR), Apple)
+        PACKAGE_PATH = /opt/local
+      else
+        PACKAGE_PATH = /usr/local
+      endif
 +    endif
 +  endif
 +endif
@ -26,7 +30,7 @@ $OpenBSD: patch-corba_make_common_Defs_gmk,v 1.2 2009/01/16 16:49:29 kurt Exp $
 #
 # Get platform definitions
 #
-@@ -97,6 +115,9 @@ ifdef PROGRAM
+@@ -97,6 +119,9 @@ ifdef PROGRAM
     LDLIBS_COMMON = -ldl
   endif
 
--- a/devel/jdk/1.7/patches/patch-corba_make_common_shared_Compiler-gcc_gmk
+++ b/devel/jdk/1.7/patches/patch-corba_make_common_shared_Compiler-gcc_gmk
@ -1,31 +1,28 @@
-$OpenBSD: patch-corba_make_common_shared_Compiler-gcc_gmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/common/shared/Compiler-gcc.gmk.orig	Thu Nov  8 12:08:26 2007
-+++ corba/make/common/shared/Compiler-gcc.gmk	Thu Nov  8 12:11:13 2007
-@@ -55,6 +55,8 @@ ifeq ($(PLATFORM), windows)
+$OpenBSD: patch-corba_make_common_shared_Compiler-gcc_gmk,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- corba/make/common/shared/Compiler-gcc.gmk.orig	Fri May  8 03:29:39 2009
+++ corba/make/common/shared/Compiler-gcc.gmk	Thu May 14 23:15:23 2009
+@@ -99,6 +99,24 @@ ifeq ($(PLATFORM), linux)
 
 endif
 
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
+ifeq ($(PLATFORM), bsd)
+  # Settings specific to BSD
+  CC             = $(COMPILER_PATH)gcc
+  CPP            = $(COMPILER_PATH)gcc -E
+  CXX            = $(COMPILER_PATH)g++
+  REQUIRED_CC_VER = 3.3
+  REQUIRED_GCC_VER = 3.3.*
 +
- ifeq ($(PLATFORM), linux)
- 
-   # Settings specific to Linux
-@@ -62,13 +64,16 @@ ifeq ($(PLATFORM), linux)
-   CPP            = $(COMPILER_PATH)gcc -E
-   # statically link libstdc++ before C++ ABI is stablized on Linux
-   STATIC_CXX     = true
+# Option used to create a shared library
+ifeq ($(OS_VENDOR), Apple)
+  SHARED_LIBRARY_FLAG = -dynamiclib
 +else
-+  STATIC_CXX     = false
+  SHARED_LIBRARY_FLAG = -shared
 +endif
-   ifeq ($(STATIC_CXX),true)
-     # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
-     # We need to use gcc to statically link the C++ runtime. gcc and g++ use
-     # the same subprocess to compile C++ files, so it is OK to build using gcc.
-    CXX            = $(COMPILER_PATH)gcc
-+    CXX            = $(CC)
-   else
-    CXX            = $(COMPILER_PATH)g++
-+    CXX            ?= $(COMPILER_PATH)g++
-   endif
-   ifneq ("$(findstring sparc,$(ARCH))", "")
-     # sparc or sparcv9
+
+  SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
+endif
+
+ ifeq ($(PLATFORM), solaris)
+ 
+   # Settings specific to Solaris
--- a/devel/jdk/1.7/patches/patch-corba_make_common_shared_Compiler_gmk
+++ b/devel/jdk/1.7/patches/patch-corba_make_common_shared_Compiler_gmk
@ -1,14 +1,15 @@
-$OpenBSD: patch-corba_make_common_shared_Compiler_gmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/common/shared/Compiler.gmk.orig	Thu Nov  8 12:07:05 2007
-+++ corba/make/common/shared/Compiler.gmk	Thu Nov  8 12:08:00 2007
-@@ -37,8 +37,8 @@ ifeq ($(PLATFORM), solaris)
-   override CC_VERSION = sun
- endif
- 
-# Linux uses GNU compilers by default
-ifeq ($(PLATFORM), linux)
-+# Linux & BSD uses GNU compilers by default
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
+$OpenBSD: patch-corba_make_common_shared_Compiler_gmk,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- corba/make/common/shared/Compiler.gmk.orig	Fri May  8 03:29:39 2009
+++ corba/make/common/shared/Compiler.gmk	Thu May 14 23:15:23 2009
+@@ -42,6 +42,11 @@ ifeq ($(PLATFORM), linux)
   override CC_VERSION = gcc
 endif
 
+# BSD uses GNU compilers by default
+ifeq ($(PLATFORM), bsd)
+  override CC_VERSION = gcc
+endif
+
+ # Get the compiler specific settings
+ include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk
+ 
--- a/devel/jdk/1.7/patches/patch-corba_make_common_shared_Defs-java_gmk
+++ b/devel/jdk/1.7/patches/patch-corba_make_common_shared_Defs-java_gmk
@ -1,21 +0,0 @@
-$OpenBSD: patch-corba_make_common_shared_Defs-java_gmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/common/shared/Defs-java.gmk.orig	Tue Oct 30 05:10:15 2007
-+++ corba/make/common/shared/Defs-java.gmk	Thu Nov  8 12:42:00 2007
-@@ -38,7 +38,7 @@ ifeq ($(ARCH), ia64)
-   #   Suspect this may not be needed anymore.
-   JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
- else
-  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
-+  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=96m
- endif
- 
- # 
-@@ -81,7 +81,7 @@ JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
- #    langtools is not available.
- #    This should be the latest promoted JDK javac.
- ifndef JAVA_TOOLS_DIR
-  JAVA_TOOLS_DIR = $(JDK_IMPORT_PATH)/bin
-+  JAVA_TOOLS_DIR = $(ALT_BOOTDIR)/bin
- endif
- 
- #
--- a/devel/jdk/1.7/patches/patch-corba_make_common_shared_Defs_gmk
+++ b/devel/jdk/1.7/patches/patch-corba_make_common_shared_Defs_gmk
@ -1,16 +0,0 @@
-$OpenBSD: patch-corba_make_common_shared_Defs_gmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/common/shared/Defs.gmk.orig	Thu Nov  8 14:28:01 2007
-+++ corba/make/common/shared/Defs.gmk	Thu Nov  8 14:27:30 2007
-@@ -51,6 +51,12 @@
- # Get shared system utilities macros defined
- include $(BUILDDIR)/common/shared/Defs-utils.gmk
- 
-+ifdef ALT_LANGTOOLS_DIST
-+  LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-+else
-+  LANGTOOLS_DIST =
-+endif
-+
- # Assumes ARCH, PLATFORM, ARCH_VM_SUBDIR, etc. have been defined.
- 
- # Simple pwd path
--- a/devel/jdk/1.7/patches/patch-corba_make_common_shared_Platform_gmk
+++ b/devel/jdk/1.7/patches/patch-corba_make_common_shared_Platform_gmk
@ -1,7 +1,7 @@
-$OpenBSD: patch-corba_make_common_shared_Platform_gmk,v 1.2 2008/03/21 02:46:43 kurt Exp $
--- corba/make/common/shared/Platform.gmk.orig	Sat Dec  1 00:00:00 2007
-+++ corba/make/common/shared/Platform.gmk	Thu Mar 20 09:05:23 2008
-@@ -262,6 +262,73 @@ ifeq ($(SYSTEM_UNAME), Linux)
+$OpenBSD: patch-corba_make_common_shared_Platform_gmk,v 1.3 2009/05/23 03:03:24 kurt Exp $
+--- corba/make/common/shared/Platform.gmk.orig	Fri May  8 03:29:39 2009
+++ corba/make/common/shared/Platform.gmk	Mon May 18 08:24:56 2009
+@@ -262,6 +262,85 @@ ifeq ($(SYSTEM_UNAME), Linux)
   MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
 endif
 
@ -12,6 +12,13 @@ $OpenBSD: patch-corba_make_common_shared_Platform_gmk,v 1.2 2008/03/21 02:46:43
 + REQUIRED_OS_VERSION = 6.0
 +endif
 +
+ifeq ($(SYSTEM_UNAME), Darwin)
+  PLATFORM = bsd
+  OS_NAME = darwin
+  OS_VENDOR = Apple
+ REQUIRED_OS_VERSION = 8.0
+endif
+
 +ifeq ($(SYSTEM_UNAME), NetBSD)
 +  PLATFORM = bsd
 +  OS_NAME = netbsd
@ -42,6 +49,15 @@ $OpenBSD: patch-corba_make_common_shared_Platform_gmk,v 1.2 2008/03/21 02:46:43
 +  ARCH        := $(shell $(archExpr) )
 +  ARCH_FAMILY := $(ARCH)
 +
+  # Darwin builds may be 32-bit or 64-bit data model.
+  ifeq ($(SYSTEM_UNAME), Darwin)
+    ifeq ($(ARCH), i586)
+      ifeq ($(ARCH_DATA_MODEL), 64)
+        ARCH=amd64
+      endif
+    endif
+  endif
+
 +  # i586 and sparc are 32 bit, amd64 and sparc64 are 64
 +  ifneq (,$(findstring $(ARCH), i586 sparc))
 +    ARCH_DATA_MODEL=32
@ -65,35 +81,34 @@ $OpenBSD: patch-corba_make_common_shared_Platform_gmk,v 1.2 2008/03/21 02:46:43
 +  #    a fully built workspace.
 +  REQUIRED_FREE_SPACE=1500000
 +  # How much RAM does this machine have:
-+  ifeq ($(OS_VENDOR), OpenBSD)
-+    MB_OF_MEMORY=$(shell perl -e 'printf "%d", `sysctl hw.physmem | cut -d'=' -f2` / 1048576' )
-+  else
-+    MB_OF_MEMORY := $(shell `sysctl hw.physmem | cut -d' ' -f2` / 1048576 )
-+  endif
+  MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' )
 +endif
 +
 # Windows with and without CYGWIN will be slightly different
 ifeq ($(SYSTEM_UNAME), Windows_NT)
   PLATFORM = windows
-@@ -373,7 +440,7 @@ endif
+@@ -373,7 +452,14 @@ endif
 #    build machines and adjustments will be made to prevent excessing
 #    system swapping during the build.
 #    If we don't know, assume 512. Subtract 128 from MB for VM MAX.
 -#    Don't set VM max over 1024-128=896.
-+#    Don't set VM max over 864-128=736.
+#    Don't set VM max over 1024-128=896, except on OpenBSD where
+#    736 is the max.
+ifeq ($(OS_VENDOR), OpenBSD)
+  ABS_MAX_MEMORY := "736"
+else
+  ABS_MAX_MEMORY := "896"
+endif
+
 ifneq ($(MB_OF_MEMORY),)
   LOW_MEMORY_MACHINE := $(shell \
     if [ $(MB_OF_MEMORY) -le 512 ] ; then \
-@@ -382,10 +449,10 @@ ifneq ($(MB_OF_MEMORY),)
-       echo "false"; \
-     fi)
-   MAX_VM_MEMORY := $(shell \
-    if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
-+    if [ $(MB_OF_MEMORY) -le 864 ] ; then \
+@@ -385,7 +471,7 @@ ifneq ($(MB_OF_MEMORY),)
+     if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
       expr $(MB_OF_MEMORY) '-' 128 ; \
     else \
 -      echo "896"; \
-+      echo "736"; \
+      echo $(ABS_MAX_MEMORY); \
     fi)
   MIN_VM_MEMORY := $(shell \
     if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
--- a/devel/jdk/1.7/patches/patch-corba_make_jprt_config
+++ b/devel/jdk/1.7/patches/patch-corba_make_jprt_config
@ -1,39 +0,0 @@
-$OpenBSD: patch-corba_make_jprt_config,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- corba/make/jprt.config.orig	Thu Oct 23 03:40:16 2008
-+++ corba/make/jprt.config	Mon Dec 22 14:34:17 2008
-@@ -174,6 +174,35 @@ elif [ "${osname}" = Linux ] ; then
- 
-     umask 002
-    
-+elif [ "${osname}" = OpenBSD ] ; then
-+   
-+    # LINUX: X86, AMD64
-+    osarch=`uname -m`
-+    if [ "${osarch}" = i386 ] ; then
-+	bsd_arch=i586
-+    elif [ "${osarch}" = amd64 ] ; then
-+	bsd_arch=amd64
-+    fi
-+
-+    # Get the compilers into path (make sure it matches ALT setting)
-+    compiler_path=/usr/bin
-+    compiler_name=usr_bin
-+    ALT_COMPILER_PATH="${compiler_path}"
-+    export ALT_COMPILER_PATH
-+    dirMustExist "${compiler_path}" ALT_COMPILER_PATH
-+    path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin}
-+    
-+    # Add basic paths
-+    path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin
-+
-+    # Get the previous JDK to be used to bootstrap the build
-+    path4sdk=${bootdir}/bin:${path4sdk}
-+    
-+    # Find GNU make
-+    make=gmake
-+
-+    umask 002
-+   
- else
- 
-     # Windows: Differs on CYGWIN vs. MKS, and the compiler available.
--- a/devel/jdk/1.7/patches/patch-corba_make_jprt_properties
+++ b/devel/jdk/1.7/patches/patch-corba_make_jprt_properties
@ -1,12 +0,0 @@
-$OpenBSD: patch-corba_make_jprt_properties,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/jprt.properties.orig	Tue Feb 26 21:52:34 2008
-+++ corba/make/jprt.properties	Tue Feb 26 21:53:06 2008
-@@ -34,6 +34,8 @@ solaris_i586_5.10,\
- solaris_x64_5.10,\
- linux_i586,\
- linux_x64,\
-+bsd_i586,\
-+bsd_x64,\
- windows_i586,\
- windows_x64
- 
--- a/devel/jdk/1.7/patches/patch-corba_src_share_native_com_sun_corba_se_internal_io_ioser_c
+++ b/devel/jdk/1.7/patches/patch-corba_src_share_native_com_sun_corba_se_internal_io_ioser_c
@ -0,0 +1,180 @@
+$OpenBSD: patch-corba_src_share_native_com_sun_corba_se_internal_io_ioser_c,v 1.1 2009/05/23 03:03:24 kurt Exp $
+--- corba/src/share/native/com/sun/corba/se/internal/io/ioser.c.orig	Thu May 14 23:14:21 2009
+++ corba/src/share/native/com/sun/corba/se/internal/io/ioser.c	Thu May 14 23:13:00 2009
+@@ -24,6 +24,7 @@
+  */
+ 
+ #include "jni.h"
+#include <stdint.h>
+ 
+ #include "com_sun_corba_se_internal_io_IIOPInputStream.h"
+ #include "com_sun_corba_se_internal_io_IIOPOutputStream.h"
+@@ -643,7 +644,7 @@ JNIEXPORT jclass JNICALL Java_com_sun_corba_se_interna
+ JNIEXPORT jobject JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getObjectFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetObjectField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetObjectField(env, obj, (jfieldID)(intptr_t)fieldID);
+ }
+ 
+ /*
+@@ -654,7 +655,7 @@ JNIEXPORT jobject JNICALL Java_com_sun_corba_se_intern
+ JNIEXPORT jboolean JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getBooleanFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetBooleanField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetBooleanField(env, obj, (jfieldID)(intptr_t)fieldID);
+ }
+ 
+ /*
+@@ -665,7 +666,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_corba_se_inter
+ JNIEXPORT jbyte JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getByteFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetByteField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetByteField(env, obj, (jfieldID)(intptr_t)fieldID);
+ 
+ }
+ 
+@@ -677,7 +678,7 @@ JNIEXPORT jbyte JNICALL Java_com_sun_corba_se_internal
+ JNIEXPORT jchar JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getCharFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetCharField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetCharField(env, obj, (jfieldID)(intptr_t)fieldID);
+ 
+ }
+ 
+@@ -689,7 +690,7 @@ JNIEXPORT jchar JNICALL Java_com_sun_corba_se_internal
+ JNIEXPORT jshort JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getShortFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetShortField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetShortField(env, obj, (jfieldID)(intptr_t)fieldID);
+ }
+ 
+ /*
+@@ -700,7 +701,7 @@ JNIEXPORT jshort JNICALL Java_com_sun_corba_se_interna
+ JNIEXPORT jint JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getIntFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetIntField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetIntField(env, obj, (jfieldID)(intptr_t)fieldID);
+ 
+ }
+ 
+@@ -713,7 +714,7 @@ JNIEXPORT jint JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT jlong JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getLongFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetLongField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetLongField(env, obj, (jfieldID)(intptr_t)fieldID);
+ 
+ }
+ 
+@@ -725,7 +726,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_corba_se_internal
+ JNIEXPORT jfloat JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getFloatFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetFloatField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetFloatField(env, obj, (jfieldID)(intptr_t)fieldID);
+ 
+ }
+ 
+@@ -737,7 +738,7 @@ JNIEXPORT jfloat JNICALL Java_com_sun_corba_se_interna
+ JNIEXPORT jdouble JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getDoubleFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID)
+ {
+-    return (*env)->GetDoubleField(env, obj, (jfieldID)fieldID);
+    return (*env)->GetDoubleField(env, obj, (jfieldID)(intptr_t)fieldID);
+ 
+ }
+ 
+@@ -751,7 +752,7 @@ JNIEXPORT jdouble JNICALL Java_com_sun_corba_se_intern
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setObjectFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jobject v)
+ {
+-    (*env)->SetObjectField(env, obj, (jfieldID)fieldID, v);
+    (*env)->SetObjectField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -762,7 +763,7 @@ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setBooleanFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jboolean v)
+ {
+-    (*env)->SetBooleanField(env, obj, (jfieldID)fieldID, v);
+    (*env)->SetBooleanField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -773,7 +774,7 @@ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setByteFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jbyte v)
+ {
+-    (*env)->SetByteField(env, obj, (jfieldID)fieldID, v);
+    (*env)->SetByteField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -784,7 +785,7 @@ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setCharFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jchar v)
+ {
+-    (*env)->SetCharField(env, obj, (jfieldID)fieldID, v);
+    (*env)->SetCharField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -795,7 +796,7 @@ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setShortFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jshort v)
+ {
+-    (*env)->SetShortField(env, obj, (jfieldID)fieldID, v);
+    (*env)->SetShortField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -806,7 +807,7 @@ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setIntFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jint v)
+ {
+-  (*env)->SetIntField(env, obj, (jfieldID)fieldID, v);
+  (*env)->SetIntField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -817,7 +818,7 @@ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setLongFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jlong v)
+ {
+-    (*env)->SetLongField(env, obj, (jfieldID)fieldID, v);
+    (*env)->SetLongField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -828,7 +829,7 @@ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setFloatFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jfloat v)
+ {
+-    (*env)->SetFloatField(env, obj, (jfieldID)fieldID, v);
+    (*env)->SetFloatField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -839,7 +840,7 @@ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_
+ JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setDoubleFieldOpt
+   (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jdouble v)
+ {
+-    (*env)->SetDoubleField(env, obj, (jfieldID)fieldID, v);
+    (*env)->SetDoubleField(env, obj, (jfieldID)(intptr_t)fieldID, v);
+ }
+ 
+ /*
+@@ -858,5 +859,5 @@ JNIEXPORT jlong JNICALL Java_com_sun_corba_se_internal
+     (*env)->ReleaseStringUTFChars(env, fieldName, strFieldName);
+     (*env)->ReleaseStringUTFChars(env, fieldSig, strFieldSig);
+ 
+-    return (jlong)fieldID;
+    return (jlong)(intptr_t)fieldID;
+ }
--- a/devel/jdk/1.7/patches/patch-hotspot_make_Makefile
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_Makefile
@ -0,0 +1,31 @@
+$OpenBSD: patch-hotspot_make_Makefile,v 1.1 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/Makefile.orig	Fri May 15 16:44:15 2009
+++ hotspot/make/Makefile	Fri May 15 16:45:03 2009
+@@ -265,6 +265,19 @@ endif
+ 
+ # Shared Library
+ ifneq ($(OSNAME),windows)
+ifeq ($(OSNAME),bsd)
+# BSD-specific LIBRARY_SUFFIX build option
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+else
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
+ 	$(install-file)
+ $(EXPORT_CLIENT_DIR)/%.so:       $(C1_DIR)/%.so
+@@ -275,6 +288,7 @@ $(EXPORT_SERVER_DIR)/%.so:       $(C2_DIR)/%.so
+ 	$(install-file)
+ $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
+ 	$(install-file)
+endif
+ endif
+ 
+ # Jar file (sa-jdi.jar)
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_Makefile
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_Makefile
@ -1,12 +1,13 @@
-$OpenBSD: patch-hotspot_make_bsd_Makefile,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/Makefile.orig	Sat Aug  2 16:12:30 2008
-+++ hotspot/make/bsd/Makefile	Sat Aug  2 16:15:29 2008
-@@ -197,7 +197,7 @@ all:
- 	@echo "  $(TARGETS_C1)"
- 	@echo "  $(TARGETS_CORE)"
- 
-checks: check_os_version check_j2se_version
-+checks: check_j2se_version
- 
- # We do not want people accidentally building on old systems (e.g. Bsd 2.2.x,
+$OpenBSD: patch-hotspot_make_bsd_Makefile,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/bsd/Makefile.orig	Fri May 15 16:25:28 2009
+++ hotspot/make/bsd/Makefile	Fri May 15 16:56:20 2009
+@@ -203,7 +203,8 @@ checks: check_os_version check_j2se_version
 # Solaris 2.5.1, 2.6).
+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
+ 
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
+#SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
+DISABLE_HOTSPOT_OS_VERSION_CHECK = ok
+ OS_VERSION := $(shell uname -r)
+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
+ 
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_buildtree_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_buildtree_make
@ -0,0 +1,16 @@
+$OpenBSD: patch-hotspot_make_bsd_makefiles_buildtree_make,v 1.1 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/bsd/makefiles/buildtree.make.orig	Fri May 15 16:59:31 2009
+++ hotspot/make/bsd/makefiles/buildtree.make	Fri May 15 16:59:59 2009
+@@ -277,10 +277,11 @@ env.sh: $(BUILDTREE_MAKE)
+ 	[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
+ 	{ \
+ 	echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+	echo "DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ 	echo "CLASSPATH=$${CLASSPATH:+$$CLASSPATH:}.:\$${JAVA_HOME}/jre/lib/rt.jar:\$${JAVA_HOME}/jre/lib/i18n.jar"; \
+ 	} | sed s:$${JAVA_HOME:--------}:\$${JAVA_HOME}:g; \
+ 	echo "HOTSPOT_BUILD_USER=\"$${LOGNAME:-$$USER} in `basename $(GAMMADIR)`\""; \
+-	echo "export JAVA_HOME LD_LIBRARY_PATH CLASSPATH HOTSPOT_BUILD_USER"; \
+	echo "export JAVA_HOME LD_LIBRARY_PATH DYLD_LIBRARY_PATH CLASSPATH HOTSPOT_BUILD_USER"; \
+ 	) > $@
+ 
+ env.csh: env.sh
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_defs_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_defs_make
@ -1,42 +1,81 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_defs_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/defs.make.orig	Sat Aug  2 16:12:30 2008
-+++ hotspot/make/bsd/makefiles/defs.make	Sat Aug  2 16:15:29 2008
-@@ -79,6 +79,31 @@ ifeq ($(ARCH), x86_64) 
+$OpenBSD: patch-hotspot_make_bsd_makefiles_defs_make,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/bsd/makefiles/defs.make.orig	Sat May 16 23:21:09 2009
+++ hotspot/make/bsd/makefiles/defs.make	Mon May 18 08:17:30 2009
+@@ -28,6 +28,14 @@
+ 
+ SLASH_JAVA ?= /java
+ 
+# Library suffix
+OS_VENDOR:=$(shell uname -s)
+ifeq ($(OS_VENDOR),Darwin)
+  LIBRARY_SUFFIX=dylib
+else
+  LIBRARY_SUFFIX=so
+endif
+
+ # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
+ ARCH:=$(shell uname -m)
+ PATH_SEP = :
+@@ -61,8 +69,8 @@ ifeq ($(ARCH), sparc64)
+   HS_ARCH            = sparc
+ endif
+ 
+-# x86_64
+-ifeq ($(ARCH), x86_64) 
+# amd64
+ifeq ($(ARCH), amd64) 
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL = 64
+     MAKE_ARGS       += LP64=1
+@@ -74,17 +82,27 @@ ifeq ($(ARCH), x86_64) 
+     PLATFORM        = bsd-i586
+     VM_PLATFORM     = bsd_i486
+     HS_ARCH         = x86
+-    # We have to reset ARCH to i686 since SRCARCH relies on it
+-    ARCH            = i686   
+    # We have to reset ARCH to i386 since SRCARCH relies on it
+    ARCH            = i386   
   endif
 endif
 
-+# amd64
-+ifeq ($(ARCH), amd64)
-+  ARCH_DATA_MODEL = 64
-+  MAKE_ARGS       += LP64=1
-+  PLATFORM        = bsd-amd64
-+  VM_PLATFORM     = bsd_amd64
-+  HS_ARCH         = x86
-+endif
-+
+-# i686
+-ifeq ($(ARCH), i686)
+-  ARCH_DATA_MODEL  = 32
+-  PLATFORM         = bsd-i586
+-  VM_PLATFORM      = bsd_i486
+-  HS_ARCH          = x86
 +# i386
 +ifeq ($(ARCH), i386)
-+  ARCH_DATA_MODEL  = 32
-+  PLATFORM         = bsd-i586
-+  VM_PLATFORM      = bsd_i486
-+  HS_ARCH          = x86
-+endif
-+
-+# i486
-+ifeq ($(ARCH), i486)
-+  ARCH_DATA_MODEL  = 32
-+  PLATFORM         = bsd-i586
-+  VM_PLATFORM      = bsd_i486
-+  HS_ARCH          = x86
-+endif
-+
- # i686
- ifeq ($(ARCH), i686)
-   ARCH_DATA_MODEL  = 32
-@@ -102,12 +127,4 @@ ifeq ($(ARCH_DATA_MODEL), 32)
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    ARCH_DATA_MODEL = 64
+    MAKE_ARGS       += LP64=1
+    PLATFORM        = bsd-amd64
+    VM_PLATFORM     = bsd_amd64
+    HS_ARCH         = x86
+    # We have to reset ARCH to amd64 since SRCARCH relies on it
+    ARCH            = amd64
+  else
+    ARCH_DATA_MODEL  = 32
+    PLATFORM         = bsd-i586
+    VM_PLATFORM      = bsd_i486
+    HS_ARCH          = x86
+  endif
+ endif
+ 
+ JDK_INCLUDE_SUBDIR=bsd
+@@ -95,19 +113,11 @@ VM_DEBUG=jvmg
+ EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
+ EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.$(LIBRARY_SUFFIX)
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+   EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
-   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
+-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
+-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
 -  EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
 -  EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 
 -else
@ -45,4 +84,6 @@ $OpenBSD: patch-hotspot_make_bsd_makefiles_defs_make,v 1.1 2009/01/04 23:25:16 k
 -      EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
 -      EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
 -    endif
+  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.$(LIBRARY_SUFFIX)
+  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
 endif
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_gcc_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_gcc_make
@ -1,7 +1,12 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/gcc.make.orig	Mon Dec 22 21:13:31 2008
-+++ hotspot/make/bsd/makefiles/gcc.make	Mon Dec 22 23:13:24 2008
-@@ -25,9 +25,10 @@
+$OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/bsd/makefiles/gcc.make.orig	Wed May 20 17:32:15 2009
+++ hotspot/make/bsd/makefiles/gcc.make	Wed May 20 17:32:19 2009
+@@ -22,12 +22,15 @@
+ #  
+ #
+ 
+OS_VENDOR = $(shell uname -s)
+
 #------------------------------------------------------------------------
 # CC, CPP & AS
 
@ -11,11 +16,11 @@ $OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.1 2009/01/04 23:25:16 ku
 +CXX ?= g++
 +CPP  = $(CXX)
 +CC  ?= gcc
-+AS   = $(CC) -c
+AS   = $(CC) -c -x assembler-with-cpp
 
 # -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
 # prints the numbers (e.g. "2.95", "3.2.1")
-@@ -55,7 +56,7 @@ VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
+@@ -55,7 +58,7 @@ VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
 CFLAGS += $(VM_PICFLAG)
 CFLAGS += -fno-rtti
 CFLAGS += -fno-exceptions
@ -24,7 +29,20 @@ $OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.1 2009/01/04 23:25:16 ku
 CFLAGS += -fcheck-new
 
 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
-@@ -83,7 +84,7 @@ else
+@@ -65,6 +68,12 @@ ARCHFLAG/ia64    =
+ ARCHFLAG/sparc   = -m32 -mcpu=v9
+ ARCHFLAG/sparcv9 = -m64 -mcpu=v9
+ 
+# Darwin-specific build flags
+ifeq ($(OS_VENDOR), Darwin)
+  # Ineffecient 16-byte stack re-alignment on Darwin/IA32
+  ARCHFLAG/i486 += -mstackrealign
+endif
+
+ CFLAGS     += $(ARCHFLAG)
+ AOUT_FLAGS += $(ARCHFLAG)
+ LFLAGS     += $(ARCHFLAG)
+@@ -83,7 +92,7 @@ else
 endif
 
 # Compiler warnings are treated as errors
@ -33,12 +51,74 @@ $OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.1 2009/01/04 23:25:16 ku
 
 # Except for a few acceptable ones
 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-@@ -138,7 +139,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME
- SONAMEFLAG = -Xlinker -soname=SONAME
+@@ -98,7 +107,12 @@ endif
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+ # Special cases
+ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
+# XXXDARWIN: for _dyld_bind_fully_image_containing_address
+ifeq ($(OS_VENDOR), Darwin)
+  CFLAGS_WARN/os_bsd.o = $(CFLAGS_WARN/DEFAULT) -Wno-deprecated-declarations
+endif
 
- # Build shared library
+
+ # The flags to use for an Optimized g++ build
+ OPT_CFLAGS += -O3
+ 
+@@ -133,28 +147,40 @@ ifeq ($(BUILDARCH), ia64)
+ LFLAGS += -Wl,-relax
+ endif
+ 
+-# Enable linker optimization
+-LFLAGS += -Xlinker -O1
+-
+-# If this is a --hash-style=gnu system, use --hash-style=both
+-#   The gnu .hash section won't work on some Bsd systems like SuSE 10.
+-_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | grep -- '--hash-style=gnu')
+-ifneq ($(_HAS_HASH_STYLE_GNU),)
+-  LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
+-endif
+-LFLAGS += $(LDFLAGS_HASH_STYLE)
+-
+ # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
+ MAPFLAG = -Xlinker --version-script=FILENAME
+ 
+-# Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
+-SONAMEFLAG = -Xlinker -soname=SONAME
+#
+# Shared Library
+#
+ifeq ($(OS_VENDOR), Darwin)
+  # Standard linker flags
+  LFLAGS +=
+ 
+-# Build shared library
 -SHARED_FLAG = -shared
-+SHARED_FLAG = -shared $(VM_PICFLAG)
+  # Darwin doesn't use ELF and doesn't support version scripts
+  LDNOMAP = true
 
- # Keep symbols even they are not used
- AOUT_FLAGS += -export-dynamic
+-# Keep symbols even they are not used
+-AOUT_FLAGS += -export-dynamic
+  # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
+  SONAMEFLAG =
+
+  # Build shared library
+  SHARED_FLAG = -dynamiclib $(VM_PICFLAG)
+
+  # Keep symbols even they are not used
+  #AOUT_FLAGS += -export-dynamic
+else
+  # Enable linker optimization
+  LFLAGS += -Xlinker -O1
+
+  # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
+  SONAMEFLAG = -Xlinker -soname=SONAME
+
+  # Build shared library
+  SHARED_FLAG = -shared $(VM_PICFLAG)
+
+  # Keep symbols even they are not used
+  AOUT_FLAGS += -export-dynamic
+endif
+ 
+ #------------------------------------------------------------------------
+ # Debug flags
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_jsig_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_jsig_make
@ -1,12 +1,27 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_jsig_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/jsig.make.orig	Sat Aug  2 16:12:30 2008
-+++ hotspot/make/bsd/makefiles/jsig.make	Sat Aug  2 16:15:29 2008
-@@ -39,12 +39,12 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
+$OpenBSD: patch-hotspot_make_bsd_makefiles_jsig_make,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/bsd/makefiles/jsig.make.orig	Wed May 20 17:32:15 2009
+++ hotspot/make/bsd/makefiles/jsig.make	Wed May 20 17:33:51 2009
+@@ -26,8 +26,13 @@
+ 
+ # libjsig[_g].so: signal interposition library
+ JSIG = jsig$(G_SUFFIX)
+-LIBJSIG = lib$(JSIG).so
+ 
+ifeq ($(OS_VENDOR), Darwin)
+  LIBJSIG = lib$(JSIG).dylib
+else
+  LIBJSIG = lib$(JSIG).so
+endif
+
+ JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
+ 
+ DEST_JSIG  = $(JDK_LIBDIR)/$(LIBJSIG)
+@@ -39,12 +44,12 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
 # cause problems with interposing. See CR: 6466665
 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
 
-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT
-+LFLAGS_JSIG += -D_GNU_SOURCE -pthread
+-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
 
 $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
 	@echo Making signal interposition lib...
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_sa_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_sa_make
@ -1,36 +0,0 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_sa_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/sa.make.orig	Mon Dec 22 14:34:14 2008
-+++ hotspot/make/bsd/makefiles/sa.make	Mon Dec 22 20:50:40 2008
-@@ -31,6 +31,7 @@
- include $(GAMMADIR)/make/bsd/makefiles/rules.make
- 
- AGENT_DIR = $(GAMMADIR)/agent
-+SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
- 
- include $(GAMMADIR)/make/sa.files
- 
-@@ -42,8 +43,8 @@ SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
- 
- # gnumake 3.78.1 does not accept the *s that
- # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
-+AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
-+AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
- 
- SA_CLASSDIR = $(GENERATED)/saclasses
- 
-@@ -51,11 +52,11 @@ SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.sa
- 
- SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
- 
-# if $(AGENT_DIR) does not exist, we don't build SA
-+# if $(SASRCDIR) does not exist, we don't build SA
- # also, we don't build SA on Itanium.
- 
- all: 
-	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+	if [ -d $(SASRCDIR) -a "$(SRCARCH)" != "ia64" ] ; then \
- 	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
- 	fi
- 
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_saproc_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_saproc_make
@ -1,7 +1,22 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_saproc_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/saproc.make.orig	Sat Aug  2 16:12:30 2008
-+++ hotspot/make/bsd/makefiles/saproc.make	Sat Aug  2 16:15:29 2008
-@@ -43,11 +43,11 @@ SAMAPFILE = $(SASRCDIR)/mapfile
+$OpenBSD: patch-hotspot_make_bsd_makefiles_saproc_make,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/bsd/makefiles/saproc.make.orig	Fri May 15 16:25:29 2009
+++ hotspot/make/bsd/makefiles/saproc.make	Fri May 15 17:08:59 2009
+@@ -26,8 +26,13 @@
+ 
+ # libsaproc[_g].so: serviceability agent
+ SAPROC = saproc$(G_SUFFIX)
+-LIBSAPROC = lib$(SAPROC).so
+ 
+ifeq ($(OS_VENDOR), Darwin)
+  LIBSAPROC = lib$(SAPROC).dylib
+else
+  LIBSAPROC = lib$(SAPROC).so
+endif
+
+ AGENT_DIR = $(GAMMADIR)/agent
+ 
+ SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
+@@ -43,11 +48,11 @@ SAMAPFILE = $(SASRCDIR)/mapfile
 
 DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
 
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_vm_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_vm_make
@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_vm_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/vm.make.orig	Mon Dec 22 21:13:31 2008
-+++ hotspot/make/bsd/makefiles/vm.make	Mon Dec 22 23:29:49 2008
+$OpenBSD: patch-hotspot_make_bsd_makefiles_vm_make,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/bsd/makefiles/vm.make.orig	Fri May 15 16:25:29 2009
+++ hotspot/make/bsd/makefiles/vm.make	Fri May 15 17:11:43 2009
@@ -86,6 +86,10 @@ CPPFLAGS =           \
   ${JRE_VERSION}     \
   ${VM_DISTRO}
@ -21,7 +21,20 @@ $OpenBSD: patch-hotspot_make_bsd_makefiles_vm_make,v 1.1 2009/01/04 23:25:16 kur
 
 # By default, link the *.o into the library, not the executable.
 LINK_INTO$(LINK_INTO) = LIBJVM
-@@ -124,7 +128,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
+@@ -110,7 +114,11 @@ include $(MAKEFILES_DIR)/dtrace.make
+ # JVM
+ 
+ JVM    = jvm$(G_SUFFIX)
+-LIBJVM = lib$(JVM).so
+ifeq ($(OS_VENDOR), Darwin)
+  LIBJVM = lib$(JVM).dylib
+else
+  LIBJVM = lib$(JVM).so
+endif
+ 
+ JVM_OBJ_FILES = $(Obj_Files)
+ 
+@@ -124,7 +132,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
 	rm -f $@
 	cat $^ > $@
 
@ -30,14 +43,14 @@ $OpenBSD: patch-hotspot_make_bsd_makefiles_vm_make,v 1.1 2009/01/04 23:25:16 kur
 
 ifeq ($(LINK_INTO),AOUT)
   LIBJVM.o                 =
-@@ -142,14 +146,14 @@ else
+@@ -142,14 +150,14 @@ else
   ifeq ($(STATIC_CXX), true)
     LFLAGS_VM              += $(STATIC_LIBGCC)
     LIBS_VM                += $(STATIC_STDCXX)
-+    LINK_VM = $(LINK_LIB.c)
+    LINK_VM                = $(LINK_LIB.c)
   else
 -    LIBS_VM                += -lstdc++
-+    LINK_VM = $(LINK_LIB.CC)
+    LINK_VM                = $(LINK_LIB.CC)
   endif
 
   LIBS_VM                  += $(LIBS)
@ -47,3 +60,31 @@ $OpenBSD: patch-hotspot_make_bsd_makefiles_vm_make,v 1.1 2009/01/04 23:25:16 kur
 
 # rule for building precompiled header
 $(PRECOMPILED_HEADER): $(Precompiled_Files)
+@@ -177,11 +185,6 @@ $(LD_SCRIPT): $(LIBJVM_MAPFILE)
+ LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT)
+ endif
+ 
+-# With more recent Redhat releases (or the cutting edge version Fedora), if
+-# SEBsd is configured to be enabled, the runtime linker will fail to apply
+-# the text relocation to libjvm.so considering that it is built as a non-PIC
+-# DSO. To workaround that, we run chcon to libjvm.so after it is built. See 
+-# details in bug 6538311.
+ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
+ 	$(QUIETLY) {                                                    \
+ 	    echo Linking vm...;                                         \
+@@ -190,15 +193,6 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
+ 		       $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM);       \
+ 	    $(LINK_LIB.CC/POST_HOOK)                                    \
+ 	    rm -f $@.1; ln -s $@ $@.1;                                  \
+-	    if [ -x /usr/sbin/sebsdenabled ] ; then                   \
+-	      /usr/sbin/sebsdenabled;                                 \
+-              if [ $$? = 0 ] ; then					\
+-		/usr/bin/chcon -t textrel_shlib_t $@;                   \
+-		if [ $$? != 0 ]; then                                   \
+-		  echo "ERROR: Cannot chcon $@";			\
+-		fi							\
+-	      fi							\
+-	    fi                                                          \
+ 	}
+ 
+ DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
--- a/devel/jdk/1.7/patches/patch-hotspot_make_defs_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_defs_make
@ -1,12 +1,15 @@
-$OpenBSD: patch-hotspot_make_defs_make,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/defs.make.orig	Thu Jul 17 03:40:27 2008
-+++ hotspot/make/defs.make	Sat Aug  2 16:12:52 2008
-@@ -119,13 +119,20 @@ endif
+$OpenBSD: patch-hotspot_make_defs_make,v 1.4 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/make/defs.make.orig	Fri May  8 03:30:27 2009
+++ hotspot/make/defs.make	Fri May 15 17:12:33 2009
+@@ -119,13 +119,23 @@ endif
 # Windows should have OS predefined
 ifeq ($(OS),)
   OS   := $(shell uname -s)
 +  ifneq ($(findstring BSD,$(OS)),)
 +    OS=bsd
+  endif
+  ifeq ($(OS), Darwin)
+    OS=bsd
 +  endif
   HOST := $(shell uname -n)
 endif
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_assembler_x86_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_assembler_x86_cpp
@ -1,48 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_assembler_x86_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/assembler_x86.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/assembler_x86.cpp	Sun Dec 28 19:22:14 2008
-@@ -5212,15 +5212,15 @@ void MacroAssembler::pushptr(AddressLiteral src) {
- void MacroAssembler::reset_last_Java_frame(bool clear_fp,
-                                            bool clear_pc) {
-   // we must set sp to zero to clear frame
-  movptr(Address(r15_thread, JavaThread::last_Java_sp_offset()), (int32_t)NULL_WORD);
-+  movptr(Address(r15_thread, JavaThread::last_Java_sp_offset()), NULL_WORD);
-   // must clear fp, so that compiled frames are not confused; it is
-   // possible that we need it only for debugging
-   if (clear_fp) {
-    movptr(Address(r15_thread, JavaThread::last_Java_fp_offset()), (int32_t)NULL_WORD);
-+    movptr(Address(r15_thread, JavaThread::last_Java_fp_offset()), NULL_WORD);
-   }
- 
-   if (clear_pc) {
-    movptr(Address(r15_thread, JavaThread::last_Java_pc_offset()), (int32_t)NULL_WORD);
-+    movptr(Address(r15_thread, JavaThread::last_Java_pc_offset()), NULL_WORD);
-   }
- }
- 
-@@ -5670,7 +5670,7 @@ void MacroAssembler::call_VM_base(Register oop_result,
-   // get oop result if there is one and reset the value in the thread
-   if (oop_result->is_valid()) {
-     movptr(oop_result, Address(java_thread, JavaThread::vm_result_offset()));
-    movptr(Address(java_thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
-+    movptr(Address(java_thread, JavaThread::vm_result_offset()), NULL_WORD);
-     verify_oop(oop_result, "broken oop in call_VM_base");
-   }
- }
-@@ -6426,13 +6426,13 @@ void MacroAssembler::reset_last_Java_frame(Register ja
-     get_thread(java_thread);
-   }
-   // we must set sp to zero to clear frame
-  movptr(Address(java_thread, JavaThread::last_Java_sp_offset()), (int32_t)NULL_WORD);
-+  movptr(Address(java_thread, JavaThread::last_Java_sp_offset()), NULL_WORD);
-   if (clear_fp) {
-    movptr(Address(java_thread, JavaThread::last_Java_fp_offset()), (int32_t)NULL_WORD);
-+    movptr(Address(java_thread, JavaThread::last_Java_fp_offset()), NULL_WORD);
-   }
- 
-   if (clear_pc)
-    movptr(Address(java_thread, JavaThread::last_Java_pc_offset()), (int32_t)NULL_WORD);
-+    movptr(Address(java_thread, JavaThread::last_Java_pc_offset()), NULL_WORD);
- 
- }
- 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_c1_LIRAssembler_x86_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_c1_LIRAssembler_x86_cpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_c1_LIRAssembler_x86_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Sun Dec 28 19:22:14 2008
-@@ -779,7 +779,7 @@ void LIR_Assembler::const2mem(LIR_Opr src, LIR_Opr des
-     case T_OBJECT:  // fall through
-     case T_ARRAY:
-       if (c->as_jobject() == NULL) {
-        __ movptr(as_Address(addr), (int32_t)NULL_WORD);
-+        __ movptr(as_Address(addr), NULL_WORD);
-       } else {
-         if (is_literal_address(addr)) {
-           ShouldNotReachHere();
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_c1_Runtime1_x86_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_c1_Runtime1_x86_cpp
@ -1,78 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_c1_Runtime1_x86_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp	Tue Dec 30 08:16:21 2008
-@@ -78,10 +78,10 @@ int StubAssembler::call_RT(Register oop_result1, Regis
-     movptr(rax, Address(thread, Thread::pending_exception_offset()));
-     // make sure that the vm_results are cleared
-     if (oop_result1->is_valid()) {
-      movptr(Address(thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
-+      movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
-     }
-     if (oop_result2->is_valid()) {
-      movptr(Address(thread, JavaThread::vm_result_2_offset()), (int32_t)NULL_WORD);
-+      movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD);
-     }
-     if (frame_size() == no_frame_size) {
-       leave();
-@@ -96,12 +96,12 @@ int StubAssembler::call_RT(Register oop_result1, Regis
-   // get oop results if there are any and reset the values in the thread
-   if (oop_result1->is_valid()) {
-     movptr(oop_result1, Address(thread, JavaThread::vm_result_offset()));
-    movptr(Address(thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
-+    movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
-     verify_oop(oop_result1);
-   }
-   if (oop_result2->is_valid()) {
-     movptr(oop_result2, Address(thread, JavaThread::vm_result_2_offset()));
-    movptr(Address(thread, JavaThread::vm_result_2_offset()), (int32_t)NULL_WORD);
-+    movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD);
-     verify_oop(oop_result2);
-   }
-   return call_offset;
-@@ -728,8 +728,8 @@ void Runtime1::generate_handle_exception(StubAssembler
- 
-   // clear exception fields in JavaThread because they are no longer needed
-   // (fields must be cleared because they are processed by GC otherwise)
-  __ movptr(Address(thread, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD);
-  __ movptr(Address(thread, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
-+  __ movptr(Address(thread, JavaThread::exception_oop_offset()), NULL_WORD);
-+  __ movptr(Address(thread, JavaThread::exception_pc_offset()), NULL_WORD);
- 
-   // pop the stub frame off
-   __ leave();
-@@ -878,7 +878,7 @@ OopMapSet* Runtime1::generate_patching(StubAssembler* 
- 
-     // load and clear pending exception
-     __ movptr(rax, Address(thread, Thread::pending_exception_offset()));
-    __ movptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
-+    __ movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD);
- 
-     // check that there is really a valid exception
-     __ verify_not_null_oop(rax);
-@@ -971,14 +971,14 @@ OopMapSet* Runtime1::generate_code_for(StubID id, Stub
-         // load pending exception oop into rax,
-         __ movptr(exception_oop, Address(thread, Thread::pending_exception_offset()));
-         // clear pending exception
-        __ movptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
-+        __ movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD);
- 
-         // load issuing PC (the return address for this stub) into rdx
-         __ movptr(exception_pc, Address(rbp, 1*BytesPerWord));
- 
-         // make sure that the vm_results are cleared (may be unnecessary)
-        __ movptr(Address(thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
-        __ movptr(Address(thread, JavaThread::vm_result_2_offset()), (int32_t)NULL_WORD);
-+        __ movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
-+        __ movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD);
- 
-         // verify that that there is really a valid exception in rax,
-         __ verify_not_null_oop(exception_oop);
-@@ -1393,7 +1393,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, Stub
-         __ ret(0);
- 
-         __ bind(miss);
-        __ movptr(Address(rsp, (super_off) * VMRegImpl::stack_slot_size), 0); // result
-+        __ movptr(Address(rsp, (super_off) * VMRegImpl::stack_slot_size), NULL_WORD); // result
-         __ pop(rax);
-         __ pop(rcx);
-         __ pop(rsi);
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_cpp
@ -1,62 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp	Tue Dec 30 00:12:45 2008
-@@ -133,7 +133,7 @@ void InterpreterMacroAssembler::load_earlyret_value(To
-                              + in_ByteSize(wordSize));
-   switch (state) {
-     case atos: movptr(rax, oop_addr);
-               movptr(oop_addr, (int32_t)NULL_WORD);
-+               movptr(oop_addr, NULL_WORD);
-                verify_oop(rax, state);                break;
-     case ltos:
-                movl(rdx, val_addr1);               // fall through
-@@ -148,8 +148,8 @@ void InterpreterMacroAssembler::load_earlyret_value(To
-   }
-   // Clean up tos value in the thread object
-   movl(tos_addr,  (int32_t) ilgl);
-  movptr(val_addr,  (int32_t)NULL_WORD);
-  NOT_LP64(movl(val_addr1, (int32_t)NULL_WORD));
-+  movptr(val_addr,  NULL_WORD);
-+  NOT_LP64(movptr(val_addr1, NULL_WORD));
- }
- 
- 
-@@ -470,10 +470,10 @@ void InterpreterMacroAssembler::store_ptr_and_tag(int 
- void InterpreterMacroAssembler::tag_local(frame::Tag tag, int n) {
-   if (TaggedStackInterpreter) {
-     if (tag == frame::TagCategory2) {
-      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (int32_t)frame::TagValue);
-      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)frame::TagValue);
-+      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (intptr_t)frame::TagValue);
-+      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)frame::TagValue);
-     } else {
-      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)tag);
-+      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)tag);
-     }
-   }
- }
-@@ -482,12 +482,12 @@ void InterpreterMacroAssembler::tag_local(frame::Tag t
-   if (TaggedStackInterpreter) {
-     if (tag == frame::TagCategory2) {
-       movptr(Address(rdi, idx, Interpreter::stackElementScale(),
-                  Interpreter::local_tag_offset_in_bytes(1)), (int32_t)frame::TagValue);
-+                  Interpreter::local_tag_offset_in_bytes(1)), (intptr_t)frame::TagValue);
-       movptr(Address(rdi, idx, Interpreter::stackElementScale(),
-                    Interpreter::local_tag_offset_in_bytes(0)), (int32_t)frame::TagValue);
-+                    Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)frame::TagValue);
-     } else {
-       movptr(Address(rdi, idx, Interpreter::stackElementScale(),
-                               Interpreter::local_tag_offset_in_bytes(0)), (int32_t)tag);
-+                               Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)tag);
-     }
-   }
- }
-@@ -944,7 +944,7 @@ void InterpreterMacroAssembler::unlock_object(Register
-     movptr(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset_in_bytes ()));
- 
-     // Free entry
-    movptr(Address(lock_reg, BasicObjectLock::obj_offset_in_bytes()), (int32_t)NULL_WORD);
-+    movptr(Address(lock_reg, BasicObjectLock::obj_offset_in_bytes()), NULL_WORD);
- 
-     if (UseBiasedLocking) {
-       biased_locking_exit(obj_reg, header_reg, done);
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_hpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_hpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp	Sun Dec 28 19:22:14 2008
-@@ -120,7 +120,7 @@ class InterpreterMacroAssembler: public MacroAssembler
-   void empty_expression_stack()                            {
-        movptr(rsp, Address(rbp, frame::interpreter_frame_monitor_block_top_offset * wordSize));
-       // NULL last_sp until next java call
-      movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
-+      movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
-   }
- 
-   // Tagged stack helpers for swap and dup
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp
@ -1,21 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp	Wed Jan 14 12:04:27 2009
-@@ -54,7 +54,7 @@ void InterpreterRuntime::SignatureHandlerGenerator::bo
-   __ cmpptr(Address(from(), Interpreter::local_offset_in_bytes(from_offset)), (int32_t)NULL_WORD); // do not use temp() to avoid AGI
-   Label L;
-   __ jcc(Assembler::notZero, L);
-  __ movptr(temp(), ((int32_t)NULL_WORD));
-+  __ movptr(temp(), NULL_WORD);
-   __ bind(L);
-   __ movptr(Address(to(), to_offset * wordSize), temp());
- }
-@@ -110,7 +110,7 @@ class SlowSignatureHandler: public NativeSignatureIter
-   virtual void pass_object() {
-     // pass address of from
-     intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0));
-    *_to++ = (*(intptr_t*)from_addr == 0) ? NULL : from_addr;
-+    *_to++ = (*(intptr_t*)from_addr == 0) ? NULL_WORD : from_addr;
-     debug_only(verify_tag(frame::TagReference));
-     _from -= Interpreter::stackElementSize();
-    }
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_runtime_x86_32_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_runtime_x86_32_cpp
@ -1,18 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_runtime_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/runtime_x86_32.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/runtime_x86_32.cpp	Sun Dec 28 19:22:14 2008
-@@ -129,11 +129,11 @@ void OptoRuntime::generate_exception_blob() {
-   // Get the exception pc in case we are deoptimized
-   __ movptr(rdx, Address(rcx, JavaThread::exception_pc_offset()));
- #ifdef ASSERT
-  __ movptr(Address(rcx, JavaThread::exception_handler_pc_offset()), (int32_t)NULL_WORD);
-  __ movptr(Address(rcx, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
-+  __ movptr(Address(rcx, JavaThread::exception_handler_pc_offset()), NULL_WORD);
-+  __ movptr(Address(rcx, JavaThread::exception_pc_offset()), NULL_WORD);
- #endif
-   // Clear the exception oop so GC no longer processes it as a root.
-  __ movptr(Address(rcx, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD);
-+  __ movptr(Address(rcx, JavaThread::exception_oop_offset()), NULL_WORD);
- 
-   __ pop(rcx);
- 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_sharedRuntime_x86_32_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_sharedRuntime_x86_32_cpp
@ -1,68 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_sharedRuntime_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Sun Dec 28 19:22:14 2008
-@@ -1793,7 +1793,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroA
-   // reset handle block
-   __ movptr(rcx, Address(thread, JavaThread::active_handles_offset()));
- 
-  __ movptr(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);
-+  __ movptr(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), NULL_WORD);
- 
-   // Any exception pending?
-   __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
-@@ -1865,7 +1865,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroA
-     // Save pending exception around call to VM (which contains an EXCEPTION_MARK)
- 
-     __ pushptr(Address(thread, in_bytes(Thread::pending_exception_offset())));
-    __ movptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
-+    __ movptr(Address(thread, in_bytes(Thread::pending_exception_offset())), NULL_WORD);
- 
- 
-     // should be a peal
-@@ -2431,7 +2431,7 @@ void SharedRuntime::generate_deopt_blob() {
-   __ get_thread(rdi);
-   __ movptr(rdx, Address(rdi, JavaThread::exception_pc_offset()));
-   __ movptr(Address(rbp, wordSize), rdx);
-  __ movptr(Address(rdi, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
-+  __ movptr(Address(rdi, JavaThread::exception_pc_offset()), NULL_WORD);
- 
- #ifdef ASSERT
-   // verify that there is really an exception oop in JavaThread
-@@ -2489,8 +2489,8 @@ void SharedRuntime::generate_deopt_blob() {
-   __ jcc(Assembler::notEqual, noException);
-   __ movptr(rax, Address(rcx, JavaThread::exception_oop_offset()));
-   __ movptr(rdx, Address(rcx, JavaThread::exception_pc_offset()));
-  __ movptr(Address(rcx, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD);
-  __ movptr(Address(rcx, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
-+  __ movptr(Address(rcx, JavaThread::exception_oop_offset()), NULL_WORD);
-+  __ movptr(Address(rcx, JavaThread::exception_pc_offset()), NULL_WORD);
- 
-   __ verify_oop(rax);
- 
-@@ -2582,7 +2582,7 @@ void SharedRuntime::generate_deopt_blob() {
-           rbx); // Make it walkable
- #else /* CC_INTERP */
-   // This value is corrected by layout_activation_impl
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD );
-+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
-   __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), rbx); // Make it walkable
- #endif /* CC_INTERP */
-   __ movptr(sp_temp, rsp);              // pass to next frame
-@@ -2802,7 +2802,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {
-           rbx); // Make it walkable
- #else /* CC_INTERP */
-   // This value is corrected by layout_activation_impl
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD );
-+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD );
-   __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), rbx); // Make it walkable
- #endif /* CC_INTERP */
-   __ movptr(sp_temp, rsp);              // pass to next frame
-@@ -3020,7 +3020,7 @@ static RuntimeStub* generate_resolve_blob(address dest
-   // exception pending => remove activation and forward to exception handler
- 
-   __ get_thread(thread);
-  __ movptr(Address(thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
-+  __ movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
-   __ movptr(rax, Address(thread, Thread::pending_exception_offset()));
-   __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
- 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_32_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_32_cpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Tue Dec 30 08:17:13 2008
-@@ -407,7 +407,7 @@ class StubGenerator: public StubCodeGenerator {
-     __ get_thread(rcx);
-     __ pop(rdx);
-     __ movptr(rax, Address(rcx, Thread::pending_exception_offset()));
-    __ movptr(Address(rcx, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
-+    __ movptr(Address(rcx, Thread::pending_exception_offset()), NULL_WORD);
- 
- #ifdef ASSERT
-     // make sure exception is set
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_64_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_64_cpp
@ -1,48 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_64_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Sun Dec 28 19:22:14 2008
-@@ -472,7 +472,7 @@ class StubGenerator: public StubCodeGenerator {
-     // setup rax & rdx, remove return address & clear pending exception
-     __ pop(rdx);
-     __ movptr(rax, Address(r15_thread, Thread::pending_exception_offset()));
-    __ movptr(Address(r15_thread, Thread::pending_exception_offset()), (int)NULL_WORD);
-+    __ movptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
- 
- #ifdef ASSERT
-     // make sure exception is set
-@@ -954,9 +954,9 @@ class StubGenerator: public StubCodeGenerator {
-     __ jcc(Assembler::zero, exit); // if obj is NULL it is OK
-     // Check if the oop is in the right area of memory
-     __ movptr(c_rarg2, rax);
-    __ movptr(c_rarg3, (int64_t) Universe::verify_oop_mask());
-+    __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_mask());
-     __ andptr(c_rarg2, c_rarg3);
-    __ movptr(c_rarg3, (int64_t) Universe::verify_oop_bits());
-+    __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_bits());
-     __ cmpptr(c_rarg2, c_rarg3);
-     __ jcc(Assembler::notZero, error);
- 
-@@ -969,9 +969,9 @@ class StubGenerator: public StubCodeGenerator {
-     __ jcc(Assembler::zero, error); // if klass is NULL it is broken
-     // Check if the klass is in the right area of memory
-     __ mov(c_rarg2, rax);
-    __ movptr(c_rarg3, (int64_t) Universe::verify_klass_mask());
-+    __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_mask());
-     __ andptr(c_rarg2, c_rarg3);
-    __ movptr(c_rarg3, (int64_t) Universe::verify_klass_bits());
-+    __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_bits());
-     __ cmpptr(c_rarg2, c_rarg3);
-     __ jcc(Assembler::notZero, error);
- 
-@@ -980,9 +980,9 @@ class StubGenerator: public StubCodeGenerator {
-     __ testptr(rax, rax);
-     __ jcc(Assembler::zero, error); // if klass' klass is NULL it is broken
-     // Check if the klass' klass is in the right area of memory
-    __ movptr(c_rarg3, (int64_t) Universe::verify_klass_mask());
-+    __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_mask());
-     __ andptr(rax, c_rarg3);
-    __ movptr(c_rarg3, (int64_t) Universe::verify_klass_bits());
-+    __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_bits());
-     __ cmpptr(rax, c_rarg3);
-     __ jcc(Assembler::notZero, error);
- 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_templateInterpreter_x86_32_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_templateInterpreter_x86_32_cpp
@ -1,84 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_templateInterpreter_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Tue Dec 30 00:30:18 2008
-@@ -110,7 +110,7 @@ address TemplateInterpreterGenerator::generate_excepti
-     if (message != NULL) {
-       __ lea(rbx, ExternalAddress((address)message));
-     } else {
-      __ movptr(rbx, (int32_t)NULL_WORD);
-+      __ movptr(rbx, NULL_WORD);
-     }
-     __ call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::create_exception), rax, rbx);
-   }
-@@ -123,7 +123,7 @@ address TemplateInterpreterGenerator::generate_excepti
- address TemplateInterpreterGenerator::generate_continuation_for(TosState state) {
-   address entry = __ pc();
-   // NULL last_sp until next java call
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
-+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
-   __ dispatch_next(state);
-   return entry;
- }
-@@ -176,7 +176,7 @@ address TemplateInterpreterGenerator::generate_return_
-   // Restore stack bottom in case i2c adjusted stack
-   __ movptr(rsp, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
-   // and NULL it as marker that rsp is now tos until next java call
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
-+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
- 
-   __ restore_bcp();
-   __ restore_locals();
-@@ -211,7 +211,7 @@ address TemplateInterpreterGenerator::generate_deopt_e
- 
-   // The stack is not extended by deopt but we must NULL last_sp as this
-   // entry is like a "return".
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
-+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
-   __ restore_bcp();
-   __ restore_locals();
-   // handle exceptions
-@@ -382,7 +382,7 @@ void InterpreterGenerator::generate_counter_overflow(L
-   // indicating if the counter overflow occurs at a backwards branch (non-NULL bcp).
-   // The call returns the address of the verified entry point for the method or NULL
-   // if the compilation did not complete (either went background or bailed out).
-  __ movptr(rax, (int32_t)false);
-+  __ movptr(rax, (intptr_t)false);
-   __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax);
- 
-   __ movptr(rbx, Address(rbp, method_offset));   // restore methodOop
-@@ -1028,7 +1028,7 @@ address InterpreterGenerator::generate_native_entry(bo
- 
-   // reset handle block
-   __ movptr(t, Address(thread, JavaThread::active_handles_offset()));
-  __ movptr(Address(t, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);
-+  __ movptr(Address(t, JNIHandleBlock::top_offset_in_bytes()), NULL_WORD);
- 
-   // If result was an oop then unbox and save it in the frame
-   { Label L;
-@@ -1488,7 +1488,7 @@ void TemplateInterpreterGenerator::generate_throw_exce
- 
-   // Restore sp to interpreter_frame_last_sp even though we are going
-   // to empty the expression stack for the exception processing.
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
-+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
-   // rax,: exception
-   // rdx: return address/pc that threw exception
-   __ restore_bcp();                              // rsi points to call/send
-@@ -1608,7 +1608,7 @@ void TemplateInterpreterGenerator::generate_throw_exce
-   __ reset_last_Java_frame(rcx, true, true);
-   // Restore the last_sp and null it out
-   __ movptr(rsp, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
-+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
- 
-   __ restore_bcp();
-   __ restore_locals();
-@@ -1636,7 +1636,7 @@ void TemplateInterpreterGenerator::generate_throw_exce
-   // restore exception
-   __ get_thread(rcx);
-   __ movptr(rax, Address(rcx, JavaThread::vm_result_offset()));
-  __ movptr(Address(rcx, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
-+  __ movptr(Address(rcx, JavaThread::vm_result_offset()), NULL_WORD);
-   __ verify_oop(rax);
- 
-   // Inbetween activations - previous activation type unknown yet
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_templateTable_x86_32_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_templateTable_x86_32_cpp
@ -1,40 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_templateTable_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp.orig	Fri Dec 19 03:42:04 2008
-+++ hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp	Tue Dec 30 08:19:28 2008
-@@ -137,10 +137,10 @@ static void do_oop_store(InterpreterMacroAssembler* _m
-         // Do the actual store
-         // noreg means NULL
-         if (val == noreg) {
-          __ movl(Address(rdx, 0), NULL_WORD);
-+          __ movptr(Address(rdx, 0), NULL_WORD);
-           // No post barrier for NULL
-         } else {
-          __ movl(Address(rdx, 0), val);
-+          __ movptr(Address(rdx, 0), val);
-           __ g1_write_barrier_post(rdx, rax, rcx, rbx, rsi);
-         }
-         __ restore_bcp();
-@@ -152,9 +152,9 @@ static void do_oop_store(InterpreterMacroAssembler* _m
-     case BarrierSet::CardTableExtension:
-       {
-         if (val == noreg) {
-          __ movl(obj, NULL_WORD);
-+          __ movptr(obj, NULL_WORD);
-         } else {
-          __ movl(obj, val);
-+          __ movptr(obj, val);
-           // flatten object address if needed
-           if (!precise || (obj.index() == noreg && obj.disp() == 0)) {
-             __ store_check(obj.base());
-@@ -168,9 +168,9 @@ static void do_oop_store(InterpreterMacroAssembler* _m
-     case BarrierSet::ModRef:
-     case BarrierSet::Other:
-       if (val == noreg) {
-        __ movl(obj, NULL_WORD);
-+        __ movptr(obj, NULL_WORD);
-       } else {
-        __ movl(obj, val);
-+        __ movptr(obj, val);
-       }
-       break;
-     default      :
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_x86_32_ad
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_x86_32_ad
@ -1,48 +0,0 @@
-$OpenBSD: patch-hotspot_src_cpu_x86_vm_x86_32_ad,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/x86_32.ad.orig	Fri Dec 19 03:42:05 2008
-+++ hotspot/src/cpu/x86/vm/x86_32.ad	Sun Dec 28 19:22:15 2008
-@@ -3371,7 +3371,7 @@ encode %{
-          masm.movptr(Address(boxReg, 0), 3) ;            // results in ST-before-CAS penalty
-          masm.get_thread (scrReg) ; 
-          masm.movptr(boxReg, tmpReg);                    // consider: LEA box, [tmp-2] 
-         masm.movptr(tmpReg, 0);                         // consider: xor vs mov
-+         masm.movptr(tmpReg, NULL_WORD);                 // consider: xor vs mov
-          if (os::is_MP()) { masm.lock(); } 
-          masm.cmpxchgptr(scrReg, Address(boxReg, ObjectMonitor::owner_offset_in_bytes()-2)) ; 
-       } else 
-@@ -3387,7 +3387,7 @@ encode %{
- 
-          if ((EmitSync & 64) == 0) {
-            // Optimistic form: consider XORL tmpReg,tmpReg
-           masm.movptr(tmpReg, 0 ) ; 
-+           masm.movptr(tmpReg, NULL_WORD) ; 
-          } else { 
-            // Can suffer RTS->RTO upgrades on shared or cold $ lines
-            // Test-And-CAS instead of CAS
-@@ -3587,7 +3587,7 @@ encode %{
-          masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ; 
-          masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ; 
-          masm.jccb  (Assembler::notZero, DONE_LABEL) ; 
-         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ; 
-+         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ; 
-          masm.jmpb  (DONE_LABEL) ; 
-       } else { 
-          masm.xorptr(boxReg, Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2)) ;  
-@@ -3596,7 +3596,7 @@ encode %{
-          masm.movptr(boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ; 
-          masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ; 
-          masm.jccb  (Assembler::notZero, CheckSucc) ; 
-         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ; 
-+         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ; 
-          masm.jmpb  (DONE_LABEL) ; 
-       }
- 
-@@ -3644,7 +3644,7 @@ encode %{
-          // We currently use (3), although it's likely that switching to (2)
-          // is correct for the future.
-             
-         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ; 
-+         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ; 
-          if (os::is_MP()) { 
-             if (VM_Version::supports_sse2() && 1 == FenceInstruction) { 
-               masm.mfence();
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_launcher_java_md_c
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_launcher_java_md_c
@ -0,0 +1,131 @@
+$OpenBSD: patch-hotspot_src_os_bsd_launcher_java_md_c,v 1.1 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/src/os/bsd/launcher/java_md.c.orig	Fri May 15 17:19:44 2009
+++ hotspot/src/os/bsd/launcher/java_md.c	Fri May 15 17:58:17 2009
+@@ -45,8 +45,15 @@
+ #include "version_comp.h"
+ #endif
+ 
+#ifdef __APPLE__
+#define JVM_DLL "libjvm.dylib"
+#define JAVA_DLL "libjava.dylib"
+#define LD_LIBRARY_PATH "DYLD_LIBRARY_PATH"
+#else
+ #define JVM_DLL "libjvm.so"
+ #define JAVA_DLL "libjava.so"
+#define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
+#endif
+ 
+ #ifndef GAMMA   /* launcher.make defines ARCH */
+ 
+@@ -112,7 +119,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).
+  */
+-#ifdef __bsd__
+#ifdef _ALLBSD_SOURCE
+ static const char *system_dir   = "/usr/java";
+ static const char *user_dir     = "/java";
+ #else /* Solaris */
+@@ -456,10 +463,10 @@ CreateExecutionEnvironment(int *_argcp,
+        * If not on Solaris, assume only a single LD_LIBRARY_PATH
+        * variable.
+        */
+-      runpath = getenv("LD_LIBRARY_PATH");
+      runpath = getenv(LD_LIBRARY_PATH);
+ #endif /* __sun */
+ 
+-#ifdef __bsd
+#ifdef _ALLBSD_SOURCE
+       /*
+        * On bsd, if a binary is running as sgid or suid, glibc sets
+        * LD_LIBRARY_PATH to the empty string for security purposes.  (In
+@@ -483,7 +490,7 @@ CreateExecutionEnvironment(int *_argcp,
+       new_runpath = MemAlloc( ((runpath!=NULL)?strlen(runpath):0) +
+                               2*strlen(jrepath) + 2*strlen(arch) +
+                               strlen(jvmpath) + 52);
+-      newpath = new_runpath + strlen("LD_LIBRARY_PATH=");
+      newpath = new_runpath + strlen(LD_LIBRARY_PATH "=");
+ 
+ 
+       /*
+@@ -498,7 +505,7 @@ CreateExecutionEnvironment(int *_argcp,
+ 
+         /* jvmpath, ((running != wanted)?((wanted==64)?"/"BIG_ARCH:"/.."):""), */
+ 
+-        sprintf(new_runpath, "LD_LIBRARY_PATH="
+        sprintf(new_runpath, LD_LIBRARY_PATH "="
+                 "%s:"
+                 "%s/lib/%s:"
+                 "%s/../lib/%s",
+@@ -836,7 +843,7 @@ GetXUsagePath(char *buf, jint bufsize)
+ jboolean
+ GetApplicationHome(char *buf, jint bufsize)
+ {
+-#ifdef __bsd__
+#ifdef _ALLBSD_SOURCE
+     char *execname = GetExecname();
+     if (execname) {
+         strncpy(buf, execname, bufsize-1);
+@@ -1005,7 +1012,7 @@ SetExecname(char **argv)
+             }
+         }
+     }
+-#elif defined(__bsd__)
+#elif defined(__linux__)
+     {
+         const char* self = "/proc/self/exe";
+         char buf[PATH_MAX+1];
+@@ -1015,7 +1022,7 @@ SetExecname(char **argv)
+             exec_path = strdup(buf);
+         }
+     }
+-#else /* !__sun && !__bsd */
+#else /* !__sun && !__linux */
+     {
+         /* Not implemented */
+     }
+@@ -1220,7 +1227,7 @@ get_cpuid(uint32_t arg,
+ 
+ #endif /* __sun && i586 */
+ 
+-#if defined(__bsd__) && defined(i586)
+#if defined(_ALLBSD_SOURCE) && defined(i586)
+ 
+ /*
+  * A utility method for asking the CPU about itself.
+@@ -1286,7 +1293,7 @@ get_cpuid(uint32_t arg,
+ #endif
+ }
+ 
+-#endif /* __bsd__ && i586 */
+#endif /* _ALLBSD_SOURCE && i586 */
+ 
+ #ifdef i586
+ /*
+@@ -1465,7 +1472,7 @@ solaris_i586_ServerClassMachine(void) {
+ 
+ #endif /* __sun && i586 */
+ 
+-#if defined(__bsd__) && defined(i586)
+#if defined(_ALLBSD_SOURCE) && defined(i586)
+ 
+ /* The definition of a server-class machine for bsd-i586 */
+ jboolean
+@@ -1496,7 +1503,7 @@ bsd_i586_ServerClassMachine(void) {
+   return result;
+ }
+ 
+-#endif /* __bsd__ && i586 */
+#endif /* _ALLBSD_SOURCE && i586 */
+ 
+ /* Dispatch to the platform-specific definition of "server-class" */
+ jboolean
+@@ -1506,7 +1513,7 @@ ServerClassMachine(void) {
+   result = solaris_sparc_ServerClassMachine();
+ #elif defined(__sun) && defined(i586)
+   result = solaris_i586_ServerClassMachine();
+-#elif defined(__bsd__) && defined(i586)
+#elif defined(_ALLBSD_SOURCE) && defined(i586)
+   result = bsd_i586_ServerClassMachine();
+ #else
+   if (_launcher_debug) {
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_attachListener_bsd_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_attachListener_bsd_cpp
@ -1,7 +1,47 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_attachListener_bsd_cpp,v 1.2 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp.orig	Wed Nov  7 12:41:29 2007
-+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp	Wed Nov  7 12:41:35 2007
-@@ -330,6 +330,15 @@ BsdAttachOperation* BsdAttachListener::dequeue() {
+$OpenBSD: patch-hotspot_src_os_bsd_vm_attachListener_bsd_cpp,v 1.3 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp.orig	Fri May 15 16:25:27 2009
+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp	Fri May 15 17:25:06 2009
+@@ -179,32 +179,19 @@ int BsdAttachListener::init() {
+   struct sockaddr_un addr;
+   addr.sun_family = AF_UNIX;
+ 
+-  // FIXME: Prior to b39 the tool-side API expected to find the well
+-  // known file in the working directory. To allow this libjvm.so work with
+-  // a pre-b39 SDK we create it in the working directory if
+-  // +StartAttachListener is used is used. All unit tests for this feature
+-  // currently used this flag. Once b39 SDK has been promoted we can remove
+-  // this code.
+-  if (StartAttachListener) {
+-    sprintf(path, ".java_pid%d", os::current_process_id());
+-    strcpy(addr.sun_path, path);
+-    ::unlink(path);
+-    res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr));
+-  }
+  sprintf(path, "%s/.java_pid%d", os::get_temp_directory(), os::current_process_id());
+  strcpy(addr.sun_path, path);
+  ::unlink(path);
+  res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr));
+   if (res == -1) {
+-    sprintf(path, "%s/.java_pid%d", os::get_temp_directory(), os::current_process_id());
+-    strcpy(addr.sun_path, path);
+-    ::unlink(path);
+-    res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr));
+-  }
+-  if (res == -1) {
+     RESTARTABLE(::close(listener), res);
+     return -1;
+   }
+   set_path(path);
+ 
+-  // put in listen mode and set permission
+-  if ((::listen(listener, 5) == -1) || (::chmod(path, S_IREAD|S_IWRITE) == -1)) {
+  // put in listen mode and set permission and ownership
+  if ((::listen(listener, 5) == -1) || (::chmod(path, S_IREAD|S_IWRITE) == -1) ||
+      (::chown(path, geteuid(), getegid()) == -1)) {
+     RESTARTABLE(::close(listener), res);
+     ::unlink(path);
+     set_path(NULL);
+@@ -330,6 +317,15 @@ BsdAttachOperation* BsdAttachListener::dequeue() {
 
     // get the credentials of the peer and check the effective uid/guid
     // - check with jeff on this.
@ -17,7 +57,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_attachListener_bsd_cpp,v 1.2 2008/03/19 18
     struct ucred cred_info;
     socklen_t optlen = sizeof(cred_info);
     if (::getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void*)&cred_info, &optlen) == -1) {
-@@ -337,10 +346,13 @@ BsdAttachOperation* BsdAttachListener::dequeue() {
+@@ -337,10 +333,13 @@ BsdAttachOperation* BsdAttachListener::dequeue() {
       RESTARTABLE(::close(s), res);
       continue;
     }
@ -32,18 +72,24 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_attachListener_bsd_cpp,v 1.2 2008/03/19 18
       int res;
       RESTARTABLE(::close(s), res);
       continue;
-@@ -463,11 +475,11 @@ bool AttachListener::is_init_trigger() {
-   char fn[32];
-   sprintf(fn, ".attach_pid%d", os::current_process_id());
+@@ -460,15 +459,12 @@ bool AttachListener::is_init_trigger() {
+   if (init_at_startup() || is_initialized()) {
+     return false;               // initialized at startup or already initialized
+   }
+-  char fn[32];
+-  sprintf(fn, ".attach_pid%d", os::current_process_id());
+  char path[PATH_MAX + 1];
   int ret;
 -  struct stat64 st;
 -  RESTARTABLE(::stat64(fn, &st), ret);
-+  struct stat st;
-+  RESTARTABLE(::stat(fn, &st), ret);
-   if (ret == -1) {
-     sprintf(fn, "/tmp/.attach_pid%d", os::current_process_id());
+-  if (ret == -1) {
+-    sprintf(fn, "/tmp/.attach_pid%d", os::current_process_id());
 -    RESTARTABLE(::stat64(fn, &st), ret);
-+    RESTARTABLE(::stat(fn, &st), ret);
-   }
+-  }
+  struct stat st;
+
+  sprintf(path, "%s/.attach_pid%d", os::get_temp_directory(), os::current_process_id());
+  RESTARTABLE(::stat(path, &st), ret);
   if (ret == 0) {
     // simple check to avoid starting the attach mechanism when
+     // a bogus user creates the file
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_hpi_bsd_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_hpi_bsd_cpp
@ -0,0 +1,32 @@
+$OpenBSD: patch-hotspot_src_os_bsd_vm_hpi_bsd_cpp,v 1.1 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/src/os/bsd/vm/hpi_bsd.cpp.orig	Fri May 15 17:26:11 2009
+++ hotspot/src/os/bsd/vm/hpi_bsd.cpp	Fri May 15 17:26:18 2009
+@@ -28,6 +28,14 @@
+ # include <sys/param.h>
+ # include <dlfcn.h>
+ 
+#ifdef __APPLE__
+#define HPI_LIB "libhpi.dylib"
+#define HPI_G_LIB "libhpi.dylib"
+#else
+#define HPI_LIB "libhpi.so"
+#define HPI_G_LIB "libhpi.so"
+#endif
+
+ typedef jint (JNICALL *init_t)(GetInterfaceFunc *, void *);
+ 
+ void hpi::initialize_get_interface(vm_calls_t *callbacks) {
+@@ -45,11 +53,11 @@ void hpi::initialize_get_interface(vm_calls_t *callbac
+       os::jvm_path(buf, JVM_MAXPATHLEN);
+ 
+ #ifdef PRODUCT
+-      const char * hpi_lib = "/libhpi.so";
+      const char * hpi_lib = "/" HPI_LIB;
+ #else
+       char * ptr = strrchr(buf, '/');
+       assert(strstr(ptr, "/libjvm") == ptr, "invalid library name");
+-      const char * hpi_lib = strstr(ptr, "_g") ? "/libhpi_g.so" : "/libhpi.so";
+      const char * hpi_lib = strstr(ptr, "_g") ? "/" HPI_G_LIB : "/" HPI_LIB;
+ #endif
+ 
+       *(strrchr(buf, '/')) = '\0';  /* get rid of /libjvm.so */
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_jvm_bsd_h
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_jvm_bsd_h
@ -1,7 +1,19 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_jvm_bsd_h,v 1.3 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os/bsd/vm/jvm_bsd.h.orig	Wed Nov  7 12:41:29 2007
-+++ hotspot/src/os/bsd/vm/jvm_bsd.h	Wed Nov  7 12:41:35 2007
-@@ -90,6 +90,20 @@
+$OpenBSD: patch-hotspot_src_os_bsd_vm_jvm_bsd_h,v 1.4 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/src/os/bsd/vm/jvm_bsd.h.orig	Fri May 15 16:25:27 2009
+++ hotspot/src/os/bsd/vm/jvm_bsd.h	Fri May 15 17:27:11 2009
+@@ -51,7 +51,11 @@
+ #define AGENT_ONATTACH_SYMBOLS  {"Agent_OnAttach"}
+ 
+ #define JNI_LIB_PREFIX "lib"
+#ifdef __APPLE__
+#define JNI_LIB_SUFFIX ".dylib"
+#else
+ #define JNI_LIB_SUFFIX ".so"
+#endif
+ 
+ // Hack: MAXPATHLEN is 4095 on some Bsd and 4096 on others. This may
+ //       cause problems if JVM and the rest of JDK are built on different
+@@ -90,6 +94,20 @@
 #define SHUTDOWN2_SIGNAL SIGINT
 #define SHUTDOWN3_SIGNAL SIGTERM
 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_hpp
@ -1,7 +1,20 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.4 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.hpp.orig	Wed Dec 24 10:02:07 2008
-+++ hotspot/src/os/bsd/vm/os_bsd.hpp	Wed Dec 24 10:04:07 2008
-@@ -47,6 +47,7 @@ class Bsd {
+$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.5 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/src/os/bsd/vm/os_bsd.hpp.orig	Wed May 20 17:42:24 2009
+++ hotspot/src/os/bsd/vm/os_bsd.hpp	Wed May 20 19:02:42 2009
+@@ -27,6 +27,12 @@
+ /* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
+ typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
+ 
+#ifdef __APPLE__
+// Mac OS X doesn't support clock_gettime. Stub out the type, it is
+// unused
+typedef int clockid_t;
+#endif
+
+ class Bsd {
+   friend class os;
+ 
+@@ -47,6 +53,7 @@ class Bsd {
   static int sigflags[MAXSIGNUM];
 
   static int (*_clock_gettime)(clockid_t, struct timespec *);
@ -9,7 +22,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.4 2009/01/04 23:25:16 kurt
   static int (*_pthread_getcpuclockid)(pthread_t, clockid_t *);
 
   static address   _initial_thread_stack_bottom;
-@@ -58,6 +59,7 @@ class Bsd {
+@@ -58,6 +65,7 @@ class Bsd {
   static bool _is_floating_stack;
   static bool _is_NPTL;
   static bool _supports_fast_thread_cpu_time;
@ -17,7 +30,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.4 2009/01/04 23:25:16 kurt
 
   static GrowableArray<int>* _cpu_to_node;
 
-@@ -65,38 +67,73 @@ class Bsd {
+@@ -65,38 +73,73 @@ class Bsd {
 
   static julong _physical_memory;
   static pthread_t _main_thread;
@ -91,7 +104,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.4 2009/01/04 23:25:16 kurt
   static bool is_initial_thread(void);
 
   static int page_size(void)                                        { return _page_size; }
-@@ -133,6 +170,7 @@ class Bsd {
+@@ -133,6 +176,7 @@ class Bsd {
   static struct sigaction *get_chained_signal_action(int sig);
   static bool chained_handler(int sig, siginfo_t* siginfo, void* context);
 
@ -99,15 +112,15 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.4 2009/01/04 23:25:16 kurt
   // GNU libc and libpthread version strings
   static const char *glibc_version()          { return _glibc_version; }
   static const char *libpthread_version()     { return _libpthread_version; }
-@@ -146,6 +184,7 @@ class Bsd {
-   static bool is_floating_stack()             { return _is_floating_stack; }
- 
+@@ -148,6 +192,7 @@ class Bsd {
   static void libpthread_init();
-+#endif
   static bool libnuma_init();
- 
+   static void* libnuma_dlsym(void* handle, const char* name);
+#endif
   // Minimum stack size a thread can be created with (allowing
-@@ -156,17 +195,21 @@ class Bsd {
+   // the VM to completely create the thread and enter user code)
+   static size_t min_stack_allowed;
+@@ -156,17 +201,21 @@ class Bsd {
   static size_t default_stack_size(os::ThreadType thr_type);
   static size_t default_guard_size(os::ThreadType thr_type);
 
@ -129,7 +142,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.4 2009/01/04 23:25:16 kurt
 
   static bool supports_monotonic_clock() {
     return _clock_gettime != NULL;
-@@ -176,6 +219,7 @@ class Bsd {
+@@ -176,6 +225,7 @@ class Bsd {
     return _clock_gettime ? _clock_gettime(clock_id, tp) : -1;
   }
 
@ -137,7 +150,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.4 2009/01/04 23:25:16 kurt
   static int pthread_getcpuclockid(pthread_t tid, clockid_t *clock_id) {
     return _pthread_getcpuclockid ? _pthread_getcpuclockid(tid, clock_id) : -1;
   }
-@@ -185,6 +229,7 @@ class Bsd {
+@@ -185,6 +235,7 @@ class Bsd {
   }
 
   static jlong fast_thread_cpu_time(clockid_t clockid);
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_bsd_x86_32_s
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_bsd_x86_32_s
@ -1,29 +1,206 @@
-$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_bsd_x86_32_s,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s.orig	Tue Feb 26 18:50:51 2008
-+++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s	Tue Feb 26 18:50:54 2008
-@@ -21,6 +21,7 @@
+$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_bsd_x86_32_s,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s.orig	Fri May 15 16:25:28 2009
+++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s	Fri May 15 17:42:58 2009
+@@ -19,8 +19,19 @@
+ # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
- # 
+-# 
+#
 
-+	.globl fixcw
+ 
+#ifdef __APPLE__
+# Darwin uses _ prefixed global symbols
+#define SYMBOL(s) _ ## s
+#define ELF_TYPE(name, description)
+#else
+#define SYMBOL(s) s
+#define ELF_TYPE(name, description) .type name,description
+#endif
+
+	.globl SYMBOL(fixcw)
 	
         # NOTE WELL!  The _Copy functions are called directly
 	# from server-compiler-generated code via CallLeafNoFP,
-@@ -41,6 +42,17 @@
+@@ -28,41 +39,61 @@
+ 	# point or use it in the same manner as does the server
+ 	# compiler.
+ 	
+-        .globl _Copy_conjoint_bytes
+-        .globl _Copy_arrayof_conjoint_bytes
+-        .globl _Copy_conjoint_jshorts_atomic
+-	.globl _Copy_arrayof_conjoint_jshorts
+-        .globl _Copy_conjoint_jints_atomic
+-        .globl _Copy_arrayof_conjoint_jints
+-	.globl _Copy_conjoint_jlongs_atomic
+-	.globl _mmx_Copy_arrayof_conjoint_jshorts
+        .globl SYMBOL(_Copy_conjoint_bytes)
+        .globl SYMBOL(_Copy_arrayof_conjoint_bytes)
+        .globl SYMBOL(_Copy_conjoint_jshorts_atomic)
+	.globl SYMBOL(_Copy_arrayof_conjoint_jshorts)
+        .globl SYMBOL(_Copy_conjoint_jints_atomic)
+        .globl SYMBOL(_Copy_arrayof_conjoint_jints)
+	.globl SYMBOL(_Copy_conjoint_jlongs_atomic)
+	.globl SYMBOL(_mmx_Copy_arrayof_conjoint_jshorts)
+ 
+-        .globl _Atomic_cmpxchg_long
+        .globl SYMBOL(_Atomic_cmpxchg_long)
 
 	.text
 
+-        .globl  SafeFetch32, Fetch32PFI, Fetch32Resume
+-        .globl  SafeFetchN
 +# Support for void os::Solaris::init_thread_fpu_state() in os_solaris_i486.cpp
 +# Set fpu to 53 bit precision.  This happens too early to use a stub.
 +# ported from solaris_x86_32.s
+#ifdef __APPLE__
+        .align   4
+#else
 +	.align   16
-+fixcw:
+#endif
+SYMBOL(fixcw):
 +	pushl    $0x27f
 +	fldcw    0(%esp)
 +	popl     %eax
 +	ret
 +
-+       .align  16
-         .globl  SafeFetch32, Fetch32PFI, Fetch32Resume
-         .globl  SafeFetchN
+#ifdef __APPLE__
+        .align   4
+#else
+        .align   16
+#endif
+
+        .globl  SYMBOL(SafeFetch32), SYMBOL(Fetch32PFI), SYMBOL(Fetch32Resume)
+        .globl  SYMBOL(SafeFetchN)
         ## TODO: avoid exposing Fetch32PFI and Fetch32Resume.
+         ## Instead, the signal handler would call a new SafeFetchTriage(FaultingEIP)
+         ## routine to vet the address.  If the address is the faulting LD then
+         ## SafeFetchTriage() would return the resume-at EIP, otherwise null.
+-	.type    SafeFetch32,@function
+	ELF_TYPE(SafeFetch32,@function)
+         .p2align 4,,15
+-SafeFetch32:
+-SafeFetchN:
+SYMBOL(SafeFetch32):
+SYMBOL(SafeFetchN):
+          movl    0x8(%esp), %eax
+          movl    0x4(%esp), %ecx
+-Fetch32PFI:
+SYMBOL(Fetch32PFI):
+          movl    (%ecx), %eax
+-Fetch32Resume:
+SYMBOL(Fetch32Resume):
+          ret
+ 
+ 
+-        .globl  SpinPause
+-	.type   SpinPause,@function
+        .globl  SYMBOL(SpinPause)
+	ELF_TYPE(SpinPause,@function)
+         .p2align 4,,15
+-SpinPause:
+SYMBOL(SpinPause):
+         rep
+         nop
+         movl    $1, %eax
+@@ -72,8 +103,8 @@ SpinPause:
+         #                                       void* to,
+         #                                       size_t count)
+         .p2align 4,,15
+-	.type    _Copy_conjoint_bytes,@function
+-_Copy_conjoint_bytes:
+	ELF_TYPE(_Copy_conjoint_bytes,@function)
+SYMBOL(_Copy_conjoint_bytes):
+         pushl    %esi
+         movl     4+12(%esp),%ecx      # count
+         pushl    %edi
+@@ -180,8 +211,8 @@ cb_CopyLeft:
+         #
+         # Same as _Copy_conjoint_bytes, except no source alignment check.
+         .p2align 4,,15
+-	.type    _Copy_arrayof_conjoint_bytes,@function
+-_Copy_arrayof_conjoint_bytes:
+	ELF_TYPE(_Copy_arrayof_conjoint_bytes,@function)
+SYMBOL(_Copy_arrayof_conjoint_bytes):
+         pushl    %esi
+         movl     4+12(%esp),%ecx      # count
+         pushl    %edi
+@@ -268,8 +299,8 @@ acb_CopyLeft:
+         #                                                void* to,
+         #                                                size_t count)
+         .p2align 4,,15
+-	.type    _Copy_conjoint_jshorts_atomic,@function
+-_Copy_conjoint_jshorts_atomic:
+	ELF_TYPE(_Copy_conjoint_jshorts_atomic,@function)
+SYMBOL(_Copy_conjoint_jshorts_atomic):
+         pushl    %esi
+         movl     4+12(%esp),%ecx      # count
+         pushl    %edi
+@@ -354,8 +385,8 @@ cs_CopyLeft:
+         #                                                 void* to,
+         #                                                 size_t count)
+         .p2align 4,,15
+-	.type    _Copy_arrayof_conjoint_jshorts,@function
+-_Copy_arrayof_conjoint_jshorts:
+	ELF_TYPE(_Copy_arrayof_conjoint_jshorts,@function)
+SYMBOL(_Copy_arrayof_conjoint_jshorts):
+         pushl    %esi
+         movl     4+12(%esp),%ecx      # count
+         pushl    %edi
+@@ -431,10 +462,10 @@ acs_CopyLeft:
+         # Equivalent to
+         #   arrayof_conjoint_jints
+         .p2align 4,,15
+-	.type    _Copy_conjoint_jints_atomic,@function
+-	.type    _Copy_arrayof_conjoint_jints,@function
+-_Copy_conjoint_jints_atomic:
+-_Copy_arrayof_conjoint_jints:
+	ELF_TYPE(_Copy_conjoint_jints_atomic,@function)
+	ELF_TYPE(_Copy_arrayof_conjoint_jints,@function)
+SYMBOL(_Copy_conjoint_jints_atomic):
+SYMBOL(_Copy_arrayof_conjoint_jints):
+         pushl    %esi
+         movl     4+12(%esp),%ecx      # count
+         pushl    %edi
+@@ -494,7 +525,7 @@ ci_CopyLeft:
+         #
+         # count treated as signed
+         #
+-        # if (from > to) {
+        # // if (from > to) {
+         #   while (--count >= 0) {
+         #     *to++ = *from++;
+         #   }
+@@ -504,8 +535,8 @@ ci_CopyLeft:
+         #   }
+         # }
+         .p2align 4,,15
+-	.type    _Copy_conjoint_jlongs_atomic,@function
+-_Copy_conjoint_jlongs_atomic:
+	ELF_TYPE(_Copy_conjoint_jlongs_atomic,@function)
+SYMBOL(_Copy_conjoint_jlongs_atomic):
+         movl     4+8(%esp),%ecx       # count
+         movl     4+0(%esp),%eax       # from
+         movl     4+4(%esp),%edx       # to
+@@ -533,8 +564,8 @@ cla_CopyLeft:
+         #                                                 void* to,
+         #                                                 size_t count)
+         .p2align 4,,15
+-	.type    _mmx_Copy_arrayof_conjoint_jshorts,@function
+-_mmx_Copy_arrayof_conjoint_jshorts:
+	ELF_TYPE(_mmx_Copy_arrayof_conjoint_jshorts,@function)
+SYMBOL(_mmx_Copy_arrayof_conjoint_jshorts):
+         pushl    %esi
+         movl     4+12(%esp),%ecx
+         pushl    %edi
+@@ -632,8 +663,8 @@ mmx_acs_CopyLeft:
+         #                                   bool is_MP)
+         #
+         .p2align 4,,15
+-	.type    _Atomic_cmpxchg_long,@function
+-_Atomic_cmpxchg_long:
+	ELF_TYPE(_Atomic_cmpxchg_long,@function)
+SYMBOL(_Atomic_cmpxchg_long):
+                                    #  8(%esp) : return PC
+         pushl    %ebx              #  4(%esp) : old %ebx
+         pushl    %edi              #  0(%esp) : old %edi
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_bsd_x86_64_s
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_bsd_x86_64_s
@ -0,0 +1,150 @@
+$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_bsd_x86_64_s,v 1.1 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s.orig	Fri May 15 17:43:50 2009
+++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s	Fri May 15 17:44:04 2009
+@@ -21,6 +21,14 @@
+ # have any questions.
+ #
+ 
+#ifdef __APPLE__
+# Darwin uses _ prefixed global symbols
+#define SYMBOL(s) _ ## s
+#define ELF_TYPE(name, description)
+#else
+#define SYMBOL(s) s
+#define ELF_TYPE(name, description) .type name,description
+#endif
+ 
+         # NOTE WELL!  The _Copy functions are called directly
+ 	# from server-compiler-generated code via CallLeafNoFP,
+@@ -28,42 +36,54 @@
+ 	# point or use it in the same manner as does the server
+ 	# compiler.
+ 	
+-        .globl _Copy_arrayof_conjoint_bytes
+-	.globl _Copy_arrayof_conjoint_jshorts
+-        .globl _Copy_conjoint_jshorts_atomic
+-        .globl _Copy_arrayof_conjoint_jints
+-        .globl _Copy_conjoint_jints_atomic
+-        .globl _Copy_arrayof_conjoint_jlongs
+-        .globl _Copy_conjoint_jlongs_atomic
+        .globl SYMBOL(_Copy_arrayof_conjoint_bytes)
+	.globl SYMBOL(_Copy_arrayof_conjoint_jshorts)
+        .globl SYMBOL(_Copy_conjoint_jshorts_atomic)
+        .globl SYMBOL(_Copy_arrayof_conjoint_jints)
+        .globl SYMBOL(_Copy_conjoint_jints_atomic)
+        .globl SYMBOL(_Copy_arrayof_conjoint_jlongs)
+        .globl SYMBOL(_Copy_conjoint_jlongs_atomic)
+ 
+ 	.text
+ 
+-        .globl SafeFetch32, Fetch32PFI, Fetch32Resume
+        .globl SYMBOL(SafeFetch32), SYMBOL(Fetch32PFI), SYMBOL(Fetch32Resume)
+#ifdef __APPLE__
+        .align  4
+#else
+         .align  16
+-        .type   SafeFetch32,@function
+#endif
+        ELF_TYPE(SafeFetch32,@function)
+         // Prototype: int SafeFetch32 (int * Adr, int ErrValue) 
+-SafeFetch32:
+SYMBOL(SafeFetch32):
+         movl    %esi, %eax
+-Fetch32PFI:
+SYMBOL(Fetch32PFI):
+         movl    (%rdi), %eax
+-Fetch32Resume:
+SYMBOL(Fetch32Resume):
+         ret
+ 
+-        .globl SafeFetchN, FetchNPFI, FetchNResume
+        .globl SYMBOL(SafeFetchN), SYMBOL(FetchNPFI), SYMBOL(FetchNResume)
+#ifdef __APPLE__
+        .align  4
+#else
+         .align  16
+-        .type   SafeFetchN,@function
+#endif
+        ELF_TYPE(SafeFetchN,@function)
+         // Prototype: intptr_t SafeFetchN (intptr_t * Adr, intptr_t ErrValue) 
+-SafeFetchN:
+SYMBOL(SafeFetchN):
+         movq    %rsi, %rax
+-FetchNPFI:
+SYMBOL(FetchNPFI):
+         movq    (%rdi), %rax
+-FetchNResume:
+SYMBOL(FetchNResume):
+         ret
+ 
+-        .globl SpinPause
+-        .align 16
+-        .type  SpinPause,@function
+-SpinPause:
+        .globl SYMBOL(SpinPause)
+#ifdef __APPLE__
+        .align  4
+#else
+        .align  16
+#endif
+        ELF_TYPE(SpinPause,@function)
+SYMBOL(SpinPause):
+         rep
+         nop
+         movq   $1, %rax
+@@ -77,8 +97,8 @@ SpinPause:
+         # rdx - count, treated as ssize_t
+         #
+         .p2align 4,,15
+-	.type    _Copy_arrayof_conjoint_bytes,@function
+-_Copy_arrayof_conjoint_bytes:
+	ELF_TYPE(_Copy_arrayof_conjoint_bytes,@function)
+SYMBOL(_Copy_arrayof_conjoint_bytes):
+         movq     %rdx,%r8             # byte count
+         shrq     $3,%rdx              # qword count
+         cmpq     %rdi,%rsi
+@@ -179,10 +199,10 @@ acb_CopyLeft:
+         # rdx - count, treated as ssize_t
+         #
+         .p2align 4,,15
+-	.type    _Copy_arrayof_conjoint_jshorts,@function
+-	.type    _Copy_conjoint_jshorts_atomic,@function
+-_Copy_arrayof_conjoint_jshorts:
+-_Copy_conjoint_jshorts_atomic:
+	ELF_TYPE(_Copy_arrayof_conjoint_jshorts,@function)
+	ELF_TYPE(_Copy_conjoint_jshorts_atomic,@function)
+SYMBOL(_Copy_arrayof_conjoint_jshorts):
+SYMBOL(_Copy_conjoint_jshorts_atomic):
+         movq     %rdx,%r8             # word count
+         shrq     $2,%rdx              # qword count
+         cmpq     %rdi,%rsi
+@@ -269,10 +289,10 @@ acs_CopyLeft:
+         # rdx - count, treated as ssize_t
+         #
+         .p2align 4,,15
+-	.type    _Copy_arrayof_conjoint_jints,@function
+-	.type    _Copy_conjoint_jints_atomic,@function
+-_Copy_arrayof_conjoint_jints:
+-_Copy_conjoint_jints_atomic:
+	ELF_TYPE(_Copy_arrayof_conjoint_jints,@function)
+	ELF_TYPE(_Copy_conjoint_jints_atomic,@function)
+SYMBOL(_Copy_arrayof_conjoint_jints):
+SYMBOL(_Copy_conjoint_jints_atomic):
+         movq     %rdx,%r8             # dword count
+         shrq     %rdx                 # qword count
+         cmpq     %rdi,%rsi
+@@ -348,10 +368,10 @@ aci_CopyLeft:
+         # rdx - count, treated as ssize_t
+         #
+         .p2align 4,,15
+-	.type    _Copy_arrayof_conjoint_jlongs,@function
+-	.type    _Copy_conjoint_jlongs_atomic,@function
+-_Copy_arrayof_conjoint_jlongs:
+-_Copy_conjoint_jlongs_atomic:
+	ELF_TYPE(_Copy_arrayof_conjoint_jlongs,@function)
+	ELF_TYPE(_Copy_conjoint_jlongs_atomic,@function)
+SYMBOL(_Copy_arrayof_conjoint_jlongs):
+SYMBOL(_Copy_conjoint_jlongs_atomic):
+         cmpq     %rdi,%rsi
+         leaq     -8(%rdi,%rdx,8),%rax # from + count*8 - 8
+         jbe      acl_CopyRight
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_bytes_bsd_x86_inline_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_bytes_bsd_x86_inline_hpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_bytes_bsd_x86_inline_hpp,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.orig	Wed Nov  7 15:05:15 2007
-+++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp	Wed Nov  7 15:20:05 2007
-@@ -22,7 +22,15 @@
+$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_bytes_bsd_x86_inline_hpp,v 1.2 2009/05/23 03:03:24 kurt Exp $
+--- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.orig	Fri May 15 16:25:28 2009
+++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp	Fri May 15 17:44:35 2009
+@@ -22,7 +22,33 @@
  *
  */
 
@ -9,10 +9,28 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_bytes_bsd_x86_inline_hpp,v 1.1 200
 #include <byteswap.h>
 +#endif
 +
-+#if defined(AMD64) && defined (__OpenBSD__)
-+# define bswap_16(x)	swap16(x)
-+# define bswap_32(x)	swap32(x)
-+# define bswap_64(x)	swap64(x)
+#ifdef __APPLE__
+#include <libkern/OSByteOrder.h>
+#endif
+
+#if defined(AMD64)
+#  if defined(__APPLE__)
+#    define bswap_16(x)	OSSwapInt16(x)
+#    define bswap_32(x)	OSSwapInt32(x)
+#    define bswap_64(x)	OSSwapInt64(x)
+#  elif defined(__OpenBSD__)
+#    define bswap_16(x)	swap16(x)
+#    define bswap_32(x)	swap32(x)
+#    define bswap_64(x)	swap64(x)
+#  elif defined(__NetBSD__)
+#    define bswap_16(x)	bswap16(x)
+#    define bswap_32(x)	bswap32(x)
+#    define bswap_64(x)	bswap64(x)
+#  else
+#    define bswap_16(x) __bswap16(x)
+#    define bswap_32(x) __bswap32(x)
+#    define bswap_64(x) __bswap64(x)
+#  endif
 +#endif
 
 // Efficient swapping of data bytes from Java byte
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11:37:42 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	Fri Jan 16 12:16:38 2009
-+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Fri Jan 16 12:16:43 2009
-@@ -44,23 +44,158 @@
+$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	Fri May 15 16:25:28 2009
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sat May 16 16:49:25 2009
+@@ -44,23 +44,202 @@
 # include <sys/wait.h>
 # include <pwd.h>
 # include <poll.h>
@ -10,7 +10,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
 -# include <fpu_control.h>
 +#endif
 
-+#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__)
+#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__) && !defined(__NetBSD__)
 +# include <pthread_np.h>
 +#endif
 +
@ -163,11 +163,55 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
 +#  define context_trapno sc_trapno
 +# endif
 +#endif
+
+#ifdef __NetBSD__
+# define context_trapno uc_mcontext.__gregs[_REG_TRAPNO]
+# ifdef AMD64
+#  define __register_t __greg_t
+#  define context_pc uc_mcontext.__gregs[_REG_RIP]
+#  define context_sp uc_mcontext.__gregs[_REG_URSP]
+#  define context_fp uc_mcontext.__gregs[_REG_RBP]
+#  define context_rip uc_mcontext.__gregs[_REG_RIP]
+#  define context_rsp uc_mcontext.__gregs[_REG_URSP]
+#  define context_rax uc_mcontext.__gregs[_REG_RAX]
+#  define context_rbx uc_mcontext.__gregs[_REG_RBX]
+#  define context_rcx uc_mcontext.__gregs[_REG_RCX]
+#  define context_rdx uc_mcontext.__gregs[_REG_RDX]
+#  define context_rbp uc_mcontext.__gregs[_REG_RBP]
+#  define context_rsi uc_mcontext.__gregs[_REG_RSI]
+#  define context_rdi uc_mcontext.__gregs[_REG_RDI]
+#  define context_r8  uc_mcontext.__gregs[_REG_R8]
+#  define context_r9  uc_mcontext.__gregs[_REG_R9]
+#  define context_r10 uc_mcontext.__gregs[_REG_R10]
+#  define context_r11 uc_mcontext.__gregs[_REG_R11]
+#  define context_r12 uc_mcontext.__gregs[_REG_R12]
+#  define context_r13 uc_mcontext.__gregs[_REG_R13]
+#  define context_r14 uc_mcontext.__gregs[_REG_R14]
+#  define context_r15 uc_mcontext.__gregs[_REG_R15]
+#  define context_flags uc_mcontext.__gregs[_REG_RFL]
+#  define context_err uc_mcontext.__gregs[_REG_ERR]
+# else
+#  define context_pc uc_mcontext.__gregs[_REG_EIP]
+#  define context_sp uc_mcontext.__gregs[_REG_UESP]
+#  define context_fp uc_mcontext.__gregs[_REG_EBP]
+#  define context_eip uc_mcontext.__gregs[_REG_EIP]
+#  define context_esp uc_mcontext.__gregs[_REG_UESP]
+#  define context_eax uc_mcontext.__gregs[_REG_EAX]
+#  define context_ebx uc_mcontext.__gregs[_REG_EBX]
+#  define context_ecx uc_mcontext.__gregs[_REG_ECX]
+#  define context_edx uc_mcontext.__gregs[_REG_EDX]
+#  define context_ebp uc_mcontext.__gregs[_REG_EBP]
+#  define context_esi uc_mcontext.__gregs[_REG_ESI]
+#  define context_edi uc_mcontext.__gregs[_REG_EDI]
+#  define context_eflags uc_mcontext.__gregs[_REG_EFL]
+#  define context_trapno uc_mcontext.__gregs[_REG_TRAPNO]
+# endif
+#endif
 +
 address os::current_stack_pointer() {
 #ifdef SPARC_WORKS
   register void *esp;
-@@ -85,15 +220,15 @@ void os::initialize_thread() {
+@@ -85,15 +264,15 @@ void os::initialize_thread() {
 }
 
 address os::Bsd::ucontext_get_pc(ucontext_t * uc) {
@ -186,7 +230,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
 }
 
 // For Forte Analyzer AsyncGetCallTrace profiling support - thread
-@@ -245,18 +380,18 @@ JVM_handle_bsd_signal(int sig,
+@@ -245,18 +424,18 @@ JVM_handle_bsd_signal(int sig,
     pc = (address) os::Bsd::ucontext_get_pc(uc);
 
     if (pc == (address) Fetch32PFI) {
@ -208,7 +252,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
       address addr = (address) info->si_addr;
 
       // check if fault address is within thread stack
-@@ -278,6 +413,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -278,6 +457,7 @@ JVM_handle_bsd_signal(int sig,
           // to handle_unexpected_exception way down below.
           thread->disable_stack_red_zone();
           tty->print_raw_cr("An irrecoverable stack overflow has occurred.");
@ -216,7 +260,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
         } else {
           // Accessing stack address below sp may cause SEGV if current
           // thread has MAP_GROWSDOWN stack. This should only happen when
-@@ -293,6 +429,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -293,6 +473,7 @@ JVM_handle_bsd_signal(int sig,
           } else {
              fatal("recursive segv. expanding stack.");
           }
@ -224,7 +268,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
         }
       }
     }
-@@ -301,9 +438,16 @@ JVM_handle_bsd_signal(int sig,
+@@ -301,9 +482,16 @@ JVM_handle_bsd_signal(int sig,
       // Java thread running in Java code => find exception handler if any
       // a fault inside compiled code, the interpreter, or a stub
 
@ -242,7 +286,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
         // BugId 4454115: A read from a MappedByteBuffer can fault
         // here if the underlying file has been truncated.
         // Do not crash the VM in such a case.
-@@ -324,9 +468,31 @@ JVM_handle_bsd_signal(int sig,
+@@ -324,6 +512,28 @@ JVM_handle_bsd_signal(int sig,
                                               pc,
                                               SharedRuntime::
                                               IMPLICIT_DIVIDE_BY_ZERO);
@ -270,12 +314,8 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
 +
 #else
       if (sig == SIGFPE /* && info->si_code == FPE_INTDIV */) {
-        // HACK: si_code does not work on bsd 2.2.12-20!!!
-+        // HACK: si_code does not work on linux 2.2.12-20!!!
-         int op = pc[0];
-         if (op == 0xDB) {
-           // FIST
-@@ -351,7 +517,7 @@ JVM_handle_bsd_signal(int sig,
+         // HACK: si_code does not work on bsd 2.2.12-20!!!
+@@ -351,7 +561,7 @@ JVM_handle_bsd_signal(int sig,
           fatal("please update this code.");
         }
 #endif // AMD64
@ -284,7 +324,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
                !MacroAssembler::needs_explicit_null_check((intptr_t)info->si_addr)) {
           // Determination of interpreter/vtable stub/compiled code null exception
           stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
-@@ -375,7 +541,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -375,7 +585,7 @@ JVM_handle_bsd_signal(int sig,
     // process of write protecting the memory serialization page.
     // It write enables the page immediately after protecting it
     // so we can just return to retry the write.
@ -293,7 +333,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
         os::is_memory_serialize_page(thread, (address) info->si_addr)) {
       // Block current thread until the memory serialize page permission restored.
       os::block_on_serialize_page_trap();
-@@ -396,7 +562,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -396,7 +606,7 @@ JVM_handle_bsd_signal(int sig,
   // Furthermore, a false-positive should be harmless.
   if (UnguardOnExecutionViolation > 0 &&
       (sig == SIGSEGV || sig == SIGBUS) &&
@ -302,7 +342,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
     int page_size = os::vm_page_size();
     address addr = (address) info->si_addr;
     address pc = os::Bsd::ucontext_get_pc(uc);
-@@ -466,7 +632,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -466,7 +676,7 @@ JVM_handle_bsd_signal(int sig,
     // save all thread context in case we need to restore it
     if (thread != NULL) thread->set_saved_exception_pc(pc);
 
@ -311,7 +351,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
     return true;
   }
 
-@@ -496,13 +662,24 @@ JVM_handle_bsd_signal(int sig,
+@@ -496,13 +706,24 @@ JVM_handle_bsd_signal(int sig,
   ShouldNotReachHere();
 }
 
@ -336,7 +376,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
 int os::Bsd::get_fpu_control_word(void) {
 #ifdef AMD64
   return 0;
-@@ -518,11 +695,12 @@ void os::Bsd::set_fpu_control_word(int fpu_control) {
+@@ -518,11 +739,12 @@ void os::Bsd::set_fpu_control_word(int fpu_control) {
   _FPU_SETCW(fpu_control);
 #endif // !AMD64
 }
@ -350,7 +390,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
   return true;
 #else
   struct utsname uts;
-@@ -576,6 +754,9 @@ size_t os::Bsd::min_stack_allowed  =  (48 DEBUG_ONLY(+
+@@ -576,6 +798,9 @@ size_t os::Bsd::min_stack_allowed  =  (48 DEBUG_ONLY(+
 #define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
 #endif
 
@ -360,7 +400,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
 // Test if pthread library can support variable thread stack size. BsdThreads
 // in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads
 // in floating stack mode and NPTL support variable stack size.
-@@ -612,6 +793,7 @@ bool os::Bsd::supports_variable_stack_size() {
+@@ -612,6 +837,7 @@ bool os::Bsd::supports_variable_stack_size() {
 #endif
   }
 }
@ -368,7 +408,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
 #endif // AMD64
 
 // return default stack size for thr_type
-@@ -665,6 +847,41 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
+@@ -665,6 +891,41 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
 //    pthread_attr_getstack()
 
 static void current_stack_region(address * bottom, size_t * size) {
@ -410,7 +450,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
   if (os::Bsd::is_initial_thread()) {
      // initial thread needs special handling because pthread_getattr_np()
      // may return bogus value.
-@@ -691,6 +908,7 @@ static void current_stack_region(address * bottom, siz
+@@ -691,6 +952,7 @@ static void current_stack_region(address * bottom, siz
      pthread_attr_destroy(&attr);
 
   }
@ -418,7 +458,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11
   assert(os::current_stack_pointer() >= *bottom &&
          os::current_stack_pointer() < *bottom + *size, "just checking");
 }
-@@ -719,46 +937,44 @@ void os::print_context(outputStream *st, void *context
+@@ -719,46 +981,44 @@ void os::print_context(outputStream *st, void *context
   ucontext_t *uc = (ucontext_t*)context;
   st->print_cr("Registers:");
 #ifdef AMD64
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_threadLS_bsd_x86_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_threadLS_bsd_x86_hpp
@ -1,11 +1,11 @@
-$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_threadLS_bsd_x86_hpp,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp.orig	Wed Nov  7 14:34:07 2007
-+++ hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp	Wed Nov  7 14:33:51 2007
+$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_threadLS_bsd_x86_hpp,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp.orig	Fri May 15 16:25:28 2009
+++ hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp	Fri May 15 17:48:13 2009
@@ -27,8 +27,10 @@
 #ifndef AMD64
   // map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp
   #define SP_BITLENGTH  32
-+#ifndef _ALLBSD_SOURCE
+#ifndef PAGE_SHIFT
   #define PAGE_SHIFT    12
   #define PAGE_SIZE     (1UL << PAGE_SHIFT)
 +#endif
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_concurrentMarkSweep
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_concurrentMarkSweep
@ -1,11 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_concurrentMarkSweep,v 1.1 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.orig	Fri Dec 19 03:42:09 2008
-+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	Wed Jan 14 11:45:05 2009
-@@ -28,6 +28,7 @@ binaryTreeDictionary.cpp                allocationStat
- binaryTreeDictionary.cpp                binaryTreeDictionary.hpp
- binaryTreeDictionary.cpp                globals.hpp
- binaryTreeDictionary.cpp                ostream.hpp
-+binaryTreeDictionary.cpp                space.inline.hpp
- binaryTreeDictionary.cpp                spaceDecorator.hpp
- 
- binaryTreeDictionary.hpp                freeBlockDictionary.hpp
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_g1
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_g1
@ -1,28 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_g1,v 1.1 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_g1.orig	Fri Dec 19 03:42:09 2008
-+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_g1	Wed Jan 14 11:45:05 2009
-@@ -34,6 +34,7 @@ cardTableRS.cpp				g1SATBCardTableModRefBS.hpp
- collectionSetChooser.cpp		g1CollectedHeap.hpp
- collectionSetChooser.cpp		g1CollectorPolicy.hpp
- collectionSetChooser.cpp		collectionSetChooser.hpp
-+collectionSetChooser.cpp		space.inline.hpp
- 
- collectionSetChooser.hpp		heapRegion.hpp
- collectionSetChooser.hpp                growableArray.hpp
-@@ -44,6 +45,7 @@ concurrentG1Refine.cpp			concurrentG1RefineThread.hpp
- concurrentG1Refine.cpp			copy.hpp
- concurrentG1Refine.cpp			g1CollectedHeap.hpp
- concurrentG1Refine.cpp			g1RemSet.hpp
-+concurrentG1Refine.cpp			space.inline.hpp
- 
- concurrentG1Refine.hpp			globalDefinitions.hpp
- 
-@@ -264,7 +266,7 @@ heapRegion.cpp                          heapRegionSeq.
- heapRegion.cpp                          iterator.hpp
- heapRegion.cpp                          oop.inline.hpp
- 
-heapRegion.hpp                          space.hpp
-+heapRegion.hpp                          space.inline.hpp
- heapRegion.hpp                          spaceDecorator.hpp
- heapRegion.hpp                          g1BlockOffsetTable.inline.hpp
- heapRegion.hpp                          watermark.hpp
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew
@ -1,21 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew.orig	Fri Dec 19 03:42:09 2008
-+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew	Wed Jan 14 11:45:05 2009
-@@ -29,6 +29,8 @@ asParNewGeneration.cpp                  asParNewGenera
- asParNewGeneration.cpp                  cmsAdaptiveSizePolicy.hpp
- asParNewGeneration.cpp                  cmsGCAdaptivePolicyCounters.hpp
- asParNewGeneration.cpp                  defNewGeneration.inline.hpp
-+asParNewGeneration.cpp                  markOop.inline.hpp
-+asParNewGeneration.cpp                  markSweep.inline.hpp
- asParNewGeneration.cpp                  oop.pcgc.inline.hpp
- asParNewGeneration.cpp                  parNewGeneration.hpp
- asParNewGeneration.cpp                  referencePolicy.hpp
-@@ -40,7 +42,7 @@ parCardTableModRefBS.cpp                cardTableRS.hp
- parCardTableModRefBS.cpp                java.hpp
- parCardTableModRefBS.cpp                mutexLocker.hpp
- parCardTableModRefBS.cpp                sharedHeap.hpp
-parCardTableModRefBS.cpp                space.hpp
-+parCardTableModRefBS.cpp                space.inline.hpp
- parCardTableModRefBS.cpp                universe.hpp
- parCardTableModRefBS.cpp                virtualspace.hpp
- 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parallelScavenge
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parallelScavenge
@ -1,12 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parallelScavenge,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge.orig	Fri Dec 19 03:42:09 2008
-+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	Wed Jan 14 11:45:05 2009
-@@ -306,6 +306,8 @@ psPermGen.cpp                           parallelScaven
- psPermGen.cpp                           psMarkSweepDecorator.hpp
- psPermGen.cpp                           psParallelCompact.hpp
- psPermGen.cpp                           psPermGen.hpp
-+psPermGen.cpp                           markOop.inline.hpp
-+psPermGen.cpp                           markSweep.inline.hpp
- 
- psPermGen.hpp                           psOldGen.hpp
- 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_compiler2
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_compiler2
@ -1,19 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.6 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/includeDB_compiler2.orig	Fri Dec 19 03:42:10 2008
-+++ hotspot/src/share/vm/includeDB_compiler2	Wed Jan 14 11:45:05 2009
-@@ -140,6 +140,7 @@ c2_globals_<os_family>.hpp              globalDefiniti
- c2_globals_<os_family>.hpp              macros.hpp
- 
- c2_init_<arch>.cpp                      compile.hpp
-+c2_init_<arch>.cpp                      node.hpp
- 
- c2compiler.cpp                          ad_<arch_model>.hpp
- c2compiler.cpp                          c2compiler.hpp
-@@ -839,6 +840,7 @@ parseHelper.cpp                         systemDictiona
- phase.cpp                               compile.hpp
- phase.cpp                               compileBroker.hpp
- phase.cpp                               nmethod.hpp
-+phase.cpp                               node.hpp
- phase.cpp                               phase.hpp
- 
- phase.hpp                               port.hpp
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_core
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_core
@ -1,29 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.7 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/includeDB_core.orig	Fri Dec 19 03:42:10 2008
-+++ hotspot/src/share/vm/includeDB_core	Fri Jan 16 09:38:20 2009
-@@ -473,7 +473,7 @@ cardTableModRefBS.cpp                   cardTableRS.hp
- cardTableModRefBS.cpp                   java.hpp
- cardTableModRefBS.cpp                   mutexLocker.hpp
- cardTableModRefBS.cpp                   sharedHeap.hpp
-cardTableModRefBS.cpp                   space.hpp
-+cardTableModRefBS.cpp                   space.inline.hpp
- cardTableModRefBS.cpp                   universe.hpp
- cardTableModRefBS.cpp                   virtualspace.hpp
- 
-@@ -2014,7 +2014,7 @@ instanceKlass.cpp                       verifier.hpp
- instanceKlass.cpp                       vmSymbols.hpp
- 
- instanceKlass.hpp                       accessFlags.hpp
-instanceKlass.hpp                       bitMap.hpp
-+instanceKlass.hpp                       bitMap.inline.hpp
- instanceKlass.hpp                       constMethodOop.hpp
- instanceKlass.hpp                       constantPoolOop.hpp
- instanceKlass.hpp                       handles.hpp
-@@ -3771,6 +3771,7 @@ spaceDecorator.hpp                      space.hpp
- 
- spaceDecorator.cpp                      copy.hpp
- spaceDecorator.cpp                      spaceDecorator.hpp
-+spaceDecorator.cpp                      space.inline.hpp
- 
- specialized_oop_closures.cpp            ostream.hpp
- specialized_oop_closures.cpp            specialized_oop_closures.hpp
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_features
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_features
@ -1,12 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_includeDB_features,v 1.1 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/includeDB_features.orig	Fri Dec 19 03:42:10 2008
-+++ hotspot/src/share/vm/includeDB_features	Wed Jan 14 11:45:05 2009
-@@ -59,6 +59,8 @@ dump.cpp                                vm_operations.
- 
- dump_<arch_model>.cpp                   assembler_<arch>.inline.hpp
- dump_<arch_model>.cpp                   compactingPermGenGen.hpp
-+dump_<arch_model>.cpp                   generation.inline.hpp
-+dump_<arch_model>.cpp                   space.inline.hpp
- 
- forte.cpp                               collectedHeap.inline.hpp
- forte.cpp                               debugInfoRec.hpp
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp,v 1.3 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/interpreter/bytecodeTracer.cpp.orig	Tue Oct 30 05:00:45 2007
-+++ hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	Wed Nov  7 13:09:16 2007
-@@ -74,7 +74,7 @@ class BytecodePrinter: public BytecodeClosure {
+$OpenBSD: patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/interpreter/bytecodeTracer.cpp.orig	Fri May  8 03:30:34 2009
+++ hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	Sat May  9 10:15:54 2009
+@@ -77,7 +77,7 @@ class BytecodePrinter: public BytecodeClosure {
       // the incoming method.  We could lose a line of trace output.
       // This is acceptable in a debug-only feature.
       st->cr();
@ -10,7 +10,7 @@ $OpenBSD: patch-hotspot_src_share_vm_interpreter_bytecodeTracer_cpp,v 1.3 2008/0
       method->print_name(st);
       st->cr();
       _current_method = method();
-@@ -87,7 +87,7 @@ class BytecodePrinter: public BytecodeClosure {
+@@ -90,7 +90,7 @@ class BytecodePrinter: public BytecodeClosure {
       code = Bytecodes::code_at(bcp);
     }
     int bci = bcp - method->code_base();
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_prims_forte_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_prims_forte_cpp
@ -0,0 +1,23 @@
+$OpenBSD: patch-hotspot_src_share_vm_prims_forte_cpp,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/prims/forte.cpp.orig	Sat May 16 17:05:01 2009
+++ hotspot/src/share/vm/prims/forte.cpp	Sat May 16 17:05:10 2009
+@@ -626,6 +626,11 @@ void AsyncGetCallTrace(ASGCT_CallTrace *trace, jint de
+ // Method to let libcollector know about a dynamically loaded function.
+ // Because it is weakly bound, the calls become NOP's when the library
+ // isn't present.
+#ifdef __APPLE__
+// XXXDARWIN: Link errors occur even when __attribute__((weak_import))
+// is added
+#define collector_func_load(x0,x1,x2,x3,x4,x5,x6) (0)
+#else
+ void    collector_func_load(char* name,
+                             void* null_argument_1,
+                             void* null_argument_2,
+@@ -636,6 +641,7 @@ void    collector_func_load(char* name,
+ #pragma weak collector_func_load
+ #define collector_func_load(x0,x1,x2,x3,x4,x5,x6) \
+         ( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),0 : 0 )
+#endif // __APPLE__
+ #endif // !_WINDOWS
+ 
+ } // end extern "C"
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_globals_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_globals_hpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_runtime_globals_hpp,v 1.4 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/runtime/globals.hpp.orig	Thu Nov 20 03:41:06 2008
-+++ hotspot/src/share/vm/runtime/globals.hpp	Tue Dec 23 07:16:15 2008
-@@ -312,7 +312,7 @@ class CommandLineFlags {
+$OpenBSD: patch-hotspot_src_share_vm_runtime_globals_hpp,v 1.5 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/runtime/globals.hpp.orig	Fri May  8 03:30:37 2009
+++ hotspot/src/share/vm/runtime/globals.hpp	Sat May  9 10:15:54 2009
+@@ -316,7 +316,7 @@ class CommandLineFlags {
   /* UseMembar is theoretically a temp flag used for memory barrier         \
    * removal testing.  It was supposed to be removed before FCS but has     \
    * been re-added (see 6401008) */                                         \
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_os_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_os_cpp
@ -1,12 +1,12 @@
-$OpenBSD: patch-hotspot_src_share_vm_runtime_os_cpp,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/runtime/os.cpp.orig	Thu Jul 17 03:40:34 2008
-+++ hotspot/src/share/vm/runtime/os.cpp	Sat Aug  2 16:12:52 2008
-@@ -81,7 +81,11 @@ char* os::iso8601_time(char* buffer, size_t buffer_len
+$OpenBSD: patch-hotspot_src_share_vm_runtime_os_cpp,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/runtime/os.cpp.orig	Fri May  8 03:30:37 2009
+++ hotspot/src/share/vm/runtime/os.cpp	Sun May 10 19:23:00 2009
+@@ -79,7 +79,11 @@ char* os::iso8601_time(char* buffer, size_t buffer_len
+     assert(false, "Failed localtime_pd");
+     return NULL;
   }
-   // Save the results of localtime
-   const struct tm time_struct = *time_struct_temp;
 +#if defined(_ALLBSD_SOURCE)
-+  const time_t zone = (time_t) time_struct_temp->tm_gmtoff;
+  const time_t zone = (time_t) time_struct.tm_gmtoff;
 +#else
   const time_t zone = timezone;
 +#endif
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_vm_version_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_vm_version_cpp
@ -1,13 +1,13 @@
-$OpenBSD: patch-hotspot_src_share_vm_runtime_vm_version_cpp,v 1.5 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/runtime/vm_version.cpp.orig	Thu Jul 17 03:40:35 2008
-+++ hotspot/src/share/vm/runtime/vm_version.cpp	Sat Aug  2 16:12:52 2008
+$OpenBSD: patch-hotspot_src_share_vm_runtime_vm_version_cpp,v 1.6 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/runtime/vm_version.cpp.orig	Fri May  8 03:30:37 2009
+++ hotspot/src/share/vm/runtime/vm_version.cpp	Fri May 15 17:50:17 2009
@@ -140,7 +140,8 @@ const char* Abstract_VM_Version::vm_release() {
 
 #define OS       LINUX_ONLY("linux")             \
                  WINDOWS_ONLY("windows")         \
 -                 SOLARIS_ONLY("solaris")
 +                 SOLARIS_ONLY("solaris")         \
-+		 BSD_ONLY("bsd")
+                 BSD_ONLY("bsd")
 
 #define CPU      IA32_ONLY("x86")                \
                  IA64_ONLY("ia64")               \
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	Fri Dec 19 03:42:12 2008
-+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Sun Dec 28 19:25:16 2008
-@@ -71,12 +71,14 @@
+$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	Fri May  8 03:30:37 2009
+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Fri May 15 17:50:50 2009
+@@ -71,12 +71,25 @@
 # include <sys/procfs.h>
 # endif
 
@ -11,6 +11,17 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.3 2
 #include <signal.h>
 +#ifndef __OpenBSD__
 #include <ucontext.h>
+#endif
+#ifdef __APPLE__
+  #include <AvailabilityMacros.h>
+  #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
+    // Mac OS X 10.4 defines EFL_AC and EFL_ID,
+    // which conflict with hotspot variable names.
+    //
+    // This has been fixed in Mac OS X 10.5.
+    #undef EFL_AC
+    #undef EFL_ID
+  #endif
 +#endif
 #include <sys/time.h>
 -#endif // LINUX
@ -18,28 +29,16 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.3 2
 
 // 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
 // When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in
-@@ -107,22 +109,22 @@
- #endif
- 
- // NULL vs NULL_WORD:
-// On Linux NULL is defined as a special type '__null'. Assigning __null to
-+// With gcc NULL is defined as a special type '__null'. Assigning __null to
- // integer variable will cause gcc warning. Use NULL_WORD in places where a
-// pointer is stored as integer value.  On some platforms, sizeof(intptr_t) >
-// sizeof(void*), so here we want something which is integer type, but has the
-// same size as a pointer.
+@@ -112,7 +125,7 @@
+ // pointer is stored as integer value.  On some platforms, sizeof(intptr_t) >
+ // sizeof(void*), so here we want something which is integer type, but has the
+ // same size as a pointer.
 -#ifdef LINUX
-+// pointer is stored as integer value.  On some platforms the datatype of
-+// intptr_t != int, so here we want something which is the same size as a
-+// pointer.
-+#ifdef __GNUG__
+#ifdef __GNUC__
   #ifdef _LP64
     #define NULL_WORD  0L
   #else
-    #define NULL_WORD  0
-+    #define NULL_WORD  ((intptr_t)0)
-   #endif
- #else
+@@ -124,7 +137,7 @@
   #define NULL_WORD  NULL
 #endif
 
@ -48,7 +47,7 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.3 2
 // Compiler-specific primitive types
 typedef unsigned short     uint16_t;
 #ifndef _UINT32_T
-@@ -142,7 +144,7 @@ typedef unsigned int            uintptr_t;
+@@ -144,7 +157,7 @@ typedef unsigned int            uintptr_t;
 // prior definition of intptr_t, and add "&& !defined(XXX)" above.
 #endif // _SYS_INT_TYPES_H
 
@ -57,11 +56,13 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.3 2
 
 // Additional Java basic types
 
-@@ -226,7 +228,7 @@ inline int g_isnan(float  f) { return isnanf(f); }
+@@ -228,7 +241,9 @@ inline int g_isnan(float  f) { return isnanf(f); }
 inline int g_isnan(float  f) { return isnand(f); }
 #endif
 inline int g_isnan(double f) { return isnand(f); }
 -#elif LINUX
+#elif defined(__APPLE__)
+inline int g_isnan(double f) { return isnan(f); }
 +#elif defined(LINUX) || defined(_ALLBSD_SOURCE)
 inline int g_isnan(float  f) { return isnanf(f); }
 inline int g_isnan(double f) { return isnan(f); }
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_sparcWorks_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_sparcWorks_hpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_sparcWorks_hpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp.orig	Mon Dec 22 18:05:06 2008
-+++ hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp	Mon Dec 22 18:05:25 2008
-@@ -115,7 +115,7 @@
-   #ifdef _LP64
-     #define NULL_WORD  0L
-   #else
-    #define NULL_WORD  0
-+    #define NULL_WORD  ((intptr_t)0)
-   #endif
- #else
-   #define NULL_WORD  NULL
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_macros_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_macros_hpp
@ -1,11 +1,11 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.6 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/macros.hpp.orig	Fri Dec 19 03:42:12 2008
-+++ hotspot/src/share/vm/utilities/macros.hpp	Wed Dec 24 10:02:13 2008
-@@ -154,6 +154,14 @@
- #define X86_ONLY(code)
+$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.7 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/utilities/macros.hpp.orig	Fri May  8 03:30:37 2009
+++ hotspot/src/share/vm/utilities/macros.hpp	Fri May 15 17:51:24 2009
+@@ -146,6 +146,14 @@
+ #define NOT_WINDOWS(code) code
 #endif
 
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
 +#define BSD_ONLY(code) code
 +#define NOT_BSD(code)
 +#else
@ -13,6 +13,6 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.6 2009/01/04 23:25
 +#define NOT_BSD(code) code
 +#endif
 +
- #ifdef IA32
- #define IA32_ONLY(code) code
- #define NOT_IA32(code)
+ #if defined(IA32) || defined(AMD64)
+ #define X86
+ #define X86_ONLY(code) code
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_ostream_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_ostream_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_ostream_cpp,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/ostream.cpp.orig	Thu Nov 20 03:41:06 2008
-+++ hotspot/src/share/vm/utilities/ostream.cpp	Tue Dec 23 07:16:15 2008
-@@ -821,7 +821,7 @@ bufferedStream::~bufferedStream() {
+$OpenBSD: patch-hotspot_src_share_vm_utilities_ostream_cpp,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/utilities/ostream.cpp.orig	Fri May  8 03:30:37 2009
+++ hotspot/src/share/vm/utilities/ostream.cpp	Sat May  9 10:15:54 2009
+@@ -827,7 +827,7 @@ bufferedStream::~bufferedStream() {
 
 #ifndef PRODUCT
 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_vmError_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_vmError_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.5 2009/01/17 11:37:42 kurt Exp $
--- hotspot/src/share/vm/utilities/vmError.cpp.orig	Thu Jan 15 03:41:24 2009
-+++ hotspot/src/share/vm/utilities/vmError.cpp	Fri Jan 16 12:16:44 2009
-@@ -31,7 +31,7 @@ const char *env_list[] = {
+$OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.6 2009/05/23 03:03:25 kurt Exp $
+--- hotspot/src/share/vm/utilities/vmError.cpp.orig	Fri May  8 03:30:37 2009
+++ hotspot/src/share/vm/utilities/vmError.cpp	Fri May 15 17:51:40 2009
+@@ -31,13 +31,18 @@ const char *env_list[] = {
   "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
   "JAVA_COMPILER", "PATH", "USERNAME",
 
@ -10,24 +10,18 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.5 2009/01/17 11:3
   "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY",
   "HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE",
 
-@@ -165,9 +165,16 @@ static char* next_OnError_command(char* buf, int bufle
+   // defined on Linux
+   "LD_ASSUME_KERNEL", "_JAVA_SR_SIGNUM",
 
- static void print_bug_submit_message(outputStream *out, Thread *thread) {
-   if (out == NULL) return;
-+#ifdef __FreeBSD__
-+  out->print_raw_cr("#");
-+  out->print_raw_cr("# If you would like to submit a bug report, please write");
-+  out->print_raw_cr("# a letter to freebsd-java@FreeBSD.org mailing list");
-+  out->print_raw_cr("#");
-+#else
-   out->print_raw_cr("# If you would like to submit a bug report, please visit:");
-   out->print_raw   ("#   ");
-   out->print_raw_cr(Arguments::java_vendor_url_bug());
-+#endif
-   // If the crash is in native code, encourage user to submit a bug to the
-   // provider of that code.
-   if (thread && thread->is_Java_thread() &&
-@@ -794,7 +801,7 @@ void VMError::report_and_die() {
+  // defined on Darwin
+  "DYLD_LIBRARY_PATH", "DYLD_FALLBACK_LIBRARY_PATH",
+  "DYLD_FRAMEWORK_PATH", "DYLD_FALLBACK_FRAMEWORK_PATH",
+  "DYLD_INSERT_LIBRARIES",
+
+   // defined on Windows
+   "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR",
+ 
+@@ -799,7 +804,7 @@ void VMError::report_and_die() {
     const char* ptr = OnError;
     while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
       out.print_raw   ("#   Executing ");
--- a/devel/jdk/1.7/patches/patch-jdk_make_com_sun_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_com_sun_Makefile
@ -0,0 +1,17 @@
+$OpenBSD: patch-jdk_make_com_sun_Makefile,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/com/sun/Makefile.orig	Fri May  8 03:34:14 2009
+++ jdk/make/com/sun/Makefile	Mon May 18 10:57:22 2009
+@@ -38,10 +38,12 @@ ifndef OPENJDK
+   endif
+ endif
+ 
+# XXXBSD: removed nio subdir to avoid building java.nio.sctp for now
+
+ # Omit mirror since it's built with the apt tool.
+ SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
+     java inputmethods org xml rowset net/httpserver net/ssl demo \
+-    tools jarsigner tracing servicetag nio
+    tools jarsigner tracing servicetag
+ 
+ all build clean clobber::
+ 	$(SUBDIRS-loop)
--- a/devel/jdk/1.7/patches/patch-jdk_make_com_sun_tools_attach_Exportedfiles_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_com_sun_tools_attach_Exportedfiles_gmk
@ -0,0 +1,13 @@
+$OpenBSD: patch-jdk_make_com_sun_tools_attach_Exportedfiles_gmk,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/com/sun/tools/attach/Exportedfiles.gmk.orig	Mon May 18 10:38:18 2009
+++ jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Mon May 18 10:38:28 2009
+@@ -43,5 +43,7 @@ FILES_export = \
+ 	sun/tools/attach/LinuxVirtualMachine.java
+ endif
+ 
+-
+-
+ifeq ($(PLATFORM), bsd)
+FILES_export = \
+	sun/tools/attach/BsdVirtualMachine.java
+endif
--- a/devel/jdk/1.7/patches/patch-jdk_make_com_sun_tools_attach_FILES_java_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_com_sun_tools_attach_FILES_java_gmk
@ -1,13 +1,13 @@
-$OpenBSD: patch-jdk_make_com_sun_tools_attach_FILES_java_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/com/sun/tools/attach/FILES_java.gmk.orig	Tue Oct 30 05:04:21 2007
-+++ jdk/make/com/sun/tools/attach/FILES_java.gmk	Wed Nov  7 17:55:17 2007
+$OpenBSD: patch-jdk_make_com_sun_tools_attach_FILES_java_gmk,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/com/sun/tools/attach/FILES_java.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/com/sun/tools/attach/FILES_java.gmk	Mon May 18 10:39:25 2009
@@ -43,6 +43,11 @@ FILES_java += \
 	sun/tools/attach/LinuxAttachProvider.java
 endif
 
 +ifeq ($(PLATFORM), bsd)
 +FILES_java += \
-+	$(TARGDIR)/sun/tools/attach/BsdAttachProvider.java
+	sun/tools/attach/BsdAttachProvider.java
 +endif
 +
 #
--- a/devel/jdk/1.7/patches/patch-jdk_make_com_sun_tools_attach_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_com_sun_tools_attach_Makefile
@ -0,0 +1,13 @@
+$OpenBSD: patch-jdk_make_com_sun_tools_attach_Makefile,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/com/sun/tools/attach/Makefile.orig	Mon May 18 10:39:47 2009
+++ jdk/make/com/sun/tools/attach/Makefile	Mon May 18 10:39:55 2009
+@@ -36,6 +36,9 @@ endif
+ ifeq ($(PLATFORM), linux)
+ FILES_m = mapfile-linux
+ endif
+ifeq ($(PLATFORM), bsd)
+FILES_m = mapfile-bsd
+endif
+ include $(BUILDDIR)/common/Mapfile-vers.gmk
+ 
+ #
--- a/devel/jdk/1.7/patches/patch-jdk_make_com_sun_tools_attach_mapfile-bsd
+++ b/devel/jdk/1.7/patches/patch-jdk_make_com_sun_tools_attach_mapfile-bsd
@ -0,0 +1,19 @@
+$OpenBSD: patch-jdk_make_com_sun_tools_attach_mapfile-bsd,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/com/sun/tools/attach/mapfile-bsd.orig	Mon May 18 10:57:46 2009
+++ jdk/make/com/sun/tools/attach/mapfile-bsd	Mon May 18 10:57:53 2009
+@@ -30,14 +30,12 @@ SUNWprivate_1.1 {
+ 	    Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
+ 	    Java_sun_tools_attach_BsdVirtualMachine_close;
+ 	    Java_sun_tools_attach_BsdVirtualMachine_connect;
+-	    Java_sun_tools_attach_BsdVirtualMachine_getBsdThreadsManager;
+-	    Java_sun_tools_attach_BsdVirtualMachine_isBsdThreads;
+ 	    Java_sun_tools_attach_BsdVirtualMachine_open;
+ 	    Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
+-            Java_sun_tools_attach_BsdVirtualMachine_sendQuitToChildrenOf;
+ 	    Java_sun_tools_attach_BsdVirtualMachine_socket;
+ 	    Java_sun_tools_attach_BsdVirtualMachine_read;
+ 	    Java_sun_tools_attach_BsdVirtualMachine_write;
+	    Java_sun_tools_attach_BsdVirtualMachine_createAttachFile;
+ 	local:
+ 		*;
+ };
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_Defs-bsd_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_Defs-bsd_gmk
@ -1,6 +1,6 @@
-$OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/Defs-bsd.gmk.orig	Mon Dec 22 21:13:32 2008
-+++ jdk/make/common/Defs-bsd.gmk	Mon Dec 22 23:14:44 2008
+$OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/Defs-bsd.gmk.orig	Mon May 18 10:55:28 2009
+++ jdk/make/common/Defs-bsd.gmk	Mon May 18 11:08:55 2009
@@ -43,12 +43,6 @@
 # Get shared JDK settings
 include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
@ -23,8 +23,25 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.3 2009/01/04 23:25:16 kurt Exp
 PLATFORM_INCLUDE      = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
 
 # suffix used for make dependencies files.
-@@ -169,7 +163,7 @@ ifeq ($(FASTDEBUG), true)
-   CXXFLAGS_DBG	+= $(CC_OPT/LOWER)
+@@ -109,8 +103,14 @@ CC_OPT          = $(CC_OPT/$(OPTIMIZATION_LEVEL))
+ #    We need this frame pointer to make it easy to walk the stacks.
+ #    This should be the default on X86, but ia64 and amd64 may not have this
+ #    as the default.
+-CFLAGS_REQUIRED_amd64   += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+-CFLAGS_REQUIRED_i586    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_amd64   += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+LDFLAGS_COMMON_amd64    += -m64
+CFLAGS_REQUIRED_i586    += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+LDFLAGS_COMMON_i586     += -m32
+ifeq ($(OS_VENDOR),Apple)
+  # 16-byte stack re-alignment on 32-bit Darwin
+  CFLAGS_REQUIRED_i586 += -mstackrealign
+endif
+ CFLAGS_REQUIRED_ia64    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
+@@ -180,7 +180,7 @@ ifeq ($(FASTDEBUG), true)
+   CXXFLAGS_DBG	+= $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
 endif
 
 -CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
@ -32,7 +49,7 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.3 2009/01/04 23:25:16 kurt Exp
 		  -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
 
 ifeq ($(ARCH_DATA_MODEL), 64)
-@@ -182,27 +176,6 @@ ifneq ($(PRODUCT), java)
+@@ -193,33 +193,15 @@ ifneq ($(PRODUCT), java)
   CPPFLAGS_DBG    += -DLOGGING 
 endif
 
@ -60,48 +77,71 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.3 2009/01/04 23:25:16 kurt Exp
 #
 # -L paths for finding and -ljava
 #
-@@ -240,15 +213,6 @@ endif
- LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
+-LDFLAGS_OPT     = -Xlinker -O1
+ LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
+
+ifneq ($(OS_VENDOR), Apple)
+LDFLAGS_OPT     = -Xlinker -O1
+ LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
+endif
 
 #
+ # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
+@@ -240,8 +222,8 @@ AUTOMATIC_PCH_OPTION = 
+ #
+ ifeq ($(VARIANT), OPT)
+   ifneq ($(NO_STRIP), true)
+-    # Debug 'strip -g' leaves local function Elf symbols (better stack traces)
+-    POST_STRIP_PROCESS = $(STRIP) -g
+    # Debug 'strip -S' leaves local function Elf symbols (better stack traces)
+    POST_STRIP_PROCESS = $(STRIP) -S
+   endif
+ endif
+ 
+@@ -250,13 +232,9 @@ endif
+ #
+ LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
+ 
+-#
 -# Support for Quantify.
 -#
 -ifdef QUANTIFY
 -QUANTIFY_CMD = quantify
 -QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
 -LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
-endif
-
-#
- # Path and option to link against the VM, if you have to.  Note that
- # there are libraries that link against only -ljava, but they do get
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
-@@ -274,7 +238,9 @@ override HAVE_ALTZONE            = false
+# Darwin does not support linker map files.
+ifeq ($(OS_VENDOR), Apple)
+LDNOMAP=true
+ endif
+ 
+ #
+@@ -285,7 +263,9 @@ override HAVE_ALTZONE            = false
 override HAVE_FILIOH             = false
 override HAVE_GETHRTIME          = false
 override HAVE_GETHRVTIME         = false
-+ifeq ($(OS_VENDOR),NetBSD)
+ifeq ($(OS_VENDOR),Apple)
 override HAVE_SIGIGNORE          = true
 +endif
 override LEX_LIBRARY             = -lfl
 ifeq ($(STATIC_CXX),true)
 override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-@@ -285,13 +251,9 @@ override LIBPOSIX4               =
+@@ -296,13 +276,9 @@ override LIBPOSIX4               =
 override LIBSOCKET               =
 override LIBTHREAD               =
 override MOOT_PRIORITIES         = true
 -override NO_INTERRUPTIBLE_IO     = true
-+override NO_INTERRUPTIBLE_IO     = false
- override OPENWIN_HOME            = /usr/X11R6
+-override OPENWIN_HOME            = /usr/X11R6
 -ifeq ($(ARCH), amd64)
 -override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
 -else
+override NO_INTERRUPTIBLE_IO     = false
+override OPENWIN_HOME            = $(X11_PATH)
 override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
 -endif
 override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
 override SUN_CMM_SUBDIR          =
 override THREADS_FLAG            = native
-@@ -311,6 +273,14 @@ override USE_EXECNAME            = true
+@@ -322,6 +298,14 @@ override USE_EXECNAME            = true
 # HAVE_DPS should only be "no" if the platform has no DPS headers or libs
 # DPS (Displayable PostScript) is available on Solaris machines
 HAVE_DPS = no
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_Defs-linux_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_Defs-linux_gmk
@ -0,0 +1,12 @@
+$OpenBSD: patch-jdk_make_common_Defs-linux_gmk,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/Defs-linux.gmk.orig	Mon May 18 11:12:22 2009
+++ jdk/make/common/Defs-linux.gmk	Mon May 18 11:12:29 2009
+@@ -297,7 +297,7 @@ override LIBSOCKET               =
+ override LIBTHREAD               =
+ override MOOT_PRIORITIES         = true
+ override NO_INTERRUPTIBLE_IO     = true
+-override OPENWIN_HOME            = /usr/X11R6
+override OPENWIN_HOME            = $(X11_PATH)
+ ifeq ($(ARCH), amd64)
+ override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
+ else
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_Defs_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_Defs_gmk
@ -1,7 +1,7 @@
-$OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- jdk/make/common/Defs.gmk.orig	Fri Dec 19 03:45:14 2008
-+++ jdk/make/common/Defs.gmk	Sun Jan 11 21:46:07 2009
-@@ -172,6 +172,24 @@ ifdef OPENJDK
+$OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/Defs.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/common/Defs.gmk	Mon May 18 11:12:58 2009
+@@ -181,6 +181,36 @@ ifdef OPENJDK
   endif
 endif # OPENJDK
 
@ -9,7 +9,11 @@ $OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
 +  ifdef ALT_X11_PATH
 +    X11_PATH = $(ALT_X11_PATH)
 +  else
-+    X11_PATH = /usr/X11R6
+    ifneq ($(OS_VENDOR), NetBSD)
+      X11_PATH = /usr/X11R6
+    else
+      X11_PATH = /usr/X11R7
+    endif
 +  endif 
 +
 +  ifdef ALT_PACKAGE_PATH
@ -18,7 +22,15 @@ $OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
 +    ifeq ($(PLATFORM), linux)
 +      PACKAGE_PATH = /usr
 +    else
-+      PACKAGE_PATH = /usr/local
+      ifeq ($(OS_VENDOR), Apple)
+        PACKAGE_PATH = /opt/local
+      else
+	ifeq ($(OS_NAME), netbsd)
+	  PACKAGE_PATH = /usr/pkg
+	else
+          PACKAGE_PATH = /usr/local
+	endif
+      endif
 +    endif
 +  endif
 +endif
@ -26,7 +38,7 @@ $OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
 #
 # Get platform definitions
 #
-@@ -207,6 +225,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
+@@ -216,6 +246,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
 
   ifdef ALT_FREETYPE_LIB_PATH
     FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
@ -34,7 +46,7 @@ $OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
   else
     ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
       FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
-@@ -269,6 +288,10 @@ ifdef PROGRAM
+@@ -278,6 +309,10 @@ ifdef PROGRAM
 
   ifeq ($(PLATFORM), linux)
     LDLIBS_COMMON = -ldl
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_Program_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_Program_gmk
@ -1,7 +1,7 @@
-$OpenBSD: patch-jdk_make_common_Program_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp $
--- jdk/make/common/Program.gmk.orig	Sat Dec  1 00:00:00 2007
-+++ jdk/make/common/Program.gmk	Sun Dec 21 22:08:35 2008
-@@ -67,11 +67,22 @@ endif
+$OpenBSD: patch-jdk_make_common_Program_gmk,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/Program.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/common/Program.gmk	Mon May 18 11:13:27 2009
+@@ -67,11 +67,27 @@ endif
 # Create a dependency on libjli (Java Launcher Infrastructure)
 #
 # On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to
@ -13,19 +13,24 @@ $OpenBSD: patch-jdk_make_common_Program_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp $
 # itself, as with all the Windows libraries.
 #
 +ifeq ($(PLATFORM), bsd)
+  ifeq ($(OS_VENDOR), Apple)
+    LDFLAGS += -Wl,-all_load
+    LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
+  else
 +    LDFLAGS += -Wl,--whole-archive
 +    LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
 +    LDFLAGS += -Wl,--no-whole-archive
 +# Work-around an dlsym(RTLD_DEFAULT) bug in at least FreeBSD & OpenBSD
 +    LDFLAGS += -Wl,--export-dynamic
-+    ifeq ($(SYSTEM_ZLIB),true)
-+        OTHER_LDLIBS += -lz
-+    endif
+  endif
+  ifeq ($(SYSTEM_ZLIB),true)
+      OTHER_LDLIBS += -lz
+  endif
 +endif
 ifneq (,$(findstring $(PLATFORM), linux solaris))	# UNIX systems
     LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
     OTHER_LDLIBS += -ljli
-@@ -174,6 +185,10 @@ else # USE_PTHREADS
+@@ -180,6 +196,10 @@ else # USE_PTHREADS
   THREADLIBS = $(LIBTHREAD)
 endif # USE_PTHREADS
 
@ -36,7 +41,7 @@ $OpenBSD: patch-jdk_make_common_Program_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp $
 #
 # This rule only applies on unix.  It supports quantify and its ilk.
 #
-@@ -242,15 +257,19 @@ endif
+@@ -248,15 +268,19 @@ endif
 
 
 ifneq ($(PLATFORM), windows)
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_Release_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_Release_gmk
@ -1,7 +1,7 @@
-$OpenBSD: patch-jdk_make_common_Release_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/Release.gmk.orig	Thu Sep 11 03:44:06 2008
-+++ jdk/make/common/Release.gmk	Fri Sep 12 17:05:54 2008
-@@ -145,14 +145,13 @@ JRE_MAN_PAGES =         \
+$OpenBSD: patch-jdk_make_common_Release_gmk,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/Release.gmk.orig	Thu May 14 03:29:40 2009
+++ jdk/make/common/Release.gmk	Wed May 20 17:32:20 2009
+@@ -148,14 +148,13 @@ JRE_MAN_PAGES =         \
 	tnameserv.1     \
 	unpack200.1
 
@ -17,7 +17,7 @@ $OpenBSD: patch-jdk_make_common_Release_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
 	extcheck.1         \
 	idlj.1             \
 	jar.1              \
-@@ -191,6 +190,11 @@ ifeq ($(PLATFORM), linux)
+@@ -194,6 +193,11 @@ ifeq ($(PLATFORM), linux)
   JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
 endif # linux
 
@ -29,7 +29,7 @@ $OpenBSD: patch-jdk_make_common_Release_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
 define copy-man-pages
 $(MKDIR) -p $1/man/man1
 for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
-@@ -323,7 +327,13 @@ ifndef OPENJDK
+@@ -326,7 +330,13 @@ ifndef OPENJDK
   SOURCE_DIRS += $(CLOSED_SRC)/share/classes
 endif
 
@ -43,7 +43,7 @@ $OpenBSD: patch-jdk_make_common_Release_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
 #
 # Specific files and directories that will be filtered out from above areas.
 #
-@@ -992,7 +1002,7 @@ initial-image-jdk:: initial-image-jdk-setup \
+@@ -987,7 +997,7 @@ initial-image-jdk:: initial-image-jdk-setup \
 	@# generated by the more efficient solaris/windows method of copying files.
 	@# So for Linux, make use of the -T option (like Solaris' -I option) of
 	@# obtaining the list of files from a file. MKS tar has no such option.
@ -52,7 +52,7 @@ $OpenBSD: patch-jdk_make_common_Release_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
 	for d in $(SOURCE_DIRS); do \
 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
 	  ($(CD) $$d &&  \
-@@ -1005,7 +1015,7 @@ initial-image-jdk:: initial-image-jdk-setup \
+@@ -1000,7 +1010,7 @@ initial-image-jdk:: initial-image-jdk-setup \
 	    done ; \
 	  ) ; \
 	  if [ -f  $(ABS_TEMPDIR)/src-files.list ] ; then \
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_internal_BinaryPlugs_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_internal_BinaryPlugs_gmk
@ -1,7 +1,7 @@
-$OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/internal/BinaryPlugs.gmk.orig	Thu Sep 11 03:44:06 2008
-+++ jdk/make/common/internal/BinaryPlugs.gmk	Fri Sep 12 17:05:54 2008
-@@ -51,8 +51,6 @@ PLUG_JMF_CLASS_NAMES = \
+$OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/internal/BinaryPlugs.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/common/internal/BinaryPlugs.gmk	Sat May  9 11:08:16 2009
+@@ -49,8 +49,6 @@ PLUG_JMF_CLASS_NAMES = \
 com/sun/jmx/snmp/SnmpDataTypeEnums.class \
 com/sun/jmx/snmp/SnmpDefinitions.class \
 com/sun/jmx/snmp/SnmpOid.class \
@ -10,7 +10,7 @@ $OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.2 2009/01/04 23:25:
 com/sun/jmx/snmp/SnmpOidRecord.class \
 com/sun/jmx/snmp/SnmpOidTable.class \
 com/sun/jmx/snmp/SnmpOidTableSupport.class \
-@@ -62,17 +60,9 @@ com/sun/jmx/snmp/SnmpPeer.class \
+@@ -60,22 +58,16 @@ com/sun/jmx/snmp/SnmpPeer.class \
 com/sun/jmx/snmp/SnmpTimeticks.class \
 com/sun/jmx/snmp/SnmpVarBind.class \
 com/sun/jmx/snmp/SnmpVarBindList.class \
@ -27,25 +27,19 @@ $OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.2 2009/01/04 23:25:
 -com/sun/jmx/snmp/daemon/WaitQ.class
 +com/sun/jmx/snmp/daemon/SnmpSession.class
 
- PLUG_SOUND_CLASS_NAMES = \
- com/sun/media/sound/AbstractPlayer.class \
-@@ -126,10 +116,12 @@ com/sun/media/sound/SimpleInputDeviceProvider\$$1.clas
- com/sun/media/sound/SimpleInputDeviceProvider\$$InputDeviceInfo.class \
- com/sun/media/sound/SimpleInputDeviceProvider.class
- 
 +PLUG_GNU_CLASS_NAMES = gnu
 +
 # Class list temp files (used by both import and export of plugs)
 
 PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
-PLUG_CLASS_AREAS = jmf sound
-+PLUG_CLASS_AREAS = jmf sound gnu
+-PLUG_CLASS_AREAS = jmf
+PLUG_CLASS_AREAS = jmf gnu
 PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
 
 # Create jargs file command
-@@ -152,6 +144,11 @@ $(PLUG_TEMPDIR)/sound.clist:
- 	@for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
- 	  $(ECHO) "$$i" >> $@ ; \
+@@ -93,11 +85,18 @@ $(PLUG_TEMPDIR)/jmf.clist:
+ 	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
+ 	  $(ECHO) "$$i" >> $@; \
 	done
 +$(PLUG_TEMPDIR)/gnu.clist:
 +	@$(prep-target)
@ -55,33 +49,30 @@ $OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.2 2009/01/04 23:25:
 $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
 	@$(prep-target)
 	$(CAT) $(PLUG_CLISTS) > $@
-@@ -159,6 +156,8 @@ $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
- 	$(plug-create-jargs)
- $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
+ $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
 	$(plug-create-jargs)
 +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
 +	$(plug-create-jargs)
 $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
 	$(plug-create-jargs)
 
-@@ -195,12 +194,15 @@ import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE)
+@@ -133,10 +132,14 @@ endef # import-binary-plug-classes
+ import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
- import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
- 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
+ 
 +import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
 +	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
- 
+
 # Import all classes from the jar file
 
 import-binary-plug-jar: \
- 	     import-binary-plug-jmf-classes \
-	     import-binary-plug-sound-classes
-+	     import-binary-plug-sound-classes \
+-	     import-binary-plug-jmf-classes
+	     import-binary-plug-jmf-classes \
 +	     import-binary-plug-gnu-classes
 
- # Import native libraries
+ # Binary plug start/complete messages
 
-@@ -223,14 +225,12 @@ import-binary-plugs-completed:
+@@ -148,14 +151,12 @@ import-binary-plugs-completed:
 
 # Import lib files (only if they don't exist already)
 
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Compiler-gcc_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Compiler-gcc_gmk
@ -1,33 +1,28 @@
-$OpenBSD: patch-jdk_make_common_shared_Compiler-gcc_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/shared/Compiler-gcc.gmk.orig	Thu Jul 17 03:43:08 2008
-+++ jdk/make/common/shared/Compiler-gcc.gmk	Sat Aug  2 16:12:53 2008
-@@ -53,20 +53,24 @@ ifeq ($(PLATFORM), windows)
+$OpenBSD: patch-jdk_make_common_shared_Compiler-gcc_gmk,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/shared/Compiler-gcc.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/common/shared/Compiler-gcc.gmk	Mon May 18 11:18:32 2009
+@@ -72,6 +72,24 @@ ifeq ($(PLATFORM), linux)
 
 endif
 
-ifeq ($(PLATFORM), linux)
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
- 
-+ifeq ($(PLATFORM), linux)
-   # Settings specific to Linux
-  CC             = $(COMPILER_PATH)gcc
-  CPP            = $(COMPILER_PATH)gcc -E
-+  CC            ?= $(COMPILER_PATH)gcc
-+  CPP            = $(CC) -E
-   # statically link libstdc++ before C++ ABI is stablized on Linux
-   STATIC_CXX     = true
-+else
-+  STATIC_CXX     = false
+ifeq ($(PLATFORM), bsd)
+
+  # Settings specific to BSD
+  CC             = $(COMPILER_PATH)gcc
+  CPP            = $(COMPILER_PATH)gcc -E
+  CXX            = $(COMPILER_PATH)g++
+  REQUIRED_CC_VER = 3.2
+
+  # Option used to create a shared library
+  # Option used to create a shared library
+  ifeq ($(OS_VENDOR), Apple)
+    SHARED_LIBRARY_FLAG = -dynamiclib 
+  else
+    SHARED_LIBRARY_FLAG = -shared
+  endif
+  SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
 +endif
-   ifeq ($(STATIC_CXX),true)
-     # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
-     # We need to use gcc to statically link the C++ runtime. gcc and g++ use
-     # the same subprocess to compile C++ files, so it is OK to build using gcc.
-    CXX            = $(COMPILER_PATH)gcc
-+    CXX            = $(CC)
-   else
-    CXX            = $(COMPILER_PATH)g++
-+    CXX           ?= $(COMPILER_PATH)g++
-   endif
-   ifneq ("$(findstring sparc,$(ARCH))", "")
-     # sparc or sparcv9
+
+ ifeq ($(PLATFORM), solaris)
+ 
+   # Settings specific to Solaris
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Compiler_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Compiler_gmk
@ -1,14 +0,0 @@
-$OpenBSD: patch-jdk_make_common_shared_Compiler_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/common/shared/Compiler.gmk.orig	Tue Oct 30 05:04:22 2007
-+++ jdk/make/common/shared/Compiler.gmk	Wed Nov  7 14:50:59 2007
-@@ -37,8 +37,8 @@ ifeq ($(PLATFORM), solaris)
-   override CC_VERSION = sun
- endif
- 
-# Linux uses GNU compilers by default
-ifeq ($(PLATFORM), linux)
-+# Linux  & BSD uses GNU compilers by default
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
-   override CC_VERSION = gcc
- endif
- 
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs-java_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs-java_gmk
@ -1,12 +0,0 @@
-$OpenBSD: patch-jdk_make_common_shared_Defs-java_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/common/shared/Defs-java.gmk.orig	Wed Nov  7 14:54:30 2007
-+++ jdk/make/common/shared/Defs-java.gmk	Wed Nov  7 14:54:53 2007
-@@ -42,7 +42,7 @@ ifeq ($(ARCH), ia64)
-   #   Suspect this may not be needed anymore.
-   JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
- else
-  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
-+  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=96m
- endif
- 
- # 
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs-utils_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs-utils_gmk
@ -1,6 +1,6 @@
-$OpenBSD: patch-jdk_make_common_shared_Defs-utils_gmk,v 1.2 2009/01/16 16:49:29 kurt Exp $
--- jdk/make/common/shared/Defs-utils.gmk.orig	Fri Dec 19 03:45:14 2008
-+++ jdk/make/common/shared/Defs-utils.gmk	Wed Jan 14 12:26:34 2009
+$OpenBSD: patch-jdk_make_common_shared_Defs-utils_gmk,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/shared/Defs-utils.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/common/shared/Defs-utils.gmk	Mon May 18 11:21:03 2009
@@ -67,6 +67,13 @@ ifeq ($(PLATFORM),windows)
   UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
 endif
@ -15,7 +15,7 @@ $OpenBSD: patch-jdk_make_common_shared_Defs-utils_gmk,v 1.2 2009/01/16 16:49:29
 # Utilities
 ADB            = $(UTILS_COMMAND_PATH)adb
 AR             = $(UTILS_CCS_BIN_PATH)ar
-@@ -201,3 +208,32 @@ ifeq ($(PLATFORM),solaris)
+@@ -201,3 +208,37 @@ ifeq ($(PLATFORM),solaris)
   ECHO           = /usr/bin/echo
 endif
 
@ -47,4 +47,9 @@ $OpenBSD: patch-jdk_make_common_shared_Defs-utils_gmk,v 1.2 2009/01/16 16:49:29
 +    CPIO       = $(UTILS_USR_BIN_PATH)cpio
 +    TAR        = $(UTILS_USR_BIN_PATH)tar
 +  endif
+  ifeq ($(OS_VENDOR), NetBSD)
+    NAWK       = $(UTILS_USR_BIN_PATH)awk
+    ZIPEXE     = $(UTILS_DEVTOOL_PATH)zip
+    UNZIP      = $(UTILS_DEVTOOL_PATH)unzip
+  endif
 +endif
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs_gmk
@ -0,0 +1,14 @@
+$OpenBSD: patch-jdk_make_common_shared_Defs_gmk,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/shared/Defs.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/common/shared/Defs.gmk	Mon May 18 11:22:55 2009
+@@ -577,8 +577,8 @@ ifeq ($(PLATFORM), solaris)
+   override CC_VERSION = sun
+ endif
+ 
+-# Linux uses GNU compilers by default
+-ifeq ($(PLATFORM), linux)
+# Linux & BSD uses GNU compilers by default
+ifneq (,$(findstring $(PLATFORM), linux bsd))
+   override CC_VERSION = gcc
+ endif
+ 
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Platform_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Platform_gmk
@ -1,7 +1,16 @@
-$OpenBSD: patch-jdk_make_common_shared_Platform_gmk,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/shared/Platform.gmk.orig	Mon Aug  4 03:43:01 2008
-+++ jdk/make/common/shared/Platform.gmk	Wed Aug 13 13:42:11 2008
-@@ -272,6 +272,73 @@ ifeq ($(SYSTEM_UNAME), Linux)
+$OpenBSD: patch-jdk_make_common_shared_Platform_gmk,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/shared/Platform.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/common/shared/Platform.gmk	Tue May 19 08:31:38 2009
+@@ -82,7 +82,7 @@ SYSTEM_UNAME := $(shell uname)
+ SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
+ # When changing SCM_DIRs also change SCM_DIRS_rexp and SCM_DIRS_prune:
+ SCM_DIRS_rexp = ".hg|.svn|CVS|RCS|SCCS|Codemgr_wsdata|deleted_files|.hgignore|.hgtags"
+-SCM_DIRS_prune = \( -name .hg -o -name .svn -o -name CVS -o -name RCS -o -name SCCS -o -name Codemgr_wsdata -o -name deleted_files -o -name .hgignore -o -name .hgtags \) -prune
+SCM_DIRS_prune = \( -name .hg -o -name .svn -o -name CVS -o -name RCS -o -name SCCS -o -name Codemgr_wsdata -o -name deleted_files -o -name .hgignore -o -name .hgtags -o -name \*.orig \) -prune
+ 
+ # Don't define this unless it's not defined
+ ifndef VARIANT
+@@ -211,6 +211,85 @@ ifeq ($(SYSTEM_UNAME), Linux)
   MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
 endif
 
@ -9,7 +18,14 @@ $OpenBSD: patch-jdk_make_common_shared_Platform_gmk,v 1.3 2009/01/04 23:25:16 ku
 +  PLATFORM = bsd
 +  OS_NAME = freebsd
 +  OS_VENDOR = FreeBSD
-+ REQUIRED_OS_VERSION = 6.0
+  REQUIRED_OS_VERSION = 6.0
+endif
+
+ifeq ($(SYSTEM_UNAME), Darwin)
+  PLATFORM = bsd
+  OS_NAME = darwin
+  OS_VENDOR = Apple
+  REQUIRED_OS_VERSION = 8.0
 +endif
 +
 +ifeq ($(SYSTEM_UNAME), NetBSD)
@ -42,6 +58,15 @@ $OpenBSD: patch-jdk_make_common_shared_Platform_gmk,v 1.3 2009/01/04 23:25:16 ku
 +  ARCH        := $(shell $(archExpr) )
 +  ARCH_FAMILY := $(ARCH)
 +
+  # Darwin builds may be 32-bit or 64-bit data model.
+  ifeq ($(SYSTEM_UNAME), Darwin)
+    ifeq ($(ARCH), i586)
+      ifeq ($(ARCH_DATA_MODEL), 64)
+        ARCH=amd64
+      endif
+    endif
+  endif
+
 +  # i586 and sparc are 32 bit, amd64 and sparc64 are 64
 +  ifneq (,$(findstring $(ARCH), i586 sparc))
 +    ARCH_DATA_MODEL=32
@ -65,35 +90,45 @@ $OpenBSD: patch-jdk_make_common_shared_Platform_gmk,v 1.3 2009/01/04 23:25:16 ku
 +  #    a fully built workspace.
 +  REQUIRED_FREE_SPACE=1500000
 +  # How much RAM does this machine have:
-+  ifeq ($(OS_VENDOR), OpenBSD)
-+    MB_OF_MEMORY=$(shell perl -e 'printf "%d", `sysctl hw.physmem | cut -d'=' -f2` / 1048576' )
-+  else
-+    MB_OF_MEMORY := $(shell `sysctl hw.physmem | cut -d' ' -f2` / 1048576 )
-+  endif
+  MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' )
 +endif
 +
 # Windows with and without CYGWIN will be slightly different
 ifeq ($(SYSTEM_UNAME), Windows_NT)
   PLATFORM = windows
-@@ -451,7 +518,7 @@ endif
+@@ -376,11 +455,26 @@ ifneq ($(PLATFORM), windows)
+   ARCH_VM_SUBDIR=jre/lib/$(LIBARCH)
+ endif
+ 
+# Darwin-specific Overrides
+ifeq ($(SYSTEM_UNAME),Darwin)
+  # The suffix applied to runtime libraries
+  LIBRARY_SUFFIX = dylib
+  # The suffix applied to link libraries
+  LIB_SUFFIX = dylib
+endif
+
+ # Machines with 512Mb or less of real memory are considered low memory
 #    build machines and adjustments will be made to prevent excessing
 #    system swapping during the build.
 #    If we don't know, assume 512. Subtract 128 from MB for VM MAX.
-#    Don't set VM max over 1024-128=896.
-+#    Don't set VM max over 864-128=736.
+ #    Don't set VM max over 1024-128=896.
+#    736 is the max.
+ifeq ($(OS_VENDOR), OpenBSD)
+  ABS_MAX_MEMORY := "736"
+else
+  ABS_MAX_MEMORY := "896"
+endif
+
 ifeq ($(JDK_HAS_MEM_INFO),)
   JDK_HAS_MEM_INFO=true
   export JDK_HAS_MEM_INFO
-@@ -463,10 +530,10 @@ ifeq ($(JDK_HAS_MEM_INFO),)
-         echo "false"; \
-       fi)
-     MAX_VM_MEMORY := $(shell \
-      if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
-+      if [ $(MB_OF_MEMORY) -le 864 ] ; then \
+@@ -395,7 +489,7 @@ ifeq ($(JDK_HAS_MEM_INFO),)
+       if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
         expr $(MB_OF_MEMORY) '-' 128 2> $(DEV_NULL) ; \
       else \
 -        echo "896"; \
-+        echo "736"; \
+        echo $(ABS_MAX_MEMORY); \
       fi)
     MIN_VM_MEMORY := $(shell \
       if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Sanity-Settings_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Sanity-Settings_gmk
@ -0,0 +1,11 @@
+$OpenBSD: patch-jdk_make_common_shared_Sanity-Settings_gmk,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/shared/Sanity-Settings.gmk.orig	Mon May 18 11:24:34 2009
+++ jdk/make/common/shared/Sanity-Settings.gmk	Mon May 18 11:24:51 2009
+@@ -245,6 +245,7 @@ ifdef OPENJDK
+   ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
+   ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
+   ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH)
+  ALL_SETTINGS+=$(call addAltSetting,X11_PATH)
+   ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
+   ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS)
+   ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
--- a/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Sanity_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_common_shared_Sanity_gmk
@ -1,7 +1,7 @@
-$OpenBSD: patch-jdk_make_common_shared_Sanity_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/shared/Sanity.gmk.orig	Thu Jul 17 03:43:08 2008
-+++ jdk/make/common/shared/Sanity.gmk	Sat Aug  2 16:12:53 2008
-@@ -96,6 +96,11 @@ ifeq ($(PLATFORM), windows)
+$OpenBSD: patch-jdk_make_common_shared_Sanity_gmk,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/common/shared/Sanity.gmk.orig	Fri May  8 03:34:14 2009
+++ jdk/make/common/shared/Sanity.gmk	Mon May 18 11:25:23 2009
+@@ -142,6 +142,11 @@ ifeq ($(PLATFORM), windows)
     $(EGREP) "\#define" | $(NAWK) '{print $$3}')
 endif
 
@ -13,3 +13,22 @@ $OpenBSD: patch-jdk_make_common_shared_Sanity_gmk,v 1.2 2009/01/04 23:25:16 kurt
 # Get the version numbers of what we are using
 _MAKE_VER  :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1)
 _ZIP_VER   :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
+@@ -845,8 +850,10 @@ endif
+ 
+ ######################################################
+ # Check for existence of DEVTOOLS_PATH
+# All needed tools come with base system on Apple
+ ######################################################
+ sane-devtools_path:
+ifneq ($(OS_VENDOR), Apple)
+ 	@if [ "$(DEVTOOLS_PATH)" != "" -a ! -r "$(DEVTOOLS_PATH)" ]; then \
+ 	  $(ECHO) "ERROR: You do not have a valid DEVTOOLS_PATH setting. \n" \
+ 	    "      Please check your access to \n" \
+@@ -854,6 +861,7 @@ sane-devtools_path:
+ 	    "      and/or check your value of ALT_DEVTOOLS_PATH. \n" \
+ 	    "" >> $(ERROR_FILE) ; \
+ 	fi
+endif
+ 
+ ######################################################
+ # Check for existence of MS_RUNTIME_LIBRARIES
--- a/devel/jdk/1.7/patches/patch-jdk_make_docs_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_docs_Makefile
@ -1,16 +1,7 @@
-$OpenBSD: patch-jdk_make_docs_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/docs/Makefile.orig	Tue Oct 30 05:04:22 2007
-+++ jdk/make/docs/Makefile	Wed Nov  7 17:58:09 2007
-@@ -34,7 +34,7 @@ include $(BUILDDIR)/common/Defs.gmk
- #    NOTE: javadoc will not complete without these larger settings.
- #    WARNING: This could cause thrashing on low memory machines.
- ifeq ($(ARCH_DATA_MODEL),64)
-  MAX_VM_MEMORY = 1024
-+  MAX_VM_MEMORY = 736
- else
-   MAX_VM_MEMORY = 512
- endif
-@@ -210,7 +210,7 @@ JDI_HEADER      = "Java Debug Interface"
+$OpenBSD: patch-jdk_make_docs_Makefile,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/docs/Makefile.orig	Fri May  8 03:34:14 2009
+++ jdk/make/docs/Makefile	Mon May 18 11:26:14 2009
+@@ -214,7 +214,7 @@ SECURITYAPI_JAVADOCBOTTOM = '<font size="-1"><a href="
 #       you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR)
 #       being interpreted as an end of command (newline)
 
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_instrument_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_instrument_Makefile
@ -1,23 +1,30 @@
-$OpenBSD: patch-jdk_make_java_instrument_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/instrument/Makefile.orig	Tue Oct 30 05:04:22 2007
-+++ jdk/make/java/instrument/Makefile	Wed Nov  7 18:01:59 2007
-@@ -102,6 +102,15 @@ ifeq ($(PLATFORM), windows)
+$OpenBSD: patch-jdk_make_java_instrument_Makefile,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/instrument/Makefile.orig	Fri May  8 03:34:14 2009
+++ jdk/make/java/instrument/Makefile	Mon May 18 11:26:48 2009
+@@ -102,6 +102,22 @@ ifeq ($(PLATFORM), windows)
   # equivalent of strcasecmp is stricmp on Windows
   CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
 else
 +ifeq ($(PLATFORM), bsd)
-+  LDFLAGS += -Wl,--whole-archive
-+  LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
-+  LDFLAGS += -Wl,--no-whole-archive
-+  ICONV_DIR = /usr/local
+  ifeq ($(OS_VENDOR), Apple)
+    LDFLAGS += -Wl,-all_load
+    LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
+    OTHER_LDLIBS += -liconv
+  else
+    LDFLAGS += -Wl,--whole-archive
+    LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
+    LDFLAGS += -Wl,--no-whole-archive
+    ifneq ($(OS_NAME), netbsd)
 +# Use CPPFLAGS instead of OTHER_INCLUDES to force this last
-+  CPPFLAGS += -I$(ICONV_DIR)/include
-+  OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv
+      CPPFLAGS += -I$(PACKAGE_PATH)/include
+      OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
+    endif
+  endif
 +else
   LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
   OTHER_LDLIBS += -ljli
   OTHER_LDLIBS += -ldl 
-@@ -113,6 +122,7 @@ else
+@@ -113,6 +129,7 @@ else
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
   endif
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_java_genlocales_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_java_genlocales_gmk
@ -0,0 +1,22 @@
+$OpenBSD: patch-jdk_make_java_java_genlocales_gmk,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/java/genlocales.gmk.orig	Mon May 18 11:27:18 2009
+++ jdk/make/java/java/genlocales.gmk	Mon May 18 11:27:26 2009
+@@ -76,10 +76,14 @@ RESOURCE_NAMES="FormatData CollationData TimeZoneNames
+ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
+ 	@$(RM) $@.tmp.euro $@.tmp.noneuro;
+ 	@$(prep-target) 
+-	@$(ECHO) $(subst .properties,'\n',$(Euro_Resources_properties)) > $@.tmp.euro;
+-	@$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro;	
+-	@$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro;
+-	@$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro;
+	@$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
+'@g > $@.tmp.euro;
+	@$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
+'@g >> $@.tmp.euro;
+	@$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
+'@g > $@.tmp.noneuro;
+	@$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
+'@g >> $@.tmp.noneuro;
+ 	NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
+ 	     $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
+ 		$@.tmp.noneuro $< $@
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_java_hprof_demo_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_java_hprof_demo_Makefile
@ -1,14 +1,11 @@
-$OpenBSD: patch-jdk_make_java_java_hprof_demo_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/java_hprof_demo/Makefile.orig	Tue Oct 30 05:04:23 2007
-+++ jdk/make/java/java_hprof_demo/Makefile	Wed Nov  7 18:05:31 2007
-@@ -80,10 +80,12 @@ OTHER_INCLUDES = -I$(SRCDIR) \
- 	         -I$(PLATFORM_SRC)/npt \
- 	         -I$(SHARE_SRC)/demo/jvmti/java_crw_demo
- 
-+ifneq ($(PLATFORM), bsd)
+$OpenBSD: patch-jdk_make_java_java_hprof_demo_Makefile,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/java_hprof_demo/Makefile.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/java_hprof_demo/Makefile	Mon May 18 11:28:14 2009
+@@ -83,7 +83,9 @@ OTHER_INCLUDES = -I$(SRCDIR) \
 ifeq ($(PLATFORM), windows)
   OTHER_LDLIBS += wsock32.lib winmm.lib
 else
+ifneq ($(PLATFORM), bsd)
   OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
 +endif
 endif
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_jli_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_jli_Makefile
@ -1,6 +1,6 @@
-$OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/jli/Makefile.orig	Thu Oct 23 03:44:05 2008
-+++ jdk/make/java/jli/Makefile	Mon Dec 22 23:24:39 2008
+$OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/jli/Makefile.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/jli/Makefile	Mon May 18 11:28:33 2009
@@ -44,8 +44,10 @@ MS_RUNTIME_STATIC = true
 
 include $(BUILDDIR)/common/Defs.gmk
@ -32,7 +32,13 @@ $OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
 
 ifneq ($(PLATFORM), windows)
 
-@@ -96,10 +102,12 @@ OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
+@@ -91,15 +97,17 @@ ifeq ($(PLATFORM), solaris)
+   LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
+ endif
+ 
+-OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
+OTHER_CPPFLAGS += $(LIBARCH_DEFINES) -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+ 
 
 ifneq ($(PLATFORM), windows)	# UNIX systems
 	LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
@ -49,10 +55,11 @@ $OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
 
 OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
 OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
+-OTHER_INCLUDES += -I$(ZIP_SRC)
 +ifneq ($(SYSTEM_ZLIB),true)
- OTHER_INCLUDES += -I$(ZIP_SRC)
+  OTHER_INCLUDES += -I$(ZIP_SRC)
 +else
-+LDLIBS += -lz
+  LDLIBS += -lz
 +endif
 
 #
@ -68,7 +75,6 @@ $OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
 +STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME)
 +
 +$(STATIC_LIBRARY_DIR): $(OBJDIR)
-+	@$(prep-target)
 +	@$(MKDIR) $(STATIC_LIBRARY_DIR)
 +
 +$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
@ -85,5 +91,6 @@ $OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
 -vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
 +vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
 +ifneq ($(SYSTEM_ZLIB),true)
-+vpath %.c $(ZIP_SRC)
+  vpath %.c $(ZIP_SRC)
 +endif
+
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_management_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_management_Makefile
@ -1,7 +1,7 @@
-$OpenBSD: patch-jdk_make_java_management_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/management/Makefile.orig	Tue Oct 30 05:04:23 2007
-+++ jdk/make/java/management/Makefile	Wed Nov  7 18:01:59 2007
-@@ -83,6 +83,11 @@ vpath %.c $(PLATFORM_SRC)/native/com/sun/management
+$OpenBSD: patch-jdk_make_java_management_Makefile,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/management/Makefile.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/management/Makefile	Sat May  9 11:04:58 2009
+@@ -85,6 +85,11 @@ vpath %.c $(PLATFORM_SRC)/native/com/sun/management
 OTHER_INCLUDES += \
   -I$(SHARE_SRC)/native/sun/management 
 
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_net_FILES_c_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_net_FILES_c_gmk
@ -1,7 +1,7 @@
-$OpenBSD: patch-jdk_make_java_net_FILES_c_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/net/FILES_c.gmk.orig	Tue Oct 30 05:04:23 2007
-+++ jdk/make/java/net/FILES_c.gmk	Wed Nov  7 18:01:59 2007
-@@ -43,6 +43,10 @@ ifeq ($(PLATFORM), linux)
+$OpenBSD: patch-jdk_make_java_net_FILES_c_gmk,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/net/FILES_c.gmk.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/net/FILES_c.gmk	Sat May  9 11:04:58 2009
+@@ -47,6 +47,10 @@ ifeq ($(PLATFORM), linux)
     FILES_c += linux_close.c
 endif
 
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_nio_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_nio_Makefile
@ -1,16 +1,74 @@
-$OpenBSD: patch-jdk_make_java_nio_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/nio/Makefile.orig	Mon Aug  4 03:43:01 2008
-+++ jdk/make/java/nio/Makefile	Wed Aug 13 13:39:37 2008
-@@ -82,7 +82,7 @@ FILES_export += \
- 	sun/nio/ch/WindowsSelectorImpl.java
- endif # PLATFORM = windows
+$OpenBSD: patch-jdk_make_java_nio_Makefile,v 1.4 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/nio/Makefile.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/nio/Makefile	Tue May 19 11:48:56 2009
+@@ -260,6 +260,66 @@ FILES_gen += \
+ 	sun/nio/fs/UnixConstants.java
+ endif # PLATFORM = linux
 
-ifeq ($(PLATFORM), linux)
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
- FILES_java += \
-         sun/nio/ch/AbstractPollSelectorImpl.java \
- 	sun/nio/ch/EPollArrayWrapper.java \
-@@ -126,6 +126,11 @@ OTHER_INCLUDES += \
+ifeq ($(PLATFORM), bsd)
+FILES_java += \
+        sun/nio/ch/AbstractPollSelectorImpl.java \
+	sun/nio/ch/InheritedChannel.java \
+        sun/nio/ch/PollSelectorProvider.java \
+        sun/nio/ch/PollSelectorImpl.java \
+	sun/nio/ch/Port.java \
+	sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
+	sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
+	sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
+	\
+	sun/nio/fs/GnomeFileTypeDetector.java \
+	sun/nio/fs/BsdFileStore.java \
+	sun/nio/fs/BsdFileSystem.java \
+	sun/nio/fs/BsdFileSystemProvider.java \
+	sun/nio/fs/PollingWatchService.java \
+	sun/nio/fs/UnixChannelFactory.java \
+	sun/nio/fs/UnixCopyFile.java \
+	sun/nio/fs/UnixDirectoryStream.java \
+	sun/nio/fs/UnixException.java \
+	sun/nio/fs/UnixFileAttributeViews.java \
+	sun/nio/fs/UnixFileAttributes.java \
+	sun/nio/fs/UnixFileKey.java \
+	sun/nio/fs/UnixFileModeAttribute.java \
+	sun/nio/fs/UnixFileStore.java \
+	sun/nio/fs/UnixFileStoreAttributes.java \
+	sun/nio/fs/UnixFileSystem.java \
+	sun/nio/fs/UnixFileSystemProvider.java \
+	sun/nio/fs/UnixMountEntry.java \
+	sun/nio/fs/UnixNativeDispatcher.java \
+	sun/nio/fs/UnixPath.java \
+	sun/nio/fs/UnixSecureDirectoryStream.java \
+	sun/nio/fs/UnixUriUtils.java \
+	sun/nio/fs/UnixUserPrincipals.java
+
+FILES_c += \
+	InheritedChannel.c \
+	NativeThread.c \
+        PollArrayWrapper.c \
+	UnixAsynchronousServerSocketChannelImpl.c \
+	UnixAsynchronousSocketChannelImpl.c \
+	\
+	GnomeFileTypeDetector.c \
+	UnixCopyFile.c \
+	UnixNativeDispatcher.c
+
+FILES_export += \
+	sun/nio/ch/InheritedChannel.java \
+	sun/nio/ch/NativeThread.java \
+	sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
+	sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
+	\
+	sun/nio/fs/GnomeFileTypeDetector.java \
+	sun/nio/fs/UnixCopyFile.java \
+	sun/nio/fs/UnixNativeDispatcher.java
+	
+FILES_gen += \
+	sun/nio/fs/UnixConstants.java
+endif # PLATFORM = bsd
+
+ #
+ # Find platform-specific C source files
+ #
+@@ -284,6 +344,11 @@ OTHER_INCLUDES += \
   -I$(PLATFORM_SRC)/native/java/net \
   -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders
 
@ -22,7 +80,7 @@ $OpenBSD: patch-jdk_make_java_nio_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
 ifeq ($(PLATFORM),windows)
   OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
      -libpath:$(LIBDIR) java.lib \
-@@ -136,6 +141,9 @@ endif
+@@ -294,6 +359,9 @@ endif
 ifeq ($(PLATFORM), linux)
 OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
 endif
@ -32,7 +90,7 @@ $OpenBSD: patch-jdk_make_java_nio_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
 ifeq ($(PLATFORM), solaris)
 OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
 		-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
-@@ -157,6 +165,9 @@ FILES_m = mapfile-solaris
+@@ -315,6 +383,9 @@ FILES_m = mapfile-solaris
 endif
 ifeq ($(PLATFORM), linux)
 FILES_m = mapfile-linux
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_npt_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_npt_Makefile
@ -1,15 +1,20 @@
-$OpenBSD: patch-jdk_make_java_npt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/npt/Makefile.orig	Mon Aug  4 03:43:01 2008
-+++ jdk/make/java/npt/Makefile	Wed Aug 13 13:39:37 2008
-@@ -65,6 +65,13 @@ ifeq ($(PLATFORM), windows)
+$OpenBSD: patch-jdk_make_java_npt_Makefile,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/npt/Makefile.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/npt/Makefile	Mon May 18 11:45:54 2009
+@@ -65,6 +65,18 @@ ifeq ($(PLATFORM), windows)
   OTHER_LCF += -export:nptInitialize -export:nptTerminate
 endif
 
 +# Add location of iconv headers
 +ifeq ($(PLATFORM), bsd)
-+  ICONV_DIR = /usr/local
-+  CPPFLAGS += -I$(ICONV_DIR)/include
-+  OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv
+  ifeq ($(OS_VENDOR), Apple)
+    OTHER_LDLIBS += -liconv
+  else
+    ifneq ($(OS_NAME), netbsd)
+      CPPFLAGS += -I$(PACKAGE_PATH)/include
+      OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
+    endif
+  endif
 +endif
 +
 #
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_redist_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_redist_Makefile
@ -1,6 +1,6 @@
-$OpenBSD: patch-jdk_make_java_redist_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/redist/Makefile.orig	Thu Oct 23 03:44:05 2008
-+++ jdk/make/java/redist/Makefile	Mon Dec 22 14:34:19 2008
+$OpenBSD: patch-jdk_make_java_redist_Makefile,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/redist/Makefile.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/redist/Makefile	Mon May 18 13:01:01 2009
@@ -85,6 +85,11 @@ ifeq ($(SA_EXISTS), false)
   INCLUDE_SA := false
 endif
@ -13,3 +13,21 @@ $OpenBSD: patch-jdk_make_java_redist_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp
 ifeq ($(INCLUDE_SA), true)
   IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
                  $(LIB_LOCATION)/$(SALIB_NAME)
+@@ -311,7 +316,7 @@ $(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/%
+ $(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
+ 	$(install-file)
+ 
+-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
+ 
+ # The oblique fonts are only needed/wanted on Linux.
+ 
+@@ -325,7 +330,7 @@ $(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib
+ $(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
+ 	$(install-file)
+ 
+-endif # linux
+endif # linux || bsd
+ endif # !OPENJDK
+ 
+ # Import internal files (ones that are stashed in this source tree)
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_security_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_security_Makefile
@ -0,0 +1,19 @@
+$OpenBSD: patch-jdk_make_java_security_Makefile,v 1.1 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/security/Makefile.orig	Mon May 18 13:01:18 2009
+++ jdk/make/java/security/Makefile	Mon May 18 13:01:24 2009
+@@ -51,7 +51,15 @@ ifeq ($(PLATFORM), windows)
+   ifneq ($(ARCH_DATA_MODEL), 64)
+     PROPS_SRC   = $(TOPDIR)/src/share/lib/security/java.security-windows
+   endif
+
+else # windows
+
+ifeq ($(PLATFORM), bsd)
+  ifeq ($(OS_VENDOR), OpenBSD)
+    PROPS_SRC   = $(TOPDIR)/src/share/lib/security/java.security-openbsd
+  endif
+ endif
+endif # windows
+ endif # PLATFORM
+ 
+ 
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_zip_FILES_c_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_zip_FILES_c_gmk
@ -1,10 +1,10 @@
-$OpenBSD: patch-jdk_make_java_zip_FILES_c_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/zip/FILES_c.gmk.orig	Tue Oct 30 05:04:24 2007
-+++ jdk/make/java/zip/FILES_c.gmk	Wed Nov  7 18:01:59 2007
-@@ -30,6 +30,10 @@ FILES_c = \
+$OpenBSD: patch-jdk_make_java_zip_FILES_c_gmk,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/zip/FILES_c.gmk.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/zip/FILES_c.gmk	Sat May  9 15:01:46 2009
+@@ -29,6 +29,10 @@ FILES_c = \
+ 	Deflater.c \
 	Inflater.c \
 	ZipFile.c \
- 	ZipEntry.c \
 +	zip_util.c
 +
 +ifneq ($(SYSTEM_ZLIB),true)
@ -12,7 +12,7 @@ $OpenBSD: patch-jdk_make_java_zip_FILES_c_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp
 	zadler32.c \
 	zcrc32.c \
 	deflate.c \
-@@ -40,5 +44,5 @@ FILES_c = \
+@@ -39,5 +43,5 @@ FILES_c = \
 	inftrees.c \
 	infcodes.c \
 	infutil.c \
--- a/devel/jdk/1.7/patches/patch-jdk_make_java_zip_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_java_zip_Makefile
@ -1,7 +1,7 @@
-$OpenBSD: patch-jdk_make_java_zip_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/zip/Makefile.orig	Mon Aug  4 03:43:01 2008
-+++ jdk/make/java/zip/Makefile	Wed Aug 13 13:39:37 2008
-@@ -69,16 +69,24 @@ else
+$OpenBSD: patch-jdk_make_java_zip_Makefile,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/java/zip/Makefile.orig	Fri May  8 03:34:15 2009
+++ jdk/make/java/zip/Makefile	Sun May 10 23:05:12 2009
+@@ -69,16 +69,28 @@ else
 CPPFLAGS += -UDEBUG 
 endif
 
@ -9,6 +9,10 @@ $OpenBSD: patch-jdk_make_java_zip_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
 CPPFLAGS += -I$(SHARE_SRC)/native/java/io
 CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
 
+ifeq ($(PLATFORM),bsd)
+CPPFLAGS += -I$(PLATFORM_SRC)/hpi/include
+endif
+
 +ifneq ($(SYSTEM_ZLIB),true)
 +CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 +
--- a/devel/jdk/1.7/patches/patch-jdk_make_javax_sound_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_javax_sound_Makefile
@ -1,21 +1,10 @@
-$OpenBSD: patch-jdk_make_javax_sound_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/javax/sound/Makefile.orig	Sat Dec  1 00:00:00 2007
-+++ jdk/make/javax/sound/Makefile	Tue Mar 18 16:27:29 2008
-@@ -98,7 +98,9 @@ FILES_c += $(FILES_$(PLATFORM))
- #
- # add "closed" library
- #
-+ifneq ($(PLATFORM), bsd)
- SUBDIRS += jsoundhs
-+endif
- 
- #
- # system dependent flags
-@@ -125,6 +127,19 @@ ifeq ($(PLATFORM), linux)
-   EXTRA_SOUND_JNI_LIBS += jsoundalsa
+$OpenBSD: patch-jdk_make_javax_sound_Makefile,v 1.2 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/javax/sound/Makefile.orig	Fri May  8 03:34:15 2009
+++ jdk/make/javax/sound/Makefile	Mon May 18 13:02:26 2009
+@@ -107,6 +107,16 @@ ifeq ($(PLATFORM), linux)
   #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
 endif # PLATFORM linux
-+
+ 
 +# XXXBSD: ???
 +ifeq ($(PLATFORM), bsd)
 +    # build with empty MIDI i/o
@ -24,10 +13,8 @@ $OpenBSD: patch-jdk_make_javax_sound_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp
 +    INCLUDE_PORTS = TRUE
 +    # build with empty direct audio
 +    INCLUDE_DAUDIO = TRUE
-+    ifeq ($(OS_VENDOR), OpenBSD)
-+      LDFLAGS += -lossaudio
-+    endif
 +endif # PLATFORM bsd
- 
+
 ifeq ($(PLATFORM), solaris)
   ifneq ($(ARCH), amd64)
+     # build with ports and direct audio
--- a/devel/jdk/1.7/patches/patch-jdk_make_sun_awt_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_sun_awt_Makefile
@ -1,6 +1,6 @@
-$OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/awt/Makefile.orig	Thu Sep 11 03:44:07 2008
-+++ jdk/make/sun/awt/Makefile	Fri Sep 12 17:05:55 2008
+$OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/sun/awt/Makefile.orig	Fri May  8 03:34:16 2009
+++ jdk/make/sun/awt/Makefile	Sat May  9 11:04:59 2009
@@ -123,6 +123,13 @@ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
 OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
 endif
@ -15,7 +15,7 @@ $OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
 FILES_c += initIDs.c
 
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
-@@ -235,7 +242,7 @@ vpath %.c     $(SHARE_SRC)/native/$(PKGDIR)/../font
+@@ -236,7 +243,7 @@ vpath %.c     $(SHARE_SRC)/native/$(PKGDIR)/../font
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
 endif # PLATFORM
 
@ -24,7 +24,7 @@ $OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
 vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
-@@ -384,6 +391,19 @@ FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+@@ -390,6 +397,19 @@ FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
 endif # PLATFORM
 
@ -44,7 +44,7 @@ $OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
 FONTCONFIGS     = $(_FONTCONFIGS:%=$(LIBDIR)/%.src)
 BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc)
 
-@@ -476,6 +496,9 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
+@@ -482,6 +502,9 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
             -I$(OPENWIN_HOME)/include/X11/extensions \
             -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
 endif
@ -54,7 +54,7 @@ $OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
             -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-@@ -497,7 +520,13 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+@@ -503,7 +526,13 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
             -I$(PLATFORM_SRC)/native/$(PKGDIR) \
 	    $(EVENT_MODEL)
 
--- a/devel/jdk/1.7/patches/patch-jdk_make_sun_awt_mawt_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_sun_awt_mawt_gmk
@ -1,6 +1,6 @@
-$OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/awt/mawt.gmk.orig	Thu Oct 23 03:44:06 2008
-+++ jdk/make/sun/awt/mawt.gmk	Mon Dec 22 16:54:06 2008
+$OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/sun/awt/mawt.gmk.orig	Fri May  8 03:34:16 2009
+++ jdk/make/sun/awt/mawt.gmk	Mon May 18 13:03:16 2009
@@ -167,7 +167,7 @@ ifeq ($(PLATFORM), solaris)
 OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
 endif
@ -24,7 +24,17 @@ $OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
 #
 # Sun CC with -Xa misdefines __STDC__ to 0 (zero).
 # The following will force checking of X11 prototypes.
-@@ -221,10 +225,24 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+@@ -196,6 +200,9 @@ CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+ ifndef HEADLESS
+ CPPFLAGS += -I$(OPENWIN_HOME)/include 
+ LDFLAGS  += -L$(OPENWIN_LIB)
+ifeq ($(OS_NAME), netbsd)
+LDFLAGS  += -Wl,-R$(OPENWIN_LIB)
+endif
+ 
+ endif # !HEADLESS
+ 
+@@ -221,16 +228,33 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
         -I$(PLATFORM_SRC)/native/$(PKGDIR) \
         $(EVENT_MODEL)
 
@ -41,11 +51,20 @@ $OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
 # Checking for the X11/extensions headers at the additional location
   CPPFLAGS += -I/X11R6/include/X11/extensions \
               -I/usr/include/X11/extensions
-+endif
-+
+ endif
+ 
 +ifeq ($(PLATFORM), bsd)
 +  CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
 +              -I$(OPENWIN_HOME)/include 
+endif
+
+ ifeq ($(PLATFORM), solaris)
+   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
 endif
 
- ifeq ($(PLATFORM), solaris)
+ifneq ($(PLATFORM), windows)
+  CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+endif
+ 
+ LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
+ 	   $(AWT_RUNPATH)
--- a/devel/jdk/1.7/patches/patch-jdk_make_sun_font_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_sun_font_Makefile
@ -1,18 +1,23 @@
-$OpenBSD: patch-jdk_make_sun_font_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/font/Makefile.orig	Thu Sep 11 03:44:07 2008
-+++ jdk/make/sun/font/Makefile	Fri Sep 12 17:05:56 2008
-@@ -170,6 +170,10 @@ else # PLATFORM
+$OpenBSD: patch-jdk_make_sun_font_Makefile,v 1.3 2009/05/23 03:03:25 kurt Exp $
+--- jdk/make/sun/font/Makefile.orig	Fri May  8 03:34:16 2009
+++ jdk/make/sun/font/Makefile	Mon May 18 13:03:41 2009
+@@ -170,6 +170,15 @@ else # PLATFORM
 # Libraries to link, and other C flags.
 #
 
 +ifeq ($(PLATFORM), bsd)
-+OTHER_INCLUDES += -I/usr/X11R6/include
+OTHER_INCLUDES += -I$(X11_PATH)/include
 +OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
+ ifeq ($(OS_VENDOR),Apple)
+   # XXXDARWIN Match BSD/Linux behavior -- the mawt.dylib symbols will
+   # be available at runtime.
+   OTHER_LDLIBS += -flat_namespace -undefined suppress
+ endif
 +else
 ifeq ($(PLATFORM), solaris)
   # Note that on Solaris, fontmanager is built against the headless library.
   LDFLAGS      += -L$(LIBDIR)/$(LIBARCH)/headless
-@@ -179,6 +183,7 @@ else # PLATFORM is linux
+@@ -179,6 +188,7 @@ else # PLATFORM is linux
   ifeq ("$(CC_VER_MAJOR)", "3")
     OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
   endif                           
--- a/Show More
+++ b/Show More