update to u14

3 files changed, 200 insertions, 214 deletions

diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index fb62f3ccec8..92b12c0604c 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2009/06/02 18:21:39 christos Exp $
 
-DISTNAME=	jdk-6u12-linux-${DIST_ARCH}
+DISTNAME=	jdk-6u14-linux-${DIST_ARCH}
 #PKGREVISION=    1
-PKGNAME=	sun-jdk6-6.0.12
+PKGNAME=	sun-jdk6-6.0.14
 MASTER_SITES=	# empty
 
 DOWNLOAD_NAME=	JDK 6u12
@@ -11,7 +11,7 @@ LICENSE=	sun-jdk6-license
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
-WRKSRC=		${WRKDIR}/jdk1.6.0_12
+WRKSRC=		${WRKDIR}/jdk1.6.0_14
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
@@ -37,5 +37,18 @@ pre-install:
 	${RM} -f ${WRKSRC}/register.html
 	${RM} -f ${WRKSRC}/register_ja.html
 	${RM} -f ${WRKSRC}/register_zh_CN.html
+	${CHMOD} -x \
+		${WRKSRC}/db/bin/NetworkServerControl.bat \
+		${WRKSRC}/db/bin/dblook.bat \
+		${WRKSRC}/db/bin/derby_common.bat \
+		${WRKSRC}/db/bin/ij.bat \
+		${WRKSRC}/db/bin/setEmbeddedCP.bat \
+		${WRKSRC}/db/bin/setNetworkClientCP.bat \
+		${WRKSRC}/db/bin/setNetworkServerCP.bat \
+		${WRKSRC}/db/bin/startNetworkServer.bat \
+		${WRKSRC}/db/bin/stopNetworkServer.bat \
+		${WRKSRC}/db/bin/sysinfo.bat \
+		${WRKSRC}/sample/scripting/scriptpad/src/scripts/memory.sh
+
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sun-jdk6/PLIST b/lang/sun-jdk6/PLIST
index 679a36034b5..54e32d06ba4 100644
--- a/lang/sun-jdk6/PLIST
+++ b/lang/sun-jdk6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/01/18 23:49:06 christos Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/02 18:21:39 christos Exp $
 bin/sun6-appletviewer
 bin/sun6-apt
 bin/sun6-extcheck
@@ -47,7 +47,6 @@ java/sun-6/bin/wsgen
 java/sun-6/bin/wsimport
 java/sun-6/bin/xjc
 java/sun-6/db/3RDPARTY
-java/sun-6/db/CHANGES.html
 java/sun-6/db/LICENSE
 java/sun-6/db/NOTICE
 java/sun-6/db/RELEASE-NOTES.html
@@ -261,7 +260,6 @@ java/sun-6/db/docs/html/adminguide/cadminadvtops.html
 java/sun-6/db/docs/html/adminguide/cadminapps.html
 java/sun-6/db/docs/html/adminguide/cadminapps49914.html
 java/sun-6/db/docs/html/adminguide/cadminapps59125.html
-java/sun-6/db/docs/html/adminguide/cadminapps810777.html
 java/sun-6/db/docs/html/adminguide/cadminapps811478.html
 java/sun-6/db/docs/html/adminguide/cadminapps811631.html
 java/sun-6/db/docs/html/adminguide/cadminapps811656.html
@@ -329,7 +327,6 @@ java/sun-6/db/docs/html/adminguide/cadminsslclient.html
 java/sun-6/db/docs/html/adminguide/cadminsslkeys.html
 java/sun-6/db/docs/html/adminguide/cadminsslserver.html
 java/sun-6/db/docs/html/adminguide/index.html
-java/sun-6/db/docs/html/adminguide/radminapps810699.html
 java/sun-6/db/docs/html/adminguide/radminapps811974.html
 java/sun-6/db/docs/html/adminguide/radminappsclientxmp.html
 java/sun-6/db/docs/html/adminguide/radminappsresultsetdiffs.html
@@ -734,9 +731,6 @@ java/sun-6/db/docs/html/ref/crefjavadb.html
 java/sun-6/db/docs/html/ref/crefjavbclobnot.html
 java/sun-6/db/docs/html/ref/crefjavccns.html
 java/sun-6/db/docs/html/ref/crefjavgcasyn.html
-java/sun-6/db/docs/html/ref/crefjavsaverel.html
-java/sun-6/db/docs/html/ref/crefjavsaverules.html
-java/sun-6/db/docs/html/ref/crefjavsavesetroll.html
 java/sun-6/db/docs/html/ref/crefjavstateautogen.html
 java/sun-6/db/docs/html/ref/crefjdbc12657.html
 java/sun-6/db/docs/html/ref/crefjdbc25142.html
