Remove BROKEN and update port to b19. The port is fully 1.7 now (both

hotspot and j2se). The j2se patches are from the bsd java repositories 1.5 -> 1.6 (performed by Greg Lewis) -> 1.7 by myself. j2se patches are in sync with 1.6 patchset 1 plus the Runtime.exec fix from Michiel Boland via FreeBSD PR http://www.freebsd.org/cgi/query-pr.cgi?pr=115557. Also from FreeBSD: interactive JRL license verification. By default the port is IS_INTERACTIVE=Yes. Add ACCEPT_JRL_LICENSE=Yes to /etc/mk.conf to permanently accept the JRL license. At some point in the future I will work on switching this back to OpenJDK/GPLv2 src. That largely depends on Sun's progress at removing more of the binary plug bits so that stubbing out the remainder is less cumbersome and time consuming. Testing, comments and okay ian@
2007-09-06 15:46:18 +00:00 · 2007-09-06 15:46:18 +00:00 · 324a878467
commit 324a878467
parent 8195ab169d
229 changed files with 14492 additions and 2885 deletions
--- a/devel/jdk/1.7/Makefile
+++ b/devel/jdk/1.7/Makefile
@ -1,23 +1,29 @@
-# $OpenBSD: Makefile,v 1.4 2007/08/07 16:07:22 kurt Exp $
-
-BROKEN= "Incomplete port, 1.7 JVM + 1.5 classes"
+# $OpenBSD: Makefile,v 1.5 2007/09/06 15:46:18 kurt Exp $

 SHARED_ONLY=		Yes
 ONLY_FOR_ARCHS= 	i386 amd64

-COMMENT=		"Java2(TM) Standard Edition Dev Kit v${V}"
+COMMENT-main=		"Java2(TM) Standard Edition Dev Kit v${V}"
+COMMENT-jre=		"Java2(TM) Standard Edition Runtime Environment v${V}"
 V=			1.7.0
-B=			b15
-D=			05_jul_2007
+B=			b19
+D=			30_aug_2007
 DISTFILES=		jdk-7-ea-src-${B}-jrl-${D}.jar \
-			jdk-7-ea-bin-${B}-jrl-${D}.jar \
-			jdk-7-ea-mozilla_headers-${B}-unix-${D}.jar
+			jdk-7-ea-bin-${B}-jrl-${D}.jar
 PKGNAME=		jdk-${V}.${B}
+PKGNAME-main=		jdk-${V}.${B}
+PKGNAME-jre=		jre-${V}.${B}

 CATEGORIES=		devel/jdk java

+MULTI_PACKAGES= 	-main -jre
+
+FLAVORS=		with_ipv6
+FLAVOR?=
+
 HOMEPAGE=		https://jdk7.dev.java.net/
-MASTER_SITES=		http://www.java.net/download/jdk7/
+MASTER_SITES=		http://www.java.net/download/jdk7/ \
+			http://www.intricatesoftware.com/distfiles/

 MAINTAINER=		Kurt Miller <kurt@openbsd.org>

@ -30,38 +36,51 @@ PERMIT_DISTFILES_FTP=	"JRL"

 NO_REGRESS=		Yes

-BUILD_DEPENDS=		:jdk->=1.5.0.11:devel/jdk/1.5 \
+BUILD_DEPENDS=		:jdk-1.5.0*:devel/jdk/1.5 \
 			::archivers/zip \
-			::archivers/unzip
+			::archivers/unzip \
+			::print/cups
 USE_MOTIF=		openmotif
 MODULES=		converters/libiconv
-WANTLIB=		X11 Xext Xi Xp Xt Xtst c m ossaudio pthread \
-			stdc++ z
+WANTLIB=		X11 Xext Xi Xp Xt Xtst c freetype m ossaudio \
+			pthread stdc++

 USE_GMAKE=		Yes

 ALT_BOOTDIR=		${LOCALBASE}/jdk-1.5.0

 MAKE_ENV=		ALT_BOOTDIR=${ALT_BOOTDIR} \
-			ALT_JDK_IMPORT_PATH=${ALT_BOOTDIR} \
+			ALT_MOTIF_DIR=${LOCALBASE} \
+			ALT_FREETYPE_HEADERS_PATH=${X11BASE}/include \
+			ALT_FREETYPE_LIB_PATH=${X11BASE}/lib \
+			SKIP_COMPARE_IMAGES=true \
+			BUILD_INSTALL=false \
+			NO_DOCS=true \
+			CC="${CC}" \
+			CXX="${CXX}" \
 			DEFAULT_LIBPATH="/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib" \
 			USERNAME=${USER} \
-			HOTSPOT_BUILD_JOBS=`sysctl -n hw.ncpu`
+			HOTSPOT_BUILD_JOBS=`sysctl -n hw.ncpu` \
+			SKIP_FASTDEBUG_BUILD=true \
+			BUILD_DEPLOY=false \
+			USE_FREETYPE=true

-JDKHOME=		jdk-${V}
+.if !${FLAVOR:L:Mwith_ipv6}
+MAKE_ENV+=		DONT_ENABLE_IPV6="YES"
+.endif

-SUBST_VARS=		JDKHOME
+JDKHOME=		jdk-1.7.0
+JREHOME=		jre-1.7.0
+
+SUBST_VARS=		JDKHOME JREHOME

 WRKDIST=		${WRKDIR}
-WRKBUILD=		${WRKDIST}/hotspot/make
-JVMARCH=		${MACHINE_ARCH:S/i386/i486/}
-OUTPUTDIR1=		${WRKDIST}/hotspot/build/bsd/bsd_${JVMARCH}_compiler1
-OUTPUTDIR2=		${WRKDIST}/hotspot/build/bsd/bsd_${JVMARCH}_compiler2
-JNIMDH=			${WRKDIST}/hotspot/src/cpu/${JVMARCH}/vm/jni_${JVMARCH}.h
+WRKBUILD=		${WRKDIST}/control/make
+JVMARCH=		${MACHINE_ARCH:S/i386/i586/}
+JDKIMAGEDIR=		${WRKDIST}/control/build/bsd-${JVMARCH}/j2sdk-image
+JREIMAGEDIR=		${WRKDIST}/control/build/bsd-${JVMARCH}/j2re-image
 
-ALL_TARGET=		product
 .if ${MACHINE_ARCH} == "i386"
-ALL_TARGET+=		product1
 PKG_ARGS+=		-Dclient_vm=1
 .else
 PKG_ARGS+=		-Dclient_vm=0
@ -74,14 +93,10 @@ COPYDIRS=	hotspot/src/os/linux/launcher \
 		hotspot/build/linux \
 		hotspot/build/linux/makefiles \
 		install/make/installer/binaries/linux \
-		j2se/src/linux
+		j2se/src/linux/doc/man

 COPYFILES=	control/make/common/Defs-linux.gmk \
-		deploy/make/common/Defs-linux.gmk \
-		deploy/make/common/Rules-linux.gmk \
-		deploy/make/plugin/common/Defs-linux.gmk \
 		install/make/common/Defs-linux.gmk \
-		j2se/make/com/sun/tools/attach/mapfile-linux \
 		j2se/make/common/Defs-linux.gmk \
 		j2se/make/common/shared/Defs-linux.gmk \
 		j2se/make/java/nio/mapfile-linux \
@ -94,11 +109,21 @@ COPYFILES=	control/make/common/Defs-linux.gmk \
 		j2se/src/solaris/classes/java/lang/UNIXProcess.java.linux \
 		j2se/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \
 		j2se/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \
-		j2se/src/solaris/hpi/include/largefile_linux.h \
-		j2se/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c
+		j2se/src/solaris/hpi/include/largefile_linux.h
+
+.include <bsd.own.mk>
+
+ACCEPT_JRL_LICENSE ?= No
+
+.if ${ACCEPT_JRL_LICENSE:L} != "yes"
+IS_INTERACTIVE=	Yes
+pre-extract:
+	@${SH} ${FILESDIR}/license.sh
+	@echo continuing....
+.endif

 do-extract:
-	@mkdir ${WRKDIR}/tmp && \
+	@rm -rf ${WRKDIR}/tmp && mkdir ${WRKDIR}/tmp && \
 		${CC} ${CFLAGS} -o ${WRKDIR}/tmp/x_x2zip ${FILESDIR}/x_x2zip.c
 .for jar in ${DISTFILES}
 	@cd ${WRKDIR}/tmp && \
@ -111,7 +136,6 @@ do-extract:

 # create initial bsd src from linux src (except for threads_solaris.c)
 pre-patch:
-	@chmod -R +w ${WRKDIST}/hotspot
 	@for d in ${COPYDIRS}; do \
 		mkdir -p `echo ${WRKDIST}/$$d | sed 's/linux/bsd/g;'`; \
 		cd ${WRKDIST}/$$d; \
@ -130,22 +154,17 @@ pre-patch:
 		< ${WRKDIST}/j2se/src/solaris/hpi/native_threads/src/threads_solaris.c \
 		> ${WRKDIST}/j2se/src/solaris/hpi/native_threads/src/threads_bsd.c

+post-build:
+	@rm -rf ${JDKIMAGEDIR}/man/ja \
+		${JDKIMAGEDIR}/man/ja_JP.eucJP \
+		${JREIMAGEDIR}/man/ja \
+		${JREIMAGEDIR}/man/ja_JP.eucJP
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${JDKHOME}
-	cd ${ALT_BOOTDIR} && tar -cf - * | tar -C ${PREFIX}/${JDKHOME} -xf -
-	@find ${PREFIX}/${JDKHOME} -name \*_g -or -name \*_g.so -or -name \*_g.jar | \
-		xargs rm
-	${INSTALL_DATA} ${WRKDIST}/hotspot/src/share/vm/services/jmm.h \
-		${PREFIX}/${JDKHOME}/include
-	${INSTALL_DATA} ${OUTPUTDIR2}/generated/jvmtifiles/jvmti.h \
-		${PREFIX}/${JDKHOME}/include
-	${INSTALL_DATA_DIR} ${PREFIX}/${JDKHOME}/include/bsd
-	${INSTALL_DATA} ${JNIMDH} ${PREFIX}/${JDKHOME}/include/bsd/jni_md.h
-	${INSTALL_DATA} ${OUTPUTDIR2}/product/lib{jvm,jsig}.so \
-		${PREFIX}/${JDKHOME}/jre/lib/${MACHINE_ARCH}/server
-.if ${MACHINE_ARCH} == "i386"
-	${INSTALL_DATA} ${OUTPUTDIR1}/product/lib{jvm,jsig}.so \
-		${PREFIX}/${JDKHOME}/jre/lib/${MACHINE_ARCH}/client
-.endif
+	cd ${JDKIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JDKHOME} -xf - 
+	${INSTALL_DATA_DIR} ${PREFIX}/${JREHOME}
+	cd ${JREIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JREHOME} -xf -
+

 .include <bsd.port.mk>
