[pkgsrc/trunk]: pkgsrc/lang/sun-jre15 Fix installation on x86_64.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd2aaf4bc172
branches:  trunk
changeset: 540181:fd2aaf4bc172
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Mar 31 22:10:07 2008 +0000

description:
Fix installation on x86_64.

diffstat:

 lang/sun-jre15/Makefile           |  4 +++-
 lang/sun-jre15/PLIST.linux-x86_64 |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r c2b1457f3544 -r fd2aaf4bc172 lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Mon Mar 31 20:55:58 2008 +0000
+++ b/lang/sun-jre15/Makefile   Mon Mar 31 22:10:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/03/05 22:14:07 tnn Exp $
+# $NetBSD: Makefile,v 1.52 2008/03/31 22:10:07 tnn Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -78,7 +78,9 @@
        ${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile
 
 do-configure:
+.if ${EMUL_ARCH} == "i386"
        ${CHMOD} -x ${WRKSRC}/lib/javaws/messages_zh_HK.properties
+.endif
        cd ${WRKSRC}/lib; for file in ${SFILES}; do                     \
                ${MV} -f $$file $$file.default;                         \
        done
diff -r c2b1457f3544 -r fd2aaf4bc172 lang/sun-jre15/PLIST.linux-x86_64
--- a/lang/sun-jre15/PLIST.linux-x86_64 Mon Mar 31 20:55:58 2008 +0000
+++ b/lang/sun-jre15/PLIST.linux-x86_64 Mon Mar 31 22:10:07 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.4 2008/01/07 19:56:28 tron Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.5 2008/03/31 22:10:07 tnn Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -43,6 +43,7 @@
 java/sun-1.5/lib/amd64/libhprof.so
 java/sun-1.5/lib/amd64/libinstrument.so
 java/sun-1.5/lib/amd64/libioser12.so
+java/sun-1.5/lib/amd64/libj2pkcs11.so
 java/sun-1.5/lib/amd64/libjaas_unix.so
 java/sun-1.5/lib/amd64/libjava.so
 java/sun-1.5/lib/amd64/libjava_crw_demo.so
@@ -79,6 +80,7 @@
 java/sun-1.5/lib/ext/dnsns.jar
 java/sun-1.5/lib/ext/localedata.jar
 java/sun-1.5/lib/ext/sunjce_provider.jar
+java/sun-1.5/lib/ext/sunpkcs11.jar
 java/sun-1.5/lib/flavormap.properties.default
 java/sun-1.5/lib/fontconfig.RedHat.2.1.bfc.default
 java/sun-1.5/lib/fontconfig.RedHat.2.1.properties.src.default