@@ -888,7 +882,6 @@ java/sun-6/db/docs/html/ref/rrefjavcallstatout.html
 java/sun-6/db/docs/html/ref/rrefjavciro.html
 java/sun-6/db/docs/html/ref/rrefjavcsro.html
 java/sun-6/db/docs/html/ref/rrefjavcsti.html
-java/sun-6/db/docs/html/ref/rrefjavsaverestrict.html
 java/sun-6/db/docs/html/ref/rrefjavsqlprst.html
 java/sun-6/db/docs/html/ref/rrefjavsqlrssc.html
 java/sun-6/db/docs/html/ref/rrefjdbc1020262.html
@@ -904,10 +897,8 @@ java/sun-6/db/docs/html/ref/rrefjdbc27734.html
 java/sun-6/db/docs/html/ref/rrefjdbc27768.html
 java/sun-6/db/docs/html/ref/rrefjdbc28456.html
 java/sun-6/db/docs/html/ref/rrefjdbc29874.html
-java/sun-6/db/docs/html/ref/rrefjdbc2_0summary.html
 java/sun-6/db/docs/html/ref/rrefjdbc30469.html
 java/sun-6/db/docs/html/ref/rrefjdbc32052.html
-java/sun-6/db/docs/html/ref/rrefjdbc32593.html
 java/sun-6/db/docs/html/ref/rrefjdbc34565.html
 java/sun-6/db/docs/html/ref/rrefjdbc34954.html
 java/sun-6/db/docs/html/ref/rrefjdbc37244.html
@@ -921,26 +912,14 @@ java/sun-6/db/docs/html/ref/rrefjdbc4_0databaseMetaData.html
 java/sun-6/db/docs/html/ref/rrefjdbc4_0sqlexception.html
 java/sun-6/db/docs/html/ref/rrefjdbc4_0statement.html
 java/sun-6/db/docs/html/ref/rrefjdbc4_0summary.html
-java/sun-6/db/docs/html/ref/rrefjdbc52637.html
-java/sun-6/db/docs/html/ref/rrefjdbc59162.html
-java/sun-6/db/docs/html/ref/rrefjdbc66688.html
 java/sun-6/db/docs/html/ref/rrefjdbc70824.html
-java/sun-6/db/docs/html/ref/rrefjdbc71949.html
 java/sun-6/db/docs/html/ref/rrefjdbc75719.html
-java/sun-6/db/docs/html/ref/rrefjdbc77156.html
-java/sun-6/db/docs/html/ref/rrefjdbc80004.html
 java/sun-6/db/docs/html/ref/rrefjdbc87220.html
 java/sun-6/db/docs/html/ref/rrefjdbc88908.html
 java/sun-6/db/docs/html/ref/rrefjdbc96386.html
-java/sun-6/db/docs/html/ref/rrefjdbc99392.html
-java/sun-6/db/docs/html/ref/rrefjdbcdatabasemetadata30.html
 java/sun-6/db/docs/html/ref/rrefjdbcescapedate.html
-java/sun-6/db/docs/html/ref/rrefjdbcjavasqlconnection30.html
-java/sun-6/db/docs/html/ref/rrefjdbcjavasqlpreparedstatement30.html
 java/sun-6/db/docs/html/ref/rrefjdbcjavasqlsavepoint.html
-java/sun-6/db/docs/html/ref/rrefjdbcjavasqlstatement30.html
 java/sun-6/db/docs/html/ref/rrefjdbcjsr169.html
-java/sun-6/db/docs/html/ref/rrefjdbcparametermetadata30.html
 java/sun-6/db/docs/html/ref/rrefjdbcrefsqlxml.html
 java/sun-6/db/docs/html/ref/rrefjta1003392.html
 java/sun-6/db/docs/html/ref/rrefjta1003415.html
@@ -3155,172 +3134,168 @@ java/sun-6/lib/sa-jdi.jar
 java/sun-6/lib/tools.jar
 java/sun-6/lib/visualvm/etc/visualvm.clusters
 java/sun-6/lib/visualvm/etc/visualvm.conf
