Update jdk 1.7 to u9 level:

- Update to u6 via patchset from upstream bsd_port and u6 source from Oracle - Copied u6 -> u9 patchset from FreeBSD/Greg Lewis's port - Updated classloader patch from Matthew Dempsky (matthew@) okay landry@
2013-01-14 20:16:56 +00:00 · 2013-01-14 20:16:56 +00:00 · 583abee1c0
commit 583abee1c0
parent 25b9a844f8
20 changed files with 196 additions and 441 deletions
--- a/devel/jdk/1.7/Makefile
+++ b/devel/jdk/1.7/Makefile
@ -1,30 +1,22 @@
-# $OpenBSD: Makefile,v 1.52 2012/10/24 18:54:03 kurt Exp $
+# $OpenBSD: Makefile,v 1.53 2013/01/14 20:16:56 kurt Exp $

 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	i386 amd64

 COMMENT-main=	Java2(TM) SE Dev Kit v${V}
 COMMENT-jre=	Java2(TM) SE Runtime Environment v${V}
-V=		1.7.0.03
-B=		b13
+V=		1.7.0.09
+B=		b24
 PKGNAME=	jdk-${V}
 PKGNAME-main=	jdk-${V}
-REVISION-main=	1
 PKGNAME-jre=	jre-${V}
-REVISION-jre=	1
 EPOCH=		0

-# see openjdk/jaxp/jaxp.properties & openjdk/jaxws/jaxws.properties 
-# in ${WRKDIR} for names and download locations of extra distfiles
+JDK_SRC=	openjdk-7u6-fcs-src-b24-28_aug_2012.zip
+PATCH_SET=	openjdk-7u6-patch-set-20130111.zip
+PATCH_SET2=	openjdk-7u9-patch-set-20130110.zip

-JDK_SRC=	openjdk-7u2-fcs-src-${B}-17_nov_2011.zip
-JAXP_SRC=	jaxp145_01.zip
-JAXWS_SRC=	jdk7-jaxws2_2_4-b04-2011_06_01.zip
-JAF_SRC=	jdk7-jaf-2010_08_19.zip
-PATCH_SET=	openjdk-7u2-patch-set-20120314.zip
-PATCH_SET2=	openjdk-7u3-patch-set-20120417.zip
-
-DISTFILES=	${JDK_SRC} ${JAXP_SRC}:0 ${JAXWS_SRC}:1 ${JAF_SRC}:2 ${PATCH_SET}:3 ${PATCH_SET2}:3
+DISTFILES=	${JDK_SRC} ${PATCH_SET}:1 ${PATCH_SET2}:1
 EXTRACT_ONLY=	${JDK_SRC} ${PATCH_SET} ${PATCH_SET2}
 DIST_SUBDIR=	jdk

@ -38,22 +30,10 @@ FLAVOR?=

 HOMEPAGE=	http://openjdk.java.net/

-MASTER_SITES=	http://www.java.net/download/openjdk/jdk7u2/promoted/${B}/ \
+MASTER_SITES=	http://www.java.net/download/openjdk/jdk7u6/promoted/${B}/ \
 		http://openbsd.dead-parrot.de/distfiles/ \
 		http://distfiles.nl/
-MASTER_SITES0=  http://download.java.net/jaxp/1.4.5/ \
-		http://icedtea.classpath.org/download/drops/ \
-		http://openbsd.dead-parrot.de/distfiles/ \
-		http://distfiles.nl/
-MASTER_SITES1=  http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/ \
-		http://icedtea.classpath.org/download/drops/ \
-		http://openbsd.dead-parrot.de/distfiles/ \
-		http://distfiles.nl/
-MASTER_SITES2=  http://java.net/downloads/jax-ws/JDK7/ \
-		http://icedtea.classpath.org/download/drops/ \
-		http://openbsd.dead-parrot.de/distfiles/ \
-		http://distfiles.nl/
-MASTER_SITES3=  http://www.intricatesoftware.com/distfiles/ \
+MASTER_SITES1=  http://www.intricatesoftware.com/distfiles/ \
 		http://openbsd.dead-parrot.de/distfiles/ \
 		http://distfiles.nl/

@ -97,17 +77,17 @@ PARALLEL_BUILD=         No
 MAKE_ENV=	ALT_BOOTDIR=${ALT_BOOTDIR} \
 		ALT_FREETYPE_HEADERS_PATH=${X11BASE}/include \
 		ALT_FREETYPE_LIB_PATH=${X11BASE}/lib \
-		ALT_DROPS_DIR=${DISTDIR}/${DIST_SUBDIR} \
 		ALT_PACKAGE_PATH=${LOCALBASE} \
 		ALT_X11_PATH=${X11BASE} \
 		DEFAULT_LIBPATH="/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib" \
 		NO_DOCS=true \
 		CC="${CC}" \
 		CXX="${CXX}" \
+		COMPILER_WARNINGS_FATAL=false \
 		USERNAME=${USER} \
 		MILESTONE=fcs \
-		BUILD_NUMBER=b04 \
-		JDK_UPDATE_VERSION=03 \
+		BUILD_NUMBER=${B} \
+		JDK_UPDATE_VERSION=09 \
 		HOTSPOT_BUILD_JOBS=${MAKE_JOBS}

 #ALL_TARGET=	debug_build
@ -133,66 +113,24 @@ PKG_ARGS+=	-Dclient_vm=1
 PKG_ARGS+=	-Dclient_vm=0
 .endif

