diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index bb7a93748c41..2cdd197e7074 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -1,373 +1,373 @@
 # New ports collection makefile for:	jdk15
 # Date created:				12 January 2005
 # Whom:					Alexey Zelkin <phantom@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION}
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://download.java.net/tiger/
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
 #		 http://java.sun.com/javase/downloads/index.jsp
 DISTFILES=	${JRL_SRCFILE} ${JRL_BINFILE} ${PATCHSETFILE}
 EXTRACT_ONLY=	${JRL_SRCFILE} ${JRL_BINFILE}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Java Development Kit 1.5.0
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 OPTIONS=	DEBUG	"Enable debugging support"	off \
 		IPV6	"Enable IPv6 support"		off
 .if ${MACHINE_ARCH} == "amd64"
 WITHOUT_WEB=	yes
 .else
 OPTIONS+=	WEB	"Enable the browser plugin and Java Web Start"	on
 .endif
 OPTIONS+=	POLICY	"Install the Unlimited Strength Policy Files"	off \
 		TZUPDATE	"Update the time zone data"		on \
 		JAIL	"Port is being built within a jail"		off
 
 WANT_GNOME=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES+=	pkg-install \
 		pkg-deinstall
 SUB_LIST+=	JRE_HOME=${PREFIX}/jdk${JDK_VERSION}/jre \
 		ARCH=${MACHINE_ARCH}
 
 WRKSRC=		${WRKDIR}/control/make
 
 USE_ZIP=	YES
 
 JRL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar
 JRL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE_VERSION}-fcs-bin-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
 TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 
 JDK_VERSION=	1.5.0
