Thu Jun 9 18:44:14 2011 UTC ()
Pullup ticket #3452 - requested by obache
lang/sun-jdk6: security update
lang/sun-jre6: security update

Revisions pulled up:
- lang/sun-jdk6/Makefile                                        1.22
- lang/sun-jdk6/PLIST                                           1.12
- lang/sun-jdk6/distinfo                                        1.13
- lang/sun-jdk6/files/common                                    1.3
- lang/sun-jre6/Makefile                                        1.29
- lang/sun-jre6/PLIST.linux-i386                                1.22
- lang/sun-jre6/distinfo                                        1.16
- lang/sun-jre6/sfiles-i386.mk                                  1.5

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Thu Jun  9 09:08:18 UTC 2011

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

   Log Message:
   Update sun-{jre,jdk}6 to 6.0.26, aka 6u26.

   Java SE 6 Update 26
   * Olson Data 2011g
   * Bug fixes
      This release contains fixes for security vulnerabilities. For more
      information, please see Oracle Java SE Critical Patch Update advisory:
      http://www.oracle.com/technetwork/topics/security/javacpujune2011-313339.html

   Java SE 6 Update 25
   * Olson Data 2011b
   * Java Hotspot VM 20
   * Performance Improvement to BigDecimal
   * Performance Improvement to java.util.logging.LogRecord
   * Bug Fixes


