Re: Need help with updates for "sun15-jre" and "sun15-jdk" package

[Takahiro Kambe <taca%back-street.net@localhost>]

In message <20080105192219.GA8238%colwyn.zhadum.org.uk@localhost>
        on Sat, 5 Jan 2008 19:22:20 +0000,
        Matthias Scheler <tron%zhadum.org.uk@localhost> wrote:
> Can somebody please apply patch, make the necessary changes and either
> commit the result or send me a new patch?
Here is my patch.

-- 
Takahiro Kambe <taca%back-street.net@localhost>


Index: sun-jdk15/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk15/Makefile,v
retrieving revision 1.27
diff -u -u -r1.27 Makefile
--- sun-jdk15/Makefile  22 Aug 2007 14:03:47 -0000      1.27
+++ sun-jdk15/Makefile  7 Jan 2008 03:18:10 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.27 2007/08/22 14:03:47 jlam Exp $
 
-DISTNAME=      jdk-1_5_0_12-linux-${DIST_ARCH}
-PKGNAME=       sun-jdk15-5.0.12
-PKGREVISION=   1
+DISTNAME=      jdk-1_5_0_14-linux-${DIST_ARCH}
+PKGNAME=       sun-jdk15-5.0.14
 MASTER_SITES=  # empty
 
 SHORT_NAME=    JDK
Index: sun-jdk15/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk15/distinfo,v
retrieving revision 1.16
diff -u -u -r1.16 distinfo
--- sun-jdk15/distinfo  24 Aug 2007 16:08:49 -0000      1.16
+++ sun-jdk15/distinfo  7 Jan 2008 03:18:10 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.16 2007/08/24 16:08:49 jlam Exp $
 
-SHA1 (jdk-1_5_0_12-linux-amd64.bin) = c2ec68d16c9e62845e5df1819e39f4730a3d2c8c
-RMD160 (jdk-1_5_0_12-linux-amd64.bin) = 
04f48b9ef449d277006c5e681de0ac5224ce833e
-Size (jdk-1_5_0_12-linux-amd64.bin) = 43830513 bytes
-SHA1 (jdk-1_5_0_12-linux-i586.bin) = fc2a395b616100ab31684905945277dcb0fad3d7
-RMD160 (jdk-1_5_0_12-linux-i586.bin) = 6c58b82073f5617c08fe906acd4901037f3eca8c
-Size (jdk-1_5_0_12-linux-i586.bin) = 49622107 bytes
+SHA1 (jdk-1_5_0_14-linux-amd64.bin) = 471b7c8bcca927ab93300c28487576742fcb3909
+RMD160 (jdk-1_5_0_14-linux-amd64.bin) = 
13a10ec6ae3a1902578428472a75fb65e1aed8a4
+Size (jdk-1_5_0_14-linux-amd64.bin) = 44034138 bytes
+SHA1 (jdk-1_5_0_14-linux-i586.bin) = 52cd07489a8ed517a01c75128daf69f08e3390b2
+RMD160 (jdk-1_5_0_14-linux-i586.bin) = d16f171882bcb559c4ba98290e5a73ffc534ecea
+Size (jdk-1_5_0_14-linux-i586.bin) = 49649265 bytes
Index: sun-jre15/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre15/Makefile,v
retrieving revision 1.48
diff -u -u -r1.48 Makefile
--- sun-jre15/Makefile  27 Aug 2007 21:51:23 -0000      1.48
+++ sun-jre15/Makefile  7 Jan 2008 03:18:10 -0000
@@ -2,9 +2,8 @@
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=      jre-1_5_0_12-linux-${DIST_ARCH}
-PKGNAME=       sun-jre15-5.0.12
-PKGREVISION=   3
+DISTNAME=      jre-1_5_0_14-linux-${DIST_ARCH}
+PKGNAME=       sun-jre15-5.0.14
 MASTER_SITES=  # empty
 
 SHORT_NAME=    JRE
