Pullup ticket #3683 - requested by obache

lang/sun-{jre,jdk}6 security update

Revisions pulled up:
- lang/sun-jdk6/Makefile                                        1.28
- lang/sun-jdk6/PLIST.linux-i386                                1.2
- lang/sun-jdk6/PLIST.linux-x86_64                              1.2
- lang/sun-jdk6/distinfo                                        1.17
- lang/sun-jre6/Makefile                                        1.35
- lang/sun-jre6/PLIST.linux-i386                                1.23
- lang/sun-jre6/PLIST.linux-x86_64                              1.5
- lang/sun-jre6/distinfo                                        1.20
- lang/sun-jre6/sfiles-i386.mk                                  1.6
- lang/sun-jre6/sfiles-x86_64.mk                                1.2

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Fri Feb 17 08:16:14 UTC 2012

   Modified Files:
   	pkgsrc/lang/sun-jdk6: Makefile PLIST.linux-i386 PLIST.linux-x86_64
   	    distinfo
   	pkgsrc/lang/sun-jre6: Makefile PLIST.linux-i386 PLIST.linux-x86_64
   	    distinfo sfiles-i386.mk sfiles-x86_64.mk

   Log Message:
   Java SE 6 Update 31

   * Olson Data 2011l

   * Bug Fixes

      This release contains fixes for security vulnerabilities. For more information,
      see Oracle Java SE Critical Patch Update Advisory.
      http://www.oracle.com/technetwork/topics/security/javacpufeb2012-366318.html

10 files changed, 78 insertions, 45 deletions

diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 94baefe8bff..049c1d7d611 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2011/10/20 12:28:09 obache Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2012/02/18 01:38:57 sbd Exp $
 
-DISTNAME=	jdk-6u29-linux-${DIST_ARCH}
-PKGNAME=	sun-jdk6-6.0.29
+DISTNAME=	jdk-6u31-linux-${DIST_ARCH}
+PKGNAME=	sun-jdk6-6.0.31
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jdk6-license
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
-WRKSRC=		${WRKDIR}/jdk1.6.0_29
+WRKSRC=		${WRKDIR}/jdk1.6.0_31
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
diff --git a/lang/sun-jdk6/PLIST.linux-i386 b/lang/sun-jdk6/PLIST.linux-i386
index a7bba143a73..a4fe61db9fc 100644
--- a/lang/sun-jdk6/PLIST.linux-i386
+++ b/lang/sun-jdk6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.1 2011/08/16 22:13:23 abs Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.1.4.1 2012/02/18 01:38:57 sbd Exp $
 bin/sun6-appletviewer
 bin/sun6-apt
 bin/sun6-extcheck
@@ -3557,9 +3557,12 @@ java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-compat.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-options.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-util-enumerations.xml_hidden
 java/sun-6/lib/visualvm/visualvm/core/com-sun-tools-visualvm-modules-startup.jar
+java/sun-6/lib/visualvm/visualvm/core/locale/.svn_ja.jar
+java/sun-6/lib/visualvm/visualvm/core/locale/.svn_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/com-sun-tools-visualvm-modules-startup_ja.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/com-sun-tools-visualvm-modules-startup_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/core_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/all-wcprops
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-api-caching.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-application-views.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-application.jar
@@ -3582,6 +3585,7 @@ java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-sampler.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-threaddump.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-tools.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-uisupport.jar
+java/sun-6/lib/visualvm/visualvm/modules/entries
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-api-caching_ja.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-api-caching_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-application-views_ja.jar
@@ -3628,7 +3632,17 @@ java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-uisupport
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-uisupport_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-core-windows_visualvm.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-core_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-.svn_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-.svn_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-profiler_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-prop-base_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-prop-base_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-props_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-props_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-text-base_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-text-base_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-tmp_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-tmp_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-api-caching.xml
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-application-views.xml
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-application.xml
diff --git a/lang/sun-jdk6/PLIST.linux-x86_64 b/lang/sun-jdk6/PLIST.linux-x86_64
index afed4df341a..881db459db3 100644
--- a/lang/sun-jdk6/PLIST.linux-x86_64
+++ b/lang/sun-jdk6/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.1 2011/08/16 22:13:23 abs Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.1.4.1 2012/02/18 01:38:57 sbd Exp $
 bin/sun6-appletviewer
 bin/sun6-apt
 bin/sun6-extcheck
@@ -3556,9 +3556,12 @@ java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-compat.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-options.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-util-enumerations.xml_hidden
 java/sun-6/lib/visualvm/visualvm/core/com-sun-tools-visualvm-modules-startup.jar