-COPYDIRS=	hotspot/agent/src/os/linux \
-		hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux \
-		hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64 \
-		hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86 \
-		hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux \
-		hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_amd64 \
-		hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86 \
-		hotspot/src/os/linux/vm \
-		hotspot/src/os_cpu/linux_x86/vm \
-		hotspot/src/os_cpu/linux_zero/vm \
-		hotspot/make/linux \
-		hotspot/make/linux/makefiles \
-		jdk/src/linux/doc/man \
-		jdk/src/linux/doc/man/ja
-
-COPYFILES=	hotspot/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java \
-		corba/make/common/Defs-linux.gmk \
-		corba/make/common/shared/Defs-linux.gmk \
-		jdk/make/com/sun/tools/attach/mapfile-linux \
+COPYFILES=	hotspot/src/os/linux/vm/decoder_linux.cpp \
 		jdk/make/common/Defs-linux.gmk \
 		jdk/make/common/shared/Defs-linux.gmk \
-		jdk/make/java/nio/mapfile-linux \
-		jdk/make/netbeans/common/architectures/name-Linux.properties \
-		jdk/make/sun/awt/mapfile-vers-linux \
-		jdk/make/tools/sharing/classlist.linux \
-		jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux \
-		jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \
-		jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java \
-		jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java \
-		jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java \
-		jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java \
-		jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \
-		jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java \
-		jdk/src/solaris/native/java/net/linux_close.c \
-		jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+		jdk/make/tools/sharing/classlist.linux

 # create initial bsd src from linux src
 post-extract:
-	@for d in ${COPYDIRS}; do \
-		mkdir -p `echo ${WRKDIST}/$$d | sed 's/linux/bsd/g;'`; \
-		cd ${WRKDIST}/$$d; \
-		for f in *; do \
-			if [ -f $$f ]; then \
-				t=`echo ${WRKDIST}/$$d/$$f | sed 's/linux/bsd/g; s/Linux/Bsd/g; s/LINUX/BSD/g'`; \
-				sed 's/linux/bsd/g; s/Linux/Bsd/g; s/LINUX/BSD/g' < $$f > $$t; \
-			fi; \
-		done; \
-	done
 	@for f in ${COPYFILES}; do \
-		t=`echo $$f | sed 's/linux/bsd/g; s/Linux/Bsd/g; s/LINUX/BSD/g'`; \
-		sed 's/linux/bsd/g; s/Linux/Bsd/g; s/LINUX/BSD/g' < ${WRKDIST}/$$f > ${WRKDIST}/$$t; \
+		t=`echo $$f | sed 's/linux/bsd/g'`; \
+		sed 's/linux/bsd/g; s/Linux/Bsd/g' < ${WRKDIST}/$$f > ${WRKDIST}/$$t; \
 	done
-	@rm ${WRKDIST}/hotspot/agent/src/os/bsd/proc_service.h
 	@cp -f ${FILESDIR}/cacerts ${WRKDIST}/jdk/src/share/lib/security
 	@cp -f ${FILESDIR}/PLATFORM_API_BSDOS_PCM.c \
 		${WRKDIST}/jdk/src/solaris/native/com/sun/media/sound
 	@cd ${WRKDIST} && \
-		${PATCH} -p0 -z .orig.linux --quiet < ${WRKDIR}/${PATCH_SET:R}
+		${PATCH} -p0 -z .orig.u6 --quiet < ${WRKDIR}/${PATCH_SET:R}
 	@cd ${WRKDIST} && \
-		${PATCH} -p0 -z .orig.u2 --quiet < ${WRKDIR}/${PATCH_SET2:R}
+		${PATCH} -p0 -z .orig.u9 --quiet < ${WRKDIR}/${PATCH_SET2:R}
 	@perl -pi -e 's|build-policy install-limited|build-policy install-unlimited|' \
 		${WRKDIST}/jdk/make/javax/crypto/Makefile

