summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-03-31 22:10:07 +0000
committertnn <tnn@pkgsrc.org>2008-03-31 22:10:07 +0000
commita43a91bcfa6b08dbb4b6c2c9d2b0b242556f5279 (patch)
tree0ad2378f0eddfa019c57af16e537a5efa2187489 /lang
parent185641a88f045797a7999d1fa188c50c1d7a2d0c (diff)
downloadpkgsrc-a43a91bcfa6b08dbb4b6c2c9d2b0b242556f5279.tar.gz
Fix installation on x86_64.
Diffstat (limited to 'lang')
-rw-r--r--lang/sun-jre15/Makefile4
-rw-r--r--lang/sun-jre15/PLIST.linux-x86_644
2 files changed, 6 insertions, 2 deletions
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index e0c55329419..abd76a8f0ad 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -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 @@ post-extract:
${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 --git a/lang/sun-jre15/PLIST.linux-x86_64 b/lang/sun-jre15/PLIST.linux-x86_64
index 3674a3a2e7a..e47addf0727 100644
--- a/lang/sun-jre15/PLIST.linux-x86_64
+++ b/lang/sun-jre15/PLIST.linux-x86_64
@@ -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/libfontmanager.so
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/content-types.properties.default
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