-java/sun-6/lib/visualvm/platform7/config/ModuleAutoDeps/org-netbeans-core.xml
-java/sun-6/lib/visualvm/platform7/config/ModuleAutoDeps/org-netbeans-modules-options-api.xml
-java/sun-6/lib/visualvm/platform7/config/ModuleAutoDeps/org-netbeans-modules-queries.xml
-java/sun-6/lib/visualvm/platform7/config/ModuleAutoDeps/org-openide-execution.xml
-java/sun-6/lib/visualvm/platform7/config/ModuleAutoDeps/org-openide-explorer.xml
-java/sun-6/lib/visualvm/platform7/config/ModuleAutoDeps/org-openide-modules.xml
-java/sun-6/lib/visualvm/platform7/config/ModuleAutoDeps/org-openide-text.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-jdesktop-layout.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-api-progress.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-api-visual.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-core-execution.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-core-multiview.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-core-output2.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-core-ui.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-core-windows.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-core.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-libs-jsr223.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-applemenu.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-autoupdate-services.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-autoupdate-ui.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-core-kit.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-editor-mimelookup-impl.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-editor-mimelookup.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-favorites.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-javahelp.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-masterfs.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-options-api.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-options-keymap.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-progress-ui.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-queries.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-sendopts.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-settings.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-modules-templates.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-swing-plaf.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-netbeans-swing-tabcontrol.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-actions.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-awt.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-compat.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-dialogs.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-execution.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-explorer.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-io.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-loaders.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-nodes.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-options.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-text.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-util-enumerations.xml
-java/sun-6/lib/visualvm/platform7/config/Modules/org-openide-windows.xml
-java/sun-6/lib/visualvm/platform7/core/core.jar
-java/sun-6/lib/visualvm/platform7/core/org-openide-filesystems.jar
-java/sun-6/lib/visualvm/platform7/docs/swing-layout-1.0.3-doc.zip
-java/sun-6/lib/visualvm/platform7/docs/swing-layout-1.0.3-src.zip
-java/sun-6/lib/visualvm/platform7/lib/boot.jar
-java/sun-6/lib/visualvm/platform7/lib/nbexec
-java/sun-6/lib/visualvm/platform7/lib/org-openide-modules.jar
-java/sun-6/lib/visualvm/platform7/lib/org-openide-util.jar
-java/sun-6/lib/visualvm/platform7/modules/ext/jh-2.0_05.jar
-java/sun-6/lib/visualvm/platform7/modules/ext/script-api.jar
-java/sun-6/lib/visualvm/platform7/modules/ext/swing-layout-1.0.3.jar
-java/sun-6/lib/visualvm/platform7/modules/ext/updater.jar
-java/sun-6/lib/visualvm/platform7/modules/org-jdesktop-layout.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-api-progress.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-api-visual.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-core-execution.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-core-multiview.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-core-output2.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-core-ui.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-core-windows.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-core.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-libs-jsr223.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-applemenu.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-autoupdate-services.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-autoupdate-ui.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-core-kit.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-editor-mimelookup-impl.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-editor-mimelookup.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-favorites.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-javahelp.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-masterfs.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-options-api.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-options-keymap.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-progress-ui.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-queries.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-sendopts.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-settings.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-modules-templates.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-swing-plaf.jar
-java/sun-6/lib/visualvm/platform7/modules/org-netbeans-swing-tabcontrol.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-actions.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-awt.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-compat.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-dialogs.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-execution.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-explorer.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-io.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-loaders.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-nodes.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-options.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-text.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-util-enumerations.jar
-java/sun-6/lib/visualvm/platform7/modules/org-openide-windows.jar
-java/sun-6/lib/visualvm/platform7/update_tracking/org-jdesktop-layout.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-api-progress.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-api-visual.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-bootstrap.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-core-execution.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-core-multiview.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-core-output2.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-core-startup.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-core-ui.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-core-windows.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-core.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-libs-jsr223.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-applemenu.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-autoupdate-services.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-autoupdate-ui.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-core-kit.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-editor-mimelookup-impl.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-editor-mimelookup.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-favorites.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-javahelp.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-masterfs.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-options-api.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-options-keymap.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-progress-ui.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-queries.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-sendopts.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-settings.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-modules-templates.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-swing-plaf.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-netbeans-swing-tabcontrol.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-actions.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-awt.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-compat.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-dialogs.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-execution.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-explorer.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-filesystems.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-io.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-loaders.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-modules.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-nodes.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-options.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-text.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-util-enumerations.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-util.xml
-java/sun-6/lib/visualvm/platform7/update_tracking/org-openide-windows.xml
-java/sun-6/lib/visualvm/profiler2/config/Modules/org-netbeans-lib-profiler-common.xml
-java/sun-6/lib/visualvm/profiler2/config/Modules/org-netbeans-lib-profiler-ui.xml
-java/sun-6/lib/visualvm/profiler2/config/Modules/org-netbeans-lib-profiler.xml
-java/sun-6/lib/visualvm/profiler2/config/Modules/org-netbeans-modules-profiler.xml
-java/sun-6/lib/visualvm/profiler2/config/Services/filters-default.xml
-java/sun-6/lib/visualvm/profiler2/config/Services/filtersets-default.xml
-java/sun-6/lib/visualvm/profiler2/lib/deployed/jdk15/linux/libprofilerinterface.so
-java/sun-6/lib/visualvm/profiler2/lib/deployed/jdk16/linux/libprofilerinterface.so
-java/sun-6/lib/visualvm/profiler2/lib/jfluid-server-15.jar
-java/sun-6/lib/visualvm/profiler2/lib/jfluid-server.jar
-java/sun-6/lib/visualvm/profiler2/modules/docs/org-netbeans-modules-profiler.jar
-java/sun-6/lib/visualvm/profiler2/modules/org-netbeans-lib-profiler-common.jar
-java/sun-6/lib/visualvm/profiler2/modules/org-netbeans-lib-profiler-ui.jar
-java/sun-6/lib/visualvm/profiler2/modules/org-netbeans-lib-profiler.jar
-java/sun-6/lib/visualvm/profiler2/modules/org-netbeans-modules-profiler.jar
-java/sun-6/lib/visualvm/profiler2/update_tracking/org-netbeans-lib-profiler-common.xml
-java/sun-6/lib/visualvm/profiler2/update_tracking/org-netbeans-lib-profiler-ui.xml
-java/sun-6/lib/visualvm/profiler2/update_tracking/org-netbeans-lib-profiler.xml
-java/sun-6/lib/visualvm/profiler2/update_tracking/org-netbeans-modules-profiler.xml
+java/sun-6/lib/visualvm/platform9/config/ModuleAutoDeps/org-netbeans-core.xml
+java/sun-6/lib/visualvm/platform9/config/ModuleAutoDeps/org-netbeans-modules-options-api.xml
+java/sun-6/lib/visualvm/platform9/config/ModuleAutoDeps/org-netbeans-modules-queries.xml
+java/sun-6/lib/visualvm/platform9/config/ModuleAutoDeps/org-openide-execution.xml
+java/sun-6/lib/visualvm/platform9/config/ModuleAutoDeps/org-openide-explorer.xml
+java/sun-6/lib/visualvm/platform9/config/ModuleAutoDeps/org-openide-modules.xml
+java/sun-6/lib/visualvm/platform9/config/ModuleAutoDeps/org-openide-text.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-jdesktop-layout.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-api-progress.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-api-visual.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-core-execution.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-core-multiview.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-core-output2.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-core-ui.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-core-windows.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-core.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-applemenu.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-autoupdate-services.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-autoupdate-ui.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-core-kit.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-editor-mimelookup-impl.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-editor-mimelookup.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-favorites.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-javahelp.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-masterfs.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-options-api.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-options-keymap.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-progress-ui.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-queries.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-sendopts.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-settings.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-modules-templates.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-swing-plaf.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-netbeans-swing-tabcontrol.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-actions.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-awt.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-compat.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-dialogs.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-execution.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-explorer.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-io.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-loaders.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-nodes.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-options.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-text.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-util-enumerations.xml
+java/sun-6/lib/visualvm/platform9/config/Modules/org-openide-windows.xml
+java/sun-6/lib/visualvm/platform9/core/core.jar
+java/sun-6/lib/visualvm/platform9/core/org-openide-filesystems.jar
+java/sun-6/lib/visualvm/platform9/docs/swing-layout-1.0.3-doc.zip
+java/sun-6/lib/visualvm/platform9/docs/swing-layout-1.0.3-src.zip
+java/sun-6/lib/visualvm/platform9/lib/boot.jar
+java/sun-6/lib/visualvm/platform9/lib/nbexec
+java/sun-6/lib/visualvm/platform9/lib/org-openide-modules.jar
+java/sun-6/lib/visualvm/platform9/lib/org-openide-util.jar
+java/sun-6/lib/visualvm/platform9/modules/ext/jh-2.0_05.jar
+java/sun-6/lib/visualvm/platform9/modules/ext/swing-layout-1.0.3.jar
+java/sun-6/lib/visualvm/platform9/modules/ext/updater.jar
+java/sun-6/lib/visualvm/platform9/modules/org-jdesktop-layout.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-api-progress.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-api-visual.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-core-execution.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-core-multiview.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-core-output2.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-core-ui.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-core-windows.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-core.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-applemenu.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-autoupdate-services.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-autoupdate-ui.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-core-kit.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-editor-mimelookup-impl.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-editor-mimelookup.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-favorites.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-javahelp.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-masterfs.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-options-api.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-options-keymap.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-progress-ui.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-queries.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-sendopts.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-settings.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-modules-templates.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-swing-plaf.jar
+java/sun-6/lib/visualvm/platform9/modules/org-netbeans-swing-tabcontrol.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-actions.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-awt.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-compat.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-dialogs.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-execution.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-explorer.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-io.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-loaders.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-nodes.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-options.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-text.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-util-enumerations.jar
+java/sun-6/lib/visualvm/platform9/modules/org-openide-windows.jar
+java/sun-6/lib/visualvm/platform9/update_tracking/org-jdesktop-layout.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-api-progress.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-api-visual.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-bootstrap.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-core-execution.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-core-multiview.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-core-output2.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-core-startup.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-core-ui.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-core-windows.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-core.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-applemenu.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-autoupdate-services.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-autoupdate-ui.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-core-kit.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-editor-mimelookup-impl.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-editor-mimelookup.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-favorites.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-javahelp.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-masterfs.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-options-api.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-options-keymap.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-progress-ui.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-queries.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-sendopts.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-settings.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-modules-templates.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-swing-plaf.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-netbeans-swing-tabcontrol.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-actions.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-awt.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-compat.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-dialogs.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-execution.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-explorer.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-filesystems.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-io.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-loaders.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-modules.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-nodes.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-options.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-text.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-util-enumerations.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-util.xml
+java/sun-6/lib/visualvm/platform9/update_tracking/org-openide-windows.xml
+java/sun-6/lib/visualvm/profiler3/config/Modules/org-netbeans-lib-profiler-common.xml
+java/sun-6/lib/visualvm/profiler3/config/Modules/org-netbeans-lib-profiler-ui.xml
+java/sun-6/lib/visualvm/profiler3/config/Modules/org-netbeans-lib-profiler.xml
+java/sun-6/lib/visualvm/profiler3/config/Modules/org-netbeans-modules-profiler.xml
+java/sun-6/lib/visualvm/profiler3/config/Services/filters-default.xml
+java/sun-6/lib/visualvm/profiler3/config/Services/filtersets-default.xml
+java/sun-6/lib/visualvm/profiler3/lib/deployed/jdk15/linux/libprofilerinterface.so
+java/sun-6/lib/visualvm/profiler3/lib/deployed/jdk16/linux/libprofilerinterface.so
+java/sun-6/lib/visualvm/profiler3/lib/jfluid-server-15.jar
+java/sun-6/lib/visualvm/profiler3/lib/jfluid-server.jar
+java/sun-6/lib/visualvm/profiler3/modules/org-netbeans-modules-profiler.jar
+java/sun-6/lib/visualvm/profiler3/modules/org-netbeans-lib-profiler-common.jar
+java/sun-6/lib/visualvm/profiler3/modules/org-netbeans-lib-profiler-ui.jar
+java/sun-6/lib/visualvm/profiler3/modules/org-netbeans-lib-profiler.jar
+java/sun-6/lib/visualvm/profiler3/modules/org-netbeans-modules-profiler.jar
+java/sun-6/lib/visualvm/profiler3/update_tracking/org-netbeans-lib-profiler-common.xml
+java/sun-6/lib/visualvm/profiler3/update_tracking/org-netbeans-lib-profiler-ui.xml
+java/sun-6/lib/visualvm/profiler3/update_tracking/org-netbeans-lib-profiler.xml
+java/sun-6/lib/visualvm/profiler3/update_tracking/org-netbeans-modules-profiler.xml
 java/sun-6/lib/visualvm/visualvm/config/Modules/com-sun-tools-visualvm-application-views.xml
 java/sun-6/lib/visualvm/visualvm/config/Modules/com-sun-tools-visualvm-application.xml
 java/sun-6/lib/visualvm/visualvm/config/Modules/com-sun-tools-visualvm-attach.xml