+java/sun-6/lib/visualvm/visualvm/core/locale/.svn_ja.jar
+java/sun-6/lib/visualvm/visualvm/core/locale/.svn_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/com-sun-tools-visualvm-modules-startup_ja.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/com-sun-tools-visualvm-modules-startup_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/core_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/all-wcprops
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-api-caching.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-application-views.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-application.jar
@@ -3581,6 +3584,7 @@ java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-sampler.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-threaddump.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-tools.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-uisupport.jar
+java/sun-6/lib/visualvm/visualvm/modules/entries
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-api-caching_ja.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-api-caching_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-application-views_ja.jar
@@ -3627,7 +3631,17 @@ java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-uisupport
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-uisupport_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-core-windows_visualvm.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-core_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-.svn_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-.svn_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-profiler_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-prop-base_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-prop-base_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-props_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-props_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-text-base_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-text-base_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-tmp_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-tmp_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-api-caching.xml
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-application-views.xml
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-application.xml
@@ -3948,3 +3962,5 @@ java/sun-6/sample/webservices/EbayServer/src/ebay/server/Ebay.java
 java/sun-6/sample/webservices/EbayServer/src/ebay/server/ImageProvider.java
 java/sun-6/sample/webservices/EbayServer/src/ebay/server/Main.java
 java/sun-6/src.zip
+@pkgdir java/sun-6/lib/visualvm/platform/docs
+@pkgdir java/sun-6/db/demo/programs/localcal/lib
diff --git a/lang/sun-jdk6/distinfo b/lang/sun-jdk6/distinfo
index 7ba9633a415..64adc3912e8 100644
--- a/lang/sun-jdk6/distinfo
+++ b/lang/sun-jdk6/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2011/10/20 12:28:09 obache Exp $
+$NetBSD: distinfo,v 1.16.2.1 2012/02/18 01:38:57 sbd Exp $
 
-SHA1 (jdk-6u29-linux-i586.bin) = a73580ed8ac42040f1bbcab62617719a31c6f487
-RMD160 (jdk-6u29-linux-i586.bin) = fca7a51bf14486a81a684c91152493e8af621647
-Size (jdk-6u29-linux-i586.bin) = 85146345 bytes
-SHA1 (jdk-6u29-linux-x64.bin) = 45286e11864285c0d9d5cafd0355dbe04d272951
-RMD160 (jdk-6u29-linux-x64.bin) = 7bb1433728c9d263bfe9d968595aac7d73e6c2f3
-Size (jdk-6u29-linux-x64.bin) = 85411605 bytes
+SHA1 (jdk-6u31-linux-i586.bin) = 8e404a292d85bddb1b39d63f4248094ca05ef0da
+RMD160 (jdk-6u31-linux-i586.bin) = a917f6233912b84e3c904220fcb0cf49399486d8
+Size (jdk-6u31-linux-i586.bin) = 85292206 bytes
+SHA1 (jdk-6u31-linux-x64.bin) = 51cc34977aef629897dda480558fc78b10166cae
+RMD160 (jdk-6u31-linux-x64.bin) = c96b98671572efcde96512649f62162d46489402
+Size (jdk-6u31-linux-x64.bin) = 85581913 bytes
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 679fa93c423..379c2851e06 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.34 2011/12/30 07:12:23 sbd Exp $
+# $NetBSD: Makefile,v 1.34.2.1 2012/02/18 01:38:57 sbd Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 
-DISTNAME=	jre-6u29-linux-${DIST_ARCH}
-PKGNAME=	sun-jre6-6.0.29
-PKGREVISION=	1
+DISTNAME=	jre-6u31-linux-${DIST_ARCH}
+PKGNAME=	sun-jre6-6.0.31
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jre6-license
 
-DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u29
+DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u31
 
 USE_TOOLS+=	pax
 
-WRKSRC=		${WRKDIR}/jre1.6.0_29
+WRKSRC=		${WRKDIR}/jre1.6.0_31
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 REQD_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index 67ba59fb99f..257224945c3 100644
--- a/lang/sun-jre6/PLIST.linux-i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.22 2011/06/09 09:08:17 obache Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.22.6.1 2012/02/18 01:38:57 sbd Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -123,8 +123,8 @@ java/sun-6/lib/fontconfig.RedHat.3.bfc.default
 java/sun-6/lib/fontconfig.RedHat.3.properties.src.default
 java/sun-6/lib/fontconfig.RedHat.4.bfc.default
 java/sun-6/lib/fontconfig.RedHat.4.properties.src.default