--- a/devel/jdk/1.7/distinfo
+++ b/devel/jdk/1.7/distinfo
@ -1,30 +1,6 @@
-MD5 (jdk/jaxp145_01.zip) = MjlMeAyPteKXdfYjUlmTwA==
-MD5 (jdk/jdk7-jaf-2010_08_19.zip) = GNFd/XERfarbMyrwA9CCEg==
-MD5 (jdk/jdk7-jaxws2_2_4-b04-2011_06_01.zip) = 9kvt08US5rHKJl/aL+sJBQ==
-MD5 (jdk/openjdk-7u2-fcs-src-b13-17_nov_2011.zip) = K95GsvR+HZBfnFzWDFWoAg==
-MD5 (jdk/openjdk-7u2-patch-set-20120314.zip) = tKPk35x9SNIljcSC22ezRQ==
-MD5 (jdk/openjdk-7u3-patch-set-20120417.zip) = c0lSiAwAaXMjIHRnUSMPGA==
-RMD160 (jdk/jaxp145_01.zip) = r5G5Xn63po/GL0UNx7X+XCvkoig=
-RMD160 (jdk/jdk7-jaf-2010_08_19.zip) = +637t4HcKqjPo4S41c1hhSLlUSg=
-RMD160 (jdk/jdk7-jaxws2_2_4-b04-2011_06_01.zip) = a3RKaCiimLrSr54F+IboIuyjcfA=
-RMD160 (jdk/openjdk-7u2-fcs-src-b13-17_nov_2011.zip) = tiHJYpqe+kAeDDwrHkqWl1avkSs=
-RMD160 (jdk/openjdk-7u2-patch-set-20120314.zip) = TtybTeRzEEIXT4FVfP9jV5QFuLw=
-RMD160 (jdk/openjdk-7u3-patch-set-20120417.zip) = ERf6q9bCXBorCssPZTWMBt2iydo=
-SHA1 (jdk/jaxp145_01.zip) = EG24jI5Tq7GgZOg9Qcx6zRa3cTw=
-SHA1 (jdk/jdk7-jaf-2010_08_19.zip) = Y+qXDc8Sn7u6OaEy2Pca3Rn78fA=
-SHA1 (jdk/jdk7-jaxws2_2_4-b04-2011_06_01.zip) = hdSDFF3TSDzoE/3SOYz/Mk0Z6v8=
-SHA1 (jdk/openjdk-7u2-fcs-src-b13-17_nov_2011.zip) = KBMJSuhpBicLLZ+NJgJmkDqpFLs=
-SHA1 (jdk/openjdk-7u2-patch-set-20120314.zip) = RISFr8r4jGntVIcBABagoTZNS20=
-SHA1 (jdk/openjdk-7u3-patch-set-20120417.zip) = oS8WukklNXB2Ziqxij9nfDc9pro=
-SHA256 (jdk/jaxp145_01.zip) = xZJMYYiYji6Dl+5RQ72OqgYladBSVnr9KskyalSoSMs=
-SHA256 (jdk/jdk7-jaf-2010_08_19.zip) = 5q7+39u0Zz6AGVg9E0T7FiuU4bEDgsNiNk27/ViJwJ4=
-SHA256 (jdk/jdk7-jaxws2_2_4-b04-2011_06_01.zip) = aoc003VTED2kdxXr10B31Tl8rkcwd1sJ+iq2eWUKqCQ=
-SHA256 (jdk/openjdk-7u2-fcs-src-b13-17_nov_2011.zip) = axPd6e+wqNbNTZCSOdYzZXwq7vj2uoBkZdDMaR1oGEE=
-SHA256 (jdk/openjdk-7u2-patch-set-20120314.zip) = Eaowp3xndTVo8usKnlNdsgC81i5Y+UnQTEQMc8bQNNg=
-SHA256 (jdk/openjdk-7u3-patch-set-20120417.zip) = wFX7xwsvMWOKLeO1pq75KIdq/bB1VJl0gsQTiWbx9Ps=
-SIZE (jdk/jaxp145_01.zip) = 6389175
-SIZE (jdk/jdk7-jaf-2010_08_19.zip) = 70613
-SIZE (jdk/jdk7-jaxws2_2_4-b04-2011_06_01.zip) = 6046342
-SIZE (jdk/openjdk-7u2-fcs-src-b13-17_nov_2011.zip) = 87754846
-SIZE (jdk/openjdk-7u2-patch-set-20120314.zip) = 228334
-SIZE (jdk/openjdk-7u3-patch-set-20120417.zip) = 41873
+SHA256 (jdk/openjdk-7u6-fcs-src-b24-28_aug_2012.zip) = qbsNejvr3IJW/G97Ye2Ep5wU/P/NV3YXgBhDoB7CMfQ=
+SHA256 (jdk/openjdk-7u6-patch-set-20130111.zip) = cbs86pZbe7BlBpqAMUSANNiouMOgGhFny0AzScwGmc0=
+SHA256 (jdk/openjdk-7u9-patch-set-20130110.zip) = WeKaLmg49HHA1qMNnKIleGnkNrM2oFYqwQ2jfMMTrxY=
+SIZE (jdk/openjdk-7u6-fcs-src-b24-28_aug_2012.zip) = 103777502
+SIZE (jdk/openjdk-7u6-patch-set-20130111.zip) = 57620
+SIZE (jdk/openjdk-7u9-patch-set-20130110.zip) = 53438
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_adlc_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_adlc_make
@ -1,12 +0,0 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_adlc_make,v 1.2 2011/09/22 20:26:47 kurt Exp $
--- hotspot/make/bsd/makefiles/adlc.make.orig	Tue Sep  6 18:23:37 2011
-+++ hotspot/make/bsd/makefiles/adlc.make	Wed Sep  7 09:44:08 2011
-@@ -61,7 +61,7 @@ CPPFLAGS += -DASSERT
- 
- # CFLAGS_WARN holds compiler options to suppress/enable warnings.
- # Compiler warnings are treated as errors
-CFLAGS_WARN = -Werror
-+# CFLAGS_WARN = -Werror
- CFLAGS += $(CFLAGS_WARN)
- 
- OBJECTNAMES = \
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_buildtree_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_buildtree_make
@ -1,11 +0,0 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_buildtree_make,v 1.4 2012/03/19 19:50:57 kurt Exp $
--- hotspot/make/bsd/makefiles/buildtree.make.orig	Wed Mar 14 12:33:29 2012
-+++ hotspot/make/bsd/makefiles/buildtree.make	Wed Mar 14 12:33:30 2012
-@@ -394,7 +394,6 @@ test_gamma:  $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Q
- 	echo '#!/bin/sh'; \
- 	$(BUILDTREE_COMMENT); \
- 	echo '. ./env.sh'; \
-	echo "exit 0;"; \
- 	echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
- 	echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
- 	echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_gcc_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_gcc_make
@ -1,16 +1,7 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.5 2012/05/03 21:48:21 kurt Exp $
--- hotspot/make/bsd/makefiles/gcc.make.orig	Wed May  2 17:55:28 2012
-+++ hotspot/make/bsd/makefiles/gcc.make	Wed May  2 18:48:33 2012
-@@ -130,7 +130,7 @@ else
- endif
- 
- # Compiler warnings are treated as errors
-WARNINGS_ARE_ERRORS = -Werror
-+WARNINGS_ARE_ERRORS = 
- 
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-@@ -259,7 +259,7 @@ ifneq ($(OBJCOPY),)
+$OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.6 2013/01/14 20:16:56 kurt Exp $
+--- hotspot/make/bsd/makefiles/gcc.make.orig	Wed Jan  9 18:58:26 2013
+++ hotspot/make/bsd/makefiles/gcc.make	Wed Jan  9 18:59:05 2013
+@@ -300,7 +300,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
   endif
 
   OPT_CFLAGS/ia64  = -g
