- Update to r306764.

- Generate distfiles directly from pkg-plist.  This list was compiled from
running "ktrace -i -tn make" on openjdk6 and openjdk7 ports.
- Re-add jre/bin/java to work around a bug in openjdk7 build infrastructure.
It is not really necessary but langtools fails to build without it because
langtools/make/tools/GenStubs/GenStubs.java executes it based on java.home
property, which points to jre subdirectory.  Note this problem only exists
on recent jdk7 langtools and jdk6 and jdk8 are not affected.

Feature safe:	yes

5 files changed, 34 insertions, 120 deletions

diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index 38f13d22dcb6..517a3c12a8d6 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -2,9 +2,9 @@
 
 PORTNAME=	${JDK_NAME}
 PORTVERSION=	${DISTVERSION_${ARCH}}
-PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://people.freebsd.org/~jkim/
 MASTER_SITE_SUBDIR=	jkim
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${ARCH}-${PORTVERSION}
@@ -14,15 +14,13 @@ COMMENT=	Oracle's Java 6 virtual machine release under the GPL v2
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/registervm:${PORTSDIR}/java/javavmwrapper
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+RUN_DEPENDS=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
 
 ONLY_FOR_ARCH=	amd64 i386
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
-DISTVERSION_amd64=	r306294
-DISTVERSION_i386=	r306294
+DISTVERSION_amd64=	r306764
+DISTVERSION_i386=	r306764
 
 JDK_NAME=	openjdk
 JDK_PORT=	openjdk6