-java/sun-6/lib/fontconfig.RedHat.6.0.bfc.default
-java/sun-6/lib/fontconfig.RedHat.6.0.properties.src.default
+java/sun-6/lib/fontconfig.RedHat.6.bfc.default
+java/sun-6/lib/fontconfig.RedHat.6.properties.src.default
 java/sun-6/lib/fontconfig.RedHat.bfc.default
 java/sun-6/lib/fontconfig.RedHat.properties.src.default
 java/sun-6/lib/fontconfig.SuSE.11.bfc.default
@@ -286,6 +286,7 @@ java/sun-6/lib/zi/Africa/Freetown
 java/sun-6/lib/zi/Africa/Gaborone
 java/sun-6/lib/zi/Africa/Harare
 java/sun-6/lib/zi/Africa/Johannesburg
+java/sun-6/lib/zi/Africa/Juba
 java/sun-6/lib/zi/Africa/Kampala
 java/sun-6/lib/zi/Africa/Khartoum
 java/sun-6/lib/zi/Africa/Kigali
@@ -488,6 +489,7 @@ java/sun-6/lib/zi/Asia/Dubai
 java/sun-6/lib/zi/Asia/Dushanbe
 java/sun-6/lib/zi/Asia/Gaza
 java/sun-6/lib/zi/Asia/Harbin
+java/sun-6/lib/zi/Asia/Hebron
 java/sun-6/lib/zi/Asia/Ho_Chi_Minh
 java/sun-6/lib/zi/Asia/Hong_Kong
 java/sun-6/lib/zi/Asia/Hovd
diff --git a/lang/sun-jre6/PLIST.linux-x86_64 b/lang/sun-jre6/PLIST.linux-x86_64
index 2bfaa7bb0a8..5eb8c4350f4 100644
--- a/lang/sun-jre6/PLIST.linux-x86_64
+++ b/lang/sun-jre6/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.4 2011/09/26 13:06:52 abs Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.4.4.1 2012/02/18 01:38:57 sbd Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -168,8 +168,8 @@ java/sun-6/lib/fontconfig.RedHat.3.bfc.default
 java/sun-6/lib/fontconfig.RedHat.3.properties.src.default
 java/sun-6/lib/fontconfig.RedHat.4.bfc.default
 java/sun-6/lib/fontconfig.RedHat.4.properties.src.default
-java/sun-6/lib/fontconfig.RedHat.6.0.bfc.default
-java/sun-6/lib/fontconfig.RedHat.6.0.properties.src.default
+java/sun-6/lib/fontconfig.RedHat.6.bfc.default
+java/sun-6/lib/fontconfig.RedHat.6.properties.src.default
 java/sun-6/lib/fontconfig.RedHat.bfc.default
 java/sun-6/lib/fontconfig.RedHat.properties.src.default
 java/sun-6/lib/fontconfig.SuSE.11.bfc.default
@@ -281,6 +281,7 @@ java/sun-6/lib/zi/Africa/Freetown
 java/sun-6/lib/zi/Africa/Gaborone
 java/sun-6/lib/zi/Africa/Harare
 java/sun-6/lib/zi/Africa/Johannesburg
+java/sun-6/lib/zi/Africa/Juba
 java/sun-6/lib/zi/Africa/Kampala
 java/sun-6/lib/zi/Africa/Khartoum
 java/sun-6/lib/zi/Africa/Kigali
@@ -483,6 +484,7 @@ java/sun-6/lib/zi/Asia/Dubai
 java/sun-6/lib/zi/Asia/Dushanbe
 java/sun-6/lib/zi/Asia/Gaza
 java/sun-6/lib/zi/Asia/Harbin
+java/sun-6/lib/zi/Asia/Hebron
 java/sun-6/lib/zi/Asia/Ho_Chi_Minh
 java/sun-6/lib/zi/Asia/Hong_Kong
 java/sun-6/lib/zi/Asia/Hovd
diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo
index 5d491412584..2bdb3e534b4 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2011/10/20 12:28:09 obache Exp $
+$NetBSD: distinfo,v 1.19.2.1 2012/02/18 01:38:57 sbd Exp $
 
 SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
 Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6u29-linux-i586.bin) = 6de26b992a9920117d2f156ff5bbddf2d5b28f77
