Index: head/java/bootstrap-openjdk/Makefile
===================================================================
--- head/java/bootstrap-openjdk/Makefile	(revision 316634)
+++ head/java/bootstrap-openjdk/Makefile	(revision 316635)
@@ -1,60 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	${JDK_NAME}
 PORTVERSION=	${DISTVERSION_${ARCH}}
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://people.freebsd.org/~jkim/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkim
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${ARCH}-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Oracle's Java 6 virtual machine release under the GPL v2
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
 
 ONLY_FOR_ARCH=	amd64 i386
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
-DISTVERSION_amd64=	r306764
-DISTVERSION_i386=	r306764
+DISTVERSION_amd64=	r316538
+DISTVERSION_i386=	r316538
 
 JDK_NAME=	openjdk
 JDK_PORT=	openjdk6
 JDK_ROOT=	bootstrap-${JDK_NAME}
 
 NO_BUILD=	yes
 PLIST_SUB=	ARCH=${ARCH} JDK_NAME=${JDK_NAME} JDK_ROOT=${JDK_ROOT}
 USE_XZ=		yes
 WRKSRC=		${WRKDIR}/${JDK_ROOT}
 
 INSTALLDIR=	${PREFIX}/${JDK_ROOT}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800105
-RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libz.so.4:${PORTSDIR}/misc/compat7x
+.if ${OSVERSION} >= 900010
+RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libz.so.5:${PORTSDIR}/misc/compat8x
 .endif
 
 .if ${ARCH} == "i386"
 PLIST_SUB+=	CLIENTVM=""
 .else
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
 	@${CHOWN} ${BINOWN}:${BINGRP} ${INSTALLDIR}/bin/* ${INSTALLDIR}/jre/bin/*
 	@${CHMOD} ${BINMODE} ${INSTALLDIR}/bin/* ${INSTALLDIR}/jre/bin/*
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 update:
 	@${MAKE} -f ${.CURDIR}/Makefile.update \
 	    JDK_NAME=${JDK_NAME} JDK_PORT=${JDK_PORT} JDK_ROOT=${JDK_ROOT}
 
 .include <bsd.port.post.mk>
Index: head/java/bootstrap-openjdk/Makefile.update
===================================================================
--- head/java/bootstrap-openjdk/Makefile.update	(revision 316634)
+++ head/java/bootstrap-openjdk/Makefile.update	(revision 316635)
@@ -1,85 +1,85 @@
 # $FreeBSD$
 
 JDK_NAME?=	openjdk
 JDK_PORT?=	openjdk6
 JDK_ROOT?=	bootstrap-${JDK_NAME}
-TARGET_OS?=	7
+TARGET_OS?=	8
 
 .if !defined(PORTSDIR)
 .if exists(${.CURDIR}/../${JDK_PORT}/Makefile)
 PORTSDIR=	${.CURDIR}/../..
 .else
 PORTSDIR=	/usr/ports
 .endif
 .endif
 
 LOCALBASE?=	/usr/local
 
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
 JDK_PORTDIR!=	${REALPATH} ${PORTSDIR}/java/${JDK_PORT}
 JDK_IMAGEDIR?=	${JDK_PORTDIR}/work/build/bsd-${ARCH:S/i386/i586/}/j2sdk-image
 
 GET_REVISION=	${LOCALBASE}/bin/svnversion ${JDK_PORTDIR}
 TAR?=		/usr/bin/tar
 
 .if !defined(ARCH)
 ARCH!=		${UNAME} -p
 .endif
 BUILD_OS!=	${UNAME} -r | ${SED} -e 's/\..*//'
 PORTREVISION!=	${GET_REVISION} 2>/dev/null || ${TRUE}
 
 DISTDIR?=	${.CURDIR}
 DISTFILE=	${JDK_PORT}-${ARCH}-r${PORTREVISION}.tar.xz
 DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
 MAKEFILE=	${.CURDIR}/Makefile
 PLIST?=		${.CURDIR}/pkg-plist
 PLIST_SUB=	ARCH="${ARCH}" JDK_ROOT="."
 
 .if ${ARCH} == "i386"
 PLIST_SUB+=	CLIENTVM=""
 .else
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
 all:
 	@${ECHO} ""
 	@${ECHO} "=============================================================="
 	@${ECHO} ""
 .if ${BUILD_OS} > ${TARGET_OS}
 	@${ECHO} "We need FreeBSD ${TARGET_OS} but you seem to have ${BUILD_OS}."
 	@${ECHO} ""
 	@${ECHO} "=============================================================="
 	@${ECHO} ""
 	@${FALSE}
 .endif
 	@${ECHO} "Building ${DISTFILE}...."
 	@${ECHO} ""
 	@${ECHO} "Started at "`${SETENV} LANG=C date -u`"."
 	@${ECHO} ""
 	@${ECHO} "=============================================================="
 	@${ECHO} ""
 .if !defined(NO_BUILD)
 	@${SETENV} -i PATH=${PATH} ${MAKE} -C "${JDK_PORTDIR}" BATCH=yes
 .endif
 	@cd "${JDK_IMAGEDIR}" && \
 	${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | \
 	${GREP} -v ^@ | ${TAR} -c -f - -T - -s '|^\./|${JDK_ROOT}/|' | \
 	${XZ_CMD} -9 -c > "${DISTDIR}/${DISTFILE}"
 	@${SED} -i.bak \
 	    's/^DISTVERSION_${ARCH}=.*/DISTVERSION_${ARCH}=	r${PORTREVISION}/' \
 	    "${MAKEFILE}"
 	@${MAKE} -f "${MAKEFILE}" makesum DISTDIR="${DISTDIR}" \
 	    DISTINFO_FILE="${DISTINFO_FILE}"
 	@${ECHO} ""
 	@${ECHO} "=============================================================="
 	@${ECHO} ""
 	@${ECHO} "${DISTFILE} was built successfully!"
 	@${ECHO} ""
 	@${ECHO} "Finished at "`${SETENV} LANG=C date -u`"."
 	@${ECHO} ""
 	@${ECHO} "You may clean up the build directory if everything looks okay,"
 	@${ECHO} "e.g., 'rm -fr ${JDK_PORTDIR}/work'."
 	@${ECHO} ""
 	@${ECHO} "=============================================================="
 	@${ECHO} ""
Index: head/java/bootstrap-openjdk/distinfo.amd64
===================================================================
--- head/java/bootstrap-openjdk/distinfo.amd64	(revision 316634)
+++ head/java/bootstrap-openjdk/distinfo.amd64	(revision 316635)
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-amd64-r306764.tar.xz) = decad8643a3b3563cd95fc25421f7f30fa4014fab503cc887457647b7209edb8
-SIZE (openjdk6-amd64-r306764.tar.xz) = 22044216
+SHA256 (openjdk6-amd64-r316538.tar.xz) = 36dfec9038af3d15ab2675f08ee7b7d6eccdfd9bc7e9e9dd861c515fa0e3a6e7
+SIZE (openjdk6-amd64-r316538.tar.xz) = 22158940
Index: head/java/bootstrap-openjdk/distinfo.i386
===================================================================
--- head/java/bootstrap-openjdk/distinfo.i386	(revision 316634)
+++ head/java/bootstrap-openjdk/distinfo.i386	(revision 316635)
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-i386-r306764.tar.xz) = 89c1794e9336262e86cac01c6398e544c0f5006292a1cdb9b01c528b8ec1ef17
-SIZE (openjdk6-i386-r306764.tar.xz) = 22372236
+SHA256 (openjdk6-i386-r316538.tar.xz) = 4caa6ca8a19661e6f8c50afbf846e59cc6655e6d7b76cd32e1b82827a43756a0
+SIZE (openjdk6-i386-r316538.tar.xz) = 22428812