1 files changed, 15 insertions, 95 deletions
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