Fix SunOS PLISTs.

2 files changed, 18 insertions, 6 deletions

diff --git a/lang/sun-jdk7/PLIST.solaris-i386 b/lang/sun-jdk7/PLIST.solaris-i386
index bb920d5adba..76fb9d1978c 100644
--- a/lang/sun-jdk7/PLIST.solaris-i386
+++ b/lang/sun-jdk7/PLIST.solaris-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-i386,v 1.5 2014/02/14 16:24:35 jperkin Exp $
+@comment $NetBSD: PLIST.solaris-i386,v 1.6 2014/06/09 11:12:45 jperkin Exp $
 bin/sun7-appletviewer
 bin/sun7-apt
 bin/sun7-extcheck
@@ -98,8 +98,8 @@ java/sun-7/include/solaris/jni_md.h
 java/sun-7/jre
 java/sun-7/lib/ct.sym
 java/sun-7/lib/dt.jar
-java/sun-7/lib/${JAVA_ARCH}/libattach.so
-java/sun-7/lib/${JAVA_ARCH}/libsaproc.so
+java/sun-7/lib/i386/libattach.so
+java/sun-7/lib/i386/libsaproc.so
 java/sun-7/lib/ir.idl
 java/sun-7/lib/jconsole.jar
 java/sun-7/lib/orb.idl
@@ -114,6 +114,7 @@ java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-netbeans-modules-opti
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-netbeans-modules-queries.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-execution.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-explorer.xml
+java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-filesystems.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-loaders.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-modules.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-nodes.xml
@@ -131,6 +132,7 @@ java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-core-ui.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-core-windows.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-core.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-applemenu.xml
+java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-autoupdate-cli.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-autoupdate-services.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-autoupdate-ui.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-core-kit.xml
@@ -215,6 +217,8 @@ java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-core_ja.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-core_zh_CN.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-applemenu_ja.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-applemenu_zh_CN.jar
+java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-cli_ja.jar
+java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-cli_zh_CN.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-services_ja.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-services_zh_CN.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-ui_ja.jar
@@ -299,6 +303,7 @@ java/sun-7/lib/visualvm/platform/modules/org-netbeans-core-ui.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-core-windows.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-core.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-applemenu.jar
+java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-autoupdate-cli.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-autoupdate-services.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-autoupdate-ui.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-core-kit.jar
@@ -349,6 +354,7 @@ java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-core-ui.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-core-windows.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-core.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-applemenu.xml
+java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-autoupdate-cli.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-autoupdate-services.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-autoupdate-ui.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-core-kit.xml
diff --git a/lang/sun-jdk7/PLIST.solaris-x86_64 b/lang/sun-jdk7/PLIST.solaris-x86_64
index 8b1e895cae3..53b526aac56 100644
--- a/lang/sun-jdk7/PLIST.solaris-x86_64
+++ b/lang/sun-jdk7/PLIST.solaris-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-x86_64,v 1.4 2014/02/14 16:24:35 jperkin Exp $
+@comment $NetBSD: PLIST.solaris-x86_64,v 1.5 2014/06/09 11:12:45 jperkin Exp $
 bin/sun7-appletviewer
 bin/sun7-apt
 bin/sun7-extcheck
@@ -125,10 +125,10 @@ java/sun-7/include/jvmticmlr.h
 java/sun-7/include/solaris/jawt_md.h
 java/sun-7/include/solaris/jni_md.h
 java/sun-7/jre
+java/sun-7/lib/amd64/libattach.so
+java/sun-7/lib/amd64/libsaproc.so
 java/sun-7/lib/ct.sym
 java/sun-7/lib/dt.jar
-java/sun-7/lib/${JAVA_ARCH}/libattach.so
-java/sun-7/lib/${JAVA_ARCH}/libsaproc.so
 java/sun-7/lib/ir.idl
 java/sun-7/lib/jconsole.jar
 java/sun-7/lib/orb.idl
@@ -143,6 +143,7 @@ java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-netbeans-modules-opti
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-netbeans-modules-queries.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-execution.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-explorer.xml
+java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-filesystems.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-loaders.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-modules.xml
 java/sun-7/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-nodes.xml
@@ -160,6 +161,7 @@ java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-core-ui.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-core-windows.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-core.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-applemenu.xml
+java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-autoupdate-cli.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-autoupdate-services.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-autoupdate-ui.xml
 java/sun-7/lib/visualvm/platform/config/Modules/org-netbeans-modules-core-kit.xml
@@ -244,6 +246,8 @@ java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-core_ja.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-core_zh_CN.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-applemenu_ja.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-applemenu_zh_CN.jar
+java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-cli_ja.jar
+java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-cli_zh_CN.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-services_ja.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-services_zh_CN.jar
 java/sun-7/lib/visualvm/platform/modules/locale/org-netbeans-modules-autoupdate-ui_ja.jar
@@ -328,6 +332,7 @@ java/sun-7/lib/visualvm/platform/modules/org-netbeans-core-ui.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-core-windows.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-core.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-applemenu.jar
+java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-autoupdate-cli.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-autoupdate-services.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-autoupdate-ui.jar
 java/sun-7/lib/visualvm/platform/modules/org-netbeans-modules-core-kit.jar
@@ -378,6 +383,7 @@ java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-core-ui.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-core-windows.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-core.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-applemenu.xml
+java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-autoupdate-cli.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-autoupdate-services.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-autoupdate-ui.xml
 java/sun-7/lib/visualvm/platform/update_tracking/org-netbeans-modules-core-kit.xml