Update to patch set 6

PR: 34923
Submitted by: Greg Lewis

3 files changed, 207 insertions, 2 deletions

diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index b5397842b58c..b0aa988e1219 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -20,12 +20,17 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		gtar:${PORTSDIR}/archivers/gtar \
 		${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-jdk13 \
 		${X11BASE}/lib/libMrm.a:${PORTSDIR}/x11-toolkits/open-motif-devel
+.if !defined(WITHOUT_PLUGIN)
+RUN_DEPENDS=	glib12.3:$(PORTSDIR)/devel/glib12 \
+		gtk12.3:$(PORTSDIR)/x11-toolkits/gtk12 \
+		nspr4.1:$(PORTSDIR)/devel/nspr
+.endif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 WRKSRC=		${WRKDIR}/j2sdk1.3.1/make
 
 JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	5
+JDK_PATCHSET_VERSION=	6
 
 JDK13DIR?=	${LOCALBASE}/linux-jdk${JDK_VERSION}
 
@@ -39,7 +44,16 @@ MAKE_ENV=	ALT_BOOTDIR="${JDK13DIR}" \
 		CLASSPATH="" \
 		LD_LIBRARY_PATH="" \
 		JAVA_COMPILER=""
+.if !defined(WITHOUT_PLUGIN)
+MAKE_ENV +=	LIBG_HDRS="${LOCALBASE}/include/glib12" \
+		GTK_HDRS="${X11BASE}/include/gtk12" \
+		LIBIDL_HDRS=
+.endif
+.if !defined(WITHOUT_PLUGIN)
+ALL_TARGET=	all plugin images
+.else
 ALL_TARGET=	all images
+.endif
 TAR=		gtar	# Necessary for proper extraction of sources
 BSD_TAR=	/usr/bin/tar
 PLIST_SUB+=	JDK_VERSION=${JDK_VERSION}
@@ -54,6 +68,19 @@ PKGNAMESUFFIX=	-nodebug
 PLIST_SUB+=	DEBUG:=""
 .endif
 
+.if defined(WITH_NATIVE_THREADS)
+PLIST_SUB+=    NATIVE:=""
+MAKE_ARGS+=    HPIS="green native"
+.else
+PLIST_SUB+=    NATIVE:="@comment "
+.endif
+
+.if defined(WITHOUT_PLUGIN)
+PLIST_SUB+=    PLUGIN:="@comment "
+.else
+PLIST_SUB+=    PLUGIN:=""
+.endif
+
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 IGNORE=		"You can not legally distribute pre-compiled binaries"
 .endif
@@ -68,9 +95,16 @@ IGNORE=You must manually fetch the source distribution and FreeBSD patches (${DI
 
 pre-patch:
 	@cd ${WRKDIR} &&  \
+		${CHMOD} -R u+w * && \
 		${MKDIR} -p j2sdk1.3.1/ext/plugin/oji-plugin/include/bsd/jdk12 && \
 		${MKDIR} -p j2sdk1.3.1/ext/plugin/oji-plugin/include/solaris/navig5/private && \
 		${MKDIR} -p j2sdk1.3.1/src/bsd/doc/man && \
+		${MKDIR} -p hotspot1.3.1/build/bsd && \
+		${MKDIR} -p hotspot1.3.1/build/bsd/makefiles && \
+		${MKDIR} -p hotspot1.3.1/build/bsd/package && \
+		${MKDIR} -p hotspot1.3.1/src/os/bsd/launcher && \
+		${MKDIR} -p hotspot1.3.1/src/os/bsd/vm && \
+		${MKDIR} -p hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
 			${PATCH} < ${WRKDIR}/jdk131.patches
 
 .if !defined(NODEBUG)
@@ -92,5 +126,17 @@ do-install:
 
 post-install:
 	${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
+.if !defined(WITHOUT_PLUGIN)
+	@${ECHO_MSG}
+	@${ECHO_MSG} The use the Java plugin with Mozilla you must create a
+	@${ECHO_MSG} symbolic link from
+	@${ECHO_MSG}
+	@${ECHO_MSG} ${PREFIX}/jdk${JDK_VERSION}/jre/plugin/i386/ns600/libjavaplugin_oji.so
+	@${ECHO_MSG}
+	@${ECHO_MSG} to your Mozilla plugins directory, which is usually found at
+	@${ECHO_MSG}
+	@${ECHO_MSG} ${X11BASE}/lib/mozilla/plugins
+	@${ECHO_MSG}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index 83fe691178ed..5817a11c25c5 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -1,2 +1,2 @@
 MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
-MD5 (bsd-jdk131-patches-5.tar.gz) = 7a7ddb0f86f4796fe8b46286d8865dcb
+MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9
diff --git a/java/jdk16/pkg-plist b/java/jdk16/pkg-plist
index fdd0eafe31fb..b4a5055eb820 100644
--- a/java/jdk16/pkg-plist
+++ b/java/jdk16/pkg-plist
@@ -4,6 +4,8 @@ jdk%%JDK_VERSION%%/LICENSE.fr
 jdk%%JDK_VERSION%%/README
 jdk%%JDK_VERSION%%/README.html
 jdk%%JDK_VERSION%%/bin/.java_wrapper
+jdk%%JDK_VERSION%%/bin/ControlPanel
+jdk%%JDK_VERSION%%/bin/HtmlConverter
 jdk%%JDK_VERSION%%/bin/appletviewer
 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/appletviewer_g
 jdk%%JDK_VERSION%%/bin/awt_robot
@@ -22,6 +24,8 @@ jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner
 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/jarsigner_g
 jdk%%JDK_VERSION%%/bin/i386/green_threads/java
 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_g
+%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm
+%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/java_vm_g
 jdk%%JDK_VERSION%%/bin/i386/green_threads/javac
 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/javac_g
 jdk%%JDK_VERSION%%/bin/i386/green_threads/javadoc
@@ -54,6 +58,52 @@ jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver
 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/serialver_g
 jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv
 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/appletviewer_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/extcheck_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/idlj_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jar_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_g
+%%PLUGIN:%%%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm
+%%PLUGIN:%%%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javah_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javap_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jdb_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/keytool_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/native2ascii_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjava_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjavac_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/oldjdb_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/policytool_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmic_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmid_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/rmiregistry_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/serialver_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/tnameserv_g
 jdk%%JDK_VERSION%%/bin/idlj
 %%DEBUG:%%jdk%%JDK_VERSION%%/bin/idlj_g
 jdk%%JDK_VERSION%%/bin/jar
@@ -641,34 +691,90 @@ jdk%%JDK_VERSION%%/include/jvmdi.h
 jdk%%JDK_VERSION%%/include/jvmpi.h
 jdk%%JDK_VERSION%%/jre/CHANGES
 jdk%%JDK_VERSION%%/jre/COPYRIGHT
+jdk%%JDK_VERSION%%/jre/ControlPanel.html
 jdk%%JDK_VERSION%%/jre/LICENSE
 jdk%%JDK_VERSION%%/jre/LICENSE.fr
 jdk%%JDK_VERSION%%/jre/README
 jdk%%JDK_VERSION%%/jre/Welcome.html
 jdk%%JDK_VERSION%%/jre/bin/.java_wrapper
+jdk%%JDK_VERSION%%/jre/bin/ControlPanel
 jdk%%JDK_VERSION%%/jre/bin/awt_robot
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/appletviewer_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/extcheck_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/idlj_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jar_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jarsigner_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_g
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm
+%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/java_vm_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javac_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javadoc_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javah_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/javap_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/jdb_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/keytool_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/native2ascii_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjava_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjavac_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/oldjdb_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/policytool_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmic_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmid_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/rmiregistry_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/serialver_g
 jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv
+%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/appletviewer_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/extcheck_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/idlj_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jar_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jarsigner_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_g
+%%PLUGIN:%%%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm
+%%PLUGIN:%%%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javac_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javadoc_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javah_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javap_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jdb_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/keytool_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/native2ascii_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjava_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjavac_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/oldjdb_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/policytool_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmic_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmid_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/rmiregistry_g
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/serialver_g
+%%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/tnameserv_g
 jdk%%JDK_VERSION%%/jre/bin/java
 jdk%%JDK_VERSION%%/jre/bin/keytool
 jdk%%JDK_VERSION%%/jre/bin/policytool
@@ -724,6 +830,8 @@ jdk%%JDK_VERSION%%/jre/lib/i386/libioser12.so
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libioser12_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni.so
+%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjavaplugin_jni_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjawt.so
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjawt_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libjcov.so
@@ -741,6 +849,8 @@ jdk%%JDK_VERSION%%/jre/lib/i386/libverify.so
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libverify_g.so
 jdk%%JDK_VERSION%%/jre/lib/i386/libzip.so
 %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libzip_g.so
+%%NATIVE:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi.so
+%%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/native_threads/libhpi_g.so
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/cursors.properties
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/invalid32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -749,9 +859,22 @@ jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif
 jdk%%JDK_VERSION%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/javaplugin.jar
 jdk%%JDK_VERSION%%/jre/lib/jvm.cfg
 jdk%%JDK_VERSION%%/jre/lib/jvm.hprof.txt
 jdk%%JDK_VERSION%%/jre/lib/jvm.jcov.txt
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
 jdk%%JDK_VERSION%%/jre/lib/psfont.properties.ja
 jdk%%JDK_VERSION%%/jre/lib/psfontj2d.properties
 jdk%%JDK_VERSION%%/jre/lib/rt.jar
@@ -760,7 +883,12 @@ jdk%%JDK_VERSION%%/jre/lib/security/java.policy
 jdk%%JDK_VERSION%%/jre/lib/security/java.security
 jdk%%JDK_VERSION%%/jre/lib/sunrsasign.jar
 jdk%%JDK_VERSION%%/jre/lib/tzmappings
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin.so
+%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns4/javaplugin_g.so
+%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji.so
+%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/plugin/i386/ns600/libjavaplugin_oji_g.so
 jdk%%JDK_VERSION%%/lib/dt.jar
+jdk%%JDK_VERSION%%/lib/htmlconverter.jar
 jdk%%JDK_VERSION%%/lib/i386/libdt_socket.so
 jdk%%JDK_VERSION%%/lib/i386/libjdwp.so
 jdk%%JDK_VERSION%%/lib/ir.idl
@@ -795,10 +923,39 @@ jdk%%JDK_VERSION%%/src.jar
 @dirrm jdk%%JDK_VERSION%%/man
 @dirrm jdk%%JDK_VERSION%%/lib/i386
 @dirrm jdk%%JDK_VERSION%%/lib
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386
 @dirrm jdk%%JDK_VERSION%%/jre/plugin
 @dirrm jdk%%JDK_VERSION%%/jre/lib/security
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de
+@dirrm jdk%%JDK_VERSION%%/jre/lib/locale
 @dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
 @dirrm jdk%%JDK_VERSION%%/jre/lib/images
+%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/native_threads
 @dirrm jdk%%JDK_VERSION%%/jre/lib/i386/green_threads
 @dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
 @dirrm jdk%%JDK_VERSION%%/jre/lib/i386
@@ -808,6 +965,7 @@ jdk%%JDK_VERSION%%/src.jar
 @dirrm jdk%%JDK_VERSION%%/jre/lib/audio
 @dirrm jdk%%JDK_VERSION%%/jre/lib/applet
 @dirrm jdk%%JDK_VERSION%%/jre/lib
+@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
 @dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
 @dirrm jdk%%JDK_VERSION%%/jre/bin/i386
 @dirrm jdk%%JDK_VERSION%%/jre/bin
@@ -911,6 +1069,7 @@ jdk%%JDK_VERSION%%/src.jar
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator
 @dirrm jdk%%JDK_VERSION%%/demo/applets
 @dirrm jdk%%JDK_VERSION%%/demo
+@dirrm jdk%%JDK_VERSION%%/bin/i386/native_threads
 @dirrm jdk%%JDK_VERSION%%/bin/i386/green_threads
 @dirrm jdk%%JDK_VERSION%%/bin/i386
 @dirrm jdk%%JDK_VERSION%%/bin