(tron)
diff -r1.21 -r1.21.2.1 pkgsrc/lang/sun-jdk6/Makefile
diff -r1.11 -r1.11.2.1 pkgsrc/lang/sun-jdk6/PLIST
diff -r1.12 -r1.12.2.1 pkgsrc/lang/sun-jdk6/distinfo
diff -r1.2 -r1.2.4.1 pkgsrc/lang/sun-jdk6/files/common
diff -r1.28 -r1.28.2.1 pkgsrc/lang/sun-jre6/Makefile
diff -r1.21 -r1.21.2.1 pkgsrc/lang/sun-jre6/PLIST.linux-i386
diff -r1.15 -r1.15.2.1 pkgsrc/lang/sun-jre6/distinfo
diff -r1.4 -r1.4.2.1 pkgsrc/lang/sun-jre6/sfiles-i386.mk
cvs diff -r1.21 -r1.21.2.1 pkgsrc/lang/sun-jdk6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/sun-jdk6/Attic/Makefile 2011/02/21 07:48:19 1.21
+++ pkgsrc/lang/sun-jdk6/Attic/Makefile 2011/06/09 18:44:12 1.21.2.1
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.21 2011/02/21 07:48:19 obache Exp $ 1# $NetBSD: Makefile,v 1.21.2.1 2011/06/09 18:44:12 tron Exp $
2 2
3DISTNAME= jdk-6u24-linux-${DIST_ARCH} 3DISTNAME= jdk-6u26-linux-${DIST_ARCH}
4PKGNAME= sun-jdk6-6.0.24 4PKGNAME= sun-jdk6-6.0.26
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6 6
7LICENSE= sun-jdk6-license 7LICENSE= sun-jdk6-license
8 8
9DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6 9DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
10 10
11WRKSRC= ${WRKDIR}/jdk1.6.0_24 11WRKSRC= ${WRKDIR}/jdk1.6.0_26
12JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ 12JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
13 javac javadoc javah javap jdb rmic serialver 13 javac javadoc javah javap jdb rmic serialver
14 14
15MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
16 16
17.include "../../lang/sun-jre6/Makefile.common" 17.include "../../lang/sun-jre6/Makefile.common"
18 18
19# Remove parts that are in common with the JRE 19# Remove parts that are in common with the JRE
20# 20#
21post-extract: 21post-extract:
22 common=`${AWK} '/^#.*/ { next } /^$$/ { next } { print }' ${FILESDIR}/common`; \ 22 common=`${AWK} '/^#.*/ { next } /^$$/ { next } { print }' ${FILESDIR}/common`; \
23 cd ${WRKSRC}; for i in $$common; do \ 23 cd ${WRKSRC}; for i in $$common; do \
24 if [ -d $$i ]; then \ 24 if [ -d $$i ]; then \
cvs diff -r1.11 -r1.11.2.1 pkgsrc/lang/sun-jdk6/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/sun-jdk6/Attic/PLIST 2011/02/21 07:48:19 1.11
+++ pkgsrc/lang/sun-jdk6/Attic/PLIST 2011/06/09 18:44:12 1.11.2.1
@@ -1,30 +1,28 @@ @@ -1,30 +1,28 @@
1@comment $NetBSD: PLIST,v 1.11 2011/02/21 07:48:19 obache Exp $ 1@comment $NetBSD: PLIST,v 1.11.2.1 2011/06/09 18:44:12 tron Exp $
2bin/sun6-appletviewer 2bin/sun6-appletviewer
3bin/sun6-apt 3bin/sun6-apt
4bin/sun6-extcheck 4bin/sun6-extcheck
5bin/sun6-idlj 5bin/sun6-idlj
6bin/sun6-jar 6bin/sun6-jar
7bin/sun6-jarsigner 7bin/sun6-jarsigner
8bin/sun6-javac 8bin/sun6-javac
9bin/sun6-javadoc 9bin/sun6-javadoc
10bin/sun6-javah 10bin/sun6-javah
11bin/sun6-javap 11bin/sun6-javap
12bin/sun6-jdb 12bin/sun6-jdb
13bin/sun6-rmic 13bin/sun6-rmic
14bin/sun6-serialver 14bin/sun6-serialver
15java/sun-6/README.html 15java/sun-6/README.html
16java/sun-6/README_ja.html 
17java/sun-6/README_zh_CN.html 
18java/sun-6/bin/HtmlConverter 16java/sun-6/bin/HtmlConverter
19java/sun-6/bin/appletviewer 17java/sun-6/bin/appletviewer
20java/sun-6/bin/apt 18java/sun-6/bin/apt
21java/sun-6/bin/extcheck 19java/sun-6/bin/extcheck
22java/sun-6/bin/idlj 20java/sun-6/bin/idlj
23java/sun-6/bin/jar 21java/sun-6/bin/jar
24java/sun-6/bin/jarsigner 22java/sun-6/bin/jarsigner
25java/sun-6/bin/java-rmi.cgi 23java/sun-6/bin/java-rmi.cgi
26java/sun-6/bin/javac 24java/sun-6/bin/javac
27java/sun-6/bin/javadoc 25java/sun-6/bin/javadoc
28java/sun-6/bin/javah 26java/sun-6/bin/javah
29java/sun-6/bin/javap 27java/sun-6/bin/javap
30java/sun-6/bin/jconsole 28java/sun-6/bin/jconsole
@@ -1862,28 +1860,26 @@ java/sun-6/demo/applets/WireFrame/Matrix @@ -1862,28 +1860,26 @@ java/sun-6/demo/applets/WireFrame/Matrix
1862java/sun-6/demo/applets/WireFrame/Model3D.class 1860java/sun-6/demo/applets/WireFrame/Model3D.class
1863java/sun-6/demo/applets/WireFrame/ThreeD.class 1861java/sun-6/demo/applets/WireFrame/ThreeD.class
1864java/sun-6/demo/applets/WireFrame/ThreeD.java 1862java/sun-6/demo/applets/WireFrame/ThreeD.java
1865java/sun-6/demo/applets/WireFrame/example1.html 1863java/sun-6/demo/applets/WireFrame/example1.html
1866java/sun-6/demo/applets/WireFrame/example2.html 1864java/sun-6/demo/applets/WireFrame/example2.html
1867java/sun-6/demo/applets/WireFrame/example3.html 1865java/sun-6/demo/applets/WireFrame/example3.html
1868java/sun-6/demo/applets/WireFrame/example4.html 1866java/sun-6/demo/applets/WireFrame/example4.html
1869java/sun-6/demo/applets/WireFrame/models/cube.obj 1867java/sun-6/demo/applets/WireFrame/models/cube.obj
1870java/sun-6/demo/applets/WireFrame/models/dinasaur.obj 1868java/sun-6/demo/applets/WireFrame/models/dinasaur.obj
1871java/sun-6/demo/applets/WireFrame/models/hughes_500.obj 1869java/sun-6/demo/applets/WireFrame/models/hughes_500.obj
1872java/sun-6/demo/applets/WireFrame/models/knoxS.obj 1870java/sun-6/demo/applets/WireFrame/models/knoxS.obj
1873java/sun-6/demo/jfc/CodePointIM/CodePointIM.jar 1871java/sun-6/demo/jfc/CodePointIM/CodePointIM.jar
1874java/sun-6/demo/jfc/CodePointIM/README.html 1872java/sun-6/demo/jfc/CodePointIM/README.html
1875java/sun-6/demo/jfc/CodePointIM/README_ja.html 
1876java/sun-6/demo/jfc/CodePointIM/README_zh_CN.html 
1877java/sun-6/demo/jfc/CodePointIM/src/CodePointIM.java 1873java/sun-6/demo/jfc/CodePointIM/src/CodePointIM.java
1878java/sun-6/demo/jfc/CodePointIM/src/CodePointInputMethod.java 1874java/sun-6/demo/jfc/CodePointIM/src/CodePointInputMethod.java
1879java/sun-6/demo/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java 1875java/sun-6/demo/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java
1880java/sun-6/demo/jfc/CodePointIM/src/resources/codepoint.properties 1876java/sun-6/demo/jfc/CodePointIM/src/resources/codepoint.properties
1881java/sun-6/demo/jfc/CodePointIM/src/resources/codepoint_ja.properties 1877java/sun-6/demo/jfc/CodePointIM/src/resources/codepoint_ja.properties
1882java/sun-6/demo/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties 1878java/sun-6/demo/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties
1883java/sun-6/demo/jfc/FileChooserDemo/FileChooserDemo.jar 1879java/sun-6/demo/jfc/FileChooserDemo/FileChooserDemo.jar
1884java/sun-6/demo/jfc/FileChooserDemo/README.txt 1880java/sun-6/demo/jfc/FileChooserDemo/README.txt
1885java/sun-6/demo/jfc/FileChooserDemo/src/ExampleFileView.java 1881java/sun-6/demo/jfc/FileChooserDemo/src/ExampleFileView.java
1886java/sun-6/demo/jfc/FileChooserDemo/src/FileChooserDemo.java 1882java/sun-6/demo/jfc/FileChooserDemo/src/FileChooserDemo.java
1887java/sun-6/demo/jfc/FileChooserDemo/src/resources/images/gifIcon.gif 1883java/sun-6/demo/jfc/FileChooserDemo/src/resources/images/gifIcon.gif
1888java/sun-6/demo/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg 1884java/sun-6/demo/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg
1889java/sun-6/demo/jfc/Font2DTest/Font2DTest.html 1885java/sun-6/demo/jfc/Font2DTest/Font2DTest.html
@@ -2737,28 +2733,26 @@ java/sun-6/demo/plugin/applets/WireFrame @@ -2737,28 +2733,26 @@ java/sun-6/demo/plugin/applets/WireFrame
2737java/sun-6/demo/plugin/applets/WireFrame/Model3D.class 2733java/sun-6/demo/plugin/applets/WireFrame/Model3D.class
2738java/sun-6/demo/plugin/applets/WireFrame/ThreeD.class 2734java/sun-6/demo/plugin/applets/WireFrame/ThreeD.class
2739java/sun-6/demo/plugin/applets/WireFrame/ThreeD.java 2735java/sun-6/demo/plugin/applets/WireFrame/ThreeD.java
2740java/sun-6/demo/plugin/applets/WireFrame/example1.html 2736java/sun-6/demo/plugin/applets/WireFrame/example1.html
2741java/sun-6/demo/plugin/applets/WireFrame/example2.html 2737java/sun-6/demo/plugin/applets/WireFrame/example2.html
2742java/sun-6/demo/plugin/applets/WireFrame/example3.html 2738java/sun-6/demo/plugin/applets/WireFrame/example3.html
2743java/sun-6/demo/plugin/applets/WireFrame/example4.html 2739java/sun-6/demo/plugin/applets/WireFrame/example4.html
2744java/sun-6/demo/plugin/applets/WireFrame/models/cube.obj 2740java/sun-6/demo/plugin/applets/WireFrame/models/cube.obj
2745java/sun-6/demo/plugin/applets/WireFrame/models/dinasaur.obj 2741java/sun-6/demo/plugin/applets/WireFrame/models/dinasaur.obj
2746java/sun-6/demo/plugin/applets/WireFrame/models/hughes_500.obj 2742java/sun-6/demo/plugin/applets/WireFrame/models/hughes_500.obj
2747java/sun-6/demo/plugin/applets/WireFrame/models/knoxS.obj 2743java/sun-6/demo/plugin/applets/WireFrame/models/knoxS.obj
2748java/sun-6/demo/plugin/jfc/CodePointIM/CodePointIM.jar 2744java/sun-6/demo/plugin/jfc/CodePointIM/CodePointIM.jar
2749java/sun-6/demo/plugin/jfc/CodePointIM/README.html 2745java/sun-6/demo/plugin/jfc/CodePointIM/README.html
2750java/sun-6/demo/plugin/jfc/CodePointIM/README_ja.html 
2751java/sun-6/demo/plugin/jfc/CodePointIM/README_zh_CN.html 
2752java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointIM.java 2746java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointIM.java
2753java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointInputMethod.java 2747java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointInputMethod.java
2754java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java 2748java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java
2755java/sun-6/demo/plugin/jfc/CodePointIM/src/resources/codepoint.properties 2749java/sun-6/demo/plugin/jfc/CodePointIM/src/resources/codepoint.properties
2756java/sun-6/demo/plugin/jfc/CodePointIM/src/resources/codepoint_ja.properties 2750java/sun-6/demo/plugin/jfc/CodePointIM/src/resources/codepoint_ja.properties
2757java/sun-6/demo/plugin/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties 2751java/sun-6/demo/plugin/jfc/CodePointIM/src/resources/codepoint_zh_CN.properties
2758java/sun-6/demo/plugin/jfc/FileChooserDemo/FileChooserDemo.jar 2752java/sun-6/demo/plugin/jfc/FileChooserDemo/FileChooserDemo.jar
2759java/sun-6/demo/plugin/jfc/FileChooserDemo/README.txt 2753java/sun-6/demo/plugin/jfc/FileChooserDemo/README.txt
2760java/sun-6/demo/plugin/jfc/FileChooserDemo/src/ExampleFileView.java 2754java/sun-6/demo/plugin/jfc/FileChooserDemo/src/ExampleFileView.java
2761java/sun-6/demo/plugin/jfc/FileChooserDemo/src/FileChooserDemo.java 2755java/sun-6/demo/plugin/jfc/FileChooserDemo/src/FileChooserDemo.java
2762java/sun-6/demo/plugin/jfc/FileChooserDemo/src/resources/images/gifIcon.gif 2756java/sun-6/demo/plugin/jfc/FileChooserDemo/src/resources/images/gifIcon.gif
2763java/sun-6/demo/plugin/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg 2757java/sun-6/demo/plugin/jfc/FileChooserDemo/src/resources/images/jpgIcon.jpg
2764java/sun-6/demo/plugin/jfc/Font2DTest/Font2DTest.html 2758java/sun-6/demo/plugin/jfc/Font2DTest/Font2DTest.html
cvs diff -r1.12 -r1.12.2.1 pkgsrc/lang/sun-jdk6/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/sun-jdk6/Attic/distinfo 2011/02/21 07:48:19 1.12
+++ pkgsrc/lang/sun-jdk6/Attic/distinfo 2011/06/09 18:44:12 1.12.2.1
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.12 2011/02/21 07:48:19 obache Exp $ 1$NetBSD: distinfo,v 1.12.2.1 2011/06/09 18:44:12 tron Exp $
2 2
3SHA1 (jdk-6u24-linux-i586.bin) = 4aad5209feb08eb86304f92c7b13ba83836f6605 3SHA1 (jdk-6u26-linux-i586.bin) = 5f5c9c8489391b881ec324b455a98cabf832ca7a
4RMD160 (jdk-6u24-linux-i586.bin) = ef3f5cada8598c179bdc22f0e7e54c1579330141 4RMD160 (jdk-6u26-linux-i586.bin) = 613bb466a85679517d7415bc70b15add2e1cc395
5Size (jdk-6u24-linux-i586.bin) = 84927175 bytes 5Size (jdk-6u26-linux-i586.bin) = 85141056 bytes
cvs diff -r1.2 -r1.2.4.1 pkgsrc/lang/sun-jdk6/files/Attic/common (expand / switch to unified diff)