@@ -49,13 +47,10 @@ PLIST_SUB+=	CLIENTVM="@comment "
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
-	@${CHOWN} ${BINOWN}:${BINGRP} ${INSTALLDIR}/bin/*
-	@${CHMOD} ${BINMODE} ${INSTALLDIR}/bin/*
-	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # Bootstrap JDK'" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
+	@${CHOWN} ${BINOWN}:${BINGRP} ${INSTALLDIR}/bin/* ${INSTALLDIR}/jre/bin/*
+	@${CHMOD} ${BINMODE} ${INSTALLDIR}/bin/* ${INSTALLDIR}/jre/bin/*
 
 post-install:
-	@${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # Bootstrap JDK'
 	@${CAT} ${PKGMESSAGE}
 
 update:
diff --git a/java/bootstrap-openjdk/Makefile.update b/java/bootstrap-openjdk/Makefile.update
index c675e09dd142..16dd09936ff3 100644
--- a/java/bootstrap-openjdk/Makefile.update
+++ b/java/bootstrap-openjdk/Makefile.update
@@ -17,8 +17,6 @@ LOCALBASE?=	/usr/local
 
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
-JDK_EXCLUDE?=	demo im images java-rmi.cgi jexec jre/bin man management \
-		native_threads sample src.zip
 JDK_PORTDIR!=	${REALPATH} ${PORTSDIR}/java/${JDK_PORT}
 JDK_IMAGEDIR?=	${JDK_PORTDIR}/work/build/bsd-${ARCH:S/i386/i586/}/j2sdk-image
 
@@ -35,12 +33,13 @@ 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="."
 
-TAR_EXCLUDE=
-.if !empty(JDK_EXCLUDE)
-.for i in ${JDK_EXCLUDE}
-TAR_EXCLUDE+=	--exclude ${i}
-.endfor
+.if ${ARCH} == "i386"
+PLIST_SUB+=	CLIENTVM=""
+.else
+PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
 all:
@@ -64,8 +63,8 @@ all:
 	@${SETENV} -i PATH=${PATH} ${MAKE} -C "${JDK_PORTDIR}" BATCH=yes
 .endif
 	@cd "${JDK_IMAGEDIR}" && \
-	${FIND} . \! -type d | ${SORT} | \
-	${TAR} -c -f - -T - -s '|^\./|${JDK_ROOT}/|' ${TAR_EXCLUDE} | \
+	${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}/' \
diff --git a/java/bootstrap-openjdk/distinfo.amd64 b/java/bootstrap-openjdk/distinfo.amd64
index edcdf5109b09..30a612fca9e1 100644
--- a/java/bootstrap-openjdk/distinfo.amd64
+++ b/java/bootstrap-openjdk/distinfo.amd64
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-amd64-r306294.tar.xz) = 8896fc61ffbb95935cdb23dd743ef12905cfe4e966989b840186afafb57bc9b9
-SIZE (openjdk6-amd64-r306294.tar.xz) = 25140432
+SHA256 (openjdk6-amd64-r306764.tar.xz) = decad8643a3b3563cd95fc25421f7f30fa4014fab503cc887457647b7209edb8
+SIZE (openjdk6-amd64-r306764.tar.xz) = 22044216
diff --git a/java/bootstrap-openjdk/distinfo.i386 b/java/bootstrap-openjdk/distinfo.i386
index 8a0141527c03..1881ed6c8e13 100644
--- a/java/bootstrap-openjdk/distinfo.i386
+++ b/java/bootstrap-openjdk/distinfo.i386
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-i386-r306294.tar.xz) = 591c12ea3f4dce89bd330129af5071de70042c15c83f2d395e276ba6b0700289
-SIZE (openjdk6-i386-r306294.tar.xz) = 25441692
+SHA256 (openjdk6-i386-r306764.tar.xz) = 89c1794e9336262e86cac01c6398e544c0f5006292a1cdb9b01c528b8ec1ef17
+SIZE (openjdk6-i386-r306764.tar.xz) = 22372236
diff --git a/java/bootstrap-openjdk/pkg-plist b/java/bootstrap-openjdk/pkg-plist
index 03c43968d7e3..2114435ce18b 100644
--- a/java/bootstrap-openjdk/pkg-plist
+++ b/java/bootstrap-openjdk/pkg-plist
@@ -1,136 +1,55 @@
 %%JDK_ROOT%%/ASSEMBLY_EXCEPTION
 %%JDK_ROOT%%/LICENSE
 %%JDK_ROOT%%/THIRD_PARTY_README
-%%JDK_ROOT%%/bin/appletviewer
-%%JDK_ROOT%%/bin/apt
-%%JDK_ROOT%%/bin/extcheck
 %%JDK_ROOT%%/bin/idlj
 %%JDK_ROOT%%/bin/jar
-%%JDK_ROOT%%/bin/jarsigner
 %%JDK_ROOT%%/bin/java
 %%JDK_ROOT%%/bin/javac
-%%JDK_ROOT%%/bin/javadoc
 %%JDK_ROOT%%/bin/javah
 %%JDK_ROOT%%/bin/javap
-%%JDK_ROOT%%/bin/jconsole
-%%JDK_ROOT%%/bin/jdb
-%%JDK_ROOT%%/bin/jhat
-%%JDK_ROOT%%/bin/jinfo
-%%JDK_ROOT%%/bin/jmap
-%%JDK_ROOT%%/bin/jps
-%%JDK_ROOT%%/bin/jrunscript
-%%JDK_ROOT%%/bin/jsadebugd
-%%JDK_ROOT%%/bin/jstack
-%%JDK_ROOT%%/bin/jstat
-%%JDK_ROOT%%/bin/jstatd
-%%JDK_ROOT%%/bin/keytool
 %%JDK_ROOT%%/bin/native2ascii
-%%JDK_ROOT%%/bin/orbd
-%%JDK_ROOT%%/bin/pack200
-%%JDK_ROOT%%/bin/policytool
 %%JDK_ROOT%%/bin/rmic
-%%JDK_ROOT%%/bin/rmid
-%%JDK_ROOT%%/bin/rmiregistry
-%%JDK_ROOT%%/bin/schemagen
-%%JDK_ROOT%%/bin/serialver
-%%JDK_ROOT%%/bin/servertool
-%%JDK_ROOT%%/bin/tnameserv
-%%JDK_ROOT%%/bin/unpack200
-%%JDK_ROOT%%/bin/wsgen
-%%JDK_ROOT%%/bin/wsimport
-%%JDK_ROOT%%/bin/xjc
-%%JDK_ROOT%%/include/classfile_constants.h
-%%JDK_ROOT%%/include/freebsd/jawt_md.h
-%%JDK_ROOT%%/include/freebsd/jni_md.h
-%%JDK_ROOT%%/include/jawt.h
-%%JDK_ROOT%%/include/jdwpTransport.h
 %%JDK_ROOT%%/include/jni.h
-%%JDK_ROOT%%/include/jvmti.h
-%%JDK_ROOT%%/include/jvmticmlr.h
+%%JDK_ROOT%%/include/freebsd/jni_md.h
 %%JDK_ROOT%%/jre/ASSEMBLY_EXCEPTION
 %%JDK_ROOT%%/jre/LICENSE
 %%JDK_ROOT%%/jre/THIRD_PARTY_README
-%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/Xusage.txt
-%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/libjsig.so
-%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/libjvm.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/headless/libmawt.so
+%%JDK_ROOT%%/jre/bin/java
+%%JDK_ROOT%%/jre/lib/charsets.jar
+%%JDK_ROOT%%/jre/lib/currency.data
+%%JDK_ROOT%%/jre/lib/fontconfig.bfc
+%%JDK_ROOT%%/jre/lib/jce.jar
+%%JDK_ROOT%%/jre/lib/jsse.jar
+%%JDK_ROOT%%/jre/lib/logging.properties
+%%JDK_ROOT%%/jre/lib/meta-index
+%%JDK_ROOT%%/jre/lib/net.properties
+%%JDK_ROOT%%/jre/lib/resources.jar
+%%JDK_ROOT%%/jre/lib/rt.jar
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/jvm.cfg
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libattach.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libawt.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libdt_socket.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libfontmanager.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libhprof.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libinstrument.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libj2gss.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libj2pcsc.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libj2pkcs11.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjaas_unix.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libjava.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjava_crw_demo.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjawt.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjdwp.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjli.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libjpeg.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjsig.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjsound.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/liblcms.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libmanagement.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libmlib_image.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libnet.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libnio.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libnpt.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/librmi.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libsaproc.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libsplashscreen.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libunpack.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libverify.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libzip.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/server/Xusage.txt
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/server/libjsig.so
+%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/libjvm.so
+%%JDK_ROOT%%/jre/lib/%%ARCH%%/headless/libmawt.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/server/libjvm.so
 %%JDK_ROOT%%/jre/lib/%%ARCH%%/xawt/libmawt.so
-%%JDK_ROOT%%/jre/lib/calendars.properties
-%%JDK_ROOT%%/jre/lib/charsets.jar
-%%JDK_ROOT%%/jre/lib/classlist
-%%JDK_ROOT%%/jre/lib/cmm/CIEXYZ.pf
 %%JDK_ROOT%%/jre/lib/cmm/GRAY.pf
-%%JDK_ROOT%%/jre/lib/cmm/LINEAR_RGB.pf
 %%JDK_ROOT%%/jre/lib/cmm/PYCC.pf
 %%JDK_ROOT%%/jre/lib/cmm/sRGB.pf
-%%JDK_ROOT%%/jre/lib/content-types.properties
-%%JDK_ROOT%%/jre/lib/currency.data
 %%JDK_ROOT%%/jre/lib/ext/dnsns.jar
 %%JDK_ROOT%%/jre/lib/ext/localedata.jar
 %%JDK_ROOT%%/jre/lib/ext/meta-index
 %%JDK_ROOT%%/jre/lib/ext/sunjce_provider.jar
 %%JDK_ROOT%%/jre/lib/ext/sunpkcs11.jar
-%%JDK_ROOT%%/jre/lib/flavormap.properties
-%%JDK_ROOT%%/jre/lib/fontconfig.bfc
-%%JDK_ROOT%%/jre/lib/fontconfig.properties.src
-%%JDK_ROOT%%/jre/lib/jce.jar
-%%JDK_ROOT%%/jre/lib/jsse.jar
-%%JDK_ROOT%%/jre/lib/jvm.hprof.txt
-%%JDK_ROOT%%/jre/lib/logging.properties
-%%JDK_ROOT%%/jre/lib/management-agent.jar
-%%JDK_ROOT%%/jre/lib/meta-index
-%%JDK_ROOT%%/jre/lib/net.properties
-%%JDK_ROOT%%/jre/lib/psfont.properties.ja
-%%JDK_ROOT%%/jre/lib/psfontj2d.properties
-%%JDK_ROOT%%/jre/lib/resources.jar
-%%JDK_ROOT%%/jre/lib/rt.jar
-%%JDK_ROOT%%/jre/lib/security/US_export_policy.jar
-%%JDK_ROOT%%/jre/lib/security/cacerts
-%%JDK_ROOT%%/jre/lib/security/java.policy
 %%JDK_ROOT%%/jre/lib/security/java.security
-%%JDK_ROOT%%/jre/lib/security/local_policy.jar
-%%JDK_ROOT%%/jre/lib/sound.properties
 %%JDK_ROOT%%/jre/lib/zi
 %%JDK_ROOT%%/lib/ct.sym
-%%JDK_ROOT%%/lib/dt.jar
-%%JDK_ROOT%%/lib/ir.idl
-%%JDK_ROOT%%/lib/jconsole.jar
-%%JDK_ROOT%%/lib/orb.idl
-%%JDK_ROOT%%/lib/sa-jdi.jar
 %%JDK_ROOT%%/lib/tools.jar
 @dirrm %%JDK_ROOT%%/lib
 @dirrm %%JDK_ROOT%%/jre/lib/security
@@ -142,6 +61,7 @@
 %%CLIENTVM%%@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/client
 @dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%
 @dirrm %%JDK_ROOT%%/jre/lib
+@dirrm %%JDK_ROOT%%/jre/bin
 @dirrm %%JDK_ROOT%%/jre
 @dirrm %%JDK_ROOT%%/include/freebsd
 @dirrm %%JDK_ROOT%%/include