--- a/devel/jdk/1.7/distinfo
+++ b/devel/jdk/1.7/distinfo
@ -1,15 +1,10 @@
-MD5 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = 2z1HN/o7TQYmEmii6KuVrg==
-MD5 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = 9fsvaJhKATFbEuYqX2tMgg==
-MD5 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = J6aBuW5tWRIwkwkaAc3P3Q==
-RMD160 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = PXd7WPhNiYBAMmUQ7/rQthtVRVA=
-RMD160 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = tQ2ENIetrdrZwc2rWsPPR4QeaU0=
-RMD160 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = cELHS3YwGGitLK0oSRd+VIkypD4=
-SHA1 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = o6eEa6tvU0wZ/f+I4TiDa9atSGY=
-SHA1 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = HzQ7uPYKJX1l23FGWhIVPel1g7A=
-SHA1 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = qbPg9c6rvNennLRHWf+ytl4r7lA=
-SHA256 (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = ObwO+meXKjZ78j6P3ViWoZyDJ381+aq6voCpAAQLRKQ=
-SHA256 (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = VUlOcj0hjEf2+rheL4Lm/aaA7zTDLoY51EfINX6s/k4=
-SHA256 (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = KtlZp09CBFU21JLXfAs7ZuZX/KvxpnjC8+awj36ReZw=
-SIZE (jdk-7-ea-bin-b15-jrl-05_jul_2007.jar) = 389618
-SIZE (jdk-7-ea-mozilla_headers-b15-unix-05_jul_2007.jar) = 8608406
-SIZE (jdk-7-ea-src-b15-jrl-05_jul_2007.jar) = 73163504
+MD5 (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = bSeR/6QG706EJxoD8Uz7/g==
+MD5 (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = d52e07DLuwZ8D4vkkzKcbQ==
+RMD160 (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = RipdorYmkRzyg8ytGK7iDAyZ0tM=
+RMD160 (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = C6QQtE6cKffpafglPsP5Args8F0=
+SHA1 (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = 28vjF2zXp3KJq+0c2CclZwrg8t4=
+SHA1 (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = Gt2XvYAbfmKWT5eE2Uec2WGADZU=
+SHA256 (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = VvrLpZAfVNayYLq0yD+mmENCxz7yR/pDCPPYloZF1bk=
+SHA256 (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = M+1kaqGSwkukWQn63bVWmeuvUSVxcEzdgeiCdgVJbss=
+SIZE (jdk-7-ea-bin-b19-jrl-30_aug_2007.jar) = 389561
+SIZE (jdk-7-ea-src-b19-jrl-30_aug_2007.jar) = 73616969
--- a/devel/jdk/1.7/files/license.sh
+++ b/devel/jdk/1.7/files/license.sh
@ -0,0 +1,195 @@
+#!/bin/sh
+# $OpenBSD: license.sh,v 1.1 2007/09/06 15:46:18 kurt Exp $
+# $FreeBSD: ports/java/jdk15/files/license.sh,v 1.1 2007/08/13 04:57:47 glewis Exp $
+
+# License agreement
+more << EOF_LICENSE
+JAVA RESEARCH LICENSE
+Version 1.6
+
+
+I.    DEFINITIONS.
+
+"Licensee" means You and any other party that has entered into and has
+in effect a version of this License.
+
+"Modifications" means any change or addition to the Technology.
+
+"Sun" means Sun Microsystems, Inc. and its successors and assignees.
+
+"Research Use" means research, evaluation, or development for the
+purpose of advancing knowledge, teaching, learning, or customizing the
+Technology or Modifications for personal use. Research Use expressly
+excludes use or distribution for direct or indirect commercial
+(including strategic) gain or advantage.
+
+"Technology" means the source code and object code of the technology
+made available by Sun pursuant to this License.
+
+"Technology Site" means the website designated by Sun for accessing
+the Technology.
+
+"You" means the individual executing this License or the legal entity
+or entities represented by the individual executing this License.
+
+II.     PURPOSE.
+
+Sun is licensing the Technology under this Java Research License (the
+"License") to promote research, education, innovation, and development
+using the Technology.  This License is not intended to permit or
+enable access to the Technology for active consultation as part of
+creating an independent implementation of the Technology.
+
+COMMERCIAL USE AND DISTRIBUTION OF TECHNOLOGY AND MODIFICATIONS IS
+PERMITTED ONLY UNDER A SUN COMMERCIAL LICENSE.
+
+III.     RESEARCH USE RIGHTS.
+
+A.    License Grant. Subject to the conditions contained herein, Sun
+grants to You a non-exclusive, non-transferable, worldwide, and
+royalty-free license to do the following for Your Research Use only:
+
+1.    Reproduce, create Modifications of,  and use the Technology
+alone, or with Modifications;
+
+2.    Share source code of the Technology alone, or with
+Modifications, with other Licensees; and
+
+3.    Distribute object code of the Technology, alone, or with
+Modifications, to any third parties for Research Use only, under a
+license of Your choice that is consistent with this License; and
+publish papers and books discussing the Technology which may include
+relevant excerpts that do not in the aggregate constitute a
+significant portion of the Technology.
+
+B.     Residual Rights.  If You examine the Technology after accepting
+this License and remember anything about it later, You are not
+"tainted" in a way that would prevent You from creating or
+contributing to an independent implementation, but this License grants
+You no rights to Sun's copyrights or patents for use in such an
+implementation.
+
+C.    No Implied Licenses.  Other than the rights granted herein, Sun
+retains all rights, title, and interest in Technology, and You retain
+all rights, title, and interest in Your Modifications and associated
+specifications, subject to the terms of this License.
+
+D.    Third Party Software.  Portions of the Technology may be
+provided with licenses or other notices from third parties that govern
+the use of those portions. Any licenses granted hereunder do not alter
+any rights and obligations You may have under such licenses, however,
+the disclaimer of warranty and limitation of liability provisions in
+this License will apply to all Technology in this distribution.
+
+IV.    INTELLECTUAL PROPERTY REQUIREMENTS
+
+As a condition to Your License, You agree to comply with the following
+restrictions and responsibilities:
+
+A.    License and Copyright Notices. You must include a copy of this
+Java Research License in a Readme file for any Technology or
+Modifications you distribute. You must also include the following
+statement, "Use and distribution of this technology is subject to the
+Java Research License included herein", (a) once prominently in the
+source code tree and/or specifications for Your source code
+distributions, and (b) once in the same file as Your copyright or
+proprietary notices for Your binary code distributions. You must cause
+any files containing Your Modification to carry prominent notice
+stating that You changed the files. You must not remove or alter any
+copyright or other proprietary notices in the Technology.
+
+B.    Licensee Exchanges.    Any Technology and Modifications You
+receive from any Licensee are governed by this License.
+
+V.    GENERAL TERMS.
+
+A.    Disclaimer Of Warranties.
+
+THE TECHNOLOGY IS PROVIDED "AS IS", WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, WARRANTIES
+THAT THE TECHNOLOGY IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A
+PARTICULAR PURPOSE, OR NON-INFRINGING OF THIRD PARTY RIGHTS.  YOU
+AGREE THAT YOU BEAR THE ENTIRE RISK IN CONNECTION WITH YOUR USE AND
+DISTRIBUTION OF ANY AND ALL TECHNOLOGY  UNDER THIS LICENSE.
+
+B.    Infringement; Limitation Of Liability.
+
+1.    If any portion of, or functionality implemented by, the
+Technology becomes the subject of a claim or threatened claim of
+infringement ("Affected Materials"), Sun may, in its unrestricted
+discretion, suspend Your rights to use and distribute the Affected
+Materials under this License. Such suspension of rights will be
+effective immediately upon Sun's posting of notice of suspension on
+the Technology Site.
+
+2.    IN NO EVENT WILL SUN BE LIABLE FOR ANY DIRECT, INDIRECT,
+PUNITIVE, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES IN CONNECTION
+WITH OR ARISING OUT OF THIS LICENSE (INCLUDING, WITHOUT LIMITATION,
+LOSS OF PROFITS, USE, DATA, OR ECONOMIC ADVANTAGE OF ANY SORT),
+HOWEVER IT ARISES AND ON ANY THEORY OF LIABILITY (including
+negligence), WHETHER OR NOT SUN HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.  LIABILITY UNDER THIS SECTION V.B.2 SHALL BE SO LIMITED
+AND EXCLUDED, NOTWITHSTANDING FAILURE OF THE ESSENTIAL PURPOSE OF ANY
+REMEDY.
+
+C.     Termination.
+
+1.    You may terminate this License at any time by notifying Sun in a
+writing addressed to Sun Microsystems, Inc., 4150 Network Circle,
+Santa Clara, California 95054, Attn.: Legal Department/Products and
+Technology Law.
+
+2.    All Your rights will terminate under this License if You fail to
+comply with any of its material terms or conditions and do not cure
+such failure within thirty (30) days after becoming aware of such
+noncompliance.
+
+3.    Upon termination, You must discontinue all uses and distribution
+under this agreement, and all provisions of this Section V ("General
+Terms") shall survive termination.
+
+D.     Miscellaneous.
+
+
+1.    Trademark.  You agree to comply with Sun's Trademark & Logo
+Usage Requirements, as modified from time to time, available at
+http://www.sun.com/policies/trademarks/.  Except as expressly provided
+in this License, You are granted no rights in or to any Sun trademarks
+now or hereafter used or licensed by Sun.
+
+2.    Integration.  This License represents the complete agreement of
+the parties concerning the subject matter hereof.
+
+3.    Severability.  If any provision of this License is held
+unenforceable, such provision shall be reformed to the extent
+necessary to make it enforceable unless to do so would defeat the
+intent of the parties, in which case, this License shall terminate.
+
+4.    Governing Law.  This License is governed by the laws of the
+United States and the State of California, as applied to contracts
+entered into and performed in California between California residents.
+In no event shall this License be construed against the drafter.
+
+5.    Export Control.   As further described at
+http://www.sun.com/its, you agree to comply with the U.S. export
+controls and trade laws of other countries that apply to Technology
+and Modifications.
+
+EOF_LICENSE
+
+agreed=
+while [ x$agreed = x ]; do
+        echo
+        echo "Do you agree to the above license terms? [yes or no] "
+        read reply leftover
+        case $reply in
+                y* | Y*)
+                        agreed=1
+                        ;;
+                n* | N*)
+                        echo
+                        echo "If you don't agree to the license you can't build this software"
+                        exit 1
+                        ;;
+        esac
+done
--- a/devel/jdk/1.7/patches/patch-control_make_sanity-rules_gmk
+++ b/devel/jdk/1.7/patches/patch-control_make_sanity-rules_gmk
@ -0,0 +1,12 @@
+$OpenBSD: patch-control_make_sanity-rules_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- control/make/sanity-rules.gmk.orig	Thu Aug  2 03:44:47 2007
+++ control/make/sanity-rules.gmk	Fri Aug  3 18:02:51 2007
+@@ -241,7 +241,7 @@ ifneq ($(SKIP_COMPARE_IMAGES), true)
+ 	@if [ ! -f $(PREVIOUS_JDK_BUNDLE) ]; then \
+ 	  $(ECHO) "ERROR: You do not have access to the previous java release sdk bundles. \n" \
+ 	    "      Please check your access to \n" \
+-	    "          $(PREVIOUS_sdk_BUNDLE) \n" \
+	    "          $(PREVIOUS_JDK_BUNDLE) \n" \
+ 	    "      and/or check your value of ALT_PREVIOUS_RELEASE_PATH or ALT_PREVIOUS_JDK_FILE. \n" \
+ 	    "      This will affect you if you build the images target. \n" \
+ 	    "" >> $(ERROR_FILE) ; \
--- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_Makefile
+++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_Makefile
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_build_bsd_Makefile,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $
--- hotspot/build/bsd/Makefile.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/build/bsd/Makefile	Mon Apr 16 08:42:38 2007
-@@ -189,7 +189,7 @@ all:
+$OpenBSD: patch-hotspot_build_bsd_Makefile,v 1.2 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/build/bsd/Makefile.orig	Sun Sep  2 14:06:00 2007
+++ hotspot/build/bsd/Makefile	Sun Sep  2 14:06:01 2007
+@@ -191,7 +191,7 @@ all:
 	@echo "  $(TARGETS_C1)"
 	@echo "  $(TARGETS_CORE)"
 
--- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_defs_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_defs_make
@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_build_bsd_makefiles_defs_make,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $
--- hotspot/build/bsd/makefiles/defs.make.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/build/bsd/makefiles/defs.make	Mon Apr 16 08:42:38 2007
+$OpenBSD: patch-hotspot_build_bsd_makefiles_defs_make,v 1.2 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/build/bsd/makefiles/defs.make.orig	Sun Sep  2 14:06:00 2007
+++ hotspot/build/bsd/makefiles/defs.make	Sun Sep  2 14:06:01 2007
@@ -61,32 +61,31 @@ ifeq ($(ARCH), sparc64)
   HS_ARCH            = sparc
 endif
@ -44,7 +44,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_defs_make,v 1.1.1.1 2007/05/08 17:06
 +endif
 +
 JDK_INCLUDE_SUBDIR=bsd
- MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(FULL_VERSION)
+ 
 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
@@ -102,12 +101,4 @@ ifeq ($(ARCH_DATA_MODEL), 32)
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
--- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_gcc_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_gcc_make
@ -1,7 +1,21 @@
-$OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/build/bsd/makefiles/gcc.make.orig	Mon Apr 30 19:56:06 2007
-+++ hotspot/build/bsd/makefiles/gcc.make	Mon Apr 30 21:42:08 2007
-@@ -50,19 +50,12 @@ PICFLAG = -fPIC
+$OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.2 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/build/bsd/makefiles/gcc.make.orig	Thu Aug  2 09:35:19 2007
+++ hotspot/build/bsd/makefiles/gcc.make	Thu Aug  2 09:37:28 2007
+@@ -25,9 +25,10 @@
+ #------------------------------------------------------------------------
+ # CC, CPP & AS
+ 
+-CPP = g++
+-CC  = gcc
+-AS  = $(CC) -c
+CXX ?= g++
+CPP  = $(CXX)
+CC  ?= gcc
+AS   = $(CC) -c
+ 
+ # -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")
+@@ -50,19 +51,12 @@ PICFLAG = -fPIC
 
 VM_PICFLAG/LIBJVM = $(PICFLAG)
 VM_PICFLAG/AOUT   =
@ -22,7 +36,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.1.1.1 2007/05/08 17:06:
 CFLAGS += -fcheck-new
 
 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
-@@ -129,6 +122,11 @@ endif
+@@ -129,6 +123,11 @@ endif
 # Enable linker optimization
 LFLAGS += -Xlinker -O1
 
@ -34,7 +48,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.1.1.1 2007/05/08 17:06:
 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
 MAPFLAG = -Xlinker --version-script=FILENAME
 
-@@ -136,7 +134,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME
+@@ -136,7 +135,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME
 SONAMEFLAG = -Xlinker -soname=SONAME
 
 # Build shared library
--- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_sa_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_sa_make
@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_build_bsd_makefiles_sa_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/build/bsd/makefiles/sa.make.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/build/bsd/makefiles/sa.make	Mon Apr 16 08:42:38 2007
+$OpenBSD: patch-hotspot_build_bsd_makefiles_sa_make,v 1.2 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/build/bsd/makefiles/sa.make.orig	Sun Sep  2 14:06:00 2007
+++ hotspot/build/bsd/makefiles/sa.make	Sun Sep  2 14:06:01 2007
@@ -31,6 +31,7 @@
 include $(GAMMADIR)/build/bsd/makefiles/rules.make
 
@ -18,7 +18,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_sa_make,v 1.1.1.1 2007/05/08 17:06:1
 
 SA_CLASSDIR = $(GENERATED)/saclasses
 
-@@ -54,11 +55,11 @@ SA_VERSION = $(HS_MAJOR_VER).$(HS_MINOR_VER).$(HS_MICR
+@@ -54,11 +55,11 @@ SA_VERSION = $(HS_MAJOR_VER)
 SA_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.supportedVersion=$(SA_VERSION)"
 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
 
--- a/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_vm_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_vm_make
@ -1,8 +1,8 @@
-$OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.2 2007/07/13 22:52:35 kurt Exp $
--- hotspot/build/bsd/makefiles/vm.make.orig	Fri Jul  6 08:51:57 2007
-+++ hotspot/build/bsd/makefiles/vm.make	Fri Jul  6 08:59:35 2007
-@@ -100,6 +100,10 @@ CPPFLAGS =           \
-   ${RELEASE_VERSION} \
+$OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.3 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/build/bsd/makefiles/vm.make.orig	Sun Sep  2 14:06:00 2007
+++ hotspot/build/bsd/makefiles/vm.make	Sun Sep  2 14:06:01 2007
+@@ -111,6 +111,10 @@ CPPFLAGS =           \
+   ${JRE_VERSION}     \
   ${VM_DISTRO}
 
 +ifdef DEFAULT_LIBPATH
@ -12,7 +12,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.2 2007/07/13 22:52:35 ku
 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 CFLAGS += $(CFLAGS_WARN/BYFILE)
 
-@@ -109,7 +113,7 @@ CFLAGS += $(CFLAGS/NOEX)
+@@ -120,7 +124,7 @@ CFLAGS += $(CFLAGS/NOEX)
 # Extra flags from gnumake's invocation or environment
 CFLAGS += $(EXTRA_CFLAGS)
 
@ -21,7 +21,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.2 2007/07/13 22:52:35 ku
 
 # By default, link the *.o into the library, not the executable.
 LINK_INTO$(LINK_INTO) = LIBJVM
-@@ -138,7 +142,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
+@@ -149,7 +153,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
 	rm -f $@
 	cat $^ > $@
 
--- a/devel/jdk/1.7/patches/patch-hotspot_make_defs_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_defs_make
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_make_defs_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/make/defs.make.orig	Tue Apr 10 04:00:13 2007
-+++ hotspot/make/defs.make	Mon Apr 16 08:42:38 2007
-@@ -93,13 +93,20 @@ endif
+$OpenBSD: patch-hotspot_make_defs_make,v 1.2 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/make/defs.make.orig	Thu Aug 30 04:57:10 2007
+++ hotspot/make/defs.make	Sun Sep  2 14:06:01 2007
+@@ -118,13 +118,20 @@ endif
 # Windows should have OS predefined
 ifeq ($(OS),)
   OS   := $(shell uname -s)
--- a/devel/jdk/1.7/patches/patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $
--- hotspot/src/cpu/amd64/vm/assembler_amd64.cpp.orig	Fri Jul  6 10:49:14 2007
-+++ hotspot/src/cpu/amd64/vm/assembler_amd64.cpp	Fri Jul  6 10:48:32 2007
-@@ -1282,7 +1282,7 @@ void Assembler::movl(Address dst, Register src) {
+$OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp,v 1.3 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/src/cpu/amd64/vm/assembler_amd64.cpp.orig	Thu Aug 16 03:49:42 2007
+++ hotspot/src/cpu/amd64/vm/assembler_amd64.cpp	Thu Aug 23 11:12:54 2007
+@@ -1307,7 +1307,7 @@ void Assembler::movl(Address dst, Register src) {
   emit_operand(src, dst);
 }
 
@ -10,7 +10,7 @@ $OpenBSD: patch-hotspot_src_cpu_amd64_vm_assembler_amd64_cpp,v 1.2 2007/07/13 22
   InstructionMark im(this);
   int encode = prefixq_and_encode(dst->encoding());
   emit_byte(0xB8 | encode);
-@@ -1309,7 +1309,7 @@ void Assembler::movq(Register dst, Address src) {
+@@ -1334,7 +1334,7 @@ void Assembler::movq(Register dst, Address src) {
   emit_operand(dst, src);
 }
 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp
@ -1,49 +0,0 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_mutex_bsd_cpp,v 1.2 2007/07/13 22:52:35 kurt Exp $
--- hotspot/src/os/bsd/vm/mutex_bsd.cpp.orig	Thu Jul  5 09:51:29 2007
-+++ hotspot/src/os/bsd/vm/mutex_bsd.cpp	Thu Jul  5 09:51:31 2007
-@@ -252,7 +252,7 @@ bool Monitor::wait(bool no_safepoint_check, long timeo
-     }
-     
-     // If wait was interrupted by a signal or timeout, do not use up a ticket
-    if (wait_status == EINTR || wait_status == ETIME || wait_status == ETIMEDOUT) {
-+    if (wait_status == EINTR || wait_status == ETIMEDOUT) {
-       ++_tickets;		// will be decremented again below
-       break;
-     }
-@@ -267,7 +267,7 @@ bool Monitor::wait(bool no_safepoint_check, long timeo
- #endif
-    
-   // return true if timed out
-  return (wait_status == ETIME || wait_status == ETIMEDOUT);
-+  return (wait_status == ETIMEDOUT);
- }
- 
- 
-@@ -344,7 +344,7 @@ bool Monitor::notify_all() {
-  * of "now + 100,000,000". This places a limit on the timeout of about 3.17
-  * years from "now".
-  */
-static void unpackTime(timespec* absTime, bool isAbsolute, jlong time) {
-+static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
-   assert (time > 0, "convertTime");
- 
-   struct timeval now;
-@@ -403,7 +403,7 @@ void Parker::park(bool isAbsolute, jlong time) {
-   }
- 
-   // Next, demultiplex/decode time arguments
-  timespec absTime;
-+  struct timespec absTime;
-   if (time < 0) { // don't wait at all
-     return; 
-   }
-@@ -456,8 +456,7 @@ void Parker::park(bool isAbsolute, jlong time) {
-     }
-   }
-   assert_status(status == 0 || status == EINTR || 
-                status == ETIME || status == ETIMEDOUT, 
-                status, "cond_timedwait");
-+                status == ETIMEDOUT, status, "cond_timedwait");
- 
- #ifdef ASSERT
-   pthread_sigmask(SIG_SETMASK, &oldsigs, NULL);
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/src/os/bsd/vm/osThread_bsd.cpp.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/src/os/bsd/vm/osThread_bsd.cpp	Mon Apr 16 08:42:39 2007
-@@ -42,8 +42,8 @@ static pthread_mutex_t EventFreeLock = PTHREAD_MUTEX_I
+$OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_cpp,v 1.2 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/src/os/bsd/vm/osThread_bsd.cpp.orig	Fri Aug  3 18:02:38 2007
+++ hotspot/src/os/bsd/vm/osThread_bsd.cpp	Fri Aug  3 18:02:52 2007
+@@ -31,8 +31,8 @@
 
 void OSThread::pd_initialize() {
   assert(this != NULL, "check");
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp
@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp,v 1.1.1.1 2007/05/08 17:06:19 kurt Exp $
--- hotspot/src/os/bsd/vm/osThread_bsd.hpp.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/src/os/bsd/vm/osThread_bsd.hpp	Mon Apr 16 08:42:39 2007
+$OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp,v 1.2 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/src/os/bsd/vm/osThread_bsd.hpp.orig	Fri Aug  3 18:02:38 2007
+++ hotspot/src/os/bsd/vm/osThread_bsd.hpp	Fri Aug  3 18:02:52 2007
@@ -39,6 +39,12 @@
 
  private:
@ -58,9 +58,9 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp,v 1.1.1.1 2007/05/08 17:0
   pthread_t pthread_id() const {
     return _pthread_id;
   }
-@@ -130,6 +149,9 @@
+@@ -123,12 +142,20 @@
 
-   os::Bsd::Event* _interrupt_event;
+ private:
   Monitor* _startThread_lock;     // sync parent and child in thread creation
 +#ifdef _ALLBSD_SOURCE
 +  JavaThreadState      _saved_interrupt_thread_state;       // the thread state before a system call -- restored afterward
@ -68,7 +68,6 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_osThread_bsd_hpp,v 1.1.1.1 2007/05/08 17:0
 
 public:
 
-@@ -143,6 +165,11 @@
   Monitor* startThread_lock() const {
     return _startThread_lock;
   }
--- 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
@ -1,6 +1,6 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	Wed Jun 13 16:37:27 2007
-+++ hotspot/src/os/bsd/vm/os_bsd.cpp	Wed Jun 13 16:37:30 2007
+$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.4 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	Fri Aug  3 18:02:38 2007
+++ hotspot/src/os/bsd/vm/os_bsd.cpp	Fri Aug  3 18:35:06 2007
@@ -50,13 +50,26 @@
 # include <semaphore.h>
 # include <fcntl.h>
@ -637,7 +637,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 // TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation.
 // Solaris uses poll(), bsd uses park().  
 // Poll() is likely a better choice, assuming that Thread.interrupt()
-@@ -2676,9 +2947,28 @@ void os::loop_breaker(int attempts) {
+@@ -2691,9 +2962,28 @@ void os::loop_breaker(int attempts) {
 // this reason, the code should not be used as default (ThreadPriorityPolicy=0).
 // It is only used when ThreadPriorityPolicy=1 and requires root privilege.
 
@ -666,7 +666,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
    4,              // 1 MinPriority
    3,              // 2
    2,              // 3
-@@ -2693,6 +2983,7 @@ int os::java_to_os_priority[MaxPriority + 1] = {
+@@ -2708,6 +2998,7 @@ int os::java_to_os_priority[MaxPriority + 1] = {
 
   -5               // 10 MaxPriority
 };
@ -674,7 +674,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 
 static int prio_init() {
   if (ThreadPriorityPolicy == 1) {
-@@ -2712,8 +3003,17 @@ static int prio_init() {
+@@ -2727,8 +3018,17 @@ static int prio_init() {
 OSReturn os::set_native_priority(Thread* thread, int newpri) {
   if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK;
 
@ -692,7 +692,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 }
 
 OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
-@@ -2723,7 +3023,11 @@ OSReturn os::get_native_priority(const Thread* const t
+@@ -2738,7 +3038,11 @@ OSReturn os::get_native_priority(const Thread* const t
   }
 
   errno = 0;
@ -704,7 +704,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
   return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
 }
 
-@@ -2833,7 +3137,7 @@ static int SR_initialize() {
+@@ -2848,7 +3152,7 @@ static int SR_initialize() {
   /* Get signal number to use for suspend/resume */
   if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
     int sig = ::strtol(s, 0, 10);
@ -713,7 +713,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 	SR_signum = sig;
     }
   }
-@@ -3197,6 +3501,7 @@ void os::Bsd::install_signal_handlers() {
+@@ -3211,6 +3515,7 @@ void os::Bsd::install_signal_handlers() {
   }
 }
 
@ -721,7 +721,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 // This is the fastest way to get thread cpu time on Bsd.
 // Returns cpu time (user+sys) for any thread, not only for current.
 // POSIX compliant clocks are implemented in the kernels 2.6.16+.
-@@ -3211,6 +3516,7 @@ jlong os::Bsd::fast_thread_cpu_time(clockid_t clockid)
+@@ -3225,6 +3530,7 @@ jlong os::Bsd::fast_thread_cpu_time(clockid_t clockid)
 
   return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
 }
@ -729,7 +729,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 
 /////
 // glibc on Bsd platform uses non-documented flag
-@@ -3432,16 +3738,16 @@ void os::init(void) {
+@@ -3446,16 +3752,16 @@ void os::init(void) {
 
   _initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid();
 
@ -749,7 +749,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
   }
 
   Bsd::initialize_system_info();
-@@ -3463,7 +3769,9 @@ extern "C" {
+@@ -3477,7 +3783,9 @@ extern "C" {
 // this is called _after_ the global arguments have been parsed
 jint os::init_2(void)
 {
@ -759,7 +759,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 
   // Allocate a single page and mark it as readable for safepoint polling
   address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-@@ -3512,6 +3820,7 @@ jint os::init_2(void)
+@@ -3526,6 +3834,7 @@ jint os::init_2(void)
   JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes,
         vm_page_size()));
 
@ -767,7 +767,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
   Bsd::capture_initial_stack(JavaThread::stack_size_at_create());
 
   Bsd::libpthread_init();
-@@ -3520,6 +3829,7 @@ jint os::init_2(void)
+@@ -3534,6 +3843,7 @@ jint os::init_2(void)
           Bsd::glibc_version(), Bsd::libpthread_version(), 
           Bsd::is_floating_stack() ? "floating stack" : "fixed stack");
   }
@ -775,7 +775,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 
   if (MaxFDLimit) {
     // set the number of file descriptors to max. print out error
-@@ -3539,8 +3849,10 @@ jint os::init_2(void)
+@@ -3553,8 +3863,10 @@ jint os::init_2(void)
     }
   }
 
@ -786,7 +786,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 
   // Initialize HPI.
   jint hpi_result = hpi::initialize();
-@@ -3587,11 +3899,15 @@ void os::make_polling_page_readable(void) {
+@@ -3601,11 +3913,15 @@ void os::make_polling_page_readable(void) {
 };
 
 int os::active_processor_count() {
@ -802,7 +802,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 }
 
 bool os::distribute_processes(uint length, uint* distribution) {
-@@ -3633,6 +3949,9 @@ ExtendedPC os::get_thread_pc(Thread* thread) {
+@@ -3647,6 +3963,9 @@ ExtendedPC os::get_thread_pc(Thread* thread) {
 
 int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
 {
@ -812,7 +812,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
    if (is_NPTL()) {
       return pthread_cond_timedwait(_cond, _mutex, _abstime);
    } else {
-@@ -3648,6 +3967,7 @@ int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond
+@@ -3662,6 +3981,7 @@ int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond
 #endif // IA64
       return status;
    }
@ -820,7 +820,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-@@ -3783,17 +4103,17 @@ int os::create_binary_file(const char* path, bool rewr
+@@ -3797,17 +4117,17 @@ int os::create_binary_file(const char* path, bool rewr
   if (!rewrite_existing) {
     oflags |= O_EXCL;
   }
@ -841,7 +841,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 }
 
 // Map a block of memory.
-@@ -3843,6 +4163,7 @@ bool os::unmap_memory(char* addr, size_t bytes) {
+@@ -3857,6 +4177,7 @@ bool os::unmap_memory(char* addr, size_t bytes) {
   return munmap(addr, bytes) == 0;
 }
 
@ -849,7 +849,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
 
 static clockid_t thread_cpu_clockid(Thread* thread) {
-@@ -3854,6 +4175,7 @@ static clockid_t thread_cpu_clockid(Thread* thread) {
+@@ -3868,6 +4189,7 @@ static clockid_t thread_cpu_clockid(Thread* thread) {
   assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
   return clockid;
 }
@ -857,7 +857,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 
 // current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool) 
 // are used by JVM M&M and JVMTI to get user+sys or user CPU time
-@@ -3863,39 +4185,48 @@ static clockid_t thread_cpu_clockid(Thread* thread) {
+@@ -3877,39 +4199,48 @@ static clockid_t thread_cpu_clockid(Thread* thread) {
 // the fast estimate available on the platform.
 
 jlong os::current_thread_cpu_time() {
@ -906,7 +906,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 //
 //  -1 on error.
 // 
-@@ -3984,6 +4315,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool
+@@ -3998,6 +4329,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool
     return (jlong)user_time * (1000000000 / clock_tics_per_sec);
   }
 }
@ -914,7 +914,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 
 void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
   info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits
-@@ -4000,7 +4332,11 @@ void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr
+@@ -4014,7 +4346,11 @@ void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr
 }
 
 bool os::is_thread_cpu_time_supported() {
@ -926,7 +926,16 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
 }
 
 // System loadavg support.  Returns -1 if load average cannot be obtained.
-@@ -4169,7 +4505,7 @@ void os::PlatformEvent::park() {       // AKA "down()"
+@@ -4147,7 +4483,7 @@ jdk_pthread_sigmask(int how , const sigset_t* newmask,
+ // abstime will be the absolute timeout time
+ // TODO: replace compute_abstime() with unpackTime()
+ 
+-static struct timespec* compute_abstime(timespec* abstime, jlong millis) {
+static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
+   if (millis < 0)  millis = 0;
+   struct timeval now;
+   int status = gettimeofday(&now, NULL);
+@@ -4199,7 +4535,7 @@ void os::PlatformEvent::park() {       // AKA "down()"
         status = pthread_cond_wait(_cond, _mutex);
         // for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
         // Treat this the same as if the wait was interrupted
@ -935,7 +944,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
         assert_status(status == 0 || status == EINTR, status, "cond_wait");
      }
      -- _nParked ; 
-@@ -4227,10 +4563,10 @@ int os::PlatformEvent::park(jlong millis) {
+@@ -4257,10 +4593,10 @@ int os::PlatformEvent::park(jlong millis) {
       pthread_cond_init (_cond, NULL) ;
     }
     assert_status(status == 0 || status == EINTR || 
@ -948,3 +957,65 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.3 2007/07/13 22:52:35 kurt
     // We consume and ignore EINTR and spurious wakeups.   
   }
   --_nParked ;
+@@ -4352,7 +4688,7 @@ void os::PlatformEvent::unpark() {
+  * years from "now".
+  */
+ 
+-static void unpackTime(timespec* absTime, bool isAbsolute, jlong time) {
+static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
+   assert (time > 0, "convertTime");
+ 
+   struct timeval now;
+@@ -4411,7 +4747,7 @@ void Parker::park(bool isAbsolute, jlong time) {
+   }
+ 
+   // Next, demultiplex/decode time arguments
+-  timespec absTime;
+  struct timespec absTime;
+   if (time < 0) { // don't wait at all
+     return; 
+   }
+@@ -4464,7 +4800,7 @@ void Parker::park(bool isAbsolute, jlong time) {
+     }
+   }
+   assert_status(status == 0 || status == EINTR || 
+-                status == ETIME || status == ETIMEDOUT, 
+                status == ETIMEDOUT, 
+                 status, "cond_timedwait");
+ 
+ #ifdef ASSERT
+@@ -4508,14 +4844,6 @@ void Parker::unpark() {
+ 
+ extern char** environ;
+ 
+-#ifndef __NR_fork
+-#define __NR_fork IA32_ONLY(2) IA64_ONLY(not defined) AMD64_ONLY(57)
+-#endif
+-
+-#ifndef __NR_execve
+-#define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59)
+-#endif
+-
+ // Run the specified command in a separate process. Return its exit value,
+ // or -1 on failure (e.g. can't fork a new process).
+ // Unlike system(), this function can be called from signal handler. It
+@@ -4532,8 +4860,7 @@ int os::fork_and_exec(char* cmd) {
+   // separate process to execve. Make a direct syscall to fork process.
+   // On IA64 there's no fork syscall, we have to use fork() and hope for
+   // the best...
+-  pid_t pid = NOT_IA64(syscall(__NR_fork);) 
+-              IA64_ONLY(fork();)
+  pid_t pid = fork();
+ 
+   if (pid < 0) {
+     // fork failed
+@@ -4549,8 +4876,7 @@ int os::fork_and_exec(char* cmd) {
+     // in the new process, so make a system call directly.
+     // IA64 should use normal execve() from glibc to match the glibc fork() 
+     // above.
+-    NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);)
+-    IA64_ONLY(execve("/bin/sh", argv, environ);)
+    execve("/bin/sh", argv, environ);
+ 
+     // execve failed
+     _exit(-1);
--- 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,6 +1,6 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.hpp.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/src/os/bsd/vm/os_bsd.hpp	Mon Apr 16 08:42:39 2007
+$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.2 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/src/os/bsd/vm/os_bsd.hpp.orig	Fri Aug  3 18:02:38 2007
+++ hotspot/src/os/bsd/vm/os_bsd.hpp	Fri Aug  3 18:02:52 2007
@@ -50,6 +50,7 @@ class Bsd {
   static int sigflags[MAXSIGNUM];
 
@ -142,50 +142,3 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.1.1.1 2007/05/08 17:06:18 k
 
   // Stack repair handling
 
-@@ -250,7 +295,7 @@ class Bsd {
-       int status = pthread_mutex_unlock(_mutex);
-       assert_status(status == 0, status, "mutex_unlock");
-     }
-    int timedwait(timespec* abstime) {
-+    int timedwait(struct timespec* abstime) {
-       verify();
-       ++_nParked ; 
-       int status = safe_cond_timedwait(_cond, _mutex, abstime);
-@@ -264,12 +309,11 @@ class Bsd {
-          pthread_cond_init (_cond, NULL) ; 
-       }
-       assert_status(status == 0 || status == EINTR || 
-		    status == ETIME || status == ETIMEDOUT, 
-		    status, "cond_timedwait");
-+		    status == ETIMEDOUT, status, "cond_timedwait");
-       return status;
-     }
-     int timedwait(jlong millis) {
-      timespec abst;
-+      struct timespec abst;
-       Event::compute_abstime(&abst, millis);
-       return timedwait(&abst);
-     }
-@@ -278,11 +322,6 @@ class Bsd {
-       ++_nParked ; 
-       int status = pthread_cond_wait(_cond, _mutex);
-       --_nParked ; 
-      // for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
-      // Treat this the same as if the wait was interrupted
-      if(status == ETIME) {
-	status = EINTR;
-      }
-       assert_status(status == 0 || status == EINTR, status, "cond_wait");
-       return status;
-     }
-@@ -352,8 +391,9 @@ class Bsd {
-      _count = 0;
-     }
- 
-+// XXXBSD TODO: sync with 1.5 version
-     // utility to compute the abstime argument to timedwait:
-    static struct timespec* compute_abstime(timespec* abstime, jlong millis) {
-+    static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
-       // millis is the relative timeout time
-       // abstime will be the absolute timeout time
-       if (millis < 0)  millis = 0;
--- a/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_vmError_bsd_cpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_vmError_bsd_cpp
@ -1,13 +0,0 @@
-$OpenBSD: patch-hotspot_src_os_bsd_vm_vmError_bsd_cpp,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/src/os/bsd/vm/vmError_bsd.cpp.orig	Mon Apr 16 08:42:36 2007
-+++ hotspot/src/os/bsd/vm/vmError_bsd.cpp	Mon Apr 16 08:42:39 2007
-@@ -60,8 +60,7 @@ int VMError::fork_and_exec(char* cmd) {
-   // separate process to execve. Make a direct syscall to fork process.
-   // On IA64 there's no fork syscall, we have to use fork() and hope for
-   // the best...
-  pid_t pid = NOT_IA64(syscall(__NR_fork);) 
-              IA64_ONLY(fork();)
-+  pid_t pid = fork();
- 
-   if (pid < 0) {
-     // fork failed
--- 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,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 kurt Exp $
--- hotspot/src/share/vm/includeDB_core.orig	Thu Jun 21 04:18:24 2007
-+++ hotspot/src/share/vm/includeDB_core	Thu Jul  5 12:14:20 2007
-@@ -466,7 +466,7 @@ cardTableModRefBS.cpp                   cardTableRS.hp
+$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.4 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/src/share/vm/includeDB_core.orig	Thu Aug 16 03:49:58 2007
+++ hotspot/src/share/vm/includeDB_core	Thu Aug 23 11:12:54 2007
+@@ -450,7 +450,7 @@ cardTableModRefBS.cpp                   cardTableRS.hp
 cardTableModRefBS.cpp                   java.hpp
 cardTableModRefBS.cpp                   mutexLocker.hpp
 cardTableModRefBS.cpp                   sharedHeap.hpp
@ -10,7 +10,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku
 cardTableModRefBS.cpp                   universe.hpp
 cardTableModRefBS.cpp                   virtualspace.hpp
 
-@@ -1029,15 +1029,14 @@ compactPermGen.hpp                      permGen.hpp
+@@ -1013,15 +1013,14 @@ compactPermGen.hpp                      permGen.hpp
 compactingPermGenGen.cpp                compactingPermGenGen.hpp
 compactingPermGenGen.cpp                filemap.hpp
 compactingPermGenGen.cpp                genOopClosures.inline.hpp
@ -27,7 +27,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku
 
 compilationPolicy.cpp                   compilationPolicy.hpp
 compilationPolicy.cpp                   compiledIC.hpp
-@@ -1785,7 +1784,7 @@ generation.hpp                          watermark.hpp
+@@ -1726,7 +1725,7 @@ generation.hpp                          watermark.hpp
 
 generation.inline.hpp                   genCollectedHeap.hpp
 generation.inline.hpp                   generation.hpp
@ -36,7 +36,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku
 
 generationSpec.cpp                      compactPermGen.hpp
 generationSpec.cpp                      defNewGeneration.hpp
-@@ -2811,6 +2810,7 @@ klass.hpp                               specialized_oo
+@@ -2435,6 +2434,7 @@ klass.hpp                               specialized_oo
 
 klass.inline.hpp                        klass.hpp
 klass.inline.hpp                        markOop.hpp
@ -44,7 +44,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku
 
 klassKlass.cpp                          collectedHeap.hpp
 klassKlass.cpp                          collectedHeap.inline.hpp
-@@ -4024,6 +4024,7 @@ space.hpp                               blockOffsetTab
+@@ -3636,6 +3636,7 @@ space.hpp                               blockOffsetTab
 space.hpp                               cardTableModRefBS.hpp
 space.hpp                               iterator.hpp
 space.hpp                               markOop.hpp
@ -52,7 +52,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.3 2007/07/13 22:52:35 ku
 space.hpp                               memRegion.hpp
 space.hpp                               mutexLocker.hpp
 space.hpp                               os_<os_family>.inline.hpp
-@@ -4222,6 +4223,7 @@ synchronizer.cpp                        vmSymbols.hpp
+@@ -3837,6 +3838,7 @@ synchronizer.cpp                        vmSymbols.hpp
 
 synchronizer.hpp                        handles.hpp
 synchronizer.hpp                        markOop.hpp
--- 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,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_runtime_vm_version_cpp,v 1.2 2007/05/09 15:48:31 kurt Exp $
--- hotspot/src/share/vm/runtime/vm_version.cpp.orig	Sun May  6 05:01:20 2007
-+++ hotspot/src/share/vm/runtime/vm_version.cpp	Tue May  8 15:33:14 2007
-@@ -190,7 +190,8 @@ const char* Abstract_VM_Version::vm_release() {
+$OpenBSD: patch-hotspot_src_share_vm_runtime_vm_version_cpp,v 1.3 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/src/share/vm/runtime/vm_version.cpp.orig	Thu Aug 30 04:57:42 2007
+++ hotspot/src/share/vm/runtime/vm_version.cpp	Sun Sep  2 14:06:03 2007
+@@ -141,7 +141,8 @@ const char* Abstract_VM_Version::vm_release() {
 
 #define OS       LINUX_ONLY("linux")             \
                  WINDOWS_ONLY("windows")         \
--- 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,7 +1,7 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.3 2007/07/13 22:52:35 kurt Exp $
--- hotspot/src/share/vm/utilities/macros.hpp.orig	Thu Jun 21 03:31:11 2007
-+++ hotspot/src/share/vm/utilities/macros.hpp	Thu Jul  5 09:51:32 2007
-@@ -124,6 +124,14 @@
+$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.4 2007/09/06 15:46:18 kurt Exp $
+--- hotspot/src/share/vm/utilities/macros.hpp.orig	Thu Aug  2 03:45:19 2007
+++ hotspot/src/share/vm/utilities/macros.hpp	Fri Aug  3 18:02:53 2007
+@@ -139,6 +139,14 @@
 #define NOT_WINDOWS(code) code
 #endif
 
--- a/devel/jdk/1.7/patches/patch-j2se_make_com_sun_java_pack_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_java_pack_Makefile
@ -0,0 +1,34 @@
+$OpenBSD: patch-j2se_make_com_sun_java_pack_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/com/sun/java/pack/Makefile.orig	Fri Jul 13 20:49:47 2007
+++ j2se/make/com/sun/java/pack/Makefile	Fri Jul 13 20:53:08 2007
+@@ -61,6 +61,7 @@ vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
+ 
+ 
+ ifeq ($(STANDALONE),true)
+ ifneq ($(SYSTEM_ZLIB),true)
+   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
+ 
+   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
+@@ -78,6 +79,10 @@ ifeq ($(STANDALONE),true)
+   ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+   OTHER_CXXFLAGS += $(ZINCLUDE)
+   LDDFLAGS += $(ZIPOBJS)
+ else
+  LDDFLAGS += -lz
+  OTHER_CXXFLAGS += -DSYSTEM_ZLIB
+ endif
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+   OTHER_LDLIBS += $(JVMLIB)
+@@ -101,7 +106,11 @@ ifeq ($(PLATFORM), windows) 
+   COMPILER_WARNINGS_FATAL=false
+ else
+   LDOUTPUT = -o #Have a space 
+ifeq ($(PLATFORM), bsd)
+  LDDFLAGS += -pthread
+else
+   LDDFLAGS += -lc
+endif
+   OTHER_LDLIBS  += $(LIBCXX)
+ # setup the list of libraries to link in...
+ ifeq ($(PLATFORM), linux)
--- a/devel/jdk/1.7/patches/patch-j2se_make_com_sun_security_auth_module_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_security_auth_module_Makefile
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_make_com_sun_security_auth_module_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/com/sun/security/auth/module/Makefile.orig	Fri Jul 13 20:53:14 2007
+++ j2se/make/com/sun/security/auth/module/Makefile	Fri Jul 13 22:26:15 2007
+@@ -70,7 +70,7 @@ ifeq ($(PLATFORM), solaris)
+   include FILES_c_solaris.gmk
+ endif # solaris
+ 
+-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
+   LIBRARY = jaas_unix
+   include FILES_export_unix.gmk
+   include FILES_c_unix.gmk
--- a/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_c_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_c_gmk
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_make_com_sun_tools_attach_FILES_c_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/com/sun/tools/attach/FILES_c.gmk.orig	Wed Aug  1 12:49:57 2007
+++ j2se/make/com/sun/tools/attach/FILES_c.gmk	Wed Aug  1 13:17:17 2007
+@@ -39,4 +39,7 @@ FILES_c = \
+ 	LinuxVirtualMachine.c
+ endif
+ 
+-
+ifeq ($(PLATFORM),bsd)
+FILES_c = \
+	BsdVirtualMachine.c
+endif
--- a/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_java_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_com_sun_tools_attach_FILES_java_gmk
@ -0,0 +1,15 @@
+$OpenBSD: patch-j2se_make_com_sun_tools_attach_FILES_java_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/com/sun/tools/attach/FILES_java.gmk.orig	Thu Aug  2 03:45:43 2007
+++ j2se/make/com/sun/tools/attach/FILES_java.gmk	Fri Aug  3 18:02:54 2007
+@@ -43,6 +43,11 @@ FILES_java += \
+ 	sun/tools/attach/LinuxAttachProvider.java
+ endif
+ 
+ifeq ($(PLATFORM), bsd)
+FILES_java += \
+	$(TARGDIR)/sun/tools/attach/BsdAttachProvider.java
+endif
+
+ #
+ # Files that need to be copied
+ #
--- a/devel/jdk/1.7/patches/patch-j2se_make_common_Defs-bsd_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_Defs-bsd_gmk
@ -0,0 +1,103 @@
+$OpenBSD: patch-j2se_make_common_Defs-bsd_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/Defs-bsd.gmk.orig	Thu Aug 23 11:22:35 2007
+++ j2se/make/common/Defs-bsd.gmk	Thu Aug 23 12:07:31 2007
+@@ -48,12 +48,6 @@ ifndef COMPILE_APPROACH
+   COMPILE_APPROACH = parallel
+ endif
+ 
+-# Part of INCREMENTAL_BUILD mechanism.
+-#   Compiler emits things like:  path/file.o: file.h
+-#   We want something like: relative_path/file.o relative_path/file.d: file.h
+-CC_DEPEND	 = -MM
+-CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
+-
+ ifndef PLATFORM_SRC
+   PLATFORM_SRC = $(J2SE_TOPDIR)/src/solaris
+ endif # PLATFORM_SRC
+@@ -66,7 +60,7 @@ ifndef OPENJDK
+ endif
+ 
+ # platform specific include files
+-PLATFORM_INCLUDE_NAME = $(PLATFORM)
+PLATFORM_INCLUDE_NAME = $(OS_NAME)
+ PLATFORM_INCLUDE      = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
+ 
+ # suffix used for make dependencies files.
+@@ -187,7 +181,7 @@ ifeq ($(FASTDEBUG), true)
+   CXXFLAGS_DBG	+= $(CC_LOWER_OPT)
+ endif
+ 
+-CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
+CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -D_ALLBSD_SOURCE $(VERSION_DEFINES) \
+ 		  -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
+ 
+ ifeq ($(ARCH_DATA_MODEL), 64)
+@@ -197,27 +191,6 @@ endif
+ CPPFLAGS_OPT    = 
+ CPPFLAGS_DBG    = -DDEBUG
+ 
+-ifdef LIBRARY
+-  # Libraries need to locate other libraries at runtime, and you can tell
+-  #   a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
+-  #   buried inside the .so. The $ORIGIN says to look relative to where
+-  #   the library itself is and it can be followed with relative paths from
+-  #   that. By default we always look in $ORIGIN, optionally we add relative
+-  #   paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths.
+-  #   On Bsd we add a flag -z origin, not sure if this is necessary, but 
+-  #   doesn't seem to hurt.
+-  #   The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
+-  #   Try: 'readelf -d lib*.so' to see these settings in a library.
+-  #
+-  LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN
+-  LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%)
+-endif
+-
+-EXTRA_LIBS += -lc
+-
+-LDFLAGS_DEFS_OPTION  = -z defs
+-LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
+-
+ #
+ # -L paths for finding and -ljava
+ #
+@@ -255,15 +228,6 @@ 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
+@@ -289,7 +253,9 @@ override HAVE_ALTZONE            = false
+ override HAVE_FILIOH             = false
+ override HAVE_GETHRTIME          = false
+ override HAVE_GETHRVTIME         = false
+ifeq ($(OS_VENDOR),NetBSD)
+ override HAVE_SIGIGNORE          = true
+endif
+ override LEX_LIBRARY             = -lfl
+ ifeq ($(STATIC_CXX),true)
+ override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
+@@ -300,13 +266,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
+-ifeq ($(ARCH), amd64)
+-override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
+-else
+ override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
+-endif
+ override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
+ override SUN_CMM_SUBDIR          =
+ override THREADS_FLAG            = native
--- a/devel/jdk/1.7/patches/patch-j2se_make_common_Defs_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_Defs_gmk
@ -0,0 +1,40 @@
+$OpenBSD: patch-j2se_make_common_Defs_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/Defs.gmk.orig	Thu Aug 30 04:58:10 2007
+++ j2se/make/common/Defs.gmk	Sun Sep  2 14:06:03 2007
+@@ -208,7 +208,7 @@ include $(J2SE_TOPDIR)/make/common/Defs-$(PLATFORM).gm
+ #
+ # Freetype logic is applicable to OpenJDK only
+ #
+-ifdef OPENJDK
+ifdef USE_FREETYPE
+ 
+ #if we use system lib we do not need to copy it to build tree
+ USING_SYSTEM_FT_LIB=false
+@@ -230,6 +230,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
+ 
+   ifdef ALT_FREETYPE_LIB_PATH
+     FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
+    USING_SYSTEM_FT_LIB=true
+   else
+     ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
+       FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
+@@ -294,6 +295,10 @@ ifdef PROGRAM
+     LDLIBS_COMMON = -ldl
+   endif
+ 
+  ifeq ($(PLATFORM), bsd)
+    LDLIBS_COMMON = -pthread
+  endif
+
+ endif # PROGRAM
+ 
+ LDLIBS_COMMON += $(EXTRA_LIBS)
+@@ -493,7 +498,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
+ JAVA_MEM_JFLAGS   = $(JAVA_MEM_FLAGS:%=-J%)
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_make_common_Program_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_Program_gmk
@ -0,0 +1,43 @@
+$OpenBSD: patch-j2se_make_common_Program_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/Program.gmk.orig	Fri Jul 13 22:32:48 2007
+++ j2se/make/common/Program.gmk	Fri Jul 13 22:37:02 2007
+@@ -67,11 +67,17 @@ endif
+ # Create a dependency on libjli (Java Launcher Infrastructure)
+ #
+ # On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to
+-# do this reliably on Linux takes a different syntax than Solaris.
+# do this reliably on Linux takes a different syntax than Solaris. BSD's
+# don't support $ORIGIN so build an archive instead.
+ #
+ # On Windows, this is done by using the same directory as the executable
+ # itself, as with all the Windows libraries.
+ #
+ifeq ($(PLATFORM), bsd)
+    LDFLAGS += -Wl,--whole-archive
+    LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
+    LDFLAGS += -Wl,--no-whole-archive
+endif
+ ifneq (,$(findstring $(PLATFORM), linux solaris))	# UNIX systems
+     LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
+     OTHER_LDLIBS += -ljli
+@@ -174,6 +180,10 @@ else # USE_PTHREADS
+   THREADLIBS = $(LIBTHREAD)
+ endif # USE_PTHREADS
+ 
+ifeq ($(PLATFORM), bsd)
+THREADLIBS = -pthread
+endif
+
+ #
+ # This rule only applies on unix.  It supports quantify and its ilk.
+ #
+@@ -242,7 +252,9 @@ endif
+ 
+ 
+ ifneq ($(PLATFORM), windows)
+ifneq ($(PLATFORM), bsd)
+ HAVE_GETHRTIME=true
+endif
+ endif
+ 
+ ifeq ($(HAVE_GETHRTIME),true)
--- a/devel/jdk/1.7/patches/patch-j2se_make_common_Release_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_Release_gmk
@ -0,0 +1,76 @@
+$OpenBSD: patch-j2se_make_common_Release_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/Release.gmk.orig	Thu Aug  2 03:45:44 2007
+++ j2se/make/common/Release.gmk	Fri Aug 10 21:36:11 2007
+@@ -148,7 +148,7 @@ JRE_MAN_PAGES = \
+ 	pack200.1	      \
+ 	unpack200.1
+ 
+-ifeq ($(ARCH_DATA_MODEL),32)
+ifeq ($(BUILD_DEPLOY), true)
+   JRE_MAN_PAGES += javaws.1
+ endif
+ 
+@@ -158,7 +158,6 @@ endif
+ JDK_MAN_PAGES = \
+ 	$(JRE_MAN_PAGES) \
+ 	appletviewer.1 \
+-  apt.1 \
+ 	extcheck.1 \
+ 	idlj.1 \
+ 	jar.1 \
+@@ -199,7 +198,19 @@ ifeq ($(PLATFORM), linux)
+   DEST_MAN_PATH = man/man1
+ endif
+ 
+ifeq ($(PLATFORM), bsd)
+  MANDIR=$(TOPDIR)/src/bsd/doc/man
+  JA_MANDIR=$(TOPDIR)/src/bsd/doc/man
+  DEST_MAN_PATH = man/man1
+endif
+ 
+ifeq ($(OS_VENDOR), OpenBSD)
+  FILES_FROM_ARG=-I
+else
+  FILES_FROM_ARG=-T
+endif
+
+
+ #
+ # Targets.
+ #
+@@ -789,7 +800,7 @@ else # Not windows
+ 	@#
+ 	@# Add Japanese manpages
+ 	@#
+-  ifeq ($(PLATFORM), linux)
+  ifneq (,$(findstring $(PLATFORM), linux bsd))
+ 	for manpage in $(JRE_MAN_PAGES); do \
+ 	    for encoding in $(JA_TARGET_ENCODINGS); do \
+ 		MAN_DEST_PATH=$(JRE_IMAGE_DIR)/man/ja; \
+@@ -1013,7 +1024,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.
+-  ifeq ($(PLATFORM), linux)
+  ifneq (,$(findstring $(PLATFORM), linux bsd))
+ 	for d in $(SOURCE_DIRS); do \
+ 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
+ 	  ($(CD) $$d;  \
+@@ -1026,7 +1037,7 @@ initial-image-jdk:: initial-image-jdk-setup \
+ 	    done ; \
+ 	  ) ; \
+ 	  if [ -f  $(ABS_TEMPDIR)/src-files.list ] ; then \
+-	    ($(CD) $$d; $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
+	    ($(CD) $$d; $(TAR) cf - $(FILES_FROM_ARG) $(ABS_TEMPDIR)/src-files.list ) \
+ 	       | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xf -); \
+ 	  fi; \
+ 	done
+@@ -1100,7 +1111,7 @@ initial-image-jdk:: initial-image-jdk-setup \
+ 	@#
+ 	@# Add Japanese manpages for Solaris
+ 	@#
+-    ifeq ($(PLATFORM), linux)
+    ifneq (,$(findstring $(PLATFORM), linux bsd))
+ 	for manpage in $(JDK_MAN_PAGES); do \
+ 	    for encoding in $(JA_TARGET_ENCODINGS); do \
+ 		MAN_DEST_PATH=$(JDK_IMAGE_DIR)/man/ja; \
--- a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler-gcc_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler-gcc_gmk
@ -0,0 +1,33 @@
+$OpenBSD: patch-j2se_make_common_shared_Compiler-gcc_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/shared/Compiler-gcc.gmk.orig	Thu Jul  5 04:56:08 2007
+++ j2se/make/common/shared/Compiler-gcc.gmk	Thu Aug  2 09:52:58 2007
+@@ -55,20 +55,24 @@ ifeq ($(PLATFORM), windows)
+ 
+ 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
+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
--- a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Compiler_gmk
@ -0,0 +1,14 @@
+$OpenBSD: patch-j2se_make_common_shared_Compiler_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/shared/Compiler.gmk.orig	Fri Jul 13 22:47:15 2007
+++ j2se/make/common/shared/Compiler.gmk	Fri Jul 13 22:49:18 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-j2se_make_common_shared_Defs-bsd_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Defs-bsd_gmk
@ -0,0 +1,44 @@
+$OpenBSD: patch-j2se_make_common_shared_Defs-bsd_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/shared/Defs-bsd.gmk.orig	Sun Sep  2 14:06:00 2007
+++ j2se/make/common/shared/Defs-bsd.gmk	Sun Sep  2 14:47:53 2007
+@@ -38,7 +38,7 @@ $(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && p
+ endef
+ 
+ # Location on system where jdk installs might be
+-USRJDKINSTANCES_PATH =/opt/java
+USRJDKINSTANCES_PATH =/usr/local
+ 
+ # UNIXCOMMAND_PATH: path to where the most common Unix commands are.
+ #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
+@@ -117,28 +117,16 @@ else
+ endif
+ 
+ # Motif settings, always build headless on Bsd
+-STATIC_MOTIF=true
+STATIC_MOTIF=false
+ LIBM=-lm
+ ifdef MOTIF_REQUIRED
+   BUILD_MOTIF21 = true
+ endif
+ BUILD_HEADLESS = true
+-ifeq ($(ARCH_DATA_MODEL), 32)
+-  MOTIF_LIB = $(MOTIF_DIR)/lib
+-else
+-  MOTIF_LIB = $(MOTIF_DIR)/lib64
+-endif
+MOTIF_LIB = $(MOTIF_DIR)/lib
+ MOTIF_INCLUDE = $(MOTIF_DIR)/include
+ 
+-# GCC29_COMPILER_PATH: is the path to where the gcc 2.9 compiler is installed
+-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
+-ifneq "$(origin ALT_GCC29_COMPILER_PATH)" "undefined"
+-  GCC29_COMPILER_PATH :=$(call PrefixPath,$(ALT_GCC29_COMPILER_PATH))
+-else
+-  GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/
+-endif
+-
+-_CUPS_HEADERS_PATH=/usr/include
+_CUPS_HEADERS_PATH=/usr/local/include
+ 
+ # BUILD_JDK_IMPORT_PATH: location of all previously built JDKs (this version).
+ ifdef ALT_BUILD_JDK_IMPORT_PATH
--- a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Platform_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Platform_gmk
@ -0,0 +1,100 @@
+$OpenBSD: patch-j2se_make_common_shared_Platform_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/shared/Platform.gmk.orig	Thu Aug 16 03:50:40 2007
+++ j2se/make/common/shared/Platform.gmk	Thu Aug 23 11:12:55 2007
+@@ -277,6 +277,73 @@ ifeq ($(SYSTEM_UNAME), Linux)
+   MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
+ endif
+ 
+ifeq ($(SYSTEM_UNAME), FreeBSD)
+  PLATFORM = bsd
+  OS_NAME = freebsd
+  OS_VENDOR = FreeBSD
+ REQUIRED_OS_VERSION = 6.0
+endif
+
+ifeq ($(SYSTEM_UNAME), NetBSD)
+  PLATFORM = bsd
+  OS_NAME = netbsd
+  OS_VENDOR = NetBSD
+  REQUIRED_OS_VERSION = 3.0
+endif
+
+ifeq ($(SYSTEM_UNAME), OpenBSD)
+  PLATFORM = bsd
+  OS_NAME = openbsd
+  OS_VENDOR = OpenBSD
+  REQUIRED_OS_VERSION = 4.0
+endif
+
+# Platform settings specific to BSD
+ifeq ($(PLATFORM), bsd)
+  OS_VERSION := $(shell uname -r)
+  # Arch and OS name/version
+  mach := $(shell uname -m)
+  archExpr = case "$(mach)" in \
+                i[3-9]86) \
+                    echo i586 \
+                    ;; \
+                *) \
+                    echo $(mach) \
+                    ;; \
+      esac
+  ARCH        := $(shell $(archExpr) )
+  ARCH_FAMILY := $(ARCH)
+
+  # i586 and sparc are 32 bit, amd64 and sparc64 are 64
+  ifneq (,$(findstring $(ARCH), i586 sparc))
+    ARCH_DATA_MODEL=32
+  else
+    ARCH_DATA_MODEL=64
+  endif
+
+  # Need to maintain the jre/lib/i386 location for 32-bit Intel
+  ifeq ($(ARCH), i586)
+    LIBARCH = i386
+  else
+    LIBARCH = $(ARCH)
+  endif
+
+  # Value of Java os.arch property
+  ARCHPROP  = $(LIBARCH)
+
+  # Suffix for file bundles used in previous release
+  BUNDLE_FILE_SUFFIX=.tar.gz
+  # Minimum disk space needed as determined by running 'du -sk' on 
+  #    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
+endif
+
+ # Windows with and without CYGWIN will be slightly different
+ ifeq ($(SYSTEM_UNAME), Windows_NT)
+   PLATFORM = windows
+@@ -401,8 +468,8 @@ 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.
+#    If we don't know, assume 512. Subtract 288 from MB for VM MAX.
+#    Don't set VM max over 1024-288=736.
+ ifneq ($(MB_OF_MEMORY),)
+   LOW_MEMORY_MACHINE := $(shell \
+     if [ $(MB_OF_MEMORY) -le 512 ] ; then \
+@@ -412,9 +479,9 @@ ifneq ($(MB_OF_MEMORY),)
+     fi)
+   MAX_VM_MEMORY := $(shell \
+     if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
+-      expr $(MB_OF_MEMORY) '-' 128 ; \
+      expr $(MB_OF_MEMORY) '-' 288 ; \
+     else \
+-      echo "896"; \
+      echo "736"; \
+     fi)
+   MIN_VM_MEMORY := $(shell \
+     if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
--- a/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Sanity_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_common_shared_Sanity_gmk
@ -0,0 +1,15 @@
+$OpenBSD: patch-j2se_make_common_shared_Sanity_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/common/shared/Sanity.gmk.orig	Fri Jul 13 23:09:20 2007
+++ j2se/make/common/shared/Sanity.gmk	Fri Jul 13 23:10:00 2007
+@@ -94,6 +94,11 @@ ifeq ($(PLATFORM), windows)
+     $(EGREP) "\#define" | $(NAWK) '{print $$3}')
+ endif
+ 
+ifeq ($(PLATFORM), bsd)
+  FREE_SPACE := $(shell BLOCKSIZE=512 $(DF) $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
+  TEMP_FREE_SPACE := $(shell BLOCKSIZE=512 $(DF) $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
+endif
+
+ # 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')
--- a/devel/jdk/1.7/patches/patch-j2se_make_docs_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_docs_Makefile
@ -0,0 +1,21 @@
+$OpenBSD: patch-j2se_make_docs_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/docs/Makefile.orig	Thu Jul  5 04:56:08 2007
+++ j2se/make/docs/Makefile	Wed Aug  1 15:41:46 2007
+@@ -47,7 +47,7 @@ ifeq ($(ARCH_DATA_MODEL), 32)
+     JAVADOC_VM_MEMORY_FLAGS = -J-Xms32M -J-Xmx384M
+   endif
+ else
+-  JAVADOC_VM_MEMORY_FLAGS = -J-Xms128M -J-Xmx1024M
+  JAVADOC_VM_MEMORY_FLAGS = -J-Xms128M -J-Xmx736M
+ endif
+ 
+ COMMON_JAVADOCFLAGS =					\
+@@ -216,7 +216,7 @@ JDI_HEADER      = "Java Debug Interface"
+ #       you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR)
+ #       being interpreted as an end of command (newline)
+ 
+-JAAS_SOURCEPATH  = "$(TOPDIR)/src/share/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/solaris/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/windows/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/linux/classes"
+JAAS_SOURCEPATH  = "$(TOPDIR)/src/share/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/solaris/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/windows/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/linux/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/bsd/classes"
+ JAAS_DOCDIR	 = $(DOCSDIR)/jre/api/security/jaas/spec
+ JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS)			 \
+ 		   -encoding ascii			         \
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_Makefile
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_make_java_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/Makefile.orig	Fri Jul 13 23:11:03 2007
+++ j2se/make/java/Makefile	Fri Jul 13 23:11:52 2007
+@@ -61,7 +61,7 @@ ifeq ($(PLATFORM), solaris)
+   endif
+ endif # PLATFORM
+ 
+-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
+   SUBDIRS += jexec
+ endif # PLATFORM
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_hpi_common_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_hpi_common_gmk
@ -0,0 +1,14 @@
+$OpenBSD: patch-j2se_make_java_hpi_hpi_common_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/hpi/hpi_common.gmk.orig	Fri Jul 13 23:12:15 2007
+++ j2se/make/java/hpi/hpi_common.gmk	Fri Jul 13 23:13:01 2007
+@@ -86,6 +86,10 @@ endif
+ # Things that must be linked in.
+ #
+ ifneq ($(PLATFORM), windows)
+ifeq ($(PLATFORM), bsd)
+OTHER_LDLIBS += $(LIBM)
+else
+ LIBSOCKET = -lsocket
+ OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
+endif
+ endif
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_native_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_hpi_native_Makefile
@ -0,0 +1,22 @@
+$OpenBSD: patch-j2se_make_java_hpi_native_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/hpi/native/Makefile.orig	Fri Jul 13 23:13:05 2007
+++ j2se/make/java/hpi/native/Makefile	Fri Jul 13 23:14:45 2007
+@@ -72,11 +72,18 @@ OTHER_CPPFLAGS += -DUSE_PTHREADS
+ ifeq ($(MOOT_PRIORITIES),true)
+ OTHER_CPPFLAGS += -DMOOT_PRIORITIES
+ endif
+ifeq ($(PLATFORM), bsd)
+LIBPOSIX4      =
+OTHER_LDLIBS   += -pthread
+else
+ LIBPOSIX4	= -lposix4
+ OTHER_LDLIBS   += -lpthread $(LIBPOSIX4)
+ endif
+endif
+ 
+ifneq ($(PLATFORM), bsd)
+ HAVE_GETHRVTIME=true
+endif
+ ifeq ($(HAVE_GETHRVTIME),true)
+ OTHER_CPPFLAGS += -DHAVE_GETHRVTIME
+ endif
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_instrument_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_instrument_Makefile
@ -0,0 +1,27 @@
+$OpenBSD: patch-j2se_make_java_instrument_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/instrument/Makefile.orig	Thu Aug  2 03:45:45 2007
+++ j2se/make/java/instrument/Makefile	Fri Aug 10 17:03:38 2007
+@@ -102,6 +102,15 @@ 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
+# Use CPPFLAGS instead of OTHER_INCLUDES to force this last
+  CPPFLAGS += -I$(ICONV_DIR)/include
+  OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv
+else
+   LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
+   OTHER_LDLIBS += -ljli
+   OTHER_LDLIBS += -ldl 
+@@ -113,6 +122,7 @@ else
+     LDFLAGS += -Wl,--allow-shlib-undefined
+     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
+   endif
+endif
+ endif
+ 
+ #
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_java_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_java_Makefile
@ -0,0 +1,29 @@
+$OpenBSD: patch-j2se_make_java_java_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/java/Makefile.orig	Fri Jul 13 23:18:23 2007
+++ j2se/make/java/java/Makefile	Fri Jul 13 23:19:52 2007
+@@ -167,8 +167,10 @@ OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/util
+ # Is the altzone extern documented in ctime(3C) available?
+ #
+ ifneq ($(PLATFORM), windows)
+ifneq ($(PLATFORM), bsd)
+ HAVE_ALTZONE=true
+ endif
+endif
+ 
+ ifeq ($(HAVE_ALTZONE),true)
+ OTHER_CPPFLAGS += -DHAVE_ALTZONE
+@@ -205,9 +207,14 @@ ifeq ($(PLATFORM),windows)
+ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
+ 		       -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
+ else
+ifeq ($(PLATFORM), bsd)
+OTHER_LDLIBS += $(JVMLIB) -lverify -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) \
+               -lfdlibm.$(ARCH)
+else
+ LIBSOCKET = -lsocket
+ OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
+ 		-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
+endif
+ endif
+ 
+ #
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_java_hprof_demo_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_java_hprof_demo_Makefile
@ -0,0 +1,17 @@
+$OpenBSD: patch-j2se_make_java_java_hprof_demo_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/java_hprof_demo/Makefile.orig	Fri Jul 13 23:20:36 2007
+++ j2se/make/java/java_hprof_demo/Makefile	Fri Jul 13 23:20:56 2007
+@@ -80,11 +80,13 @@ OTHER_INCLUDES = -I$(SRCDIR) \
+ 	         -I$(PLATFORM_SRC)/npt \
+ 	         -I$(SHARE_SRC)/demo/jvmti/java_crw_demo
+ 
+ifneq ($(PLATFORM), bsd)
+ ifeq ($(PLATFORM), windows)
+   OTHER_LDLIBS += wsock32.lib winmm.lib
+ else
+   LIBSOCKET = -lsocket
+   OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
+endif
+ endif
+ 
+ #
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_java_localegen_sh
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_java_localegen_sh
@ -0,0 +1,15 @@
+$OpenBSD: patch-j2se_make_java_java_localegen_sh,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/java/localegen.sh.orig	Thu Jul  5 04:56:09 2007
+++ j2se/make/java/java/localegen.sh	Mon Jul 30 18:15:44 2007
+@@ -55,9 +55,9 @@ sed_script="$SED -e \"s@^#warn .*@// -- This file was 
+ for FILE in $RESOURCE_NAMES 
+ do
+     getlocalelist $FILE $EURO_FILES_LIST
+-    sed_script=$sed_script"-e \"s/#"$FILE"_EuroLocales#/$localelist/g\" "
+    sed_script=$sed_script"-e \"s@#"$FILE"_EuroLocales#@$localelist@g\" "
+     getlocalelist $FILE $NONEURO_FILES_LIST
+-    sed_script=$sed_script"-e \"s/#"$FILE"_NonEuroLocales#/$localelist/g\" "
+    sed_script=$sed_script"-e \"s@#"$FILE"_NonEuroLocales#@$localelist@g\" "
+ done
+ 
+ sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_jli_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_jli_Makefile
@ -0,0 +1,37 @@
+$OpenBSD: patch-j2se_make_java_jli_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/jli/Makefile.orig	Thu Jul  5 04:56:09 2007
+++ j2se/make/java/jli/Makefile	Mon Jul 30 19:27:41 2007
+@@ -68,7 +68,7 @@ FILES_c = \
+ 
+ OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
+ 
+-ifneq (,$(findstring $(PLATFORM), linux solaris))	# UNIX systems
+ifneq (,$(findstring $(PLATFORM), linux solaris bsd))	# UNIX systems
+ 	LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
+ 	# Guarantee very limited dependencies
+ 	LDLIBS = -lc
+@@ -135,6 +135,24 @@ $(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
+ library:: $(STATIC_LIBRARY)
+ 
+ endif	# PLATFORM
+
+ifeq ($(PLATFORM), bsd)
+
+STATIC_LIBRARY_DIR = $(OBJDIR)/static
+STATIC_LIBRARY_NAME = lib$(LIBRARY).a
+STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME)
+
+$(STATIC_LIBRARY_DIR): $(OBJDIR)
+	@$(prep-target)
+	@$(MKDIR) $(STATIC_LIBRARY_DIR)
+
+$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
+	@$(prep-target)
+	$(AR) -r $@ $(FILES_o)
+
+library:: $(STATIC_LIBRARY)
+
+endif  # PLATFORM
+ 
+ #
+ # Add to ambient vpath so we pick up the library files
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_management_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_management_Makefile
@ -0,0 +1,15 @@
+$OpenBSD: patch-j2se_make_java_management_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/management/Makefile.orig	Sun Jul 15 22:14:48 2007
+++ j2se/make/java/management/Makefile	Sun Jul 15 22:16:48 2007
+@@ -88,6 +88,11 @@ JAVAHFLAGS += -jni      # Generate JNI-style header fi
+ OTHER_INCLUDES += \
+   -I$(SHARE_SRC)/native/sun/management 
+ 
+ifeq ($(PLATFORM),bsd)
+OTHER_INCLUDES += \
+  -I$(PLATFORM_SRC)/hpi/include
+endif
+
+ ifeq ($(PLATFORM),windows)
+   OTHER_LDLIBS += $(JVMLIB)
+ endif
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_net_FILES_c_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_net_FILES_c_gmk
@ -0,0 +1,14 @@
+$OpenBSD: patch-j2se_make_java_net_FILES_c_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/net/FILES_c.gmk.orig	Thu Aug  2 03:45:45 2007
+++ j2se/make/java/net/FILES_c.gmk	Fri Aug  3 18:02:55 2007
+@@ -43,6 +43,10 @@ ifeq ($(PLATFORM), linux)
+     FILES_c += linux_close.c
+ endif
+ 
+ifeq ($(OS_VENDOR), FreeBSD)
+    FILES_c += $(CTARGDIR)bsd_close.c
+endif
+
+ ifeq ($(PLATFORM), windows)
+     FILES_c += TwoStacksPlainSocketImpl.c
+     FILES_c += DualStackPlainSocketImpl.c
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_net_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_net_Makefile
@ -0,0 +1,24 @@
+$OpenBSD: patch-j2se_make_java_net_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/net/Makefile.orig	Thu Aug  2 03:45:45 2007
+++ j2se/make/java/net/Makefile	Fri Aug  3 18:02:55 2007
+@@ -97,6 +97,12 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk
+ 
+ include $(BUILDDIR)/common/Library.gmk
+ 
+ifeq ($(PLATFORM), bsd)
+ifdef DONT_ENABLE_IPV6
+  OTHER_CFLAGS += -DDONT_ENABLE_IPV6
+endif
+  OTHER_LDLIBS = $(JVMLIB) -pthread
+else
+ ifeq ($(PLATFORM), windows)
+   OTHER_LDLIBS = ws2_32.lib $(JVMLIB)
+   # Will not compile at warning level 3 if warnings are fatal
+@@ -108,6 +114,7 @@ endif
+ ifeq ($(PLATFORM), linux)
+   OTHER_LDLIBS += -lpthread
+ endif
+endif # PLATFORM == bsd
+ 
+ CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_nio_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_nio_Makefile
@ -0,0 +1,44 @@
+$OpenBSD: patch-j2se_make_java_nio_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/nio/Makefile.orig	Sun Jul 15 22:20:55 2007
+++ j2se/make/java/nio/Makefile	Sun Jul 15 22:22:36 2007
+@@ -81,7 +81,7 @@ FILES_export += \
+ 	sun/nio/ch/WindowsSelectorImpl.java
+ endif # PLATFORM = windows
+ 
+-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 += \
+   -I$(PLATFORM_SRC)/native/java/net \
+   -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders
+ 
+ifeq ($(PLATFORM), bsd)
+OTHER_INCLUDES += \
+  -I$(PLATFORM_SRC)/hpi/include
+endif
+
+ ifeq ($(PLATFORM),windows)
+   OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
+      -libpath:$(LIBDIR) java.lib \
+@@ -137,6 +142,9 @@ ifeq ($(PLATFORM), linux)
+ COMPILER_WARNINGS_FATAL=true
+ OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
+ endif
+ifeq ($(PLATFORM), bsd)
+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -pthread
+endif
+ ifeq ($(PLATFORM), solaris)
+ OTHER_LDLIBS += $(JVMLIB) -lsocket -lposix4 -ldl \
+ 		-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
+@@ -158,6 +166,9 @@ FILES_m = mapfile-solaris
+ endif
+ ifeq ($(PLATFORM), linux)
+ FILES_m = mapfile-linux
+endif
+ifeq ($(PLATFORM), bsd)
+FILES_m = mapfile-bsd
+ endif
+ include $(BUILDDIR)/common/Mapfile-vers.gmk
+ include $(BUILDDIR)/common/Library.gmk
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_npt_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_npt_Makefile
@ -0,0 +1,17 @@
+$OpenBSD: patch-j2se_make_java_npt_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/npt/Makefile.orig	Thu Aug  2 03:45:46 2007
+++ j2se/make/java/npt/Makefile	Fri Aug 10 17:04:49 2007
+@@ -70,6 +70,13 @@ 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
+endif
+
+ #
+ # Add to ambient vpath so we pick up the library files
+ #
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_redist_FILES_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_redist_FILES_gmk
@ -0,0 +1,18 @@
+$OpenBSD: patch-j2se_make_java_redist_FILES_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/redist/FILES.gmk.orig	Sun Jul 15 22:24:17 2007
+++ j2se/make/java/redist/FILES.gmk	Sun Jul 15 22:25:03 2007
+@@ -38,6 +38,14 @@ SHARED_FONTFILES =					\
+ 	$(LIBDIR)/fonts/LucidaSansDemiBold.ttf       	\
+ 
+ ifeq ($(PLATFORM), linux)
+NEED_OBLIQUE_FONTS = true
+endif
+
+ifeq ($(PLATFORM), bsd)
+NEED_OBLIQUE_FONTS = true
+endif
+
+ifeq ($(NEED_OBLIQUE_FONTS), true)
+ 
+ # The oblique versions of the font are derived from the base versions
+ # and since 2D can do this derivation on the fly at run time there is no
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_redist_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_redist_Makefile
@ -0,0 +1,33 @@
+$OpenBSD: patch-j2se_make_java_redist_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/redist/Makefile.orig	Thu Aug  2 03:45:46 2007
+++ j2se/make/java/redist/Makefile	Fri Aug  3 18:09:11 2007
+@@ -95,6 +95,11 @@ ifeq ($(SA_EXISTS), false)
+   INCLUDE_SA := false
+ endif
+ 
+# FIXME: Remove when the build of libsaproc is fixed.
+ifeq ($(PLATFORM), bsd)
+  INCLUDE_SA := false
+endif
+
+ ifeq ($(INCLUDE_SA), true)
+   IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
+                  $(LIB_LOCATION)/$(SALIB_NAME)
+@@ -319,7 +324,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.
+ 
+@@ -333,7 +338,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
+ 
+ PARTIAL_SECURITY_CLASSFILE_LIST = \
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_sun_nio_FILES_java_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_sun_nio_FILES_java_gmk
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_make_java_sun_nio_FILES_java_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/sun_nio/FILES_java.gmk.orig	Thu Aug  2 03:45:46 2007
+++ j2se/make/java/sun_nio/FILES_java.gmk	Fri Aug  3 18:10:26 2007
+@@ -130,6 +130,8 @@ FILES_java += \
+     sun/io/CharToByteCp1257.java \
+     sun/io/ByteToCharKOI8_R.java \
+     sun/io/CharToByteKOI8_R.java \
+    sun/io/ByteToCharKOI8_U.java \
+    sun/io/CharToByteKOI8_U.java \
+     sun/io/ByteToCharSingleByte.java \
+     sun/io/CharToByteSingleByte.java
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_zip_FILES_c_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_zip_FILES_c_gmk
@ -0,0 +1,22 @@
+$OpenBSD: patch-j2se_make_java_zip_FILES_c_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/zip/FILES_c.gmk.orig	Thu Aug  2 03:45:46 2007
+++ j2se/make/java/zip/FILES_c.gmk	Fri Aug  3 18:14:39 2007
+@@ -30,6 +30,10 @@ FILES_c = \
+ 	Inflater.c \
+ 	ZipFile.c \
+ 	ZipEntry.c \
+	zip_util.c
+
+ifneq ($(SYSTEM_ZLIB),true)
+FILES_c += \
+ 	zadler32.c \
+ 	zcrc32.c \
+ 	deflate.c \
+@@ -40,5 +44,5 @@ FILES_c = \
+ 	inftrees.c \
+ 	infcodes.c \
+ 	infutil.c \
+-	inffast.c \
+-	zip_util.c
+	inffast.c
+endif
--- a/devel/jdk/1.7/patches/patch-j2se_make_java_zip_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_java_zip_Makefile
@ -0,0 +1,32 @@
+$OpenBSD: patch-j2se_make_java_zip_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/java/zip/Makefile.orig	Sun Jul 15 22:34:44 2007
+++ j2se/make/java/zip/Makefile	Sun Jul 15 22:36:10 2007
+@@ -78,14 +78,17 @@ else
+ CPPFLAGS += -UDEBUG 
+ endif
+ 
+-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+ CPPFLAGS += -I$(SHARE_SRC)/native/java/io
+ CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
+ 
+ifneq ($(SYSTEM_ZLIB),true)
+CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+
+ #
+ # Add to ambient vpath so we pick up the library files
+ #
+ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
+endif
+ 
+ #
+ # Has been converted to the JNI: generate JNI-style header files
+@@ -95,4 +98,9 @@ JAVAHFLAGS += -jni
+ #
+ # Link to JVM library for JVM_Zip* functions
+ #
+ifeq ($(SYSTEM_ZLIB),true)
+OTHER_LDLIBS = -lz
+else
+ OTHER_LDLIBS = $(JVMLIB)
+endif
+
--- a/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_FILES_c_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_FILES_c_gmk
@ -0,0 +1,14 @@
+$OpenBSD: patch-j2se_make_javax_sound_FILES_c_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/javax/sound/FILES_c.gmk.orig	Thu Aug  2 03:45:46 2007
+++ j2se/make/javax/sound/FILES_c.gmk	Fri Aug  3 18:02:55 2007
+@@ -75,6 +75,10 @@ FILES_linux = \
+ 	HAE_API_LinuxOS.c \
+ 	HAE_API_LinuxOS_Capture.c
+ 
+FILES_bsd = \
+       $(CTARGDIR)HAE_API_BsdOS.c \
+       $(CTARGDIR)HAE_API_BsdOS_Capture.c
+
+ FILES_windows = \
+ 	HAE_API_WinOS.c \
+ 	HAE_API_WinOS_Capture.c \
--- a/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_Makefile
@ -0,0 +1,23 @@
+$OpenBSD: patch-j2se_make_javax_sound_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/javax/sound/Makefile.orig	Thu Aug  2 03:45:46 2007
+++ j2se/make/javax/sound/Makefile	Fri Aug  3 18:02:55 2007
+@@ -114,6 +114,19 @@ ifeq ($(PLATFORM), linux)
+   endif
+ endif # PLATFORM linux
+ 
+# XXXBSD: ???
+ifeq ($(PLATFORM), bsd)
+    # build with empty MIDI i/o
+    INCLUDE_MIDI = TRUE
+    # build with empty ports
+    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-j2se_make_javax_sound_SoundDefs_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_javax_sound_SoundDefs_gmk
@ -0,0 +1,14 @@
+$OpenBSD: patch-j2se_make_javax_sound_SoundDefs_gmk,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/javax/sound/SoundDefs.gmk.orig	Sun Jul 15 22:39:32 2007
+++ j2se/make/javax/sound/SoundDefs.gmk	Sun Jul 15 22:39:57 2007
+@@ -59,6 +59,10 @@ ifeq ($(PLATFORM), linux)
+   CPPFLAGS += -DX_PLATFORM=X_LINUX
+ endif # PLATFORM linux
+ 
+ifeq ($(PLATFORM), bsd)
+  CPPFLAGS += -DX_PLATFORM=X_BSD
+endif # PLATFORM bsd
+
+ ifeq ($(PLATFORM), solaris)
+   CPPFLAGS += -DX_PLATFORM=X_SOLARIS
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_make_jpda_back_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_jpda_back_Makefile
@ -0,0 +1,13 @@
+$OpenBSD: patch-j2se_make_jpda_back_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/jpda/back/Makefile.orig	Wed Aug  1 15:25:46 2007
+++ j2se/make/jpda/back/Makefile	Wed Aug  1 15:26:10 2007
+@@ -49,7 +49,9 @@ OTHER_INCLUDES = -I$(SHARE_SRC)/transport/export \
+                  -I$(TEMPDIR)/../com.sun.tools.jdwpgen/jdwp
+ 
+ ifneq ($(PLATFORM), windows)
+ifneq ($(PLATFORM), bsd)
+   OTHER_LDLIBS += -ldl
+endif # PLATFORM
+ endif # PLATFORM
+ 
+ #
--- a/devel/jdk/1.7/patches/patch-j2se_make_jpda_transport_socket_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_jpda_transport_socket_Makefile
@ -0,0 +1,15 @@
+$OpenBSD: patch-j2se_make_jpda_transport_socket_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
+--- j2se/make/jpda/transport/socket/Makefile.orig	Sun Jul 15 22:40:00 2007
+++ j2se/make/jpda/transport/socket/Makefile	Sun Jul 15 22:40:21 2007
+@@ -46,6 +46,11 @@ ifeq ($(PLATFORM), linux)
+   OTHER_LDLIBS += -lnsl -lpthread
+ endif
+ 
+ifeq ($(PLATFORM), bsd)
+  LIBSOCKET =
+  OTHER_LDLIBS += -pthread
+endif
+
+ ifeq ($(PLATFORM), solaris)
+   LIBSOCKET = -lsocket
+   OTHER_LDLIBS += -lnsl -lsocket
--- a/devel/jdk/1.7/patches/patch-j2se_make_mkdemo_jvmti_Demo_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_mkdemo_jvmti_Demo_gmk
@ -0,0 +1,28 @@
+$OpenBSD: patch-j2se_make_mkdemo_jvmti_Demo_gmk,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/mkdemo/jvmti/Demo.gmk.orig	Thu Jul  5 04:56:12 2007
+++ j2se/make/mkdemo/jvmti/Demo.gmk	Thu Aug  2 21:45:58 2007
+@@ -145,10 +145,12 @@ ifdef USES_CRW
+       OTHER_LDLIBS += -R\$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR)
+       OTHER_LDLIBS += -R\$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR)
+     else
+-      # Add runpath options so that this library can find java_crw_demo
+-      OTHER_LDLIBS += -Xlinker -z -Xlinker origin
+-      OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR)
+-      OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR)
+      ifneq ($(PLATFORM), bsd)
+        # Add runpath options so that this library can find java_crw_demo
+        OTHER_LDLIBS += -Xlinker -z -Xlinker origin
+        OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR)
+        OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR)
+      endif
+     endif
+     # Add dependence on java_crw_demo
+     OTHER_LDLIBS += -ljava_crw_demo
+@@ -244,6 +246,7 @@ demo_src_dir_layout:
+ 	    $(RM) -r $(ABS_DEMODESTDIR)/src/$(PLATFORM); \
+ 	    $(MKDIR) -p $(ABS_DEMODESTDIR)/src/$(PLATFORM); \
+ 	    $(CP) $(PSRCDIR)/*.* $(ABS_DEMODESTDIR)/src/$(PLATFORM); \
+	    $(RM) $(ABS_DEMODESTDIR)/src/$(PLATFORM)/*.orig; \
+ 	fi
+ 	@if [ "$(DEMO_NAME)" = hprof ] ; then \
+ 	    $(CP) $(SHARE_SRC)/classes/com/sun/demo/jvmti/hprof/*.java \
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_Makefile
@ -0,0 +1,73 @@
+$OpenBSD: patch-j2se_make_sun_awt_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/awt/Makefile.orig	Thu Aug 30 04:58:15 2007
+++ j2se/make/sun/awt/Makefile	Sun Sep  2 14:06:04 2007
+@@ -128,6 +128,14 @@ OTHER_CFLAGS += -DMOTIF_VERSION=2
+ OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
+ endif
+ 
+ifeq  ($(PLATFORM), bsd)
+FILES_c = $(FILES_2D_c)
+FILES_c += awt_LoadLibrary.c
+OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
+OTHER_CFLAGS += -DMOTIF_VERSION=2
+OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM)
+endif
+
+ FILES_c += initIDs.c
+ 
+ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
+@@ -240,7 +248,7 @@ vpath %.c     $(SHARE_SRC)/native/$(PKGDIR)/../font
+ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
+ endif # PLATFORM
+ 
+-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
+ # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
+ vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
+@@ -420,6 +428,19 @@ FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
+ endif # PLATFORM
+ 
+ifeq ($(PLATFORM), bsd)
+# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv BSD
+
+FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/fontconfigs
+_FONTCONFIGS   = \
+       fontconfig.properties
+
+FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ BSD
+endif # PLATFORM
+
+
+ FONTCONFIGS     = $(_FONTCONFIGS:%=$(LIBDIR)/%.src)
+ BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc)
+ 
+@@ -514,6 +535,9 @@ CPPFLAGS += -I$(MOTIF_DIR)/include \
+             -I$(OPENWIN_HOME)/include/X11/extensions \
+             -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
+ endif
+ifeq ($(PLATFORM), bsd)
+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
+endif
+ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
+             -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
+@@ -535,7 +559,14 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+             -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+ 	    $(EVENT_MODEL)
+ 
+-ifeq ($(PLATFORM), linux)
+# include these last so we don't pick up unintentional includes
+ifeq ($(PLATFORM), bsd)
+CPPFLAGS += -I$(MOTIF_DIR)/include \
+            -I$(OPENWIN_HOME)/include \
+            -I$(OPENWIN_HOME)/include/X11/extensions
+endif
+
+ifneq (,$(findstring $(PLATFORM), linux bsd))
+ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
+ endif
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_mawt_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_awt_mawt_gmk
@ -0,0 +1,94 @@
+$OpenBSD: patch-j2se_make_sun_awt_mawt_gmk,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/awt/mawt.gmk.orig	Thu Aug 30 04:58:15 2007
+++ j2se/make/sun/awt/mawt.gmk	Sun Sep  2 14:06:04 2007
+@@ -57,7 +57,7 @@ else
+   ifeq ($(MOTIF_VERSION), 2)
+     FILES_c += awt_motif21.c
+     FILES_c += awt_Choice21.c
+-    ifeq  ($(PLATFORM), linux)
+    ifneq (,$(findstring $(PLATFORM), linux bsd))
+         FILES_c += Xinerama.c
+     endif
+   endif
+@@ -142,7 +142,7 @@ CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
+ 
+ ifeq ($(STATIC_MOTIF),true)
+     LIBXM = $(MOTIF_LIB)/libXm.a -lXp -lXmu
+-    ifeq ($(PLATFORM), linux)
+    ifneq (,$(findstring $(PLATFORM), linux bsd))
+ 	ifeq ($(ARCH_DATA_MODEL), 64)
+             LIBXT = -lXt
+         else
+@@ -157,7 +157,7 @@ ifeq ($(STATIC_MOTIF),true)
+     endif
+ else
+     LIBXM = -L$(MOTIF_LIB) -lXm -lXp
+-    ifeq ($(PLATFORM), linux)
+    ifneq (,$(findstring $(PLATFORM), linux bsd))
+ 	LIBXT = -lXt
+ 	LIBSM = 
+ 	LIBICE = 
+@@ -175,7 +175,7 @@ ifeq ($(PLATFORM), solaris)
+ OTHER_LDLIBS = $(LIBXM) -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
+ endif
+ 
+-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
+ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
+ OTHER_CFLAGS += -DMOTIF_VERSION=2
+ OTHER_CFLAGS += -DXMSTRINGDEFINES=1
+@@ -186,8 +186,12 @@ endif
+ # !HEADLESS
+ 
+ OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \
+-                -lawt $(LIBM) -ldl
+                -lawt $(LIBM)
+ 
+ifneq ($(PLATFORM), bsd)
+OTHER_LDLIBS += -ldl
+endif
+
+ #
+ # Sun CC with -Xa misdefines __STDC__ to 0 (zero).
+ # The following will force checking of X11 prototypes.
+@@ -199,15 +203,6 @@ endif
+ #
+ # Other extra flags needed for compiling.
+ #
+-CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+-
+-ifndef HEADLESS
+-CPPFLAGS += -I$(MOTIF_DIR)/include \
+-            -I$(OPENWIN_HOME)/include 
+-LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
+-
+-endif # !HEADLESS
+-
+ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
+             -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
+@@ -230,10 +225,24 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+         -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+         $(EVENT_MODEL)
+ 
+CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+
+ifndef HEADLESS
+CPPFLAGS += -I$(MOTIF_DIR)/include \
+            -I$(OPENWIN_HOME)/include 
+LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
+
+endif # !HEADLESS
+
+ ifeq ($(PLATFORM), linux)
+ # Checking for the X11/extensions headers at the additional location
+   CPPFLAGS += -I/X11R6/include/X11/extensions \
+               -I/usr/include/X11/extensions
+endif
+
+ifeq ($(PLATFORM), bsd)
+  CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+              -I$(OPENWIN_HOME)/include 
+ endif
+ 
+ ifeq ($(PLATFORM), solaris)
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_font_FILES_c_gmk
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_font_FILES_c_gmk
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_make_sun_font_FILES_c_gmk,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/font/FILES_c.gmk.orig	Fri Aug 10 16:10:45 2007
+++ j2se/make/sun/font/FILES_c.gmk	Fri Aug 10 16:11:04 2007
+@@ -31,7 +31,7 @@ FILES_c_shared = \
+         DrawGlyphList.c \
+         sunFont.c
+ 
+-ifdef OPENJDK
+ifdef USE_FREETYPE
+ FILES_c_shared += $(TARGDIR)freetypeScaler.c 
+ endif
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_font_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_font_Makefile
@ -0,0 +1,40 @@
+$OpenBSD: patch-j2se_make_sun_font_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/font/Makefile.orig	Thu Aug  2 03:45:49 2007
+++ j2se/make/sun/font/Makefile	Fri Aug 10 15:09:37 2007
+@@ -97,7 +97,7 @@ else # PLATFORM unix
+ endif # PLATFORM
+ 
+ #In the non-OpenJDK mode we need to build T2K
+-ifndef OPENJDK
+ifndef USE_FREETYPE
+ t2k:
+ 	$(ECHO) "lib=" $(ACTUAL_LIBRARY)
+ 	$(MAKE) -C t2k
+@@ -161,7 +161,7 @@ vpath %.cpp   $(SHARE_SRC)/native/$(PKGDIR)
+ CFLAGS       += -DHEADLESS
+ CXXFLAGS     += -DHEADLESS
+ 
+-ifndef OPENJDK
+ifndef USE_FREETYPE
+   CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
+ else
+   CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
+@@ -177,6 +177,10 @@ else # PLATFORM
+ # Libraries to link, and other C flags.
+ #
+ 
+ifeq ($(PLATFORM), bsd)
+OTHER_INCLUDES += -I/usr/X11R6/include
+OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
+else
+ ifeq ($(PLATFORM), solaris)
+   # Note that on Solaris, fontmanager is built against the headless library.
+   LDFLAGS      += -L$(LIBDIR)/$(LIBARCH)/headless
+@@ -186,6 +190,7 @@ else # PLATFORM is linux
+   ifeq ("$(CC_VER_MAJOR)", "3")
+     OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+   endif                           
+endif
+ endif
+ 
+ endif # PLATFORM
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_image_generic_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_image_generic_Makefile
@ -0,0 +1,16 @@
+$OpenBSD: patch-j2se_make_sun_image_generic_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/image/generic/Makefile.orig	Sun Jul 15 22:57:34 2007
+++ j2se/make/sun/image/generic/Makefile	Sun Jul 15 22:57:58 2007
+@@ -69,7 +69,11 @@ CPPFLAGS += \
+             -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib 
+ 
+ OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
+-OTHER_LDLIBS = $(LIBM) -ldl
+OTHER_LDLIBS = $(LIBM)
+ifneq ($(PLATFORM), bsd)
+OTHER_LDLIBS += -ldl
+endif
+
+ 
+ #
+ # Has been converted to the JNI: generate JNI-style header files
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_jawt_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_jawt_Makefile
@ -0,0 +1,32 @@
+$OpenBSD: patch-j2se_make_sun_jawt_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/jawt/Makefile.orig	Thu Aug  2 03:45:50 2007
+++ j2se/make/sun/jawt/Makefile	Fri Aug 10 17:18:13 2007
+@@ -98,9 +98,7 @@ else # PLATFORM
+ #
+ # Other extra flags needed for compiling.
+ #
+-CPPFLAGS += -I$(OPENWIN_HOME)/include \
+-	    -I$(MOTIF_DIR)/include \
+-	    -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+             -I$(SHARE_SRC)/native/$(PKGDIR)/image \
+ 	    -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
+ 	    -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
+@@ -114,6 +112,8 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
+ 	    -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
+ 	    -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
+             -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
+	    -I$(OPENWIN_HOME)/include \
+	    -I$(MOTIF_DIR)/include \
+ 	    $(EVENT_MODEL)
+ #
+ # Libraries to link in.
+@@ -122,7 +122,7 @@ ifeq ($(PLATFORM), solaris)
+ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
+ endif # PLATFORM
+ 
+-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
+ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
+ endif # PLATFORM
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_security_jgss_wrapper_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_jgss_wrapper_Makefile
@ -0,0 +1,15 @@
+$OpenBSD: patch-j2se_make_sun_security_jgss_wrapper_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/security/jgss/wrapper/Makefile.orig	Sun Jul 15 23:01:16 2007
+++ j2se/make/sun/security/jgss/wrapper/Makefile	Sun Jul 15 23:03:23 2007
+@@ -73,6 +73,10 @@ include $(BUILDDIR)/common/Library.gmk
+ #
+ # Libraries to link
+ #
+-ifneq ($(PLATFORM), windows)
+ifneq (,$(findstring $(PLATFORM), linux solaris))
+   OTHER_LDLIBS = -ldl $(JVMLIB)
+endif
+
+ifeq ($(PLATFORM), bsd)
+  OTHER_LDLIBS = $(JVMLIB)
+ endif
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_security_pkcs11_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_pkcs11_Makefile
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_make_sun_security_pkcs11_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/security/pkcs11/Makefile.orig	Sun Jul 15 23:03:34 2007
+++ j2se/make/sun/security/pkcs11/Makefile	Sun Jul 15 23:03:54 2007
+@@ -80,7 +80,7 @@ include $(BUILDDIR)/common/Library.gmk
+ #
+ # Libraries to link
+ #
+-ifeq ($(PLATFORM), windows)
+ifneq (,$(findstring $(PLATFORM), windows bsd))
+   OTHER_LDLIBS = $(JVMLIB)
+ else
+   OTHER_LDLIBS = -ldl $(JVMLIB)
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_security_smartcardio_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_security_smartcardio_Makefile
@ -0,0 +1,15 @@
+$OpenBSD: patch-j2se_make_sun_security_smartcardio_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/security/smartcardio/Makefile.orig	Sun Jul 15 23:04:02 2007
+++ j2se/make/sun/security/smartcardio/Makefile	Sun Jul 15 23:04:45 2007
+@@ -75,6 +75,10 @@ include $(BUILDDIR)/common/Library.gmk
+ ifeq ($(PLATFORM), windows)
+   OTHER_LDLIBS = $(JVMLIB) winscard.lib
+ else
+-  OTHER_LDLIBS = -ldl $(JVMLIB)
+  ifeq ($(PLATFORM), bsd)
+    OTHER_LDLIBS = $(JVMLIB)
+  else
+    OTHER_LDLIBS = -ldl $(JVMLIB)
+  endif
+   OTHER_CFLAGS = -D__sun_jdk
+ endif
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_splashscreen_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_splashscreen_Makefile
@ -0,0 +1,38 @@
+$OpenBSD: patch-j2se_make_sun_splashscreen_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/splashscreen/Makefile.orig	Thu Aug  2 03:45:52 2007
+++ j2se/make/sun/splashscreen/Makefile	Fri Aug 10 20:23:10 2007
+@@ -61,10 +61,22 @@ JAVALIB=
+ 
+ CFLAGS += -DSPLASHSCREEN
+ 
+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+
+ ifneq ($(PLATFORM), windows)
+   CFLAGS += -DWITH_X11
+-  CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+-  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
+  ifeq ($(PLATFORM), bsd)
+    CFLAGS += -DPNG_NO_MMX_CODE
+    ICONV_DIR=/usr/local
+    CPPFLAGS += -I$(OPENWIN_HOME)/include \
+                -I$(OPENWIN_HOME)/include/X11/extensions \
+                -I$(ICONV_DIR)/include
+    OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext -L$(ICONV_DIR)/lib -liconv $(LIBM) -pthread
+  else
+    CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+    OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
+  endif
+ else # PLATFORM
+   CFLAGS += -DWITH_WIN32
+   OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib 
+@@ -81,9 +93,6 @@ vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-1.1
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+ vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
+-
+-CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ 
+ #
+ # Has been converted to the JNI: generate JNI-style header files
--- a/devel/jdk/1.7/patches/patch-j2se_make_sun_xawt_Makefile
+++ b/devel/jdk/1.7/patches/patch-j2se_make_sun_xawt_Makefile
@ -0,0 +1,59 @@
+$OpenBSD: patch-j2se_make_sun_xawt_Makefile,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/make/sun/xawt/Makefile.orig	Thu Aug 30 04:58:19 2007
+++ j2se/make/sun/xawt/Makefile	Sun Sep  2 14:06:04 2007
+@@ -54,6 +54,12 @@ LDFLAGS += -lpthread
+ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
+ endif
+ 
+ifeq ($(PLATFORM), bsd)
+FILES_c += Xinerama.c
+LDFLAGS += -pthread
+dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
+endif
+
+ # Since this library will be living in a subdirectory below the other libraries
+ #   we need to add an extra runpath so that libraries in the upper directory
+ #   are found at runtime.
+@@ -87,7 +93,12 @@ vpath %.c   $(SHARE_SRC)/native/sun/java2d/opengl
+ vpath %.c   $(PLATFORM_SRC)/native/sun/java2d/opengl
+ vpath %.c   $(PLATFORM_SRC)/native/sun/java2d/x11
+ 
+-OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \
+ifeq ($(PLATFORM), bsd)
+LIBDL=
+else
+LIBDL=-ldl
+endif
+OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 $(LIBDL) \
+                    $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
+ 
+ ifeq  ($(PLATFORM), solaris)
+@@ -95,8 +106,6 @@ CPPFLAGS += -DFUNCPROTO=15
+ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
+ endif
+ 
+-CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+-
+ CPPFLAGS += -DXAWT -DXAWT_HACK \
+         -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
+         -I$(PLATFORM_SRC)/native/sun/awt \
+@@ -123,6 +132,8 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \
+         -I$(SHARE_SRC)/native/sun/awt \
+         -I$(PLATFORM_SRC)/native/sun/awt 
+ 
+CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+
+ ifeq ($(PLATFORM), linux)
+ # Allows for builds on Debian GNU Linux, X11 is in a different place 
+   CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
+@@ -133,6 +144,10 @@ endif
+ 
+ ifeq ($(PLATFORM), solaris)
+   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(MOTIF_DIR)/include 
+endif
+
+ifeq ($(PLATFORM), bsd)
+  CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
+ endif
+ 
+ ifeq ($(MILESTONE), internal)
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_classes_sun_jdbc_odbc_JdbcOdbc_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_classes_sun_jdbc_odbc_JdbcOdbc_c
@ -0,0 +1,13 @@
+$OpenBSD: patch-j2se_src_closed_share_classes_sun_jdbc_odbc_JdbcOdbc_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/classes/sun/jdbc/odbc/JdbcOdbc.c.orig	Sun Jul 29 22:35:46 2007
+++ j2se/src/closed/share/classes/sun/jdbc/odbc/JdbcOdbc.c	Sun Jul 29 22:36:41 2007
+@@ -86,6 +86,9 @@
+ #include "stdio.h"
+ #include "sun_jdbc_odbc_JdbcOdbc.h"
+ 
+#ifdef _ALLBSD_SOURCE
+#include <string.h>
+#endif
+ 
+ static double buf = 0;
+ //SDWORD	lenValue = SQL_NULL_DATA;
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_DirectAudioDevice_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_DirectAudioDevice_c
@ -0,0 +1,15 @@
+$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_DirectAudioDevice_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/com/sun/media/sound/DirectAudioDevice.c.orig	Thu Jul  5 03:44:22 2007
+++ j2se/src/closed/share/native/com/sun/media/sound/DirectAudioDevice.c	Wed Aug  1 11:23:46 2007
+@@ -18,7 +18,11 @@
+ #include <jni.h>
+ 
+ // for malloc
+#ifdef _ALLBSD_SOURCE
+#include <stdlib.h>
+#else
+ #include <malloc.h>
+#endif
+ 
+ // for type definitions
+ #include "engine/X_API.h"
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_Platform_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_Platform_c
@ -0,0 +1,21 @@
+$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_Platform_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/com/sun/media/sound/Platform.c.orig	Sun Jul 29 22:39:30 2007
+++ j2se/src/closed/share/native/com/sun/media/sound/Platform.c	Sun Jul 29 22:40:26 2007
+@@ -81,5 +81,17 @@ JNIEXPORT jint JNICALL Java_com_sun_media_sound_Platfo
+ 	return com_sun_media_sound_Platform_LIB_ALSA;
+     }
+ #endif
+#if (X_PLATFORM == X_BSD)
+    switch (feature) {
+    case com_sun_media_sound_Platform_FEATURE_MIDIIO:
+       return com_sun_media_sound_Platform_LIB_MAIN;
+    case com_sun_media_sound_Platform_FEATURE_PORTS:
+       return com_sun_media_sound_Platform_LIB_MAIN;
+    case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
+       // XXXBSD: When native Direct Audio support is ported change
+       // this back to returning com_sun_media_sound_Platform_LIB_MAIN
+       return 0;
+    }
+#endif
+     return 0;
+ }
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_HAE_cpp
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_HAE_cpp
@ -0,0 +1,11 @@
+$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_engine_HAE_cpp,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/com/sun/media/sound/engine/HAE.cpp.orig	Sun Jul 29 22:40:44 2007
+++ j2se/src/closed/share/native/com/sun/media/sound/engine/HAE.cpp	Sun Jul 29 22:41:09 2007
+@@ -3216,6 +3216,7 @@ HAEErr HAEMidiFile::GetInfo(HAEInfoTypes infoType, cha
+ #if ( (X_PLATFORM == X_WINDOWS) 			||	\
+ 	  (X_PLATFORM == X_WIN_HARDWARE)	||	\
+ 	  (X_PLATFORM == X_SOLARIS)	|| \
+	  (X_PLATFORM == X_BSD)         || \
+ 	  (X_PLATFORM == X_LINUX)	)
+ 	    while (*cInfo)
+ 		{
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_c
@ -0,0 +1,180 @@
+$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/com/sun/media/sound/engine/X_API.c.orig	Thu Jul  5 03:44:25 2007
+++ j2se/src/closed/share/native/com/sun/media/sound/engine/X_API.c	Sun Jul 29 22:42:45 2007
+@@ -300,7 +300,7 @@
+ #include <fcntl.h>
+ #endif
+ 
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ #include <stdio.h>
+ #include <memory.h>
+ #include <stdlib.h>
+@@ -587,7 +587,7 @@ XPTR XNewPtr(INT32 size)
+ 	    XSetMemory(data, size, 0);
+ 	}
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+     // $$kk: 10.14.97
+     // changed this line as per Liang He's performance recommendations
+     //	data = (char *)malloc((size_t)size);
+@@ -661,7 +661,7 @@ void XDisposePtr(XPTR data)
+ #if X_PLATFORM == X_BE
+ 	    free(osAllocatedData);
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 	    free(osAllocatedData);
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -711,7 +711,7 @@ INT32 XGetPtrSize(XPTR data)
+ #if X_PLATFORM == X_BE
+ 		    size = 0;
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 		    size = 0;
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -744,7 +744,7 @@ void XBlockMove(XPTR source, XPTR dest, INT32 size)
+ #if X_PLATFORM == X_BE
+ 	    memcpy(dest, source, size);
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 	    memcpy(dest, source, (size_t)size);
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -872,6 +872,7 @@ XBOOL XIsStereoSupported(void)
+ 		  (X_PLATFORM == X_BE)				||	\
+ 		  (X_PLATFORM == X_SOLARIS)			||	\
+ 		  (X_PLATFORM == X_LINUX)			||	\
+		  (X_PLATFORM == X_BSD)				||	\
+ 		  (X_PLATFORM == X_NAVIO) )
+     return TRUE;
+ #endif
+@@ -988,7 +989,7 @@ UINT32 XMicroseconds(void)
+ 	}
+     return (hardwareTicks - starttick);
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+     static hrtime_t solaristick = 0;
+ 
+     if (solaristick == 0)
+@@ -1030,6 +1031,7 @@ XBOOL XIs16BitSupported(void)
+ 		  (X_PLATFORM == X_BE)				||	\
+ 		  (X_PLATFORM == X_SOLARIS)			||	\
+ 		  (X_PLATFORM == X_LINUX)			||	\
+		  (X_PLATFORM == X_BSD)				||	\
+ 		  (X_PLATFORM == X_WEBTV)			||	\
+ 		  (X_PLATFORM == X_NAVIO) )
+     return TRUE;
+@@ -1271,6 +1273,7 @@ void XConvertNativeFileToXFILENAME(void *file, XFILENA
+ 		  (X_PLATFORM == X_BE)				||	\
+ 		  (X_PLATFORM == X_SOLARIS)			||	\
+ 		  (X_PLATFORM == X_LINUX)			||	\
+		  (X_PLATFORM == X_BSD)				||	\
+ 		  (X_PLATFORM == X_NAVIO) )
+ 	    XStrCpy((char *)xfile->theFile, (char *)file);
+ #endif
+@@ -1600,7 +1603,7 @@ XFILE XFileOpenResource(XFILENAME *file, XBOOL readOnl
+ 		}
+ #endif
+ 
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM ==X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 	    if (readOnly)
+ 		{
+ 		    pReference->fileReference = open(pReference->theFile, O_RDONLY);	// O_BINARY
+@@ -1781,7 +1784,7 @@ XFILE XFileOpenForRead(XFILENAME *file)
+ 		    pReference = NULL;
+ 		}
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 	    pReference->fileReference = open(pReference->theFile, O_RDONLY);	// O_BINARY
+ 	    if (pReference->fileReference == -1)
+ 		{
+@@ -1871,7 +1874,7 @@ XFILE XFileOpenForWrite(XFILENAME *file, XBOOL create)
+ 		    pReference = NULL;
+ 		}
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 	    if (create)
+ 		{
+ 		    pReference->fileReference = open(pReference->theFile, O_WRONLY | O_CREAT | O_TRUNC);
+@@ -1918,7 +1921,7 @@ XERR XFileDelete(XFILENAME *file)
+ #if X_PLATFORM == X_BE
+     return unlink(file->theFile);
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+     return unlink(file->theFile);
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -1958,7 +1961,7 @@ void XFileClose(XFILE fileRef)
+ #if X_PLATFORM == X_BE
+ 		    close(pReference->fileReference);
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 		    close(pReference->fileReference);
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -2008,7 +2011,7 @@ XERR XFileRead(XFILE fileRef, void * buffer, INT32 buf
+ #if X_PLATFORM == X_BE
+ 		    return (read(pReference->fileReference, buffer, bufferLength) == bufferLength) ? 0 : -1;
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 		    return (read(pReference->fileReference, buffer, (size_t)bufferLength) == bufferLength) ? 0 : -1;
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -2045,7 +2048,7 @@ XERR XFileWrite(XFILE fileRef, void *buffer, INT32 buf
+ #if X_PLATFORM == X_BE
+ 		    return (write(pReference->fileReference, buffer, bufferLength) == bufferLength) ? 0 : -1;
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 		    return (write(pReference->fileReference, buffer, (size_t)bufferLength) == bufferLength) ? 0 : -1;
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -2088,7 +2091,7 @@ XERR XFileSetPosition(XFILE fileRef, INT32 filePositio
+ #if X_PLATFORM == X_BE
+ 		    err = (lseek(pReference->fileReference, filePosition, SEEK_SET) == -1) ? -1 : 0;
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 		    err = (lseek(pReference->fileReference, (off_t)filePosition, SEEK_SET) == -1) ? -1 : 0;
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -2156,7 +2159,7 @@ INT32 XFileGetPosition(XFILE fileRef)
+ #if X_PLATFORM == X_BE
+ 		    pos = lseek(pReference->fileReference, 0, SEEK_CUR);
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 		    pos = lseek(pReference->fileReference, 0, SEEK_CUR);
+ #endif
+ #if X_PLATFORM == X_NAVIO
+@@ -2194,7 +2197,7 @@ INT32 XFileSetLength(XFILE fileRef, INT32 newSize)
+ 		    // deleting of resources will fail until this function is fixed
+ 		    //			chsize(pReference->fileReference, newSize);
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 		    error = -1;
+ 		    // deleting of resources will fail until this function is fixed
+ 		    //			chsize(pReference->fileReference, newSize);
+@@ -2238,7 +2241,7 @@ INT32 XFileGetLength(XFILE fileRef)
+ 		    pos = lseek(pReference->fileReference, 0, SEEK_END);
+ 		    lseek(pReference->fileReference, 0, SEEK_SET);
+ #endif
+-#if (X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX)
+#if (X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD)
+ 		    pos = lseek(pReference->fileReference, 0, SEEK_END);
+ 		    lseek(pReference->fileReference, 0, SEEK_SET);
+ #endif
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_h
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_h
@ -0,0 +1,55 @@
+$OpenBSD: patch-j2se_src_closed_share_native_com_sun_media_sound_engine_X_API_h,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/com/sun/media/sound/engine/X_API.h.orig	Thu Jul  5 03:44:25 2007
+++ j2se/src/closed/share/native/com/sun/media/sound/engine/X_API.h	Sun Jul 29 22:42:45 2007
+@@ -205,6 +205,7 @@
+ #define X_NAVIO         7		// NaviOS
+ #define X_WIN_HARDWARE  8		// Windows 95 only direct to Sound Blaster hardware
+ #define X_LINUX         9		// Linux
+#define X_BSD          10 		// BSD
+ 
+ // **********************************
+ // Make sure you set the X_PLATFORM define correctly. Everything depends upon this
+@@ -245,7 +246,7 @@
+ //#define HAE_EDITOR		1
+ 
+ // following is needed for _LP64
+-#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX))
+#if ((X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD))
+ #include <sys/types.h>
+ #endif
+ 
+@@ -291,7 +292,7 @@
+ 
+ 
+ /* ************** ENDIANNESS selection ************** */
+-#if ( (CPU_TYPE == k80X86) || (CPU_TYPE == kIA64) || (CPU_TYPE == kAMD64) || defined(_LITTLE_ENDIAN) )
+#if ( (CPU_TYPE == k80X86) || (CPU_TYPE == kIA64) || (CPU_TYPE == kAMD64) )
+ /* little endian */
+ #define X_WORD_ORDER   TRUE
+ #else
+@@ -889,7 +890,7 @@ extern "C" {
+ /* $$fb 2002-03-11: added X_LINUX type */
+ // **********************************
+ // Linux via dev/dsp thread
+-#if X_PLATFORM == X_LINUX
+#if ((X_PLATFORM == X_LINUX)||(X_PLATFORM == X_BSD))
+ #ifndef DEBUG_STR
+ #ifdef  USE_DEBUG
+ #include <stdio.h>
+@@ -1099,7 +1100,7 @@ extern "C" {
+ #define FILE_NAME_LENGTH	63
+ #endif
+ 
+-#if ((X_PLATFORM == X_SOLARIS || X_PLATFORM == X_LINUX))
+#if ((X_PLATFORM == X_SOLARIS)||(X_PLATFORM == X_LINUX)||(X_PLATFORM==X_BSD))
+     // $$kk: 08.12.98: what is the real value?  is 1024 correct??
+ #define FILE_NAME_LENGTH	1024
+ #endif
+@@ -1130,6 +1131,7 @@ extern "C" {
+ 	  (X_PLATFORM == X_BE)				||	\
+ 	  (X_PLATFORM == X_SOLARIS)			||	\
+ 	  (X_PLATFORM == X_LINUX)			||	\
+	  (X_PLATFORM == X_BSD)				||	\
+ 	  (X_PLATFORM == X_NAVIO) )
+ 	/* $$fb 2002-02-14: itanium port */
+ 	XFILE_HANDLE				fileReference;
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcms_sys_h
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcms_sys_h
@ -0,0 +1,30 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcms_sys_h,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/kcms_sys.h.orig	Thu Jul  5 03:44:30 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/kcms_sys.h	Sun Jul 29 22:48:36 2007
+@@ -47,7 +47,7 @@
+ #define KCMS_SYS_H
+ 
+ #include "kcmsos.h"
+-#if defined (KPLINUX)
+#if defined (KPLINUX) || defined (KPBSD)
+ #include <sys/sem.h>
+ #endif
+ 
+@@ -221,7 +221,7 @@ KpInt32_t KpInterlockedExchange (KpInt32_t FAR *addres
+ 										a semaphore by when releasing
+ 										the semaphore					*/
+ 
+-#if defined (KPSOLARIS) || defined (KPLINUX)
+#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ #define KCMS_SYS_SEM_SET	"Kp_kcms_sys.sem"
+ #define KCMS_SYS_NUM_SEMS	1
+ #define KCMS_SYS_SEMAPHORE	1
+@@ -260,7 +260,7 @@ KpUInt32_t	FAR KpSemaphoreRelease (
+ 			KpUInt32_t	FAR *SemList,
+ 			KpUInt32_t	Increment);
+ 
+-#if defined (KPSOLARIS) || defined (KPLINUX)
+#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ KpUInt32_t	getKeyFromName (char *name, key_t *key);
+ KpSemSet_t	acquireKcmsSysLock (void);
+ KpUInt32_t	releaseKcmsSysLock (KpSemSet_t *SemSet);		
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcmsos_h
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcmsos_h
@ -0,0 +1,68 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kcmsos_h,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/kcmsos.h.orig	Thu Jul  5 03:44:30 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/kcmsos.h	Sun Jul 29 22:48:36 2007
+@@ -249,6 +249,27 @@ extern "C" {
+ 	#define KP_USE_VERSIONSTRING
+ #endif
+ 
+#if defined (_ALLBSD_SOURCE)
+	#define KPGCC		1
+	#define KPBSD		1
+	#define KPUNIX		1
+	#define KPUNIX_BSD	1
+	#define KP_POSIX_THREADS 1
+
+	#define KPINT32		1
+
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#endif
+#include <machine/endian.h>
+#if (BYTE_ORDER == LITTLE_ENDIAN)
+	#define KPLSBFIRST	1
+#else
+	#define KPMSBFIRST	1
+#endif
+	#define KP_USE_VERSIONSTRING
+#endif
+
+ #if defined(__sgi) && defined (__mips)  /* SGI C Compiler */
+ #if defined(SGIALL)
+ 	#define KPSGIALL	1
+@@ -399,6 +420,9 @@ extern "C" {
+ #elif defined(KPDU)
+ 	#define KP_ALIGN 0x3
+ 	#define KcpFileDirSep   "/"
+#elif defined(KPBSD)
+	#define KP_ALIGN 0x3
+	#define KcpFileDirSep   "/"
+ #endif
+ 
+ #if defined(KPMAC) || defined (KPMSMAC)
+@@ -618,7 +642,7 @@ typedef struct tagOFSTRUCT  KpFileProps_t;
+ 
+ 
+ 
+-#elif defined(KPSUN) || defined(KPDU)
+#elif defined(KPSUN) || defined(KPDU) || defined(KPBSD)
+ /*
+  *     *** Sun Microsystems Section ***
+  */
+@@ -1045,7 +1069,7 @@ typedef struct {
+ struct KpThreadMemHdl_tag { char dontuse; };
+ typedef struct KpThreadMemHdl_tag FAR* KpThreadMemHdl_t; 
+ 
+-#if defined (KPSOLARIS) || defined (KPLINUX)
+#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ #if defined (KP_POSIX_THREADS)
+ #include "pthread.h"
+ #else
+@@ -1058,7 +1082,7 @@ typedef struct {
+ 	KpInt32_t	SyncFlag;
+ #if defined (KPWIN32)
+ 	CRITICAL_SECTION CriticalFlag;
+-#elif defined (KPSOLARIS) || defined (KPLINUX)
+#elif defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ 	KpInt32_t	ThreadId;
+ 	KpUInt32_t	Count;
+ #if defined (KP_POSIX_THREADS)
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kpfile_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kpfile_c
@ -0,0 +1,48 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_kpfile_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/kpfile.c.orig	Thu Jul  5 03:44:30 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/kpfile.c	Sun Jul 29 22:48:36 2007
+@@ -104,7 +104,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ 
+-#if !defined (KPLINUX)
+#if !defined (KPLINUX) && !defined(KPBSD)
+ #include <sys/dirent.h> 
+ #endif
+ 
+@@ -597,7 +597,7 @@ void KpFileStripPath (KpChar_p filePlusPath, KpChar_p 
+ 	theFile[0] = '\0';
+ 
+ 	/* find the last occurrence of the slash */
+-#if defined (KPLINUX)
+#if defined (KPLINUX) || defined (KPBSD)
+ 	fPtr = strrchr (filePlusPath, '/');
+ #else
+ 	fPtr = strrchr (filePlusPath, '//');
+@@ -654,7 +654,7 @@ void KpFileStripPath (KpChar_p filePlusPath, KpChar_p 
+    char         PathName[256];
+    KpInt32_t    Result;
+    KpBool_t     fileFound = KPFALSE;
+-#if defined (KPLINUX)
+#if defined (KPLINUX) || defined (KPBSD)
+    struct dirent *dpb;
+ #else
+    dirent_t    *dpb;
+@@ -689,7 +689,7 @@ void KpFileStripPath (KpChar_p filePlusPath, KpChar_p 
+       	
+       while ( fileFound == KPTRUE)
+       {
+-#if defined (KPLINUX)
+#if defined (KPLINUX) || defined (KPBSD)
+ 		  if ((dpb = readdir(FD)) == (struct direct *)NULL)
+ #else
+ 		  if ((dpb = readdir(FD)) == (dirent_t *)NULL)
+@@ -770,7 +770,7 @@ dirStatus FAR KpFileDirCount (
+          KpInt32_t      FAR *numFiles)
+ {
+ DIR         *FD;
+-#if defined (KPLINUX)
+#if defined (KPLINUX) || defined (KPBSD)
+ struct dirent *dpb;
+ #else
+ dirent_t    *dpb;
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sithread_h
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sithread_h
@ -0,0 +1,30 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sithread_h,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/sithread.h.orig	Thu Jul  5 03:44:31 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/sithread.h	Sun Jul 29 22:48:36 2007
+@@ -25,7 +25,7 @@
+ #include <signal.h>
+ #endif /* KPSOLARIS */
+ 
+-#if defined (KPLINUX)
+#if defined (KPLINUX) || defined (KPBSD)
+ #include <pthread.h>
+ #endif
+ 
+@@ -75,7 +75,7 @@ typedef struct KpThreadFlags_s {
+ /******************************
+  * Linux definitons
+  ******************************/ 
+-#if defined (KPLINUX)
+#if defined (KPLINUX) || defined (KPBSD)
+ 
+ typedef pthread_t KpThread_t, *KpThread_p;
+ 
+@@ -83,7 +83,7 @@ typedef struct KpThreadFlags_s {
+ 		KpInt32_t				CreationFlags;
+ } KpThreadFlags_t, FAR * KpThreadFlags_p, FAR * FAR * KpThreadFlags_h;
+ 
+-#endif /* KPLINUX */
+#endif /* KPLINUX || KPBSD */
+ 
+ /***********************
+  * Function Prototypes 
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sptagmgr_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sptagmgr_c
@ -0,0 +1,25 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sptagmgr_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/sptagmgr.c.orig	Thu Jul  5 03:44:31 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/sptagmgr.c	Sun Jul 29 22:48:36 2007
+@@ -22,9 +22,9 @@
+ 	Windows Revision Level:
+ 		$Workfile: sptagmgr.c $
+ 		$Logfile: /DLL/KodakCMS/sprof_lib/sptagmgr.c $
+-		$Revision: 1.1 $
+-		$Date: 2007/09/06 15:46:19 $
+-		$Author: kurt $
+		$Revision: 1.1 $
+		$Date: 2007/09/06 15:46:19 $
+		$Author: kurt $
+ 
+ 	SCCS Revision:
+ 		@(#)sptagmgr.c	1.41	1/8/99
+@@ -902,7 +902,7 @@ SpStatus_t KSPAPI SpProfileCreateEx (
+     ProfileData->Header.Platform = SpSigMake ('A', 'P', 'P', 'L');
+ #elif defined (KPSGI) || defined(KPSGIALL)
+     ProfileData->Header.Platform = SpSigMake ('S', 'G', 'I', ' ');
+-#elif defined (KPSUN)
+#elif defined (KPSUN) || defined(KPBSD)
+     ProfileData->Header.Platform = SpSigMake ('S', 'U', 'N', 'W');
+ #else
+     ProfileData->Header.Platform = SpSigMake ('M', 'S', 'F', 'T');
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_c
@ -0,0 +1,48 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/sync.c.orig	Thu Jul  5 03:44:31 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/sync.c	Sun Jul 29 22:48:37 2007
+@@ -341,7 +341,7 @@ KpInt32_t KpGetCurrentThreadId (void)
+ KpInt32_t KpGetCurrentThreadId (void)
+ {
+ 
+-#if defined (KPSOLARIS) || defined (KPLINUX)
+#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ #if defined (KP_POSIX_THREADS)
+ 	return ((KpInt32_t) pthread_self());
+ #else
+@@ -517,7 +517,7 @@ void KpDeleteCriticalSection (KpCriticalFlag_t FAR *Cr
+ /* Process/Thread Synchronization functions (Solaris) */
+ /******************************************************/
+ 
+-#elif defined (KPSOLARIS) || defined (KPLINUX)
+#elif defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ 
+ /*--------------------------------------------------------------------
+  * DESCRIPTION (Solaris Version)
+@@ -796,7 +796,7 @@ KpInt32_t KpInterlockedExchange (KpInt32_p address, Kp
+ /* Atomic Read Modify Write functions (Solaris Version) */
+ /***************************************************************/
+ 
+-#elif defined (KPSOLARIS) || defined (KPLINUX)
+#elif defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ 
+ 								/*	This mutex is used to ensure that
+ 									the exchange in the Solaris
+@@ -814,7 +814,7 @@ KpInt32_t KpInterlockedExchange (KpInt32_p address, Kp
+ 									is only initialized once per process.	*/
+ 									
+ #if defined (KP_POSIX_THREADS)
+-static pthread_mutex_t		exchangeMutex;
+static pthread_mutex_t		exchangeMutex = PTHREAD_MUTEX_INITIALIZER;
+ #else
+ static mutex_t		exchangeMutex;
+ #endif
+@@ -885,7 +885,7 @@ KpInt32_t		data;
+ /* Semaphore functions (Solaris Versions) */
+ /*******************************************************/
+ 
+-#if defined (KPSOLARIS) || defined (KPLINUX)
+#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ 
+ /*--------------------------------------------------------------------
+  * FUNCTION
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_h
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_h
@ -0,0 +1,32 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_sync_h,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/sync.h.orig	Thu Jul  5 03:44:31 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/sync.h	Sun Jul 29 22:48:37 2007
+@@ -57,7 +57,7 @@
+ 	/* Solaris Includes */
+ 	/********************/
+ 
+-	#if defined (KPSOLARIS) || defined (KPLINUX)
+	#if defined (KPSOLARIS) || defined (KPLINUX) || defined (KPBSD)
+ 	#if defined (KP_POSIX_THREADS)
+ 		#include <pthread.h>
+ 	#else
+@@ -121,7 +121,7 @@
+ 		 * files although the documentation says it should be.
+ 		 */
+ 
+-		#if defined (KPSOLARIS) || defined (KPLINUX)
+		#if defined (KPSOLARIS) || defined (KPLINUX) || defined(__NetBSD__)
+ 
+ 			typedef union semun_u {
+ 				int val;
+@@ -129,6 +129,10 @@
+ 				ushort *array;
+ 			} semun_t;
+ 		
+		#endif
+
+		#if defined(KPBSD) && !defined(__NetBSD__)
+			typedef union semun semun_t;
+ 		#endif
+ 
+ 	#endif
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_thread_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_thread_c
@ -0,0 +1,34 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_thread_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/thread.c.orig	Thu Jul  5 03:44:32 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/thread.c	Sun Jul 29 22:48:37 2007
+@@ -30,6 +30,11 @@
+ #include <signal.h>
+ #include <asm/errno.h>
+ #endif
+#if defined (KPBSD)
+#include <pthread.h>
+#include <signal.h>
+#include <errno.h>
+#endif
+ 
+ /***************************************************************************
+  * Windows (32 bit) Thread Creation, Termination and Manipulation functions
+@@ -652,7 +657,7 @@ KpGetCurrentThread (void)
+ /*******************************************************************
+  * LINUX Thread Creation, Termination and Manipulation functions
+  *******************************************************************/
+-#if defined (KPLINUX)
+#if defined (KPLINUX) || defined (KPBSD)
+ 
+ /******************************************************************
+  * KpThreadCreate (LINUX Version)
+@@ -690,8 +695,7 @@ int				retVal;
+ 
+ 	if (NULL == flags) { }
+ 
+-	pthread_attr_init(&attr);
+-	retVal = pthread_create (&thread, &attr,
+	retVal = pthread_create (&thread, NULL,
+ 				startFunc, arg);
+ 	if (0 != retVal) {
+ 		return (0);
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_ukcpmgr_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_ukcpmgr_c
@ -0,0 +1,24 @@
+$OpenBSD: patch-j2se_src_closed_share_native_sun_java2d_cmm_kcms_ukcpmgr_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/share/native/sun/java2d/cmm/kcms/ukcpmgr.c.orig	Thu Jul  5 03:44:32 2007
+++ j2se/src/closed/share/native/sun/java2d/cmm/kcms/ukcpmgr.c	Sun Jul 29 22:48:37 2007
+@@ -77,7 +77,9 @@ KpInt32_t	nProcessors;
+ 	if (theIGPtr) {}
+ 
+ 	/* setup directory for CPxx files */
+-#if defined (KPSGI) || defined(KPSGIALL)
+#if defined (KPBSD)
+	strcpy (iGP->KCPDataDir, "/tmp/");
+#elif defined (KPSGI) || defined(KPSGIALL)
+ 	strcpy (iGP->KCPDataDir, "/var/cms/cmscp/");
+ #elif defined (KPSUN) && defined (SOLARIS_CMM)
+ 	strcpy (iGP->KCPDataDir, "/tmp/");
+@@ -116,6 +118,9 @@ KpInt32_t	nProcessors;
+ 	if (thr_main() == -1) {
+ 		nProcessors = 1;		/* no Java threading, can't use extra processors */
+ 	}
+#endif
+#if defined(KPBSD)
+	nProcessors = 1;		/* XXXBSD: sysctl(hw.ncpu)? */
+ #endif
+ 	iGP->numProcessorsAvailable = iGP->numProcessors = nProcessors;
+ }
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_Capture_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_Capture_c
@ -0,0 +1,114 @@
+$OpenBSD: patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_Capture_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_BsdOS_Capture.c.orig	Sun Jul 29 23:11:09 2007
+++ j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_BsdOS_Capture.c	Sun Jul 29 23:19:53 2007
+@@ -37,11 +37,13 @@
+ #include <sys/ioctl.h>
+ #include <sys/wait.h>
+ #include <errno.h>
+-#include <bsd/soundcard.h>
+-#include <malloc.h>
+ 
+-// for I_FLUSH
+-#include <stropts.h>
+#ifdef __FreeBSD__
+#include <sys/soundcard.h>
+#endif
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <soundcard.h>
+#endif
+ 
+ #include <string.h>
+ 
+@@ -55,15 +57,15 @@
+ #endif
+ 
+ 
+-#define HAE_LINUX_NUM_CAPTURE_BUFFERS	1	// number of capture buffers
+#define HAE_BSD_NUM_CAPTURE_BUFFERS	1	// number of capture buffers
+ 
+-#define HAE_LINUX_FRAMES_PER_BUFFER	4096	// how many frames do we read (capture) at a time?
+#define HAE_BSD_FRAMES_PER_BUFFER	4096	// how many frames do we read (capture) at a time?
+ 
+-#define HAE_LINUX_SOUND_CAPTURE_PERIOD	10	// sleep time in milliseconds, between position checks
+#define HAE_BSD_SOUND_CAPTURE_PERIOD	10	// sleep time in milliseconds, between position checks
+ // $$kk: 10.13.98: need to implement position checks!
+ 
+-#define HAE_LINUX_DEFAULT_BUFFERSIZE_IN_MS	150		// default size of buffer in ms
+-#define HAE_LINUX_MIN_BUFFERSIZE_IN_MS		50		// minimum size of buffer in ms (can't go beneath
+#define HAE_BSD_DEFAULT_BUFFERSIZE_IN_MS	150		// default size of buffer in ms
+#define HAE_BSD_MIN_BUFFERSIZE_IN_MS		50		// minimum size of buffer in ms (can't go beneath
+ // hardware buffersize, however)
+ 
+ 
+@@ -83,9 +85,9 @@ static short int g_soundDeviceIndex = 0; // if non zer
+ 
+ static UINT32	g_encoding; // audio encoding
+ 
+-// number of frames to read; right now this is fixed as HAE_LINUX_FRAMES_PER_BUFFER
+// number of frames to read; right now this is fixed as HAE_BSD_FRAMES_PER_BUFFER
+ // $$kk: 10.13.98: need to figure out how to configure this
+-static INT32 g_audioFramesToRead = HAE_LINUX_FRAMES_PER_BUFFER;
+static INT32 g_audioFramesToRead = HAE_BSD_FRAMES_PER_BUFFER;
+ 
+ static HAE_CaptureDone	g_captureDoneProc; // capture callback
+ 
+@@ -202,11 +204,11 @@ void PV_AudioWaveInFrameThread(void* context) {
+ 		    if (g_flushMode == FLUSHMODE_FLUSHED) {
+ 			break;
+ 		    }
+-		    HAE_SleepFrameThread(context, HAE_LINUX_SOUND_CAPTURE_PERIOD);
+		    HAE_SleepFrameThread(context, HAE_BSD_SOUND_CAPTURE_PERIOD);
+ 		}
+ 	    } else if (!g_captureShutdown) {
+ 		/* what to do here ? */
+-		HAE_SleepFrameThread(context, HAE_LINUX_SOUND_CAPTURE_PERIOD);
+		HAE_SleepFrameThread(context, HAE_BSD_SOUND_CAPTURE_PERIOD);
+ 	    }
+ 	}
+ 	if (g_flushMode == FLUSHMODE_FLUSHED) {
+@@ -269,9 +271,9 @@ int HAE_AquireAudioCapture(void *context, UINT32 encod
+ 
+     // $$jb: 05.19.99: Setting the buffer size
+     // $$kk: 08.06.99: i got rid of the fixed minimum value for buffersize
+-    // minFramesPerBuffer = sampleRate * HAE_LINUX_MIN_BUFFERSIZE_IN_MS / 1000;
+    // minFramesPerBuffer = sampleRate * HAE_BSD_MIN_BUFFERSIZE_IN_MS / 1000;
+     if ( audioFramesPerBuffer == 0 ) {
+-	audioFramesPerBuffer = sampleRate * HAE_LINUX_DEFAULT_BUFFERSIZE_IN_MS / 1000;
+	audioFramesPerBuffer = sampleRate * HAE_BSD_DEFAULT_BUFFERSIZE_IN_MS / 1000;
+     }
+ 
+ 
+@@ -383,7 +385,7 @@ int HAE_StartAudioCapture(HAE_CaptureDone done, void *
+ 
+ 	// allocate the capture buffer
+ 	// $$jb: 05.19.99:  This is set in HAE_AquireAudioCapture
+-	//g_audioFramesToRead = HAE_LINUX_FRAMES_PER_BUFFER;	// our read buffer will hold this many frames of sampled audio data
+	//g_audioFramesToRead = HAE_BSD_FRAMES_PER_BUFFER;	// our read buffer will hold this many frames of sampled audio data
+ 
+ 	// we're going to build this many buffers at a time
+ 	if (g_bitSize == 8) {
+@@ -555,7 +557,14 @@ void HAE_GetCaptureDeviceName(INT32 deviceID, char *cN
+ {
+     char		*data;
+     static char *names[] =
+-    {	"Bsd,dev/dsp,multi threaded",
+    {
+#ifdef __FreeBSD__
+               "FreeBSD,dev/dsp,multi threaded",
+#elif __NetBSD__
+               "NetBSD,dev/dsp,multi threaded",
+#elif __OpenBSD__
+               "OpenBSD,dev/dsp,multi threaded",
+#endif
+     };
+     if (cName && cNameLength)
+ 	{
+@@ -587,7 +596,7 @@ UINT32 HAE_GetCaptureBufferSizeInFrames()
+ // return the number of buffers used.
+ int HAE_GetCaptureBufferCount()
+ {
+-    return HAE_LINUX_NUM_CAPTURE_BUFFERS;
+    return HAE_BSD_NUM_CAPTURE_BUFFERS;
+ }
+ 
+ // return the number of samples captured at the device
--- a/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_c
@ -0,0 +1,203 @@
+$OpenBSD: patch-j2se_src_closed_solaris_native_com_sun_media_sound_engine_HAE_API_BsdOS_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_BsdOS.c.orig	Sun Jul 29 23:03:54 2007
+++ j2se/src/closed/solaris/native/com/sun/media/sound/engine/HAE_API_BsdOS.c	Sun Jul 29 23:09:59 2007
+@@ -37,9 +37,15 @@
+ #include <sys/ioctl.h>
+ #include <sys/wait.h>
+ #include <errno.h>
+-#include <bsd/soundcard.h>
+-#include <malloc.h>
+ 
+#ifdef __FreeBSD__
+#include <sys/param.h>
+#include <sys/soundcard.h>
+#endif
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <soundcard.h>
+#endif
+
+ // $$kk: 08.12.98 merge 
+ // $$kk: 04.28.98: we *need* to use string.h, NOT strings.h; 
+ // the latter is not available on earlier versions of solaris
+@@ -59,9 +65,20 @@
+ #define FALSE		0
+ #endif
+ 
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
+static inline void *
+memalign(size_t alignment, size_t size)
+{
+    void *ret;
+    return posix_memalign(&ret, alignment, size) ? NULL : ret;
+}
+#else
+#define memalign(a, b) valloc(b)
+#endif
+
+ // How many audio frames to generate at one time 
+-#define HAE_LINUX_FRAMES_PER_BLOCK		8
+-#define HAE_LINUX_SOUND_PERIOD			10	// sleep time in milliseconds, between position checks
+#define HAE_BSD_FRAMES_PER_BLOCK		8
+#define HAE_BSD_SOUND_PERIOD			10	// sleep time in milliseconds, between position checks
+ 
+ static void					*g_audioBufferBlock;
+ static long					g_audioByteBufferSize;			// size of audio buffers in bytes
+@@ -76,9 +93,9 @@ static long					g_audioByteBufferSize;			// size of au
+ 
+ /* $$fb 2002-03-13: facilitate porting by defining the 16-bit format here */
+ #if X_WORD_ORDER == TRUE
+-#define LINUX_FORMAT16	AFMT_S16_LE
+#define BSD_FORMAT16	AFMT_S16_LE
+ #else
+-#define LINUX_FORMAT16	AFMT_S16_BE
+#define BSD_FORMAT16	AFMT_S16_BE
+ #endif
+ 
+ 
+@@ -151,7 +168,7 @@ int HAE_Setup(void)
+ 	AFMT_MU_LAW,
+ 	AFMT_A_LAW,
+ 	AFMT_S8,
+-	LINUX_FORMAT16,
+	BSD_FORMAT16,
+     };
+     // In the same order of Formats[] array.
+     int JSEncodings[] = { ULAW, ALAW, PCM, PCM };
+@@ -177,7 +194,7 @@ int HAE_Setup(void)
+ 
+     //$$fb we do not support unsigned 16 bit
+     //g_supports16 = (formats & (AFMT_U16_LE | AFMT_S16_LE)) != 0;
+-    g_supports16 = (formats & LINUX_FORMAT16) != 0;
+    g_supports16 = (formats & BSD_FORMAT16) != 0;
+     g_convertUnsigned = (formats & AFMT_S8) != 0;
+ 
+     /* Read channels. */
+@@ -570,7 +587,7 @@ void PV_AudioWaveOutFrameThread(void* context)
+     }
+ 
+     // $$ay - sample count is in bytes for bsd and not in samples
+-    lastPos = audio_info.bytes - ((g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK * 2));
+    lastPos = audio_info.bytes - ((g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK * 2));
+ 
+     if (g_audioBufferBlock) {
+ 	while ((g_activeDoubleBuffer) && (g_shutDownDoubleBuffer == FALSE)) {
+@@ -580,9 +597,9 @@ void PV_AudioWaveOutFrameThread(void* context)
+ 	    g_checkpointMicros = XMicroseconds();
+ 	    g_checkpointSyncCount = GM_GetSyncTimeStamp();
+ 
+-	    // Generate HAE_LINUX_FRAMES_PER_BLOCK frames of audio
+	    // Generate HAE_BSD_FRAMES_PER_BLOCK frames of audio
+ 	    pFillBuffer = (char *)g_audioBufferBlock;	
+-	    for (count = 0; count < HAE_LINUX_FRAMES_PER_BLOCK; count++) {
+	    for (count = 0; count < HAE_BSD_FRAMES_PER_BLOCK; count++) {
+ 		// Generate one frame audio
+ 		HAE_BuildMixerSlice(context, pFillBuffer,
+ 				    g_audioByteBufferSize,
+@@ -597,7 +614,7 @@ void PV_AudioWaveOutFrameThread(void* context)
+ 	    // for some solaris drivers, we must supply unsigned data when rendering 8 bit data
+ 	    if (g_convertUnsigned && (g_bitSize == 8)) {
+ 		pFillBuffer = (char *)g_audioBufferBlock;	
+-		for (i = 0; i < (g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK); i++) {
+		for (i = 0; i < (g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK); i++) {
+ 		    *pFillBuffer = (*pFillBuffer >= 0) ? (0x80 | *pFillBuffer) : (0x7F & *pFillBuffer);
+ 		    pFillBuffer++;
+ 		}
+@@ -606,7 +623,7 @@ void PV_AudioWaveOutFrameThread(void* context)
+ 	    // $$jb: Changing the write() loop to handle cases when the 
+ 	    // device is unavailable, or we can't write our entire buffer
+ 	    bytesWritten = 0;
+-	    bytesToWrite = (g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK);
+	    bytesToWrite = (g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK);
+ 
+ 	    while ( bytesToWrite > 0 ) {
+ #ifdef TODO		
+@@ -641,7 +658,7 @@ void PV_AudioWaveOutFrameThread(void* context)
+ 		    // be written to.  Make sure we're not shutting down and 
+ 		    // sleep a bit so that we don't completely hog the CPU
+ 		    if( g_shutDownDoubleBuffer == FALSE ) {
+-			HAE_SleepFrameThread(context, HAE_LINUX_SOUND_PERIOD);
+			HAE_SleepFrameThread(context, HAE_BSD_SOUND_PERIOD);
+ 		    } else {
+ 			break;
+ 		    }
+@@ -667,7 +684,7 @@ void PV_AudioWaveOutFrameThread(void* context)
+ #endif
+ 	    
+ 	    while ((currentPos < lastPos) && (g_shutDownDoubleBuffer == FALSE))	{
+-		HAE_SleepFrameThread(context, HAE_LINUX_SOUND_PERIOD);		// in ms
+		HAE_SleepFrameThread(context, HAE_BSD_SOUND_PERIOD);		// in ms
+ 		
+ 		ioctl(g_waveDevice, SNDCTL_DSP_GETOPTR, &audio_info);
+ 		currentPos = audio_info.bytes;
+@@ -676,7 +693,7 @@ void PV_AudioWaveOutFrameThread(void* context)
+ 		// of this timing loop on sunAudioHeader.play.error != 0.
+ 	    }
+ 	    
+-	    lastPos += (g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK);
+	    lastPos += (g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK);
+ 	    // ... and reschedule ourselves.	
+ 	}
+ 	TRACE0("g_activeDoubleBuffer = FALSE;\n");
+@@ -791,8 +808,8 @@ int HAE_AquireAudioCard(void *context, UINT32 sampleRa
+ #endif
+ 
+     /* we're going to build this many buffers at a time */
+-    g_synthFramesPerBlock = HAE_LINUX_FRAMES_PER_BLOCK;
+-    g_audioPeriodSleepTime = HAE_LINUX_SOUND_PERIOD;
+    g_synthFramesPerBlock = HAE_BSD_FRAMES_PER_BLOCK;
+    g_audioPeriodSleepTime = HAE_BSD_SOUND_PERIOD;
+     g_bitSize = bits;
+     g_channels = channels;
+     if (bits == 8) {
+@@ -804,7 +821,7 @@ int HAE_AquireAudioCard(void *context, UINT32 sampleRa
+ 
+     flag = 1;
+     /* allocate buffer blocks */
+-    g_audioBufferBlock = HAE_Allocate(g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK);
+    g_audioBufferBlock = HAE_Allocate(g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK);
+ 
+     if (g_audioBufferBlock) {
+ 
+@@ -827,7 +844,7 @@ int HAE_AquireAudioCard(void *context, UINT32 sampleRa
+ 		break;
+ 
+ 	    case 16:
+-		format = LINUX_FORMAT16;
+		format = BSD_FORMAT16;
+ 		break;
+ 
+ 	    //default:
+@@ -882,7 +899,7 @@ int HAE_AquireAudioCard(void *context, UINT32 sampleRa
+ 
+ 		    /* [sbb] I don't think this should be any value other than zero,
+ 		     * since we just opened the device... */
+-		    /* lastPos = sunAudioHeader.play.samples - ((g_audioByteBufferSize * HAE_LINUX_FRAMES_PER_BLOCK * 2) / sampleFrameSize); */
+		    /* lastPos = sunAudioHeader.play.samples - ((g_audioByteBufferSize * HAE_BSD_FRAMES_PER_BLOCK * 2) / sampleFrameSize); */
+ 		    lastPos = 0;
+ #endif 
+ 		}
+@@ -924,7 +941,7 @@ int HAE_ReleaseAudioCard(void *context)
+ 	TRACE1("Waiting %d...\r", ctr);
+ 	// the following call MUST allow the FrameThread to continue 
+ 	// (i.e. to exit the PV_AudioWaveOutFrameThread function)
+-	HAE_SleepFrameThread(context, HAE_LINUX_SOUND_PERIOD);
+	HAE_SleepFrameThread(context, HAE_BSD_SOUND_PERIOD);
+     }
+     if (!ctr) {
+     	ERROR0("Timed out waiting for frame thread to die!\n");
+@@ -1009,7 +1026,14 @@ void HAE_GetDeviceName(INT32 deviceID, char *cName, UI
+ {
+     char		*data;
+     static char *names[] =
+-    {	"Bsd,/dev/dsp",
+    {
+#ifdef __FreeBSD__
+               "FreeBSD,dev/dsp,multi threaded",
+#elif __NetBSD__
+               "NetBSD,dev/dsp,multi threaded",
+#elif __OpenBSD__
+               "OpenBSD,dev/dsp,multi threaded",
+#endif
+     };
+     if (cName && cNameLength)
+ 	{
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_back_commonRef_c
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_back_commonRef_c
@ -0,0 +1,14 @@
+$OpenBSD: patch-j2se_src_share_back_commonRef_c,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/back/commonRef.c.orig	Wed Aug  1 13:32:05 2007
+++ j2se/src/share/back/commonRef.c	Wed Aug  1 13:36:00 2007
+@@ -23,6 +23,10 @@
+  *
+  */
+ 
+#if defined(_ALLBSD_SOURCE)
+#include <stdint.h>			/* for uintptr_t */
+#endif
+
+ #include "util.h"
+ #include "commonRef.h"
+ 
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity_java
@ -0,0 +1,14 @@
+$OpenBSD: patch-j2se_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.orig	Thu Jul  5 04:56:37 2007
+++ j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java	Fri Jul 27 18:24:17 2007
+@@ -478,6 +478,10 @@ class Metacity implements SynthConstants {
+ 		String[] dirs = new String[] {
+ 		    userHome + sep + ".themes",
+ 		    System.getProperty("swing.metacitythemedir"),
+		    "/usr/X11R6/share/themes",
+		    "/usr/X11R6/share/gnome/themes",
+		    "/usr/local/share/themes",
+		    "/usr/local/share/gnome/themes",
+ 		    "/usr/share/themes",
+ 		    "/usr/gnome/share/themes",  // Debian/Redhat/Solaris
+                     "/opt/gnome2/share/themes"  // SuSE
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_tools_javah_Util_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_com_sun_tools_javah_Util_java
@ -0,0 +1,16 @@
+$OpenBSD: patch-j2se_src_share_classes_com_sun_tools_javah_Util_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/com/sun/tools/javah/Util.java.orig	Thu Jul  5 04:59:48 2007
+++ j2se/src/share/classes/com/sun/tools/javah/Util.java	Fri Jul 27 18:24:17 2007
+@@ -180,6 +180,12 @@ public class Util {
+ 	    os = "win32";
+ 	} else if (os.indexOf("Linux") >= 0) {
+ 	    os = "Linux";
+	} else if (os.indexOf("FreeBSD") >= 0) {
+	    os = "FreeBSD";
+	} else if (os.indexOf("NetBSD") >= 0) {
+	    os = "NetBSD";
+	} else if (os.indexOf("OpenBSD") >= 0) {
+	    os = "OpenBSD";
+ 	}
+ 	String arch = System.getProperty("os.arch");
+ 	String resname = "com.sun.tools.javah.resources." + os + "_" + arch;
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_awt_GraphicsEnvironment_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_awt_GraphicsEnvironment_java
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_src_share_classes_java_awt_GraphicsEnvironment_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/java/awt/GraphicsEnvironment.java.orig	Thu Jul  5 05:00:30 2007
+++ j2se/src/share/classes/java/awt/GraphicsEnvironment.java	Fri Jul 27 18:24:24 2007
+@@ -149,7 +149,7 @@ public abstract class GraphicsEnvironment {
+                         } else {
+                             String osName = System.getProperty("os.name");                        
+                             headless = defaultHeadless =
+-                                Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName)) &&
+                                Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName) || "FreeBSD".equals(osName) || "NetBSD".equals(osName) || "OpenBSD".equals(osName)) &&
+                                                 (System.getenv("DISPLAY") == null));
+                         }
+                     } else if (nm.equals("true")) {
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_lang_ClassLoader_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_lang_ClassLoader_java
@ -0,0 +1,67 @@
+$OpenBSD: patch-j2se_src_share_classes_java_lang_ClassLoader_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/java/lang/ClassLoader.java.orig	Thu Jul  5 05:00:40 2007
+++ j2se/src/share/classes/java/lang/ClassLoader.java	Thu Aug  2 09:39:29 2007
+@@ -27,6 +27,7 @@ package java.lang;
+ import java.io.InputStream;
+ import java.io.IOException;
+ import java.io.File;
+import java.io.FilenameFilter;
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.InvocationTargetException;
+ import java.net.MalformedURLException;
+@@ -47,6 +48,7 @@ import java.util.Set;
+ import java.util.Stack;
+ import java.util.Map;
+ import java.util.Vector;
+import java.util.Arrays;
+ import sun.misc.ClassFileTransformer;
+ import sun.misc.CompoundEnumeration;
+ import sun.misc.Resource;
+@@ -1701,18 +1703,43 @@ public abstract class ClassLoader {
+     }
+ 
+     private static boolean loadLibrary0(Class fromClass, final File file) {
+-	Boolean exists = (Boolean)
+	File libfile = (File)
+ 	    AccessController.doPrivileged(new PrivilegedAction() {
+		class LibraryFileFilter implements FilenameFilter {
+		    String lib_name;
+		    LibraryFileFilter(String lib_name) { this.lib_name = lib_name; }
+		    public boolean accept(File dir, String name) {
+			if (name.startsWith(lib_name)) {
+			    return name.substring(lib_name.length()).matches("\056[0-9]+\056[0-9]+$");
+			}
+			return false;
+		    }
+		}
+
+ 		public Object run() {
+-		    return new Boolean(file.exists());
+		    if (file.exists())
+			return file;
+		    // if file is unversioned, check for a versioned one in same dir
+		    if (file.getName().endsWith(".so")) {
+			File dir = file.getParentFile();
+			if (dir != null) {
+			    String liblist[] = dir.list(new LibraryFileFilter(file.getName()));
+			    if (liblist != null && liblist.length > 0) {
+				// return the highest versioned lib
+				Arrays.sort(liblist);
+				return new File(dir, liblist[liblist.length - 1]);
+			    }
+			}
+		    }
+		    return null;
+ 		}
+ 	    });
+-	if (!exists.booleanValue()) {
+	if (libfile == null) {
+ 	    return false;
+ 	}
+         String name;
+ 	try {
+-	    name = file.getCanonicalPath();
+	    name = libfile.getCanonicalPath();
+ 	} catch (IOException e) {
+ 	    return false;
+ 	}
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_util_TimeZone_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_java_util_TimeZone_java
@ -0,0 +1,20 @@
+$OpenBSD: patch-j2se_src_share_classes_java_util_TimeZone_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/java/util/TimeZone.java.orig	Thu Jul  5 05:00:58 2007
+++ j2se/src/share/classes/java/util/TimeZone.java	Fri Jul 27 18:24:24 2007
+@@ -780,15 +780,13 @@ abstract public class TimeZone implements Serializable
+ 	}
+ 	int gmtOffset =  (hours * 60 + num) * 60 * 1000;
+ 
+	zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
+ 	if (gmtOffset == 0) {
+-	    zi = ZoneInfoFile.getZoneInfo(GMT_ID);
+ 	    if (negative) {
+ 		zi.setID("GMT-00:00");
+ 	    } else {
+ 		zi.setID("GMT+00:00");
+ 	    }
+-	} else {
+-	    zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
+ 	}
+ 	return zi;
+     }
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_awt_FontConfiguration_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_awt_FontConfiguration_java
@ -0,0 +1,21 @@
+$OpenBSD: patch-j2se_src_share_classes_sun_awt_FontConfiguration_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/sun/awt/FontConfiguration.java.orig	Thu Jul  5 05:01:54 2007
+++ j2se/src/share/classes/sun/awt/FontConfiguration.java	Fri Jul 27 18:24:24 2007
+@@ -1073,7 +1073,7 @@ public abstract class FontConfiguration {
+      */
+     HashMap<String, Boolean> existsMap;
+     public boolean needToSearchForFile(String fileName) {
+-	if (!environment.isLinux) {
+	if (!environment.isLinuxOrBSD) {
+ 	    return false;
+ 	} else if (existsMap == null) {
+ 	   existsMap = new HashMap<String, Boolean>(); 
+@@ -1309,7 +1309,7 @@ public abstract class FontConfiguration {
+ 				   + "<filename." 
+ 				   + getString(table_componentFontNameIDs[ii])
+                                    + "> entry is missing!!!");
+-                if (!osName.contains("Linux")) {                
+                if (!osName.contains("Linux") && !osName.contains("BSD")) {
+ 		    errors++;
+ 		}
+             }
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_font_FontManager_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_font_FontManager_java
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_src_share_classes_sun_font_FontManager_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/sun/font/FontManager.java.orig	Fri Aug 10 18:41:20 2007
+++ j2se/src/share/classes/sun/font/FontManager.java	Fri Aug 10 18:41:58 2007
+@@ -3696,7 +3696,7 @@ public final class FontManager {
+         boolean.class, int.class};
+ 
+         try {
+-            if (SunGraphicsEnvironment.isOpenJDK()) {
+            if (true || SunGraphicsEnvironment.isOpenJDK()) {
+                 scalerClass = Class.forName("sun.font.FreetypeFontScaler");
+             } else {
+                 scalerClass = Class.forName("sun.font.T2KFontScaler");
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_ByteToCharKOI8_U_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_ByteToCharKOI8_U_java
@ -0,0 +1,65 @@
+$OpenBSD: patch-j2se_src_share_classes_sun_io_ByteToCharKOI8_U_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/sun/io/ByteToCharKOI8_U.java.orig	Mon Jul 30 19:21:00 2007
+++ j2se/src/share/classes/sun/io/ByteToCharKOI8_U.java	Mon Jul 30 19:20:06 2007
+@@ -0,0 +1,61 @@
+/*
+ * @(#)ByteToCharKOI8_U.java	1.0 01/05/01
+ *
+ *
+ */
+
+package sun.io;
+
+/**
+ * A table to convert KOI8_U to Unicode
+ *
+ * @author  Andriy Rysin
+ * @version >= JDK1.1.6
+ */
+
+public class ByteToCharKOI8_U extends ByteToCharSingleByte {
+
+    public String getCharacterEncoding() {
+        return "KOI8_U";
+    }
+
+    public ByteToCharKOI8_U() {
+        super.byteToCharTable = byteToCharTable;
+    }
+
+    private final static String byteToCharTable =
+
+        "\u2500\u2502\u250C\u2510\u2514\u2518\u251C\u2524" +     // 0x80 - 0x87
+        "\u252C\u2534\u253C\u2580\u2584\u2588\u258C\u2590" +     // 0x88 - 0x8F
+        "\u2591\u2592\u2593\u2320\u25A0\u2219\u221A\u2248" +     // 0x90 - 0x97
+        "\u2264\u2265\u00A0\u2321\u00B0\u00B2\u00B7\u00F7" +     // 0x98 - 0x9F
+        "\u2550\u2551\u2552\u0451\u0454\u2554\u0456\u0457" +     // 0xA0 - 0xA7
+        "\u2557\u2558\u2559\u255A\u255B\u0491\u045E\u255E" +     // 0xA8 - 0xAF
+        "\u255F\u2560\u2561\u0401\u0404\u2563\u0406\u0407" +     // 0xB0 - 0xB7
+        "\u2566\u2567\u2568\u2569\u256A\u0490\u040E\u00A9" +     // 0xB8 - 0xBF
+        "\u044E\u0430\u0431\u0446\u0434\u0435\u0444\u0433" +     // 0xC0 - 0xC7
+        "\u0445\u0438\u0439\u043A\u043B\u043C\u043D\u043E" +     // 0xC8 - 0xCF
+        "\u043F\u044F\u0440\u0441\u0442\u0443\u0436\u0432" +     // 0xD0 - 0xD7
+        "\u044C\u044B\u0437\u0448\u044D\u0449\u0447\u044A" +     // 0xD8 - 0xDF
+        "\u042E\u0410\u0411\u0426\u0414\u0415\u0424\u0413" +     // 0xE0 - 0xE7
+        "\u0425\u0418\u0419\u041A\u041B\u041C\u041D\u041E" +     // 0xE8 - 0xEF
+        "\u041F\u042F\u0420\u0421\u0422\u0423\u0416\u0412" +     // 0xF0 - 0xF7
+        "\u042C\u042B\u0417\u0428\u042D\u0429\u0427\u042A" +     // 0xF8 - 0xFF
+        "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" +     // 0x00 - 0x07
+        "\b\t\n\u000B\f\r\u000E\u000F" +     // 0x08 - 0x0F
+        "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" +     // 0x10 - 0x17
+        "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" +     // 0x18 - 0x1F
+        "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" +     // 0x20 - 0x27
+        "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" +     // 0x28 - 0x2F
+        "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" +     // 0x30 - 0x37
+        "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" +     // 0x38 - 0x3F
+        "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" +     // 0x40 - 0x47
+        "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" +     // 0x48 - 0x4F
+        "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" +     // 0x50 - 0x57
+        "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" +     // 0x58 - 0x5F
+        "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" +     // 0x60 - 0x67
+        "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" +     // 0x68 - 0x6F
+        "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" +     // 0x70 - 0x77
+        "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F";     // 0x78 - 0x7F
+
+}
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharToByteKOI8_U_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharToByteKOI8_U_java
@ -0,0 +1,240 @@
+$OpenBSD: patch-j2se_src_share_classes_sun_io_CharToByteKOI8_U_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/sun/io/CharToByteKOI8_U.java.orig	Mon Jul 30 19:24:16 2007
+++ j2se/src/share/classes/sun/io/CharToByteKOI8_U.java	Mon Jul 30 19:23:56 2007
+@@ -0,0 +1,236 @@
+/*
+ * @(#)CharToByteKOI8_U.java	1.0 01/05/01
+ *
+ *
+ */
+
+package sun.io;
+
+/**
+ * Tables and data to convert Unicode to KOI8_U
+ *
+ * @author  Andriy Rysin
+ * @version >= JDK1.1.6
+ */
+
+public class CharToByteKOI8_U extends CharToByteSingleByte {
+
+    public String getCharacterEncoding() {
+        return "KOI8_U";
+    }
+
+    public CharToByteKOI8_U() {
+        super.mask1 = 0xFF00;
+        super.mask2 = 0x00FF;
+        super.shift = 8;
+        super.index1 = index1;
+        super.index2 = index2;
+    }
+
+    private final static String index2 =
+
+        "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" + 
+        "\b\t\n\u000B\f\r\u000E\u000F" + 
+        "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" + 
+        "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" + 
+        "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" + 
+        "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" + 
+        "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" + 
+        "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" + 
+        "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" + 
+        "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" + 
+        "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" + 
+        "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" + 
+        "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" + 
+        "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" + 
+        "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" + 
+        "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u009A\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u00BF\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u009C\u0000\u009D\u0000\u0000\u0000\u0000\u009E" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u009F" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u00B3\u0000\u0000\u00B4\u0000\u00B6\u00B7\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u00BE\u0000\u00E1" + 
+        "\u00E2\u00F7\u00E7\u00E4\u00E5\u00F6\u00FA\u00E9" + 
+        "\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F0\u00F2" + 
+        "\u00F3\u00F4\u00F5\u00E6\u00E8\u00E3\u00FE\u00FB" + 
+        "\u00FD\u00FF\u00F9\u00F8\u00FC\u00E0\u00F1\u00C1" + 
+        "\u00C2\u00D7\u00C7\u00C4\u00C5\u00D6\u00DA\u00C9" + 
+        "\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0\u00D2" + 
+        "\u00D3\u00D4\u00D5\u00C6\u00C8\u00C3\u00DE\u00DB" + 
+        "\u00DD\u00DF\u00D9\u00D8\u00DC\u00C0\u00D1\u0000" + 
+        "\u00A3\u0000\u0000\u00A4\u0000\u00A6\u00A7\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u00AE\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00BD" + 
+        "\u00AD\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0095" + 
+        "\u0096\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0097\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0098\u0099\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0093\u009B" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0080\u0000" + 
+        "\u0081\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0082\u0000\u0000\u0000\u0083\u0000" + 
+        "\u0000\u0000\u0084\u0000\u0000\u0000\u0085\u0000" + 
+        "\u0000\u0000\u0086\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0087\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0088\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0089\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u008A\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u00A0\u00A1" + 
+        "\u00A2\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA" + 
+        "\u00AB\u00AC\u00AD\u00AE\u00AF\u00B0\u00B1\u00B2" + 
+        "\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB" + 
+        "\u00BC\u00BD\u00BE\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u008B\u0000" + 
+        "\u0000\u0000\u008C\u0000\u0000\u0000\u008D\u0000" + 
+        "\u0000\u0000\u008E\u0000\u0000\u0000\u008F\u0090" + 
+        "\u0091\u0092\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0094\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + 
+        "\u0000\u0000\u0000\u0000\u0000\u0000"; 
+
+    private final static short index1[] = {
+        0, 248, 248, 248, 503, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 734, 958, 248, 1214, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+        248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 
+    };
+
+}
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharacterEncoding_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_io_CharacterEncoding_java
@ -0,0 +1,26 @@
+$OpenBSD: patch-j2se_src_share_classes_sun_io_CharacterEncoding_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/sun/io/CharacterEncoding.java.orig	Thu Jul  5 05:02:04 2007
+++ j2se/src/share/classes/sun/io/CharacterEncoding.java	Fri Jul 27 18:24:24 2007
+@@ -92,6 +92,7 @@ public class CharacterEncoding {
+         aliasTable.put("gb18030",               "GB18030");
+         aliasTable.put("gbk",                   "GBK");
+         aliasTable.put("koi8-r",                "KOI8_R");
+        aliasTable.put("koi8-u",                "KOI8_U");
+         aliasTable.put("tis620.2533",           "TIS620");
+         
+         // Windows encodings
+@@ -785,8 +786,13 @@ public class CharacterEncoding {
+ 
+             // Russian KOI8-R
+             aliasTable.put("koi8-r",                "KOI8_R");
+-            aliasTable.put("koi8",                  "KOI8_R");
+             aliasTable.put("cskoi8r",               "KOI8_R");
+
+            // Ukrainian and Bielorussian KOI8-U (includes KOI8-R)
+            aliasTable.put("koi8-u",                "KOI8_U");
+            aliasTable.put("koi8",                  "KOI8_U");
+            aliasTable.put("koi8u",                 "KOI8_U");
+            aliasTable.put("cskoi8u",               "KOI8_U");
+ 
+             // Simplified Chinese
+             aliasTable.put("gb2312",        	    "EUC_CN");
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_java2d_SunGraphicsEnvironment_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_java2d_SunGraphicsEnvironment_java
@ -0,0 +1,38 @@
+$OpenBSD: patch-j2se_src_share_classes_sun_java2d_SunGraphicsEnvironment_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/sun/java2d/SunGraphicsEnvironment.java.orig	Thu Jul  5 05:02:05 2007
+++ j2se/src/share/classes/sun/java2d/SunGraphicsEnvironment.java	Fri Jul 27 18:31:36 2007
+@@ -77,7 +77,7 @@ import sun.font.NativeFont;
+ public abstract class SunGraphicsEnvironment extends GraphicsEnvironment
+     implements FontSupport, DisplayChangedListener {
+ 
+-    public static boolean isLinux;
+    public static boolean isLinuxOrBSD;
+     public static boolean isSolaris;
+     public static boolean isWindows;
+     public static boolean noType1Font;
+@@ -165,7 +165,13 @@ public abstract class SunGraphicsEnvironment extends G
+             public Object run() {
+                 String osName = System.getProperty("os.name");
+                 if ("Linux".equals(osName)) {
+-                    isLinux = true;
+                    isLinuxOrBSD = true;
+                } else if ("FreeBSD".equals(osName)) {
+                    isLinuxOrBSD = true;
+                } else if ("NetBSD".equals(osName)) {
+                    isLinuxOrBSD = true;
+                } else if ("OpenBSD".equals(osName)) {
+                    isLinuxOrBSD = true;
+                 } else if ("SunOS".equals(osName)) {
+                     isSolaris = true;
+                 } else if ("Windows".equals(osName)) {
+@@ -228,8 +234,8 @@ public abstract class SunGraphicsEnvironment extends G
+ 		 * Pass "true" to registerFonts method as on-screen these
+ 		 * JRE fonts always go through the T2K rasteriser.
+ 		 */
+-		if (isLinux) {
+-		    /* Linux font configuration uses these fonts */
+		if (isLinuxOrBSD) {
+		    /* Linux/BSD font configuration uses these fonts */
+ 		    registerFontDir(jreFontDirName);
+ 		}
+ 		registerFontsInDir(jreFontDirName, true, Font2D.JRE_RANK,
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_print_PSPrinterJob_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_print_PSPrinterJob_java
@ -0,0 +1,14 @@
+$OpenBSD: patch-j2se_src_share_classes_sun_print_PSPrinterJob_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/sun/print/PSPrinterJob.java.orig	Thu Jul  5 05:02:24 2007
+++ j2se/src/share/classes/sun/print/PSPrinterJob.java	Fri Jul 27 18:24:34 2007
+@@ -1530,7 +1530,9 @@ public class PSPrinterJob extends RasterPrinterJob {
+             pFlags |= NOSHEET;
+             ncomps+=1;
+         }
+-       if (System.getProperty("os.name").equals("Linux")) {
+
+	String osname = System.getProperty("os.name");
+       if (osname.equals("Linux") || osname.equals("FreeBSD") || osname.equals("NetBSD") || osname.equals("OpenBSD")) {
+             execCmd = new String[ncomps];
+             execCmd[n++] = "/usr/bin/lpr";
+             if ((pFlags & PRINTER) != 0) {
--- a/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_security_provider_SunEntries_java
+++ b/devel/jdk/1.7/patches/patch-j2se_src_share_classes_sun_security_provider_SunEntries_java
@ -0,0 +1,12 @@
+$OpenBSD: patch-j2se_src_share_classes_sun_security_provider_SunEntries_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
+--- j2se/src/share/classes/sun/security/provider/SunEntries.java.orig	Fri Aug  3 18:37:38 2007
+++ j2se/src/share/classes/sun/security/provider/SunEntries.java	Fri Aug  3 18:37:51 2007
+@@ -252,7 +252,7 @@ final class SunEntries {
+     // name of the *Security* property
+     private final static String PROP_RNDSOURCE = "securerandom.source";
+     
+-    final static String URL_DEV_RANDOM = "file:/dev/random";
+    final static String URL_DEV_RANDOM = "file:/dev/srandom";
+     final static String URL_DEV_URANDOM = "file:/dev/urandom";
+ 
+     private static final String seedSource;
--- a/Show More
+++ b/Show More