@@ -3339,11 +3314,9 @@ java/sun-6/lib/visualvm/visualvm/config/Modules/com-sun-tools-visualvm-threaddum
 java/sun-6/lib/visualvm/visualvm/config/Modules/com-sun-tools-visualvm-tools.xml
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-netbeans-core-execution.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-netbeans-core-output2.xml_hidden
-java/sun-6/lib/visualvm/visualvm/config/Modules/org-netbeans-libs-jsr223.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-core-kit.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-favorites.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-options-keymap.xml_hidden
-java/sun-6/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-sendopts.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-templates.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-compat.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-util-enumerations.xml_hidden
@@ -3796,22 +3769,22 @@ java/sun-6/src.zip
 @dirrm java/sun-6/lib/visualvm/visualvm/core/locale
 @dirrm java/sun-6/lib/visualvm/visualvm/core
 @dirrm java/sun-6/lib/visualvm/visualvm/config/Modules
-@dirrm java/sun-6/lib/visualvm/profiler2/update_tracking
-@dirrm java/sun-6/lib/visualvm/profiler2/modules/docs
-@dirrm java/sun-6/lib/visualvm/profiler2/modules
-@dirrm java/sun-6/lib/visualvm/profiler2/lib/deployed/jdk16/linux
-@dirrm java/sun-6/lib/visualvm/profiler2/lib/deployed/jdk15/linux
-@dirrm java/sun-6/lib/visualvm/profiler2/lib
-@dirrm java/sun-6/lib/visualvm/profiler2/config/Services
-@dirrm java/sun-6/lib/visualvm/profiler2/config/Modules
-@dirrm java/sun-6/lib/visualvm/platform7/update_tracking
-@dirrm java/sun-6/lib/visualvm/platform7/modules/ext
-@dirrm java/sun-6/lib/visualvm/platform7/modules
-@dirrm java/sun-6/lib/visualvm/platform7/lib
-@dirrm java/sun-6/lib/visualvm/platform7/docs
-@dirrm java/sun-6/lib/visualvm/platform7/core
-@dirrm java/sun-6/lib/visualvm/platform7/config/Modules
-@dirrm java/sun-6/lib/visualvm/platform7/config/ModuleAutoDeps
+@dirrm java/sun-6/lib/visualvm/profiler3/update_tracking
+@dirrm java/sun-6/lib/visualvm/profiler3/modules/docs
+@dirrm java/sun-6/lib/visualvm/profiler3/modules
+@dirrm java/sun-6/lib/visualvm/profiler3/lib/deployed/jdk16/linux
+@dirrm java/sun-6/lib/visualvm/profiler3/lib/deployed/jdk15/linux
+@dirrm java/sun-6/lib/visualvm/profiler3/lib
+@dirrm java/sun-6/lib/visualvm/profiler3/config/Services
+@dirrm java/sun-6/lib/visualvm/profiler3/config/Modules
+@dirrm java/sun-6/lib/visualvm/platform9/update_tracking
+@dirrm java/sun-6/lib/visualvm/platform9/modules/ext
+@dirrm java/sun-6/lib/visualvm/platform9/modules
+@dirrm java/sun-6/lib/visualvm/platform9/lib
+@dirrm java/sun-6/lib/visualvm/platform9/docs
+@dirrm java/sun-6/lib/visualvm/platform9/core
+@dirrm java/sun-6/lib/visualvm/platform9/config/Modules
+@dirrm java/sun-6/lib/visualvm/platform9/config/ModuleAutoDeps
 @dirrm java/sun-6/lib/visualvm/etc
 @dirrm java/sun-6/lib
 @dirrm java/sun-6/include/linux
diff --git a/lang/sun-jdk6/distinfo b/lang/sun-jdk6/distinfo
index 5391129cb71..116c426c2fb 100644
--- a/lang/sun-jdk6/distinfo
+++ b/lang/sun-jdk6/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/02/08 00:23:20 christos Exp $
+$NetBSD: distinfo,v 1.7 2009/06/02 18:21:39 christos Exp $
 
-SHA1 (jdk-6u12-linux-i586.bin) = de1964692463d54027af620861471ba8e7a98db7
-RMD160 (jdk-6u12-linux-i586.bin) = 4434fda38b9b9b7c18eca57cdf7cbe2953534423
-Size (jdk-6u12-linux-i586.bin) = 80105323 bytes
+SHA1 (jdk-6u14-linux-i586.bin) = fbd1a565af7bce33ca43325e0c9ddf1c2839c00c
+RMD160 (jdk-6u14-linux-i586.bin) = 3084eaaf77157bbcc76bd91740b6c56ae251d2ff
+Size (jdk-6u14-linux-i586.bin) = 81771117 bytes