--- a/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_vm_make
+++ b/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_vm_make
@ -1,14 +0,0 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_vm_make,v 1.6 2012/03/19 19:50:57 kurt Exp $
--- hotspot/make/bsd/makefiles/vm.make.orig	Wed Mar 14 12:33:29 2012
-+++ hotspot/make/bsd/makefiles/vm.make	Wed Mar 14 12:33:30 2012
-@@ -102,6 +102,10 @@ ifdef DEFAULT_LIBPATH
- CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
- endif
- 
-+ifdef SHARK_LLVM_VERSION
-+CPPFLAGS += -DSHARK_LLVM_VERSION="$(SHARK_LLVM_VERSION)"
-+endif
-+
- # CFLAGS_WARN holds compiler options to suppress/enable warnings.
- CFLAGS += $(CFLAGS_WARN/BYFILE)
- 
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp
@ -1,16 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.6 2011/09/22 20:26:47 kurt Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	Sun Sep 18 21:21:56 2011
-+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Sun Sep 18 21:25:49 2011
-@@ -80,6 +80,12 @@
- #ifndef __STDC_LIMIT_MACROS
- #define __STDC_LIMIT_MACROS
- #endif // __STDC_LIMIT_MACROS
-+#ifndef __STDC_CONSTANT_MACROS
-+#define __STDC_CONSTANT_MACROS
-+#endif // __STDC_CONSTANT_MACROS
-+#ifndef __STDC_FORMAT_MACROS
-+#define __STDC_FORMAT_MACROS
-+#endif // __STDC_FORMAT_MACROS
- #include <inttypes.h>
- #include <signal.h>
- #ifndef __OpenBSD__
--- a/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_hpp
+++ b/devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_hpp
@ -1,14 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_hpp,v 1.1 2011/09/22 20:26:47 kurt Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions.hpp.orig	Sun Sep 18 21:26:08 2011
-+++ hotspot/src/share/vm/utilities/globalDefinitions.hpp	Sun Sep 18 21:26:20 2011
-@@ -25,10 +25,6 @@
- #ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
- #define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
- 
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
- #ifdef TARGET_COMPILER_gcc
- # include "utilities/globalDefinitions_gcc.hpp"
- #endif
--- a/devel/jdk/1.7/patches/patch-jdk_make_javax_sound_FILES_c_gmk
+++ b/devel/jdk/1.7/patches/patch-jdk_make_javax_sound_FILES_c_gmk
@ -1,13 +1,17 @@
-$OpenBSD: patch-jdk_make_javax_sound_FILES_c_gmk,v 1.3 2011/09/22 20:26:48 kurt Exp $
--- jdk/make/javax/sound/FILES_c.gmk.orig	Tue Sep  6 18:23:39 2011
-+++ jdk/make/javax/sound/FILES_c.gmk	Wed Sep  7 09:44:08 2011
-@@ -34,7 +34,8 @@ FILES_solaris = \
+$OpenBSD: patch-jdk_make_javax_sound_FILES_c_gmk,v 1.4 2013/01/14 20:16:56 kurt Exp $
+--- jdk/make/javax/sound/FILES_c.gmk.orig	Tue Aug 28 19:13:14 2012
+++ jdk/make/javax/sound/FILES_c.gmk	Thu Jan 10 14:55:03 2013
+@@ -34,7 +34,12 @@ FILES_solaris = \
 
 FILES_linux = 
 
 -FILES_bsd =
+ifeq ($(OS_VENDOR), OpenBSD)
 +FILES_bsd = \
 +	PLATFORM_API_BSDOS_PCM.c
+else
+FILES_bsd = 
+endif
 
- FILES_windows = \
- 	PLATFORM_API_WinOS_MidiIn.c \
+ FILES_macosx = \
+     PLATFORM_API_MacOSX_MidiIn.c \
--- a/devel/jdk/1.7/patches/patch-jdk_make_javax_sound_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_javax_sound_Makefile
@ -1,25 +1,15 @@
-$OpenBSD: patch-jdk_make_javax_sound_Makefile,v 1.5 2011/09/22 20:26:48 kurt Exp $
--- jdk/make/javax/sound/Makefile.orig	Tue Sep  6 18:23:39 2011
-+++ jdk/make/javax/sound/Makefile	Wed Sep  7 09:44:08 2011
-@@ -107,18 +107,14 @@ endif # PLATFORM linux
- 
- # XXXBSD: ???
- ifeq ($(PLATFORM), bsd)
-ifeq ($(OS_VENDOR), FreeBSD)
-  # ALSA handles directaudio, ports, and MIDI
-  SUBDIRS += jsoundalsa
-  EXTRA_SOUND_JNI_LIBS += jsoundalsa
-else
-     # build with empty MIDI i/o
-     INCLUDE_MIDI = TRUE
-     # build with empty ports
-     INCLUDE_PORTS = TRUE
-    # build with empty direct audio
-+    # build with direct audio
+$OpenBSD: patch-jdk_make_javax_sound_Makefile,v 1.6 2013/01/14 20:16:56 kurt Exp $
+--- jdk/make/javax/sound/Makefile.orig	Thu Jan 10 14:52:38 2013
+++ jdk/make/javax/sound/Makefile	Thu Jan 10 14:58:41 2013
+@@ -124,6 +124,11 @@ else
+     # build with empty direct audio
     INCLUDE_DAUDIO = TRUE
-endif
-+    CPPFLAGS += -DUSE_DAUDIO=TRUE
-+    LDFLAGS += -lsndio
+ endif
+ifeq ($(OS_VENDOR), OpenBSD)
+  # build with direct audio
+  CPPFLAGS += -DUSE_DAUDIO=TRUE
+  LDFLAGS += -lsndio
+endif
 endif # PLATFORM bsd
 