@@ -77,6 +76,7 @@
        ${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile
 
 do-configure:
+       ${CHMOD} -x ${WRKSRC}/lib/javaws/messages_zh_HK.properties
        cd ${WRKSRC}/lib; for file in ${SFILES}; do                     \
                ${MV} -f $$file $$file.default;                         \
        done
Index: sun-jre15/PLIST.linux-i386
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre15/PLIST.linux-i386,v
retrieving revision 1.5
diff -u -u -r1.5 PLIST.linux-i386
--- sun-jre15/PLIST.linux-i386  27 Aug 2007 21:51:23 -0000      1.5
+++ sun-jre15/PLIST.linux-i386  7 Jan 2008 03:18:10 -0000
@@ -308,6 +308,7 @@
 java/sun-1.5/lib/zi/America/Indiana/Knox
 java/sun-1.5/lib/zi/America/Indiana/Marengo
 java/sun-1.5/lib/zi/America/Indiana/Petersburg
+java/sun-1.5/lib/zi/America/Indiana/Tell_City
 java/sun-1.5/lib/zi/America/Indiana/Vevay
 java/sun-1.5/lib/zi/America/Indiana/Vincennes
 java/sun-1.5/lib/zi/America/Indiana/Winamac
Index: sun-jre15/PLIST.linux-x86_64
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre15/PLIST.linux-x86_64,v
retrieving revision 1.3
diff -u -u -r1.3 PLIST.linux-x86_64
--- sun-jre15/PLIST.linux-x86_64        27 Aug 2007 21:51:24 -0000      1.3
+++ sun-jre15/PLIST.linux-x86_64        7 Jan 2008 03:18:10 -0000
@@ -258,6 +258,7 @@
 java/sun-1.5/lib/zi/America/Indiana/Knox
 java/sun-1.5/lib/zi/America/Indiana/Marengo
 java/sun-1.5/lib/zi/America/Indiana/Petersburg
+java/sun-1.5/lib/zi/America/Indiana/Tell_City
 java/sun-1.5/lib/zi/America/Indiana/Vevay
 java/sun-1.5/lib/zi/America/Indiana/Vincennes
 java/sun-1.5/lib/zi/America/Indiana/Winamac
Index: sun-jre15/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre15/distinfo,v
retrieving revision 1.17
diff -u -u -r1.17 distinfo
--- sun-jre15/distinfo  8 Aug 2007 16:59:11 -0000       1.17
+++ sun-jre15/distinfo  7 Jan 2008 03:18:10 -0000
@@ -3,9 +3,9 @@
 SHA1 (jce_policy-1_5_0.zip) = f0e887b91b4499142285633e65c5710c3a133a16
 RMD160 (jce_policy-1_5_0.zip) = eb12d0333c3ddbbba57a0e825a6891a75ec485c0
 Size (jce_policy-1_5_0.zip) = 8826 bytes
-SHA1 (jre-1_5_0_12-linux-amd64.bin) = 4a635a92e959337f5f2aea2c6b8a2808345becbc
-RMD160 (jre-1_5_0_12-linux-amd64.bin) = 
c19c6a361724a0cdf5b5afc6e090b030a81e1b07
-Size (jre-1_5_0_12-linux-amd64.bin) = 16487834 bytes
-SHA1 (jre-1_5_0_12-linux-i586.bin) = c8e3cc2056911066848431202e19d59e5c3dbbc8
-RMD160 (jre-1_5_0_12-linux-i586.bin) = 02cd09c226e57e532863de63cac869920ecac880
-Size (jre-1_5_0_12-linux-i586.bin) = 17138633 bytes
+SHA1 (jre-1_5_0_14-linux-amd64.bin) = 2d6ffbc56c6c9ebc1d3a7c3e9754bcd298cd178d
+RMD160 (jre-1_5_0_14-linux-amd64.bin) = 
525acd37774301d17dceec0c6375ebe9808ad08e
+Size (jre-1_5_0_14-linux-amd64.bin) = 16683509 bytes
+SHA1 (jre-1_5_0_14-linux-i586.bin) = 645de718c567a38c7cf7ea6068a8c16c9b0a84c3
+RMD160 (jre-1_5_0_14-linux-i586.bin) = f73ad84c790b17d15b27e45b1132300e2316a81a
+Size (jre-1_5_0_14-linux-i586.bin) = 17163284 bytes