--- pkgsrc/lang/sun-jdk6/files/Attic/common 2010/10/16 04:41:19 1.2
+++ pkgsrc/lang/sun-jdk6/files/Attic/common 2011/06/09 18:44:13 1.2.4.1
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: common,v 1.2 2010/10/16 04:41:19 obache Exp $ 1# $NetBSD: common,v 1.2.4.1 2011/06/09 18:44:13 tron Exp $
2 2
3COPYRIGHT 3COPYRIGHT
 4LICENSE
4THIRDPARTYLICENSEREADME.txt 5THIRDPARTYLICENSEREADME.txt
5bin/ControlPanel 6bin/ControlPanel
6bin/java 7bin/java
7bin/javaws 8bin/javaws
8bin/jcontrol 9bin/jcontrol
9bin/keytool 10bin/keytool
10bin/orbd 11bin/orbd
11bin/pack200 12bin/pack200
12bin/policytool 13bin/policytool
13bin/rmid 14bin/rmid
14bin/rmiregistry 15bin/rmiregistry
15bin/servertool 16bin/servertool
16bin/tnameserv 17bin/tnameserv
cvs diff -r1.28 -r1.28.2.1 pkgsrc/lang/sun-jre6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/Makefile 2011/02/21 07:48:20 1.28
+++ pkgsrc/lang/sun-jre6/Attic/Makefile 2011/06/09 18:44:13 1.28.2.1
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.28 2011/02/21 07:48:20 obache Exp $ 1# $NetBSD: Makefile,v 1.28.2.1 2011/06/09 18:44:13 tron Exp $
2 2
3# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce 3# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
4# Note: Update DOWNLOAD_NAME when you update the JRE version 4# Note: Update DOWNLOAD_NAME when you update the JRE version
5 5
6DISTNAME= jre-6u24-linux-${DIST_ARCH} 6DISTNAME= jre-6u26-linux-${DIST_ARCH}
7PKGNAME= sun-jre6-6.0.24 7PKGNAME= sun-jre6-6.0.26
8MASTER_SITES= # empty 8MASTER_SITES= # empty
9 9
10LICENSE= sun-jre6-license 10LICENSE= sun-jre6-license
11 11
12DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u24 12DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u26
13 13
14USE_TOOLS+= pax 14USE_TOOLS+= pax
15 15
16WRKSRC= ${WRKDIR}/jre1.6.0_24 16WRKSRC= ${WRKDIR}/jre1.6.0_26
17JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \ 17JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \
18 servertool tnameserv 18 servertool tnameserv
19REQD_DIRS= ${JAVA_HOME} 19REQD_DIRS= ${JAVA_HOME}
20REQD_DIRS+= ${JAVA_HOME}/lib 20REQD_DIRS+= ${JAVA_HOME}/lib
21REQD_DIRS+= ${JAVA_HOME}/lib/applet 21REQD_DIRS+= ${JAVA_HOME}/lib/applet
22REQD_DIRS+= ${JAVA_HOME}/lib/images 22REQD_DIRS+= ${JAVA_HOME}/lib/images
23REQD_DIRS+= ${JAVA_HOME}/lib/images/cursors 23REQD_DIRS+= ${JAVA_HOME}/lib/images/cursors
24REQD_DIRS+= ${JAVA_HOME}/lib/security 24REQD_DIRS+= ${JAVA_HOME}/lib/security
25CONF_FILES= # empty 25CONF_FILES= # empty
26 26
27.include "../../lang/sun-jre6/Makefile.common" 27.include "../../lang/sun-jre6/Makefile.common"
28 28
29.sinclude "sfiles-${EMUL_ARCH}.mk" 29.sinclude "sfiles-${EMUL_ARCH}.mk"
cvs diff -r1.21 -r1.21.2.1 pkgsrc/lang/sun-jre6/Attic/PLIST.linux-i386 (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/PLIST.linux-i386 2011/02/21 07:48:20 1.21
+++ pkgsrc/lang/sun-jre6/Attic/PLIST.linux-i386 2011/06/09 18:44:13 1.21.2.1
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1@comment $NetBSD: PLIST.linux-i386,v 1.21 2011/02/21 07:48:20 obache Exp $ 1@comment $NetBSD: PLIST.linux-i386,v 1.21.2.1 2011/06/09 18:44:13 tron Exp $
2bin/sun6-java 2bin/sun6-java
3bin/sun6-javaws 3bin/sun6-javaws
4bin/sun6-keytool 4bin/sun6-keytool
5bin/sun6-orbd 5bin/sun6-orbd
6bin/sun6-policytool 6bin/sun6-policytool
7bin/sun6-rmid 7bin/sun6-rmid
8bin/sun6-rmiregistry 8bin/sun6-rmiregistry
9bin/sun6-servertool 9bin/sun6-servertool
10bin/sun6-tnameserv 10bin/sun6-tnameserv
11java/sun-6/.systemPrefs/.system.lock 11java/sun-6/.systemPrefs/.system.lock
12java/sun-6/.systemPrefs/.systemRootModFile 12java/sun-6/.systemPrefs/.systemRootModFile
13java/sun-6/COPYRIGHT 13java/sun-6/COPYRIGHT
 14java/sun-6/LICENSE
14java/sun-6/README 15java/sun-6/README
15java/sun-6/THIRDPARTYLICENSEREADME.txt 16java/sun-6/THIRDPARTYLICENSEREADME.txt
16java/sun-6/Welcome.html 17java/sun-6/Welcome.html
17java/sun-6/bin/ControlPanel 18java/sun-6/bin/ControlPanel
18java/sun-6/bin/java 19java/sun-6/bin/java
19java/sun-6/bin/java_vm 20java/sun-6/bin/java_vm
20java/sun-6/bin/javaws 21java/sun-6/bin/javaws
21java/sun-6/bin/jcontrol 22java/sun-6/bin/jcontrol
22java/sun-6/bin/keytool 23java/sun-6/bin/keytool
23java/sun-6/bin/orbd 24java/sun-6/bin/orbd
24java/sun-6/bin/pack200 25java/sun-6/bin/pack200
25java/sun-6/bin/policytool 26java/sun-6/bin/policytool
26java/sun-6/bin/rmid 27java/sun-6/bin/rmid
@@ -112,26 +113,28 @@ java/sun-6/lib/desktop/mime/packages/x-j @@ -112,26 +113,28 @@ java/sun-6/lib/desktop/mime/packages/x-j
112java/sun-6/lib/desktop/mime/packages/x-java-jnlp-file.xml 113java/sun-6/lib/desktop/mime/packages/x-java-jnlp-file.xml
113java/sun-6/lib/ext/dnsns.jar 114java/sun-6/lib/ext/dnsns.jar
114java/sun-6/lib/ext/localedata.jar 115java/sun-6/lib/ext/localedata.jar
115java/sun-6/lib/ext/meta-index 116java/sun-6/lib/ext/meta-index
116java/sun-6/lib/ext/sunjce_provider.jar 117java/sun-6/lib/ext/sunjce_provider.jar
117java/sun-6/lib/ext/sunpkcs11.jar 118java/sun-6/lib/ext/sunpkcs11.jar
118java/sun-6/lib/flavormap.properties.default 119java/sun-6/lib/flavormap.properties.default
119java/sun-6/lib/fontconfig.RedHat.2.1.bfc.default 120java/sun-6/lib/fontconfig.RedHat.2.1.bfc.default
120java/sun-6/lib/fontconfig.RedHat.2.1.properties.src.default 121java/sun-6/lib/fontconfig.RedHat.2.1.properties.src.default
121java/sun-6/lib/fontconfig.RedHat.3.bfc.default 122java/sun-6/lib/fontconfig.RedHat.3.bfc.default
122java/sun-6/lib/fontconfig.RedHat.3.properties.src.default 123java/sun-6/lib/fontconfig.RedHat.3.properties.src.default
123java/sun-6/lib/fontconfig.RedHat.4.bfc.default 124java/sun-6/lib/fontconfig.RedHat.4.bfc.default
124java/sun-6/lib/fontconfig.RedHat.4.properties.src.default 125java/sun-6/lib/fontconfig.RedHat.4.properties.src.default
 126java/sun-6/lib/fontconfig.RedHat.6.0.bfc.default
 127java/sun-6/lib/fontconfig.RedHat.6.0.properties.src.default
125java/sun-6/lib/fontconfig.RedHat.bfc.default 128java/sun-6/lib/fontconfig.RedHat.bfc.default
126java/sun-6/lib/fontconfig.RedHat.properties.src.default 129java/sun-6/lib/fontconfig.RedHat.properties.src.default
127java/sun-6/lib/fontconfig.SuSE.11.bfc.default 130java/sun-6/lib/fontconfig.SuSE.11.bfc.default
128java/sun-6/lib/fontconfig.SuSE.11.properties.src.default 131java/sun-6/lib/fontconfig.SuSE.11.properties.src.default
129java/sun-6/lib/fontconfig.SuSE.bfc.default 132java/sun-6/lib/fontconfig.SuSE.bfc.default
130java/sun-6/lib/fontconfig.SuSE.properties.src.default 133java/sun-6/lib/fontconfig.SuSE.properties.src.default
131java/sun-6/lib/fontconfig.Sun.bfc.default 134java/sun-6/lib/fontconfig.Sun.bfc.default
132java/sun-6/lib/fontconfig.Sun.properties.src.default 135java/sun-6/lib/fontconfig.Sun.properties.src.default
133java/sun-6/lib/fontconfig.Turbo.bfc.default 136java/sun-6/lib/fontconfig.Turbo.bfc.default
134java/sun-6/lib/fontconfig.Turbo.properties.src.default 137java/sun-6/lib/fontconfig.Turbo.properties.src.default
135java/sun-6/lib/fontconfig.Ubuntu.bfc.default 138java/sun-6/lib/fontconfig.Ubuntu.bfc.default
136java/sun-6/lib/fontconfig.Ubuntu.properties.src.default 139java/sun-6/lib/fontconfig.Ubuntu.properties.src.default
137java/sun-6/lib/fontconfig.bfc.default 140java/sun-6/lib/fontconfig.bfc.default
@@ -386,61 +389,64 @@ java/sun-6/lib/zi/America/Juneau @@ -386,61 +389,64 @@ java/sun-6/lib/zi/America/Juneau
386java/sun-6/lib/zi/America/Kentucky/Louisville 389java/sun-6/lib/zi/America/Kentucky/Louisville
387java/sun-6/lib/zi/America/Kentucky/Monticello 390java/sun-6/lib/zi/America/Kentucky/Monticello
388java/sun-6/lib/zi/America/La_Paz 391java/sun-6/lib/zi/America/La_Paz
389java/sun-6/lib/zi/America/Lima 392java/sun-6/lib/zi/America/Lima
390java/sun-6/lib/zi/America/Los_Angeles 393java/sun-6/lib/zi/America/Los_Angeles
391java/sun-6/lib/zi/America/Maceio 394java/sun-6/lib/zi/America/Maceio
392java/sun-6/lib/zi/America/Managua 395java/sun-6/lib/zi/America/Managua
393java/sun-6/lib/zi/America/Manaus 396java/sun-6/lib/zi/America/Manaus
394java/sun-6/lib/zi/America/Martinique 397java/sun-6/lib/zi/America/Martinique
395java/sun-6/lib/zi/America/Matamoros 398java/sun-6/lib/zi/America/Matamoros
396java/sun-6/lib/zi/America/Mazatlan 399java/sun-6/lib/zi/America/Mazatlan
397java/sun-6/lib/zi/America/Menominee 400java/sun-6/lib/zi/America/Menominee
398java/sun-6/lib/zi/America/Merida 401java/sun-6/lib/zi/America/Merida
 402java/sun-6/lib/zi/America/Metlakatla
399java/sun-6/lib/zi/America/Mexico_City 403java/sun-6/lib/zi/America/Mexico_City
400java/sun-6/lib/zi/America/Miquelon 404java/sun-6/lib/zi/America/Miquelon
401java/sun-6/lib/zi/America/Moncton 405java/sun-6/lib/zi/America/Moncton
402java/sun-6/lib/zi/America/Monterrey 406java/sun-6/lib/zi/America/Monterrey
403java/sun-6/lib/zi/America/Montevideo 407java/sun-6/lib/zi/America/Montevideo
404java/sun-6/lib/zi/America/Montreal 408java/sun-6/lib/zi/America/Montreal
405java/sun-6/lib/zi/America/Montserrat 409java/sun-6/lib/zi/America/Montserrat
406java/sun-6/lib/zi/America/Nassau 410java/sun-6/lib/zi/America/Nassau
407java/sun-6/lib/zi/America/New_York 411java/sun-6/lib/zi/America/New_York
408java/sun-6/lib/zi/America/Nipigon 412java/sun-6/lib/zi/America/Nipigon
409java/sun-6/lib/zi/America/Nome 413java/sun-6/lib/zi/America/Nome
410java/sun-6/lib/zi/America/Noronha 414java/sun-6/lib/zi/America/Noronha
 415java/sun-6/lib/zi/America/North_Dakota/Beulah
411java/sun-6/lib/zi/America/North_Dakota/Center 416java/sun-6/lib/zi/America/North_Dakota/Center
412java/sun-6/lib/zi/America/North_Dakota/New_Salem 417java/sun-6/lib/zi/America/North_Dakota/New_Salem
413java/sun-6/lib/zi/America/Ojinaga 418java/sun-6/lib/zi/America/Ojinaga
414java/sun-6/lib/zi/America/Panama 419java/sun-6/lib/zi/America/Panama
415java/sun-6/lib/zi/America/Pangnirtung 420java/sun-6/lib/zi/America/Pangnirtung
416java/sun-6/lib/zi/America/Paramaribo 421java/sun-6/lib/zi/America/Paramaribo
417java/sun-6/lib/zi/America/Phoenix 422java/sun-6/lib/zi/America/Phoenix
418java/sun-6/lib/zi/America/Port-au-Prince 423java/sun-6/lib/zi/America/Port-au-Prince
419java/sun-6/lib/zi/America/Port_of_Spain 424java/sun-6/lib/zi/America/Port_of_Spain
420java/sun-6/lib/zi/America/Porto_Velho 425java/sun-6/lib/zi/America/Porto_Velho
421java/sun-6/lib/zi/America/Puerto_Rico 426java/sun-6/lib/zi/America/Puerto_Rico
422java/sun-6/lib/zi/America/Rainy_River 427java/sun-6/lib/zi/America/Rainy_River
423java/sun-6/lib/zi/America/Rankin_Inlet 428java/sun-6/lib/zi/America/Rankin_Inlet
424java/sun-6/lib/zi/America/Recife 429java/sun-6/lib/zi/America/Recife
425java/sun-6/lib/zi/America/Regina 430java/sun-6/lib/zi/America/Regina
426java/sun-6/lib/zi/America/Resolute 431java/sun-6/lib/zi/America/Resolute
427java/sun-6/lib/zi/America/Rio_Branco 432java/sun-6/lib/zi/America/Rio_Branco
428java/sun-6/lib/zi/America/Santa_Isabel 433java/sun-6/lib/zi/America/Santa_Isabel
429java/sun-6/lib/zi/America/Santarem 434java/sun-6/lib/zi/America/Santarem
430java/sun-6/lib/zi/America/Santiago 435java/sun-6/lib/zi/America/Santiago
431java/sun-6/lib/zi/America/Santo_Domingo 436java/sun-6/lib/zi/America/Santo_Domingo
432java/sun-6/lib/zi/America/Sao_Paulo 437java/sun-6/lib/zi/America/Sao_Paulo
433java/sun-6/lib/zi/America/Scoresbysund 438java/sun-6/lib/zi/America/Scoresbysund
 439java/sun-6/lib/zi/America/Sitka
434java/sun-6/lib/zi/America/St_Johns 440java/sun-6/lib/zi/America/St_Johns
435java/sun-6/lib/zi/America/St_Kitts 441java/sun-6/lib/zi/America/St_Kitts
436java/sun-6/lib/zi/America/St_Lucia 442java/sun-6/lib/zi/America/St_Lucia
437java/sun-6/lib/zi/America/St_Thomas 443java/sun-6/lib/zi/America/St_Thomas
438java/sun-6/lib/zi/America/St_Vincent 444java/sun-6/lib/zi/America/St_Vincent
439java/sun-6/lib/zi/America/Swift_Current 445java/sun-6/lib/zi/America/Swift_Current
440java/sun-6/lib/zi/America/Tegucigalpa 446java/sun-6/lib/zi/America/Tegucigalpa
441java/sun-6/lib/zi/America/Thule 447java/sun-6/lib/zi/America/Thule
442java/sun-6/lib/zi/America/Thunder_Bay 448java/sun-6/lib/zi/America/Thunder_Bay
443java/sun-6/lib/zi/America/Tijuana 449java/sun-6/lib/zi/America/Tijuana
444java/sun-6/lib/zi/America/Toronto 450java/sun-6/lib/zi/America/Toronto
445java/sun-6/lib/zi/America/Tortola 451java/sun-6/lib/zi/America/Tortola
446java/sun-6/lib/zi/America/Vancouver 452java/sun-6/lib/zi/America/Vancouver
cvs diff -r1.15 -r1.15.2.1 pkgsrc/lang/sun-jre6/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/distinfo 2011/02/21 07:48:20 1.15
+++ pkgsrc/lang/sun-jre6/Attic/distinfo 2011/06/09 18:44:13 1.15.2.1
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.15 2011/02/21 07:48:20 obache Exp $ 1$NetBSD: distinfo,v 1.15.2.1 2011/06/09 18:44:13 tron Exp $
2 2
3SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425 3SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
4RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae 4RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
5Size (jce_policy-6.zip) = 9101 bytes 5Size (jce_policy-6.zip) = 9101 bytes
6SHA1 (jre-6u24-linux-i586.bin) = 4ea939acb29cb9e0e5e72ea47b9f193ccb647232 6SHA1 (jre-6u26-linux-i586.bin) = a6c3a29eb9b63a1993115ed319e960df195a1e9b
7RMD160 (jre-6u24-linux-i586.bin) = 4cc5e6d6da914c21cfbf6b9176fc56b05541895a 7RMD160 (jre-6u26-linux-i586.bin) = 90d4b26cdc1c6d22bb304ab3cd6d8e01ddd55b30
8Size (jre-6u24-linux-i586.bin) = 21428830 bytes 8Size (jre-6u26-linux-i586.bin) = 21628961 bytes
cvs diff -r1.4 -r1.4.2.1 pkgsrc/lang/sun-jre6/Attic/sfiles-i386.mk (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/sfiles-i386.mk 2011/02/21 07:48:20 1.4
+++ pkgsrc/lang/sun-jre6/Attic/sfiles-i386.mk 2011/06/09 18:44:13 1.4.2.1
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1# $NetBSD: sfiles-i386.mk,v 1.4 2011/02/21 07:48:20 obache Exp $ 1# $NetBSD: sfiles-i386.mk,v 1.4.2.1 2011/06/09 18:44:13 tron Exp $
2# 2#
3# Created with "make makesfiles" 3# Created with "make makesfiles"
4# Do not edit this file manually! 4# Do not edit this file manually!
5# 5#
6SFILES+= calendars.properties 6SFILES+= calendars.properties
7SFILES+= content-types.properties 7SFILES+= content-types.properties
8SFILES+= deploy/messages.properties 8SFILES+= deploy/messages.properties
9SFILES+= deploy/messages_zh_TW.properties 9SFILES+= deploy/messages_zh_TW.properties
10SFILES+= deploy/messages_de.properties 10SFILES+= deploy/messages_de.properties
11SFILES+= deploy/messages_es.properties 11SFILES+= deploy/messages_es.properties
12SFILES+= deploy/messages_fr.properties 12SFILES+= deploy/messages_fr.properties
13SFILES+= deploy/messages_it.properties 13SFILES+= deploy/messages_it.properties
14SFILES+= deploy/messages_ja.properties 14SFILES+= deploy/messages_ja.properties
15SFILES+= deploy/messages_ko.properties 15SFILES+= deploy/messages_ko.properties
16SFILES+= deploy/messages_pt_BR.properties 16SFILES+= deploy/messages_pt_BR.properties
17SFILES+= deploy/messages_sv.properties 17SFILES+= deploy/messages_sv.properties
18SFILES+= deploy/messages_zh_CN.properties 18SFILES+= deploy/messages_zh_CN.properties
19SFILES+= deploy/messages_zh_HK.properties 19SFILES+= deploy/messages_zh_HK.properties
20SFILES+= flavormap.properties 20SFILES+= flavormap.properties
21SFILES+= fontconfig.RedHat.2.1.bfc 21SFILES+= fontconfig.RedHat.2.1.bfc
22SFILES+= fontconfig.RedHat.2.1.properties.src 22SFILES+= fontconfig.RedHat.2.1.properties.src
23SFILES+= fontconfig.RedHat.3.bfc 23SFILES+= fontconfig.RedHat.3.bfc
24SFILES+= fontconfig.RedHat.3.properties.src 24SFILES+= fontconfig.RedHat.3.properties.src
25SFILES+= fontconfig.RedHat.4.bfc 25SFILES+= fontconfig.RedHat.4.bfc
26SFILES+= fontconfig.RedHat.4.properties.src 26SFILES+= fontconfig.RedHat.4.properties.src
 27SFILES+= fontconfig.RedHat.6.0.bfc
 28SFILES+= fontconfig.RedHat.6.0.properties.src
27SFILES+= fontconfig.RedHat.bfc 29SFILES+= fontconfig.RedHat.bfc
28SFILES+= fontconfig.RedHat.properties.src 30SFILES+= fontconfig.RedHat.properties.src
29SFILES+= fontconfig.SuSE.11.bfc 31SFILES+= fontconfig.SuSE.11.bfc
30SFILES+= fontconfig.SuSE.11.properties.src 32SFILES+= fontconfig.SuSE.11.properties.src
31SFILES+= fontconfig.SuSE.bfc 33SFILES+= fontconfig.SuSE.bfc
32SFILES+= fontconfig.SuSE.properties.src 34SFILES+= fontconfig.SuSE.properties.src
33SFILES+= fontconfig.Sun.bfc 35SFILES+= fontconfig.Sun.bfc
34SFILES+= fontconfig.Sun.properties.src 36SFILES+= fontconfig.Sun.properties.src
35SFILES+= fontconfig.Turbo.bfc 37SFILES+= fontconfig.Turbo.bfc
36SFILES+= fontconfig.Turbo.properties.src 38SFILES+= fontconfig.Turbo.properties.src
37SFILES+= fontconfig.Ubuntu.bfc 39SFILES+= fontconfig.Ubuntu.bfc
38SFILES+= fontconfig.Ubuntu.properties.src 40SFILES+= fontconfig.Ubuntu.properties.src
39SFILES+= fontconfig.bfc 41SFILES+= fontconfig.bfc