-RMD160 (jre-6u29-linux-i586.bin) = ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a
-Size (jre-6u29-linux-i586.bin) = 21632980 bytes
-SHA1 (jre-6u29-linux-x64.bin) = 820399aed6db6c1960ba0942bc64c49a3b809b89
-RMD160 (jre-6u29-linux-x64.bin) = 53bb593ae6ff9f09bc1f00a94ebd6a3506260f87
-Size (jre-6u29-linux-x64.bin) = 21230518 bytes
+SHA1 (jre-6u31-linux-i586.bin) = 7fff7f6f99282ea3adc718c1f449df9107a8ad0c
+RMD160 (jre-6u31-linux-i586.bin) = 45252ef657d84abeaa1f22d8e3cfc7906a726645
+Size (jre-6u31-linux-i586.bin) = 21699103 bytes
+SHA1 (jre-6u31-linux-x64.bin) = 0b20b1290e7c7ee3cf4ec7e99ae794fada6053af
+RMD160 (jre-6u31-linux-x64.bin) = a3c51e57681a86960313f6007c63311d029de395
+Size (jre-6u31-linux-x64.bin) = 21312981 bytes
diff --git a/lang/sun-jre6/sfiles-i386.mk b/lang/sun-jre6/sfiles-i386.mk
index df67cfe4958..aaa3d04f44c 100644
--- a/lang/sun-jre6/sfiles-i386.mk
+++ b/lang/sun-jre6/sfiles-i386.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: sfiles-i386.mk,v 1.5 2011/06/09 09:08:17 obache Exp $
+#	$NetBSD: sfiles-i386.mk,v 1.5.6.1 2012/02/18 01:38:57 sbd Exp $
 #
 # Created with "make makesfiles"
 # Do not edit this file manually!
@@ -24,8 +24,8 @@ SFILES+=	fontconfig.RedHat.3.bfc
 SFILES+=	fontconfig.RedHat.3.properties.src
 SFILES+=	fontconfig.RedHat.4.bfc
 SFILES+=	fontconfig.RedHat.4.properties.src
-SFILES+=	fontconfig.RedHat.6.0.bfc
-SFILES+=	fontconfig.RedHat.6.0.properties.src
+SFILES+=	fontconfig.RedHat.6.bfc
+SFILES+=	fontconfig.RedHat.6.properties.src
 SFILES+=	fontconfig.RedHat.bfc
 SFILES+=	fontconfig.RedHat.properties.src
 SFILES+=	fontconfig.SuSE.11.bfc
diff --git a/lang/sun-jre6/sfiles-x86_64.mk b/lang/sun-jre6/sfiles-x86_64.mk
index f510db86b46..676ddd892ce 100644
--- a/lang/sun-jre6/sfiles-x86_64.mk
+++ b/lang/sun-jre6/sfiles-x86_64.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: sfiles-x86_64.mk,v 1.1 2011/08/24 04:01:27 sbd Exp $
+#	$NetBSD: sfiles-x86_64.mk,v 1.1.4.1 2012/02/18 01:38:57 sbd Exp $
 #
 # Created with "make makesfiles"
 # Do not edit this file manually!
@@ -6,18 +6,18 @@
 SFILES+=	amd64/jvm.cfg
 SFILES+=	calendars.properties
 SFILES+=	content-types.properties
-SFILES+=	deploy/messages.properties
-SFILES+=	deploy/messages_zh_TW.properties
 SFILES+=	deploy/messages_de.properties
+SFILES+=	deploy/messages_sv.properties
+SFILES+=	deploy/messages_ja.properties
+SFILES+=	deploy/messages_zh_TW.properties
 SFILES+=	deploy/messages_es.properties
-SFILES+=	deploy/messages_fr.properties
 SFILES+=	deploy/messages_it.properties
-SFILES+=	deploy/messages_ja.properties
-SFILES+=	deploy/messages_ko.properties
 SFILES+=	deploy/messages_pt_BR.properties
-SFILES+=	deploy/messages_sv.properties
-SFILES+=	deploy/messages_zh_CN.properties
+SFILES+=	deploy/messages_fr.properties
+SFILES+=	deploy/messages.properties
 SFILES+=	deploy/messages_zh_HK.properties
+SFILES+=	deploy/messages_zh_CN.properties
+SFILES+=	deploy/messages_ko.properties
 SFILES+=	flavormap.properties
 SFILES+=	fontconfig.RedHat.2.1.bfc
 SFILES+=	fontconfig.RedHat.2.1.properties.src
@@ -25,8 +25,8 @@ SFILES+=	fontconfig.RedHat.3.bfc
 SFILES+=	fontconfig.RedHat.3.properties.src
 SFILES+=	fontconfig.RedHat.4.bfc
 SFILES+=	fontconfig.RedHat.4.properties.src
-SFILES+=	fontconfig.RedHat.6.0.bfc
-SFILES+=	fontconfig.RedHat.6.0.properties.src
+SFILES+=	fontconfig.RedHat.6.bfc
+SFILES+=	fontconfig.RedHat.6.properties.src
 SFILES+=	fontconfig.RedHat.bfc
 SFILES+=	fontconfig.RedHat.properties.src
 SFILES+=	fontconfig.SuSE.11.bfc