- ifeq ($(PLATFORM), solaris)
+ ifeq ($(PLATFORM), macosx)
--- a/devel/jdk/1.7/patches/patch-jdk_make_javax_sound_jsoundalsa_Makefile
+++ b/devel/jdk/1.7/patches/patch-jdk_make_javax_sound_jsoundalsa_Makefile
@ -1,53 +0,0 @@
-$OpenBSD: patch-jdk_make_javax_sound_jsoundalsa_Makefile,v 1.1 2011/09/22 20:26:48 kurt Exp $
--- jdk/make/javax/sound/jsoundalsa/Makefile.orig	Tue Sep  6 18:23:39 2011
-+++ jdk/make/javax/sound/jsoundalsa/Makefile	Wed Sep  7 09:44:08 2011
-@@ -51,7 +51,6 @@ FILES_c = \
- 	$(PORTFILES_c)
- 
- # platform dependent files
-ifeq ($(PLATFORM), linux)
- FILES_c += \
- 	PLATFORM_API_LinuxOS_ALSA_CommonUtils.c   \
- 	PLATFORM_API_LinuxOS_ALSA_PCM.c     \
-@@ -61,37 +60,19 @@ FILES_c += \
- 	PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
- 	PLATFORM_API_LinuxOS_ALSA_Ports.c
- 
-MIDI_CPPFLAGS= \
-	-DUSE_PLATFORM_MIDI_OUT=TRUE \
-	-DUSE_PLATFORM_MIDI_IN=TRUE
-endif
-
-ifeq ($(PLATFORM), bsd)
-FILES_c += \
-	PLATFORM_API_BsdOS_ALSA_CommonUtils.c   \
-	PLATFORM_API_BsdOS_ALSA_PCM.c     \
-	PLATFORM_API_BsdOS_ALSA_PCMUtils.c   \
-	PLATFORM_API_BsdOS_ALSA_MidiIn.c  \
-	PLATFORM_API_BsdOS_ALSA_MidiOut.c \
-	PLATFORM_API_BsdOS_ALSA_MidiUtils.c \
-	PLATFORM_API_BsdOS_ALSA_Ports.c
-
-MIDI_CPPFLAGS=
-endif
-
- FILES_export = \
- 	$(DAUDIOFILES_export) \
- 	$(MIDIFILES_export) \
- 	$(PORTFILES_export)
- 
-LDFLAGS += -L$(ALSA_LIB_PATH) -lasound
-+LDFLAGS += -lasound
- 
- CPPFLAGS += \
- 	-DUSE_DAUDIO=TRUE \
- 	-DUSE_PORTS=TRUE  \
-	$(MIDI_CPPFLAGS) \
-	-I$(SHARE_SRC)/native/com/sun/media/sound \
-	-I$(ALSA_HEADERS_PATH)
-+	-DUSE_PLATFORM_MIDI_OUT=TRUE \
-+	-DUSE_PLATFORM_MIDI_IN=TRUE \
-+	-I$(SHARE_SRC)/native/com/sun/media/sound
- 
- #
- # Add to the ambient VPATH.
--- a/devel/jdk/1.7/patches/patch-jdk_src_macosx_classes_java_lang_ClassLoaderHelper_java
+++ b/devel/jdk/1.7/patches/patch-jdk_src_macosx_classes_java_lang_ClassLoaderHelper_java
@ -0,0 +1,88 @@
+$OpenBSD: patch-jdk_src_macosx_classes_java_lang_ClassLoaderHelper_java,v 1.1 2013/01/14 20:16:56 kurt Exp $
+--- jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java.orig	Thu Jan 10 17:53:21 2013
+++ jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java	Thu Jan 10 19:02:45 2013
+@@ -25,23 +25,77 @@
+ package java.lang;
+ 
+ import java.io.File;
+import java.io.FilenameFilter;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+ 
+ class ClassLoaderHelper {
+    private static class LibraryFileFilter implements FilenameFilter {
+        final String libname;
+ 
+        LibraryFileFilter(String libname) {
+            this.libname = libname;
+        }
+
+        public boolean accept(File dir, String name) {
+            if (name.startsWith(libname)) {
+                return name.substring(libname.length()).matches("\\.[0-9]{1,20}\\.[0-9]{1,20}$");
+            }
+            return false;
+        }
+    }
+
+    private static class LibraryFileVersionComparator implements Comparator<String> {
+        public int compare(String s1, String s2) {
+            String[] f1 = s1.split("\\."), f2 = s2.split("\\.");
+            int res = compareComponents(f1[f1.length - 2], f2[f2.length - 2]);
+            if (res == 0) {
+                res = compareComponents(f1[f1.length - 1], f2[f2.length - 1]);
+            }
+            return res;
+        }
+
+        int compareComponents(String s1, String s2) {
+            return Long.valueOf(s1).compareTo(Long.valueOf(s2));
+        }
+    }
+
+     private ClassLoaderHelper() {}
+ 
+     /**
+      * Returns an alternate path name for the given file
+      * such that if the original pathname did not exist, then the
+      * file may be located at the alternate location.
+-     * For mac, this replaces the final .dylib suffix with .jnilib
+     *
+     * For OpenBSD, this handles versioned shared objects.
+      */
+-    static File mapAlternativeName(File lib) {
+-        String name = lib.toString();
+-        int index = name.toLowerCase().lastIndexOf(".dylib");
+-        if (index < 0) {
+-            return null;
+    static File mapAlternativeName(final File lib) {
+        // if file is unversioned, check for a versioned one in same dir
+        if (lib.getName().endsWith(".so")) {
+            final File dir = lib.getParentFile();
+            if (dir != null) {
+                List<String> liblist = AccessController.doPrivileged(
+                    new PrivilegedAction<List<String>>() {
+                        public List<String> run() {
+                            String liblist[] = dir.list(new LibraryFileFilter(lib.getName()));
+                            if (liblist == null) {
+                                return Collections.emptyList();
+                            }
+                            return Arrays.asList(liblist);
+                        }
+                    });
+                if (liblist != null && liblist.size() > 0) {
+                    // return the highest versioned lib
+                    String highest = Collections.max(liblist, new LibraryFileVersionComparator());
+                    return new File(dir, highest);
+                }
+            }
+         }
+-        return new File(name.substring(0, index) + ".jnilib");
+
+        return null;
+     }
+ }
--- a/devel/jdk/1.7/patches/patch-jdk_src_share_classes_java_lang_ClassLoader_java
+++ b/devel/jdk/1.7/patches/patch-jdk_src_share_classes_java_lang_ClassLoader_java
@ -1,91 +0,0 @@
-$OpenBSD: patch-jdk_src_share_classes_java_lang_ClassLoader_java,v 1.7 2012/04/12 22:27:20 matthew Exp $
--- jdk/src/share/classes/java/lang/ClassLoader.java.orig	Thu Nov 17 21:57:34 2011
-+++ jdk/src/share/classes/java/lang/ClassLoader.java	Wed Apr 11 09:10:38 2012
-@@ -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;
-@@ -40,7 +41,9 @@ import java.security.PrivilegedActionException;
- import java.security.PrivilegedExceptionAction;
- import java.security.ProtectionDomain;
- import java.security.cert.Certificate;
-+import java.util.Arrays;
- import java.util.Collections;
-+import java.util.Comparator;
- import java.util.Enumeration;
- import java.util.HashMap;
- import java.util.HashSet;
-@@ -1861,18 +1864,61 @@ public abstract class ClassLoader {
-     }
- 
-     private static boolean loadLibrary0(Class fromClass, final File file) {
-        boolean exists = AccessController.doPrivileged(
-            new PrivilegedAction<Object>() {
-                public Object run() {
-                    return file.exists() ? Boolean.TRUE : null;
-                }})
-            != null;
-        if (!exists) {
-+        File libfile = AccessController.doPrivileged(
-+            new PrivilegedAction<File>() {
-+                class LibraryFileFilter implements FilenameFilter {
-+                    final String libname;
-+
-+                    LibraryFileFilter(String libname) {
-+                        this.libname = libname;
-+                    }
-+
-+                    public boolean accept(File dir, String name) {
-+                        if (name.startsWith(libname)) {
-+                            return name.substring(libname.length()).matches("\\.[0-9]{1,20}\\.[0-9]{1,20}$");
-+                        }
-+                        return false;
-+                    }
-+                }
-+
-+                class LibraryFileVersionComparator implements Comparator<String> {
-+                    public int compare(String s1, String s2) {
-+                        String[] f1 = s1.split("\\."), f2 = s2.split("\\.");
-+                        int res = compareComponents(f1[f1.length - 2], f2[f2.length - 2]);
-+                        if (res == 0) {
-+                            res = compareComponents(f1[f1.length - 1], f2[f2.length - 1]);
-+                        }
-+                        return res;
-+                    }
-+
-+                    int compareComponents(String s1, String s2) {
-+                        return Long.valueOf(s1).compareTo(Long.valueOf(s2));
-+                    }
-+                }
-+
-+                public File run() {
-+                    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
-+                                String highest = Collections.max(Arrays.asList(liblist), new LibraryFileVersionComparator());
-+                                return new File(dir, highest);
-+                            }
-+                        }
-+                    }
-+                    return null;
-+                }});
-+        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-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java
+++ b/devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java
@ -1,11 +1,11 @@
-$OpenBSD: patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java,v 1.1 2012/10/24 18:54:03 kurt Exp $
+$OpenBSD: patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java,v 1.2 2013/01/14 20:16:56 kurt Exp $

 Crash due to missing synchronization on gconf_client.
 Upstream CR 7188755.

--- jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java.orig	Fri Aug  3 06:05:21 2012
-+++ jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	Fri Aug  3 06:05:37 2012
-@@ -339,6 +339,6 @@ public class DefaultProxySelector extends ProxySelecto
+--- jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java.orig	Tue Aug 28 19:14:39 2012
+++ jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	Wed Jan  9 18:59:05 2013
+@@ -345,6 +345,6 @@ public class DefaultProxySelector extends ProxySelecto
         }
     }
 