-JDK_UPDATE_VERSION=	11
-JDK_PATCHSET_VERSION=	5
-JDK_BUILD_NUMBER=	03
-JDK_BUILD_DATE=		15_dec_2006
+JDK_UPDATE_VERSION=	12
+JDK_PATCHSET_VERSION=	6
+JDK_BUILD_NUMBER=	04
+JDK_BUILD_DATE=		02_may_2007
 LATEST_LINK=	jdk15
 
 TZUPDATE_VERSION=	1.2.1
 TZUPDATE_TZVERSION=	2007f
 
 SUN_LINUX_JDK_VERSION=	1.5.0
 
 .if !defined(WITH_LINUX_BOOTSTRAP)
 NATIVE_BOOTSTRAP_JDKS+=	${LOCALBASE}/diablo-jdk1.5.0 \
 			${LOCALBASE}/jdk1.5.0 \
 			${LOCALBASE}/jdk1.4.2
 .endif
 
 LINUX_BOOTSTRAP_JDKS=	${LOCALBASE}/linux-sun-jdk1.5.0 \
 			${LOCALBASE}/linux-sun-jdk1.4.2
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IPV6)
 CATEGORIES+=	ipv6
 .endif
 
 .if defined(WITH_POLICY)
 DISTFILES+=	${POLICYFILE}
 EXTRACT_ONLY+=	${POLICYFILE}
 .endif
 
 .if defined(WITH_TZUPDATE)
 DISTFILES+=	${TZUPDATEFILE}
 EXTRACT_ONLY+=	${TZUPDATEFILE}
 .endif
 
 # do we have valid native jdk installed?
 .if !defined(WITH_LINUX_BOOTSTRAP)
 .for CJDK in ${NATIVE_BOOTSTRAP_JDKS}
 .  if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac)
 BOOTSTRAPJDKDIR=	${CJDK}
 .  endif
 .endfor
 .endif
 
 # do we have valid linux jdk installed?
 .if !defined(BOOTSTRAPJDKDIR)
 .for CJDK in ${LINUX_BOOTSTRAP_JDKS}
 .  if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac)
 BOOTSTRAPJDKDIR=	${CJDK}
 WITH_LINUX_BOOTSTRAP=	YES
 .  endif
 .endfor
 .endif
 
 # if no valid jdk found, set dependency
 .if !defined(BOOTSTRAPJDKDIR)
 BOOTSTRAPJDKDIR?=	${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION}
 .endif
 
 BUILD_DEPENDS+=	${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk15
 
 .if defined(WITHOUT_WEB)
 MAKE_ENV+=	DONT_BUILD_DEPLOY="YES"
 .else
 USE_GNOME=	desktopfileutils
 LIB_DEPENDS=    nspr4.1:$(PORTSDIR)/devel/nspr
 .endif
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	YES
 USE_ICONV=	YES
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 
 MAKE_ENV+=	ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \
 		ALT_MOTIF_DIR="${X11BASE}" \
 		SYS_CFLAGS="${CFLAGS}" \
 		LANG="C" \
 		JAVA_HOME="" \
 		CLASSPATH="" \
 		LD_LIBRARY_PATH="" \
 		MAKEFLAGS="" \
 		SKIP_COMPARE_IMAGES="YES"
 .if !defined(WITH_IPV6)
 MAKE_ENV+=	DONT_ENABLE_IPV6="YES"
 .endif
 .if defined(HOTSPOT_BUILD_JOBS)
 MAKE_ENV+=	HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS}
 .endif
 
 ALL_TARGET=	all
 
 PLIST_FILES=	jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \
 		jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile
 .if !defined(WITHOUT_WEB)
 PLIST_FILES+=	share/applications/sun_java15.desktop
 .endif
 PLIST_DIRS=	jdk${JDK_VERSION}/jre/.systemPrefs
 
 .if (${ARCH} == amd64)
 HOTSPOTARCH=amd64
 .else
 HOTSPOTARCH=i586
 .endif
 
 JDKIMAGEDIR=	${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image
 JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image
 
 LOCAL_FILES=	../../hotspot/src/os/bsd/vm/os_bsd.cpp
 PTHREAD_FILES=	../../hotspot/build/bsd/makefiles/vm.make \
 		../../j2se/make/com/sun/java/pack/Makefile \
 		../../j2se/make/common/Defs.gmk \
 		../../j2se/make/common/Defs-bsd.gmk \
 		../../j2se/make/common/Program.gmk \
 		../../j2se/make/java/hpi/native/Makefile \
 		../../j2se/make/java/net/Makefile \
 		../../j2se/make/java/nio/Makefile \
 		../../j2se/make/jpda/transport/socket/Makefile \
 		../../j2se/make/sun/cmm/Makefile \
 		../../j2se/make/sun/xawt/Makefile
 X11_FILES=	../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java \
 		../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
 		../../j2se/src/solaris/native/sun/awt/fontpath.c
 
 # Check for JDK sources and patch file
 .if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Due to licensing restrictions, certain files must be fetched manually.\n\n
 .if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE})#{
 IGNORE += Please open http://download.java.net/tiger/archive/tiger_u${JDK_UPDATE_VERSION}/index.csp\n\
 in a web browser.  Download the\n
 .if !exists(${DISTDIR}/${JRL_SRCFILE})#{
 IGNORE += Update ${JDK_UPDATE_VERSION} Source, ${JRL_SRCFILE}
 .endif#}
 .if !exists(${DISTDIR}/${JRL_BINFILE})#{
 .if !exists(${DISTDIR}/${JRL_SRCFILE})#{
 IGNORE += and the\n
 .endif#}
 IGNORE += Source Binaries, ${JRL_BINFILE}
 .endif#}
 IGNORE += .\n\n
 .endif#}
 .if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
 IGNORE += Please open http://java.sun.com/javase/downloads/index_jdk5.jsp\n\
 in a web browser and follow the \"Download\" link for\n\
 \"Other Downloads\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
 .endif#}
 .if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{
 IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
 in a web browser and follow the \"Download\" link for\n\
 \"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
 time zone update file, ${TZUPDATEFILE}.\n\n
 .endif#}
 .if !exists(${DISTDIR}/${PATCHSETFILE})#{
 IGNORE += Please download the patchset, ${PATCHSETFILE}, from\n\
 http://www.eyesbeyond.com/freebsddom/java/jdk15.html.\n\n
 .endif#}
 IGNORE += Please place the downloaded file(s) in ${DISTDIR}
 IGNORE += \n and restart the build.\n\n
 .endif#}
 
 pre-fetch:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have at least"
 	@${ECHO_MSG} "2.5Gb of free disk space in build area!"
 	@${ECHO_MSG}
 .if defined(WITH_LINUX_BOOTSTRAP)
 	@${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have linux emulation"
 	@${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem"
 	@${ECHO_MSG} "mounted."
 	@${ECHO_MSG}
 .endif
 
 # Get JRL agreement
 .if !defined(PACKAGE_BUILDING)
 pre-extract:
 	${SH} ${FILESDIR}/pkg-install.in ${PKGNAME} PRE-INSTALL
 .endif
 
 # Extract the files
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@${CC} ${CFLAGS} -o ${WRKDIR}/x_x2zip ${FILESDIR}/x_x2zip.c
 	@for file in ${EXTRACT_ONLY}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} "${DISTDIR}/$$file" ${EXTRACT_AFTER_ARGS}); \
 		then \
 			exit 1; \
 		fi; \
 		if [ `basename $$file .jar` != $$file ]; \
 		then \
 			if ! (cd ${WRKDIR} && ${WRKDIR}/x_x2zip 'YES I ACCEPT THE CLICK THROUGH LICENSE.  ' X_X && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/X_X.zip ${EXTRACT_AFTER_ARGS}); \
 			then \
 				exit 1; \
 			fi; \
 		fi \
 	done
 
 pre-patch:
 	@cd ${WRKDIR} &&  \
 		${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
 		${CHMOD} -R u+w * && \
 		${PATCH} -p0 < ${WRKDIR}/jdk15.patches
 
 post-patch:
 	@for file in ${LOCAL_FILES}; do \
 		${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
 			${WRKSRC}/$${file}; \
 	done
 	@for file in ${PTHREAD_FILES}; do \
 		${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \
 			${WRKSRC}/$${file}; \
 	done
 	@for file in ${X11_FILES}; do \
 		${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \
 			${WRKSRC}/$${file}; \
 	done
 	${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
 		-e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\
 		${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop
 
 .if defined(WITH_LINUX_BOOTSTRAP)
 pre-build:
 	@if [ "$${WRKDIRPREFIX}" -a \
 	     -L "/compat/linux/$${WRKDIRPREFIX}" -a \
 	     x`${LS} -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \
 	then \
 		${ECHO_MSG} "Please set WRKDIRPREFIX to something which doesn't"; \
 		${ECHO_MSG} "have a matching symbolic link in /compat/linux."; \
 		${ECHO_MSG} "This is known to cause problems during bootstrapping."; \
 		exit 1; \
 	fi
 	@if [ `/sbin/sysctl -n compat.linux.osname` != "Linux" ]; \
 	then \
 		${ECHO_MSG} "Please set the value of the sysctl compat.linux.osname"; \
 		${ECHO_MSG} "to 'Linux' with the command:"; \
 		${ECHO_MSG} "	/sbin/sysctl compat.linux.osname=Linux"; \
 		${ECHO_MSG} "Having it set to other values, such as 'FreeBSD',"; \
 		${ECHO_MSG} "is known to cause problems during bootstrapping."; \
 		exit 1; \
 	fi
 .if !defined(WITH_JAIL)#{
 	@if [ "`/sbin/mount | grep ^linprocfs`" = "" ]; \
 	then \
 		${ECHO_MSG} "ERROR: You must have LINPROCFS mounted before" ; \
 		${ECHO_MSG} "starting to build the native JDK 1.5.0." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "You may do it with the following commands:" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "# kldload linprocfs" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "and" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "# mount -t linprocfs linprocfs /compat/linux/proc" ; \
 		${ECHO_MSG} "" ; \
 		exit 1 ; \
 	fi
 .endif#}
 .endif
 
 do-build:
 	# Start of jdk build
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-build:
 	@# XXX don't install japanese manpages
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP
 .if defined(WITH_TZUPDATE)
 	@# Update time zones
 	@-${JDKIMAGEDIR}/bin/java -jar \
-		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
+		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
 	@-${RM} -rf ${JDKIMAGEDIR}/jre/lib/zi.tzdata*
 .endif
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
 	cd ${JDKIMAGEDIR} && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .if !defined(WITHOUT_WEB)
 	${INSTALL_DATA} ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop \
 		${PREFIX}/share/applications/sun_java15.desktop
 .endif
 	@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST}
 	@${FIND} -s ${JDKIMAGEDIR} -not -type d | \
 	  ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST}
 .if !defined(WITHOUT_WEB)
 	@${ECHO_MSG} '@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
 .endif
 .if defined(WITH_DEBUG)
 	cd ${JDKIMAGEDIR_G} && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 	@${FIND} -s ${JDKIMAGEDIR_G} -not -type d | \
 	  ${SED} -ne 's#^${JDKIMAGEDIR_G}#jdk${JDK_VERSION}#p' >> ${TMPPLIST}
 .endif
 	${INSTALL_DATA} ${FILESDIR}/cacerts \
 	  ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
 .if defined(WITH_POLICY)
 	${INSTALL_DATA} ${WRKDIR}/jce/*.jar ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security
 .endif
 	@${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \
 	  ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST}
 	@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST}
 .if !defined(WITHOUT_WEB)
 	@${ECHO_MSG} '@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
 .endif
 
 # XXX: put unregistervm into install script ?
 post-install:
 	@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
 .if !defined(WITHOUT_WEB)
 	@-update-desktop-database
 .endif
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo
index 3835cd69417f..a5bc1572c69c 100644
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@@ -1,15 +1,15 @@
-MD5 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = e6661cce9c94009e2fa909a151c0160c
-SHA256 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = f2dd285070a1c4d71077cbc28420e39628fc577ac4fb02e8617ebffeab8120eb
-SIZE (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = 57703958
-MD5 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 7c952fba37101c154f1636dc401aa093
-SHA256 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = c5cd6d195c1cb213546cd598da0c6d5295e1cf5fd5748e924628035b45874780
-SIZE (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 2211688
-MD5 (bsd-jdk15-patches-5.tar.bz2) = bc6339e072fabb20097eebbec0e5060f
-SHA256 (bsd-jdk15-patches-5.tar.bz2) = b996f0bc530e2c21c83598e5b3e2f86a264d50d755cb5037ee5cc38a88be9993
-SIZE (bsd-jdk15-patches-5.tar.bz2) = 772184
+MD5 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = deb204740d2f8a799ba8658c8c768ebe
+SHA256 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 8b93abe500d58a9b2d766ded6f9041e8bc457b785e6751e0e3d1d8308ed23a3f
+SIZE (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 57752561
+MD5 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 80996fbf2db79d9fa4a75e17bc1f6551
+SHA256 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 886c57a62f6691954269a84d4cd0a32c8d61eb4e04c4028933e0e9bfae2cf999
+SIZE (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 2211514
+MD5 (bsd-jdk15-patches-6.tar.bz2) = 9277d3624b9879583c1dc74c798321e2
+SHA256 (bsd-jdk15-patches-6.tar.bz2) = 6f9c225db85f63a0b9c41f0eab50c3e3394dbe163f6cc8d936f2afe76010cdd1
+SIZE (bsd-jdk15-patches-6.tar.bz2) = 777561
 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 SIZE (jce_policy-1_5_0.zip) = 8826
 MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
 SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
 SIZE (tzupdater-1_2_1-2007f.zip) = 258198
diff --git a/java/jdk15/files/patch-hotspot::bsd_i486::vm::os_bsd_i486.cpp b/java/jdk15/files/patch-hotspot::bsd_i486::vm::os_bsd_i486.cpp
deleted file mode 100644
index aba5bec91b3c..000000000000
--- a/java/jdk15/files/patch-hotspot::bsd_i486::vm::os_bsd_i486.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig	Thu May 24 15:27:43 2007
-+++ ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp	Thu May 24 19:54:47 2007
-@@ -238,15 +238,15 @@
-   // success, if not we return failure and the caller can retry.
-   // 
-   _result = false;
--  if (uc->context_eip == (int)_old_addr.pc() ) {
--    uc->context_eip = (int)_new_addr.pc();
-+  if (uc->context_eip == (intptr_t)_old_addr.pc() ) {
-+    uc->context_eip = (intptr_t)_new_addr.pc();
-     _result = true;
- #ifndef __OpenBSD__
-   } else if (uc->uc_link != NULL) {
-     // Check (and validate) one level of stacked ucontext
-     ucontext_t* linked_uc = uc->uc_link;
--    if (os::Bsd::valid_ucontext(thread, uc, linked_uc) && linked_uc->context_eip == (int)_old_addr.pc()) {
--      linked_uc->context_eip = (int)_new_addr.pc();
-+    if (os::Bsd::valid_ucontext(thread, uc, linked_uc) && linked_uc->context_eip == (intptr_t)_old_addr.pc()) {
-+      linked_uc->context_eip = (intptr_t)_new_addr.pc();
-       _result = true;
-     }
-   }
diff --git a/java/jdk15/files/patch-hotspot::i486::vm::i486.ad b/java/jdk15/files/patch-hotspot::i486::vm::i486.ad
deleted file mode 100644
index e0d91e628a78..000000000000
--- a/java/jdk15/files/patch-hotspot::i486::vm::i486.ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../../hotspot/src/cpu/i486/vm/i486.ad.orig	Thu May 24 15:27:42 2007
-+++ ../../hotspot/src/cpu/i486/vm/i486.ad	Thu May 24 19:47:30 2007
-@@ -383,8 +383,9 @@
- void emit_d32_reloc(CodeBuffer &cbuf, int d32, RelocationHolder const& rspec, 
-         int format) {
- #ifdef ASSERT
--  if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
--    assert(oop(d32)->is_oop() && oop(d32)->is_perm(), "cannot embed non-perm oops in code");
-+  if (rspec.reloc()->type() == relocInfo::oop_type &&
-+      d32 != 0 && d32 != (intptr_t)Universe::non_oop_word()) {
-+    assert(oop((intptr_t)d32)->is_oop() && oop((intptr_t)d32)->is_perm(), "cannot embed non-perm oops in code");
-   }
- #endif
-   cbuf.relocate(cbuf.mark(), rspec, format);
diff --git a/java/jdk15/files/patch-hotspot::i486::vm::register_i486.hpp b/java/jdk15/files/patch-hotspot::i486::vm::register_i486.hpp
deleted file mode 100644
index c033d064c7a6..000000000000
--- a/java/jdk15/files/patch-hotspot::i486::vm::register_i486.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../../hotspot/src/cpu/i486/vm/register_i486.hpp.orig	Thu May 24 15:27:42 2007
-+++ ../../hotspot/src/cpu/i486/vm/register_i486.hpp	Thu May 24 19:51:43 2007
-@@ -24,9 +24,9 @@
-   static Register as_Register(int encoding)      { return (Register)encoding; }
- 
-   // accessors
--  int   encoding() const                         { assert(is_valid(), "invalid register"); return (int)this; }
--  bool  is_valid() const                         { return 0 <= (int)this && (int)this < number_of_registers; }
--  bool  has_byte_register() const                { return 0 <= (int)this && (int)this < number_of_byte_registers; }
-+  int   encoding() const                         { assert(is_valid(), "invalid register"); return value(); }
-+  bool  is_valid() const                         { return 0 <= value() && value() < number_of_registers; }
-+  bool  has_byte_register() const                { return 0 <= value() && value() < number_of_byte_registers; }
-   const char* name() const;
- };
- 
-@@ -74,8 +74,8 @@
-   friend XMMRegister as_XMMRegister(int encoding) { return (XMMRegister)encoding; }
- 
-   // accessors
--  int   encoding() const                          { assert(is_valid(), "invalid register"); return (int)this; }
--  bool  is_valid() const                          { return 0 <= (int)this && (int)this < number_of_registers; }
-+  int   encoding() const                          { assert(is_valid(), "invalid register"); return value(); }
-+  bool  is_valid() const                          { return 0 <= value() && value() < number_of_registers; }
-   const char* name() const;
- };
- 
diff --git a/java/jdk15/files/patch-j2se::awt::mlib_sys.c b/java/jdk15/files/patch-j2se::awt::mlib_sys.c
deleted file mode 100644
index 6f8d8f809011..000000000000
--- a/java/jdk15/files/patch-j2se::awt::mlib_sys.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../../j2se/src/share/native/sun/awt/medialib/mlib_sys.c
-+++ ../../j2se/src/share/native/sun/awt/medialib/mlib_sys.c
-@@ -15,6 +15,9 @@
- #include <mlib_types.h>
- #include <mlib_sys_proto.h>
- #include "mlib_SysMath.h"
-+#if defined(_ALLBSD_SOURCE)
-+#include <sys/param.h>
-+#endif
- 
- /***************************************************************/
- 
-@@ -72,6 +75,9 @@
-    * alignment. -- from stdlib.h of MS VC++5.0.
-    */
-   return (void *) malloc(size);
-+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
-+  void *ret;
-+  return posix_memalign(&ret, 8, size) ? NULL : ret;
- #elif defined(_ALLBSD_SOURCE)
-   return valloc(size);
- #else
diff --git a/java/jdk15/files/patch-j2se::bin::java_md.c b/java/jdk15/files/patch-j2se::bin::java_md.c
deleted file mode 100644
index 3b8c8a276cfe..000000000000
--- a/java/jdk15/files/patch-j2se::bin::java_md.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- ../../j2se/src/solaris/bin/java_md.c.orig	Fri May 25 21:49:14 2007
-+++ ../../j2se/src/solaris/bin/java_md.c	Wed May 30 17:00:23 2007
-@@ -1060,8 +1060,9 @@
- 
- #if defined(_ALLBSD_SOURCE)
- 
--  uint64_t result;
--  int mib[2], rlen;
-+  unsigned long result;
-+  int mib[2];
-+  size_t rlen;
- 
-   /* fetch sysctl(hw.physmem) value */
-   mib[0] = CTL_HW;
-@@ -1342,10 +1343,11 @@
- 
- #if defined(_ALLBSD_SOURCE)
- 
--  unsigned long result, sys_processors;
--  int mib[2], rlen;
-+  unsigned long sys_processors;
-+  int mib[2], result;
-+  size_t rlen;
- 
--  /* fetch sysctl(hw.physmem) value */
-+  /* fetch sysctl(hw.ncpu) value */
-   mib[0] = CTL_HW;
-   mib[1] = HW_NCPU;
-   rlen = sizeof(result);
-@@ -1354,7 +1356,7 @@
- 	result = 1;
- 
-   if (_launcher_debug) {
--    printf("sysctl(hw.ncpu): %lu\n", result);
-+    printf("sysctl(hw.ncpu): %d\n", result);
-   }
- 
-   sys_processors = result;
-@@ -1635,7 +1637,7 @@
-     while (dp != NULL) {
- 	cp = strchr(dp, (int)':');
- 	if (cp != NULL)
--	    *cp = (char)NULL;
-+	    *cp = '\0';
- 	if ((target = ProcessDir(info, dp)) != NULL)
- 	    break;
- 	dp = cp;
diff --git a/java/jdk15/files/patch-j2se::hpi::memory_md.c b/java/jdk15/files/patch-j2se::hpi::memory_md.c
deleted file mode 100644
index 3b2b85b2c8bb..000000000000
--- a/java/jdk15/files/patch-j2se::hpi::memory_md.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ../../j2se/src/solaris/hpi/src/memory_md.c
-+++ ../../j2se/src/solaris/hpi/src/memory_md.c
-@@ -32,7 +32,9 @@
- #include <stdlib.h>
- #include <stdio.h>	/* For perror() */
- #include <string.h>
--#if !defined(_ALLBSD_SOURCE)
-+#if defined(_ALLBSD_SOURCE)
-+#include <sys/param.h>
-+#else
- #include <malloc.h>
- #endif
- 
-@@ -67,7 +69,16 @@
- static size_t memGrainSize;	/* A page for Linux */
- #elif defined(_ALLBSD_SOURCE)
- static size_t memGrainSize;	/* A page for FreeBSD */
-+#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
- #else
- static unsigned int memGrainSize;	/* A page for Solaris */
- #endif
diff --git a/java/jdk15/files/patch-j2se::sound::HAE_API_BSDOS.c b/java/jdk15/files/patch-j2se::sound::HAE_API_BSDOS.c
deleted file mode 100644
index 44d92bdc4725..000000000000
--- a/java/jdk15/files/patch-j2se::sound::HAE_API_BSDOS.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
-+++ ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
-@@ -42,6 +42,7 @@
- #include <errno.h>
- 
- #ifdef __FreeBSD__
-+#include <sys/param.h>
- #include <sys/soundcard.h>
- #endif
- #if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -67,7 +68,16 @@
- #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_BSD_FRAMES_PER_BLOCK		8
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index bb7a93748c41..2cdd197e7074 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -1,373 +1,373 @@
 # New ports collection makefile for:	jdk15
 # Date created:				12 January 2005
 # Whom:					Alexey Zelkin <phantom@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION}
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://download.java.net/tiger/
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
 #		 http://java.sun.com/javase/downloads/index.jsp
 DISTFILES=	${JRL_SRCFILE} ${JRL_BINFILE} ${PATCHSETFILE}
 EXTRACT_ONLY=	${JRL_SRCFILE} ${JRL_BINFILE}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Java Development Kit 1.5.0
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 OPTIONS=	DEBUG	"Enable debugging support"	off \
 		IPV6	"Enable IPv6 support"		off
 .if ${MACHINE_ARCH} == "amd64"
 WITHOUT_WEB=	yes
 .else
 OPTIONS+=	WEB	"Enable the browser plugin and Java Web Start"	on
 .endif
 OPTIONS+=	POLICY	"Install the Unlimited Strength Policy Files"	off \
 		TZUPDATE	"Update the time zone data"		on \
 		JAIL	"Port is being built within a jail"		off
 
 WANT_GNOME=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES+=	pkg-install \
 		pkg-deinstall
 SUB_LIST+=	JRE_HOME=${PREFIX}/jdk${JDK_VERSION}/jre \
 		ARCH=${MACHINE_ARCH}
 
 WRKSRC=		${WRKDIR}/control/make
 
 USE_ZIP=	YES
 
 JRL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar
 JRL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE_VERSION}-fcs-bin-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
 TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 
 JDK_VERSION=	1.5.0
-JDK_UPDATE_VERSION=	11
-JDK_PATCHSET_VERSION=	5
-JDK_BUILD_NUMBER=	03
-JDK_BUILD_DATE=		15_dec_2006
+JDK_UPDATE_VERSION=	12
+JDK_PATCHSET_VERSION=	6
+JDK_BUILD_NUMBER=	04
+JDK_BUILD_DATE=		02_may_2007
 LATEST_LINK=	jdk15
 
 TZUPDATE_VERSION=	1.2.1
 TZUPDATE_TZVERSION=	2007f
 
 SUN_LINUX_JDK_VERSION=	1.5.0
 
 .if !defined(WITH_LINUX_BOOTSTRAP)
 NATIVE_BOOTSTRAP_JDKS+=	${LOCALBASE}/diablo-jdk1.5.0 \
 			${LOCALBASE}/jdk1.5.0 \
 			${LOCALBASE}/jdk1.4.2
 .endif
 
 LINUX_BOOTSTRAP_JDKS=	${LOCALBASE}/linux-sun-jdk1.5.0 \
 			${LOCALBASE}/linux-sun-jdk1.4.2
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IPV6)
 CATEGORIES+=	ipv6
 .endif
 
 .if defined(WITH_POLICY)
 DISTFILES+=	${POLICYFILE}
 EXTRACT_ONLY+=	${POLICYFILE}
 .endif
 
 .if defined(WITH_TZUPDATE)
 DISTFILES+=	${TZUPDATEFILE}
 EXTRACT_ONLY+=	${TZUPDATEFILE}
 .endif
 
 # do we have valid native jdk installed?
 .if !defined(WITH_LINUX_BOOTSTRAP)
 .for CJDK in ${NATIVE_BOOTSTRAP_JDKS}
 .  if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac)
 BOOTSTRAPJDKDIR=	${CJDK}
 .  endif
 .endfor
 .endif
 
 # do we have valid linux jdk installed?
 .if !defined(BOOTSTRAPJDKDIR)
 .for CJDK in ${LINUX_BOOTSTRAP_JDKS}
 .  if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac)
 BOOTSTRAPJDKDIR=	${CJDK}
 WITH_LINUX_BOOTSTRAP=	YES
 .  endif
 .endfor
 .endif
 
 # if no valid jdk found, set dependency
 .if !defined(BOOTSTRAPJDKDIR)
 BOOTSTRAPJDKDIR?=	${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION}
 .endif
 
 BUILD_DEPENDS+=	${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk15
 
 .if defined(WITHOUT_WEB)
 MAKE_ENV+=	DONT_BUILD_DEPLOY="YES"
 .else
 USE_GNOME=	desktopfileutils
 LIB_DEPENDS=    nspr4.1:$(PORTSDIR)/devel/nspr
 .endif
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	YES
 USE_ICONV=	YES
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 
 MAKE_ENV+=	ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \
 		ALT_MOTIF_DIR="${X11BASE}" \
 		SYS_CFLAGS="${CFLAGS}" \
 		LANG="C" \
 		JAVA_HOME="" \
 		CLASSPATH="" \
 		LD_LIBRARY_PATH="" \
 		MAKEFLAGS="" \
 		SKIP_COMPARE_IMAGES="YES"
 .if !defined(WITH_IPV6)
 MAKE_ENV+=	DONT_ENABLE_IPV6="YES"
 .endif
 .if defined(HOTSPOT_BUILD_JOBS)
 MAKE_ENV+=	HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS}
 .endif
 
 ALL_TARGET=	all
 
 PLIST_FILES=	jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \
 		jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile
 .if !defined(WITHOUT_WEB)
 PLIST_FILES+=	share/applications/sun_java15.desktop
 .endif
 PLIST_DIRS=	jdk${JDK_VERSION}/jre/.systemPrefs
 
 .if (${ARCH} == amd64)
 HOTSPOTARCH=amd64
 .else
 HOTSPOTARCH=i586
 .endif
 
 JDKIMAGEDIR=	${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image
 JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image
 
 LOCAL_FILES=	../../hotspot/src/os/bsd/vm/os_bsd.cpp
 PTHREAD_FILES=	../../hotspot/build/bsd/makefiles/vm.make \
 		../../j2se/make/com/sun/java/pack/Makefile \
 		../../j2se/make/common/Defs.gmk \
 		../../j2se/make/common/Defs-bsd.gmk \
 		../../j2se/make/common/Program.gmk \
 		../../j2se/make/java/hpi/native/Makefile \
 		../../j2se/make/java/net/Makefile \
 		../../j2se/make/java/nio/Makefile \
 		../../j2se/make/jpda/transport/socket/Makefile \
 		../../j2se/make/sun/cmm/Makefile \
 		../../j2se/make/sun/xawt/Makefile
 X11_FILES=	../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java \
 		../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
 		../../j2se/src/solaris/native/sun/awt/fontpath.c
 
 # Check for JDK sources and patch file
 .if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Due to licensing restrictions, certain files must be fetched manually.\n\n
 .if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE})#{
 IGNORE += Please open http://download.java.net/tiger/archive/tiger_u${JDK_UPDATE_VERSION}/index.csp\n\
 in a web browser.  Download the\n
 .if !exists(${DISTDIR}/${JRL_SRCFILE})#{
 IGNORE += Update ${JDK_UPDATE_VERSION} Source, ${JRL_SRCFILE}
 .endif#}
 .if !exists(${DISTDIR}/${JRL_BINFILE})#{
 .if !exists(${DISTDIR}/${JRL_SRCFILE})#{
 IGNORE += and the\n
 .endif#}
 IGNORE += Source Binaries, ${JRL_BINFILE}
 .endif#}
 IGNORE += .\n\n
 .endif#}
 .if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
 IGNORE += Please open http://java.sun.com/javase/downloads/index_jdk5.jsp\n\
 in a web browser and follow the \"Download\" link for\n\
 \"Other Downloads\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
 .endif#}
 .if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{
 IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
 in a web browser and follow the \"Download\" link for\n\
 \"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
 time zone update file, ${TZUPDATEFILE}.\n\n
 .endif#}
 .if !exists(${DISTDIR}/${PATCHSETFILE})#{
 IGNORE += Please download the patchset, ${PATCHSETFILE}, from\n\
 http://www.eyesbeyond.com/freebsddom/java/jdk15.html.\n\n
 .endif#}
 IGNORE += Please place the downloaded file(s) in ${DISTDIR}
 IGNORE += \n and restart the build.\n\n
 .endif#}
 
 pre-fetch:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have at least"
 	@${ECHO_MSG} "2.5Gb of free disk space in build area!"
 	@${ECHO_MSG}
 .if defined(WITH_LINUX_BOOTSTRAP)
 	@${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have linux emulation"
 	@${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem"
 	@${ECHO_MSG} "mounted."
 	@${ECHO_MSG}
 .endif
 
 # Get JRL agreement
 .if !defined(PACKAGE_BUILDING)
 pre-extract:
 	${SH} ${FILESDIR}/pkg-install.in ${PKGNAME} PRE-INSTALL
 .endif
 
 # Extract the files
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@${CC} ${CFLAGS} -o ${WRKDIR}/x_x2zip ${FILESDIR}/x_x2zip.c
 	@for file in ${EXTRACT_ONLY}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} "${DISTDIR}/$$file" ${EXTRACT_AFTER_ARGS}); \
 		then \
 			exit 1; \
 		fi; \
 		if [ `basename $$file .jar` != $$file ]; \
 		then \
 			if ! (cd ${WRKDIR} && ${WRKDIR}/x_x2zip 'YES I ACCEPT THE CLICK THROUGH LICENSE.  ' X_X && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/X_X.zip ${EXTRACT_AFTER_ARGS}); \
 			then \
 				exit 1; \
 			fi; \
 		fi \
 	done
 
 pre-patch:
 	@cd ${WRKDIR} &&  \
 		${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
 		${CHMOD} -R u+w * && \
 		${PATCH} -p0 < ${WRKDIR}/jdk15.patches
 
 post-patch:
 	@for file in ${LOCAL_FILES}; do \
 		${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
 			${WRKSRC}/$${file}; \
 	done
 	@for file in ${PTHREAD_FILES}; do \
 		${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \
 			${WRKSRC}/$${file}; \
 	done
 	@for file in ${X11_FILES}; do \
 		${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \
 			${WRKSRC}/$${file}; \
 	done
 	${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
 		-e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\
 		${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop
 
 .if defined(WITH_LINUX_BOOTSTRAP)
 pre-build:
 	@if [ "$${WRKDIRPREFIX}" -a \
 	     -L "/compat/linux/$${WRKDIRPREFIX}" -a \
 	     x`${LS} -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \
 	then \
 		${ECHO_MSG} "Please set WRKDIRPREFIX to something which doesn't"; \
 		${ECHO_MSG} "have a matching symbolic link in /compat/linux."; \
 		${ECHO_MSG} "This is known to cause problems during bootstrapping."; \
 		exit 1; \
 	fi
 	@if [ `/sbin/sysctl -n compat.linux.osname` != "Linux" ]; \
 	then \
 		${ECHO_MSG} "Please set the value of the sysctl compat.linux.osname"; \
 		${ECHO_MSG} "to 'Linux' with the command:"; \
 		${ECHO_MSG} "	/sbin/sysctl compat.linux.osname=Linux"; \
 		${ECHO_MSG} "Having it set to other values, such as 'FreeBSD',"; \
 		${ECHO_MSG} "is known to cause problems during bootstrapping."; \
 		exit 1; \
 	fi
 .if !defined(WITH_JAIL)#{
 	@if [ "`/sbin/mount | grep ^linprocfs`" = "" ]; \
 	then \
 		${ECHO_MSG} "ERROR: You must have LINPROCFS mounted before" ; \
 		${ECHO_MSG} "starting to build the native JDK 1.5.0." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "You may do it with the following commands:" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "# kldload linprocfs" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "and" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "# mount -t linprocfs linprocfs /compat/linux/proc" ; \
 		${ECHO_MSG} "" ; \
 		exit 1 ; \
 	fi
 .endif#}
 .endif
 
 do-build:
 	# Start of jdk build
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-build:
 	@# XXX don't install japanese manpages
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP
 .if defined(WITH_TZUPDATE)
 	@# Update time zones
 	@-${JDKIMAGEDIR}/bin/java -jar \
-		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
+		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
 	@-${RM} -rf ${JDKIMAGEDIR}/jre/lib/zi.tzdata*
 .endif
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
 	cd ${JDKIMAGEDIR} && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .if !defined(WITHOUT_WEB)
 	${INSTALL_DATA} ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop \
 		${PREFIX}/share/applications/sun_java15.desktop
 .endif
 	@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST}
 	@${FIND} -s ${JDKIMAGEDIR} -not -type d | \
 	  ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST}
 .if !defined(WITHOUT_WEB)
 	@${ECHO_MSG} '@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
 .endif
 .if defined(WITH_DEBUG)
 	cd ${JDKIMAGEDIR_G} && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 	@${FIND} -s ${JDKIMAGEDIR_G} -not -type d | \
 	  ${SED} -ne 's#^${JDKIMAGEDIR_G}#jdk${JDK_VERSION}#p' >> ${TMPPLIST}
 .endif
 	${INSTALL_DATA} ${FILESDIR}/cacerts \
 	  ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
 .if defined(WITH_POLICY)
 	${INSTALL_DATA} ${WRKDIR}/jce/*.jar ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security
 .endif
 	@${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \
 	  ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST}
 	@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST}
 .if !defined(WITHOUT_WEB)
 	@${ECHO_MSG} '@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
 .endif
 
 # XXX: put unregistervm into install script ?
 post-install:
 	@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
 .if !defined(WITHOUT_WEB)
 	@-update-desktop-database
 .endif
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index 3835cd69417f..a5bc1572c69c 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -1,15 +1,15 @@
-MD5 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = e6661cce9c94009e2fa909a151c0160c
-SHA256 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = f2dd285070a1c4d71077cbc28420e39628fc577ac4fb02e8617ebffeab8120eb
-SIZE (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = 57703958
-MD5 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 7c952fba37101c154f1636dc401aa093
-SHA256 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = c5cd6d195c1cb213546cd598da0c6d5295e1cf5fd5748e924628035b45874780
-SIZE (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 2211688
-MD5 (bsd-jdk15-patches-5.tar.bz2) = bc6339e072fabb20097eebbec0e5060f
-SHA256 (bsd-jdk15-patches-5.tar.bz2) = b996f0bc530e2c21c83598e5b3e2f86a264d50d755cb5037ee5cc38a88be9993
-SIZE (bsd-jdk15-patches-5.tar.bz2) = 772184
+MD5 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = deb204740d2f8a799ba8658c8c768ebe
+SHA256 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 8b93abe500d58a9b2d766ded6f9041e8bc457b785e6751e0e3d1d8308ed23a3f
+SIZE (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 57752561
+MD5 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 80996fbf2db79d9fa4a75e17bc1f6551
+SHA256 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 886c57a62f6691954269a84d4cd0a32c8d61eb4e04c4028933e0e9bfae2cf999
+SIZE (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 2211514
+MD5 (bsd-jdk15-patches-6.tar.bz2) = 9277d3624b9879583c1dc74c798321e2
+SHA256 (bsd-jdk15-patches-6.tar.bz2) = 6f9c225db85f63a0b9c41f0eab50c3e3394dbe163f6cc8d936f2afe76010cdd1
+SIZE (bsd-jdk15-patches-6.tar.bz2) = 777561
 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 SIZE (jce_policy-1_5_0.zip) = 8826
 MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
 SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
 SIZE (tzupdater-1_2_1-2007f.zip) = 258198
diff --git a/java/jdk16/files/patch-hotspot::bsd_i486::vm::os_bsd_i486.cpp b/java/jdk16/files/patch-hotspot::bsd_i486::vm::os_bsd_i486.cpp
deleted file mode 100644
index aba5bec91b3c..000000000000
--- a/java/jdk16/files/patch-hotspot::bsd_i486::vm::os_bsd_i486.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig	Thu May 24 15:27:43 2007
-+++ ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp	Thu May 24 19:54:47 2007
-@@ -238,15 +238,15 @@
-   // success, if not we return failure and the caller can retry.
-   // 
-   _result = false;
--  if (uc->context_eip == (int)_old_addr.pc() ) {
--    uc->context_eip = (int)_new_addr.pc();
-+  if (uc->context_eip == (intptr_t)_old_addr.pc() ) {
-+    uc->context_eip = (intptr_t)_new_addr.pc();
-     _result = true;
- #ifndef __OpenBSD__
-   } else if (uc->uc_link != NULL) {
-     // Check (and validate) one level of stacked ucontext
-     ucontext_t* linked_uc = uc->uc_link;
--    if (os::Bsd::valid_ucontext(thread, uc, linked_uc) && linked_uc->context_eip == (int)_old_addr.pc()) {
--      linked_uc->context_eip = (int)_new_addr.pc();
-+    if (os::Bsd::valid_ucontext(thread, uc, linked_uc) && linked_uc->context_eip == (intptr_t)_old_addr.pc()) {
-+      linked_uc->context_eip = (intptr_t)_new_addr.pc();
-       _result = true;
-     }
-   }
diff --git a/java/jdk16/files/patch-hotspot::i486::vm::i486.ad b/java/jdk16/files/patch-hotspot::i486::vm::i486.ad
deleted file mode 100644
index e0d91e628a78..000000000000
--- a/java/jdk16/files/patch-hotspot::i486::vm::i486.ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../../hotspot/src/cpu/i486/vm/i486.ad.orig	Thu May 24 15:27:42 2007
-+++ ../../hotspot/src/cpu/i486/vm/i486.ad	Thu May 24 19:47:30 2007
-@@ -383,8 +383,9 @@
- void emit_d32_reloc(CodeBuffer &cbuf, int d32, RelocationHolder const& rspec, 
-         int format) {
- #ifdef ASSERT
--  if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
--    assert(oop(d32)->is_oop() && oop(d32)->is_perm(), "cannot embed non-perm oops in code");
-+  if (rspec.reloc()->type() == relocInfo::oop_type &&
-+      d32 != 0 && d32 != (intptr_t)Universe::non_oop_word()) {
-+    assert(oop((intptr_t)d32)->is_oop() && oop((intptr_t)d32)->is_perm(), "cannot embed non-perm oops in code");
-   }
- #endif
-   cbuf.relocate(cbuf.mark(), rspec, format);
diff --git a/java/jdk16/files/patch-hotspot::i486::vm::register_i486.hpp b/java/jdk16/files/patch-hotspot::i486::vm::register_i486.hpp
deleted file mode 100644
index c033d064c7a6..000000000000
--- a/java/jdk16/files/patch-hotspot::i486::vm::register_i486.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../../hotspot/src/cpu/i486/vm/register_i486.hpp.orig	Thu May 24 15:27:42 2007
-+++ ../../hotspot/src/cpu/i486/vm/register_i486.hpp	Thu May 24 19:51:43 2007
-@@ -24,9 +24,9 @@
-   static Register as_Register(int encoding)      { return (Register)encoding; }
- 
-   // accessors
--  int   encoding() const                         { assert(is_valid(), "invalid register"); return (int)this; }
--  bool  is_valid() const                         { return 0 <= (int)this && (int)this < number_of_registers; }
--  bool  has_byte_register() const                { return 0 <= (int)this && (int)this < number_of_byte_registers; }
-+  int   encoding() const                         { assert(is_valid(), "invalid register"); return value(); }
-+  bool  is_valid() const                         { return 0 <= value() && value() < number_of_registers; }
-+  bool  has_byte_register() const                { return 0 <= value() && value() < number_of_byte_registers; }
-   const char* name() const;
- };
- 
-@@ -74,8 +74,8 @@
-   friend XMMRegister as_XMMRegister(int encoding) { return (XMMRegister)encoding; }
- 
-   // accessors
--  int   encoding() const                          { assert(is_valid(), "invalid register"); return (int)this; }
--  bool  is_valid() const                          { return 0 <= (int)this && (int)this < number_of_registers; }
-+  int   encoding() const                          { assert(is_valid(), "invalid register"); return value(); }
-+  bool  is_valid() const                          { return 0 <= value() && value() < number_of_registers; }
-   const char* name() const;
- };
- 
diff --git a/java/jdk16/files/patch-j2se::awt::mlib_sys.c b/java/jdk16/files/patch-j2se::awt::mlib_sys.c
deleted file mode 100644
index 6f8d8f809011..000000000000
--- a/java/jdk16/files/patch-j2se::awt::mlib_sys.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../../j2se/src/share/native/sun/awt/medialib/mlib_sys.c
-+++ ../../j2se/src/share/native/sun/awt/medialib/mlib_sys.c
-@@ -15,6 +15,9 @@
- #include <mlib_types.h>
- #include <mlib_sys_proto.h>
- #include "mlib_SysMath.h"
-+#if defined(_ALLBSD_SOURCE)
-+#include <sys/param.h>
-+#endif
- 
- /***************************************************************/
- 
-@@ -72,6 +75,9 @@
-    * alignment. -- from stdlib.h of MS VC++5.0.
-    */
-   return (void *) malloc(size);
-+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
-+  void *ret;
-+  return posix_memalign(&ret, 8, size) ? NULL : ret;
- #elif defined(_ALLBSD_SOURCE)
-   return valloc(size);
- #else
diff --git a/java/jdk16/files/patch-j2se::bin::java_md.c b/java/jdk16/files/patch-j2se::bin::java_md.c
deleted file mode 100644
index 3b8c8a276cfe..000000000000
--- a/java/jdk16/files/patch-j2se::bin::java_md.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- ../../j2se/src/solaris/bin/java_md.c.orig	Fri May 25 21:49:14 2007
-+++ ../../j2se/src/solaris/bin/java_md.c	Wed May 30 17:00:23 2007
-@@ -1060,8 +1060,9 @@
- 
- #if defined(_ALLBSD_SOURCE)
- 
--  uint64_t result;
--  int mib[2], rlen;
-+  unsigned long result;
-+  int mib[2];
-+  size_t rlen;
- 
-   /* fetch sysctl(hw.physmem) value */
-   mib[0] = CTL_HW;
-@@ -1342,10 +1343,11 @@
- 
- #if defined(_ALLBSD_SOURCE)
- 
--  unsigned long result, sys_processors;
--  int mib[2], rlen;
-+  unsigned long sys_processors;
-+  int mib[2], result;
-+  size_t rlen;
- 
--  /* fetch sysctl(hw.physmem) value */
-+  /* fetch sysctl(hw.ncpu) value */
-   mib[0] = CTL_HW;
-   mib[1] = HW_NCPU;
-   rlen = sizeof(result);
-@@ -1354,7 +1356,7 @@
- 	result = 1;
- 
-   if (_launcher_debug) {
--    printf("sysctl(hw.ncpu): %lu\n", result);
-+    printf("sysctl(hw.ncpu): %d\n", result);
-   }
- 
-   sys_processors = result;
-@@ -1635,7 +1637,7 @@
-     while (dp != NULL) {
- 	cp = strchr(dp, (int)':');
- 	if (cp != NULL)
--	    *cp = (char)NULL;
-+	    *cp = '\0';
- 	if ((target = ProcessDir(info, dp)) != NULL)
- 	    break;
- 	dp = cp;
diff --git a/java/jdk16/files/patch-j2se::hpi::memory_md.c b/java/jdk16/files/patch-j2se::hpi::memory_md.c
deleted file mode 100644
index 3b2b85b2c8bb..000000000000
--- a/java/jdk16/files/patch-j2se::hpi::memory_md.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ../../j2se/src/solaris/hpi/src/memory_md.c
-+++ ../../j2se/src/solaris/hpi/src/memory_md.c
-@@ -32,7 +32,9 @@
- #include <stdlib.h>
- #include <stdio.h>	/* For perror() */
- #include <string.h>
--#if !defined(_ALLBSD_SOURCE)
-+#if defined(_ALLBSD_SOURCE)
-+#include <sys/param.h>
-+#else
- #include <malloc.h>
- #endif
- 
-@@ -67,7 +69,16 @@
- static size_t memGrainSize;	/* A page for Linux */
- #elif defined(_ALLBSD_SOURCE)
- static size_t memGrainSize;	/* A page for FreeBSD */
-+#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
- #else
- static unsigned int memGrainSize;	/* A page for Solaris */
- #endif
diff --git a/java/jdk16/files/patch-j2se::sound::HAE_API_BSDOS.c b/java/jdk16/files/patch-j2se::sound::HAE_API_BSDOS.c
deleted file mode 100644
index 44d92bdc4725..000000000000
--- a/java/jdk16/files/patch-j2se::sound::HAE_API_BSDOS.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
-+++ ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
-@@ -42,6 +42,7 @@
- #include <errno.h>
- 
- #ifdef __FreeBSD__
-+#include <sys/param.h>
- #include <sys/soundcard.h>
- #endif
- #if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -67,7 +68,16 @@
- #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_BSD_FRAMES_PER_BLOCK		8