--- a/devel/jdk/1.7/patches/patch-jdk_src_share_native_com_sun_media_sound_Platform_c
+++ b/devel/jdk/1.7/patches/patch-jdk_src_share_native_com_sun_media_sound_Platform_c
@ -1,24 +1,15 @@
-$OpenBSD: patch-jdk_src_share_native_com_sun_media_sound_Platform_c,v 1.3 2011/09/22 20:26:48 kurt Exp $
--- jdk/src/share/native/com/sun/media/sound/Platform.c.orig	Tue Sep  6 18:23:39 2011
-+++ jdk/src/share/native/com/sun/media/sound/Platform.c	Wed Sep  7 09:44:08 2011
-@@ -103,19 +103,11 @@ JNIEXPORT jint JNICALL Java_com_sun_media_sound_Platfo
-     switch (feature) {
-     case com_sun_media_sound_Platform_FEATURE_MIDIIO:
-        return com_sun_media_sound_Platform_LIB_MAIN;
-#ifdef __FreeBSD__
-     case com_sun_media_sound_Platform_FEATURE_PORTS:
-       return com_sun_media_sound_Platform_LIB_ALSA;
-    case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
-       return com_sun_media_sound_Platform_LIB_ALSA;
-#else
-    case com_sun_media_sound_Platform_FEATURE_PORTS:
-        return com_sun_media_sound_Platform_LIB_MAIN;
+$OpenBSD: patch-jdk_src_share_native_com_sun_media_sound_Platform_c,v 1.4 2013/01/14 20:16:56 kurt Exp $
+--- jdk/src/share/native/com/sun/media/sound/Platform.c.orig	Tue Aug 28 19:15:07 2012
+++ jdk/src/share/native/com/sun/media/sound/Platform.c	Thu Jan 10 15:03:16 2013
+@@ -118,6 +118,11 @@ JNIEXPORT jint JNICALL Java_com_sun_media_sound_Platfo
+        return com_sun_media_sound_Platform_LIB_ALSA;
     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 com_sun_media_sound_Platform_LIB_ALSA;
+#elif defined(__OpenBSD__)
+    case com_sun_media_sound_Platform_FEATURE_PORTS:
 +       return com_sun_media_sound_Platform_LIB_MAIN;
-        return 0;
-#endif
-     }
- #endif
-     return 0;
+    case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
+       return com_sun_media_sound_Platform_LIB_MAIN;
+ #else
+     case com_sun_media_sound_Platform_FEATURE_PORTS:
+        return com_sun_media_sound_Platform_LIB_MAIN;
--- a/devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_lang_java_props_md_c
+++ b/devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_lang_java_props_md_c
@ -1,36 +0,0 @@
-$OpenBSD: patch-jdk_src_solaris_native_java_lang_java_props_md_c,v 1.4 2012/10/24 18:54:03 kurt Exp $
-
-OpenBSD supports only the "C" and "POSIX" locales for all but the
-LC_CTYPE locale.
-
--- jdk/src/solaris/native/java/lang/java_props_md.c.orig	Sat Aug  4 21:43:10 2012
-+++ jdk/src/solaris/native/java/lang/java_props_md.c	Sat Aug  4 22:49:04 2012
-@@ -142,7 +142,7 @@ static int ParseLocale(int cat, char ** std_language, 
-     /* Query the locale set for the category */
-     lc = setlocale(cat, NULL);
- 
-#ifndef __linux__
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
-     if (lc == NULL) {
-         return 0;
-     }
-@@ -430,12 +430,19 @@ GetJavaProperties(JNIEnv *env)
-                     &(sprops.format_country),
-                     &(sprops.format_variant),
-                     &(sprops.encoding))) {
-+#ifdef __OpenBSD__
-+        sprops.language = sprops.format_language;
-+        sprops.script = sprops.format_script;
-+        sprops.country = sprops.format_country;
-+        sprops.variant = sprops.format_variant;
-+#else
-         ParseLocale(LC_MESSAGES,
-                     &(sprops.language),
-                     &(sprops.script),
-                     &(sprops.country),
-                     &(sprops.variant),
-                     NULL);
-+#endif
-     } else {
-         sprops.language = "en";
-         sprops.encoding = "ISO8859-1";
--- a/devel/jdk/1.7/pkg/PFRAG.client_vm-jre
+++ b/devel/jdk/1.7/pkg/PFRAG.client_vm-jre
@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.client_vm-jre,v 1.2 2012/03/19 19:50:57 kurt Exp $
+@comment $OpenBSD: PFRAG.client_vm-jre,v 1.3 2013/01/14 20:16:56 kurt Exp $
 ${JREHOME}/lib/${MACHINE_ARCH}/client/
 ${JREHOME}/lib/${MACHINE_ARCH}/client/Xusage.txt
-${JREHOME}/lib/${MACHINE_ARCH}/client/libjsig.debuginfo
+${JREHOME}/lib/${MACHINE_ARCH}/client/libjsig.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/client/libjsig.so
-${JREHOME}/lib/${MACHINE_ARCH}/client/libjvm.debuginfo
+${JREHOME}/lib/${MACHINE_ARCH}/client/libjvm.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/client/libjvm.so
--- a/devel/jdk/1.7/pkg/PFRAG.client_vm-main
+++ b/devel/jdk/1.7/pkg/PFRAG.client_vm-main
@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.client_vm-main,v 1.3 2012/03/19 19:50:57 kurt Exp $
+@comment $OpenBSD: PFRAG.client_vm-main,v 1.4 2013/01/14 20:16:56 kurt Exp $
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/Xusage.txt
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/libjsig.debuginfo
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/libjsig.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/libjsig.so
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/libjvm.debuginfo
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/libjvm.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/libjvm.so
--- a/devel/jdk/1.7/pkg/PLIST-jre
+++ b/devel/jdk/1.7/pkg/PLIST-jre
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-jre,v 1.10 2012/03/19 19:50:57 kurt Exp $
+@comment $OpenBSD: PLIST-jre,v 1.11 2013/01/14 20:16:56 kurt Exp $
@option no-default-conflict
@conflict jre->=1.7,<1.8|jre->=1.7v0,<1.8v0
 ${JREHOME}/
@ -47,42 +47,51 @@ ${JREHOME}/lib/${MACHINE_ARCH}/headless/libmawt.so
 ${JREHOME}/lib/${MACHINE_ARCH}/jli/
 ${JREHOME}/lib/${MACHINE_ARCH}/jli/libjli.so
 ${JREHOME}/lib/${MACHINE_ARCH}/jvm.cfg
+${JREHOME}/lib/${MACHINE_ARCH}/libattach.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libawt.so
+${JREHOME}/lib/${MACHINE_ARCH}/libdt_socket.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libdt_socket.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libfontmanager.so
+${JREHOME}/lib/${MACHINE_ARCH}/libhprof.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libhprof.so
+${JREHOME}/lib/${MACHINE_ARCH}/libinstrument.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libinstrument.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libj2gss.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libj2pcsc.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libj2pkcs11.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libjaas_unix.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libjava.so
+${JREHOME}/lib/${MACHINE_ARCH}/libjava_crw_demo.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libjava_crw_demo.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libjawt.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libjdwp.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libjpeg.so
+${JREHOME}/lib/${MACHINE_ARCH}/libjsdt.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libjsdt.so
-${JREHOME}/lib/${MACHINE_ARCH}/libjsig.debuginfo
+${JREHOME}/lib/${MACHINE_ARCH}/libjsig.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libjsig.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libjsound.so
 ${JREHOME}/lib/${MACHINE_ARCH}/liblcms.so
+${JREHOME}/lib/${MACHINE_ARCH}/libmanagement.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libmanagement.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libmlib_image.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libnet.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libnio.so
+${JREHOME}/lib/${MACHINE_ARCH}/libnpt.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libnpt.so
 ${JREHOME}/lib/${MACHINE_ARCH}/librmi.so
-${JREHOME}/lib/${MACHINE_ARCH}/libsaproc.debuginfo
+${JREHOME}/lib/${MACHINE_ARCH}/libsaproc.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libsplashscreen.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libsunec.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libunpack.so
+${JREHOME}/lib/${MACHINE_ARCH}/libverify.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/libverify.so
 ${JREHOME}/lib/${MACHINE_ARCH}/libzip.so
 ${JREHOME}/lib/${MACHINE_ARCH}/server/
 ${JREHOME}/lib/${MACHINE_ARCH}/server/Xusage.txt
-${JREHOME}/lib/${MACHINE_ARCH}/server/libjsig.debuginfo
+${JREHOME}/lib/${MACHINE_ARCH}/server/libjsig.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/server/libjsig.so
-${JREHOME}/lib/${MACHINE_ARCH}/server/libjvm.debuginfo
+${JREHOME}/lib/${MACHINE_ARCH}/server/libjvm.diz
 ${JREHOME}/lib/${MACHINE_ARCH}/server/libjvm.so
 ${JREHOME}/lib/${MACHINE_ARCH}/xawt/
 ${JREHOME}/lib/${MACHINE_ARCH}/xawt/libmawt.so
@ -215,6 +224,7 @@ ${JREHOME}/lib/zi/America/Cayman
 ${JREHOME}/lib/zi/America/Chicago
 ${JREHOME}/lib/zi/America/Chihuahua
 ${JREHOME}/lib/zi/America/Costa_Rica
+${JREHOME}/lib/zi/America/Creston
 ${JREHOME}/lib/zi/America/Cuiaba
 ${JREHOME}/lib/zi/America/Curacao
 ${JREHOME}/lib/zi/America/Danmarkshavn
@ -602,5 +612,5 @@ ${JREHOME}/man/man1/
@man ${JREHOME}/man/man1/servertool.1
@man ${JREHOME}/man/man1/tnameserv.1
@man ${JREHOME}/man/man1/unpack200.1
-%%client_vm%%
 ${JREHOME}/release
+%%client_vm%%
--- a/devel/jdk/1.7/pkg/PLIST-main
+++ b/devel/jdk/1.7/pkg/PLIST-main
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.12 2012/10/24 18:54:03 kurt Exp $
+@comment $OpenBSD: PLIST-main,v 1.13 2013/01/14 20:16:56 kurt Exp $
@option no-default-conflict
@conflict jdk->=1.7,<1.8|jdk->=1.7v0,<1.8v0
 ${JDKHOME}/
@ -18,6 +18,7 @@ ${JDKHOME}/bin/java-rmi.cgi
@bin ${JDKHOME}/bin/javadoc
@bin ${JDKHOME}/bin/javah
@bin ${JDKHOME}/bin/javap
+@bin ${JDKHOME}/bin/jcmd
@bin ${JDKHOME}/bin/jconsole
@bin ${JDKHOME}/bin/jdb
@bin ${JDKHOME}/bin/jhat
@ -471,44 +472,53 @@ ${JDKHOME}/jre/lib/${MACHINE_ARCH}/headless/libmawt.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/jli/
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/jli/libjli.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/jvm.cfg
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libattach.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libattach.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libawt.so
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdt_socket.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdt_socket.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libfontmanager.so
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libhprof.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libhprof.so
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libinstrument.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libinstrument.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libj2gss.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libj2pcsc.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libj2pkcs11.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjaas_unix.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjava.so
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjawt.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjdwp.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjpeg.so
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsdt.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsdt.so
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsig.debuginfo
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsig.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsig.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsound.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/liblcms.so
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libmanagement.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libmanagement.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libmlib_image.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnet.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnio.so
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnpt.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnpt.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/librmi.so
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsaproc.debuginfo
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsaproc.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsaproc.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsplashscreen.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsunec.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libunpack.so
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/libverify.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libverify.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libzip.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/Xusage.txt
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjsig.debuginfo
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjsig.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjsig.so
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjvm.debuginfo
+${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjvm.diz
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjvm.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/xawt/
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/xawt/libmawt.so
@ -641,6 +651,7 @@ ${JDKHOME}/jre/lib/zi/America/Cayman
 ${JDKHOME}/jre/lib/zi/America/Chicago
 ${JDKHOME}/jre/lib/zi/America/Chihuahua
 ${JDKHOME}/jre/lib/zi/America/Costa_Rica
+${JDKHOME}/jre/lib/zi/America/Creston
 ${JDKHOME}/jre/lib/zi/America/Cuiaba
 ${JDKHOME}/jre/lib/zi/America/Curacao
 ${JDKHOME}/jre/lib/zi/America/Danmarkshavn
@ -1027,6 +1038,7 @@ ${JDKHOME}/lib/tools.jar
@mandir ${JDKHOME}/man/
 ${JDKHOME}/man/man1/
@man ${JDKHOME}/man/man1/appletviewer.1
+@man ${JDKHOME}/man/man1/apt.1
@man ${JDKHOME}/man/man1/extcheck.1
@man ${JDKHOME}/man/man1/idlj.1
@man ${JDKHOME}/man/man1/jar.1
@ -1036,6 +1048,7 @@ ${JDKHOME}/man/man1/
@man ${JDKHOME}/man/man1/javadoc.1
@man ${JDKHOME}/man/man1/javah.1
@man ${JDKHOME}/man/man1/javap.1
+@man ${JDKHOME}/man/man1/jcmd.1
@man ${JDKHOME}/man/man1/jconsole.1
@man ${JDKHOME}/man/man1/jdb.1
@man ${JDKHOME}/man/man1/jhat.1
@ -1047,6 +1060,7 @@ ${JDKHOME}/man/man1/
@man ${JDKHOME}/man/man1/jstack.1
@man ${JDKHOME}/man/man1/jstat.1
@man ${JDKHOME}/man/man1/jstatd.1
+@man ${JDKHOME}/man/man1/jvisualvm.1
@man ${JDKHOME}/man/man1/keytool.1
@man ${JDKHOME}/man/man1/native2ascii.1
@man ${JDKHOME}/man/man1/orbd.1