From c1ef32dc2de6b085a336a1bce3b627c8e482d047 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 23 Aug 2007 18:46:36 +0000 Subject: We always install into "i386", not ${MACHINE_ARCH}, which would be wrong on amd64. --- lang/sun-jre6/PLIST.linux-i386 | 126 ++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-) (limited to 'lang') diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386 index e3273c91caf..12b88ac7f3f 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.1 2007/07/29 05:19:33 jlam Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.2 2007/08/23 18:46:36 jlam Exp $ bin/sun6-java bin/sun6-javaws bin/sun6-keytool @@ -137,55 +137,55 @@ java/sun-6/lib/fonts/LucidaSansRegular.ttf java/sun-6/lib/fonts/LucidaTypewriterBold.ttf java/sun-6/lib/fonts/LucidaTypewriterRegular.ttf java/sun-6/lib/fonts/fonts.dir -java/sun-6/lib/${MACHINE_ARCH}/client/Xusage.txt -java/sun-6/lib/${MACHINE_ARCH}/client/libjsig.so -java/sun-6/lib/${MACHINE_ARCH}/client/libjvm.so -java/sun-6/lib/${MACHINE_ARCH}/headless/libmawt.so -java/sun-6/lib/${MACHINE_ARCH}/jli/libjli.so -java/sun-6/lib/${MACHINE_ARCH}/jvm.cfg.default -java/sun-6/lib/${MACHINE_ARCH}/libJdbcOdbc.so -java/sun-6/lib/${MACHINE_ARCH}/libawt.so -java/sun-6/lib/${MACHINE_ARCH}/libcmm.so -java/sun-6/lib/${MACHINE_ARCH}/libdcpr.so -java/sun-6/lib/${MACHINE_ARCH}/libdeploy.so -java/sun-6/lib/${MACHINE_ARCH}/libdt_socket.so -java/sun-6/lib/${MACHINE_ARCH}/libfontmanager.so -java/sun-6/lib/${MACHINE_ARCH}/libhprof.so -java/sun-6/lib/${MACHINE_ARCH}/libinstrument.so -java/sun-6/lib/${MACHINE_ARCH}/libioser12.so -java/sun-6/lib/${MACHINE_ARCH}/libj2gss.so -java/sun-6/lib/${MACHINE_ARCH}/libj2pcsc.so -java/sun-6/lib/${MACHINE_ARCH}/libj2pkcs11.so -java/sun-6/lib/${MACHINE_ARCH}/libjaas_unix.so -java/sun-6/lib/${MACHINE_ARCH}/libjava.so -java/sun-6/lib/${MACHINE_ARCH}/libjava_crw_demo.so -java/sun-6/lib/${MACHINE_ARCH}/libjavaplugin_jni.so -java/sun-6/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so -java/sun-6/lib/${MACHINE_ARCH}/libjavaplugin_nscp_gcc29.so -java/sun-6/lib/${MACHINE_ARCH}/libjawt.so -java/sun-6/lib/${MACHINE_ARCH}/libjdwp.so -java/sun-6/lib/${MACHINE_ARCH}/libjpeg.so -java/sun-6/lib/${MACHINE_ARCH}/libjsig.so -java/sun-6/lib/${MACHINE_ARCH}/libjsound.so -java/sun-6/lib/${MACHINE_ARCH}/libjsoundalsa.so -java/sun-6/lib/${MACHINE_ARCH}/libmanagement.so -java/sun-6/lib/${MACHINE_ARCH}/libmlib_image.so -java/sun-6/lib/${MACHINE_ARCH}/libnative_chmod.so -java/sun-6/lib/${MACHINE_ARCH}/libnative_chmod_g.so -java/sun-6/lib/${MACHINE_ARCH}/libnet.so -java/sun-6/lib/${MACHINE_ARCH}/libnio.so -java/sun-6/lib/${MACHINE_ARCH}/libnpt.so -java/sun-6/lib/${MACHINE_ARCH}/librmi.so -java/sun-6/lib/${MACHINE_ARCH}/libsplashscreen.so -java/sun-6/lib/${MACHINE_ARCH}/libunpack.so -java/sun-6/lib/${MACHINE_ARCH}/libverify.so -java/sun-6/lib/${MACHINE_ARCH}/libzip.so -java/sun-6/lib/${MACHINE_ARCH}/motif21/libmawt.so -java/sun-6/lib/${MACHINE_ARCH}/native_threads/libhpi.so -java/sun-6/lib/${MACHINE_ARCH}/server/Xusage.txt -java/sun-6/lib/${MACHINE_ARCH}/server/libjsig.so -java/sun-6/lib/${MACHINE_ARCH}/server/libjvm.so -java/sun-6/lib/${MACHINE_ARCH}/xawt/libmawt.so +java/sun-6/lib/i386/client/Xusage.txt +java/sun-6/lib/i386/client/libjsig.so +java/sun-6/lib/i386/client/libjvm.so +java/sun-6/lib/i386/headless/libmawt.so +java/sun-6/lib/i386/jli/libjli.so +java/sun-6/lib/i386/jvm.cfg.default +java/sun-6/lib/i386/libJdbcOdbc.so +java/sun-6/lib/i386/libawt.so +java/sun-6/lib/i386/libcmm.so +java/sun-6/lib/i386/libdcpr.so +java/sun-6/lib/i386/libdeploy.so +java/sun-6/lib/i386/libdt_socket.so +java/sun-6/lib/i386/libfontmanager.so +java/sun-6/lib/i386/libhprof.so +java/sun-6/lib/i386/libinstrument.so +java/sun-6/lib/i386/libioser12.so +java/sun-6/lib/i386/libj2gss.so +java/sun-6/lib/i386/libj2pcsc.so +java/sun-6/lib/i386/libj2pkcs11.so +java/sun-6/lib/i386/libjaas_unix.so +java/sun-6/lib/i386/libjava.so +java/sun-6/lib/i386/libjava_crw_demo.so +java/sun-6/lib/i386/libjavaplugin_jni.so +java/sun-6/lib/i386/libjavaplugin_nscp.so +java/sun-6/lib/i386/libjavaplugin_nscp_gcc29.so +java/sun-6/lib/i386/libjawt.so +java/sun-6/lib/i386/libjdwp.so +java/sun-6/lib/i386/libjpeg.so +java/sun-6/lib/i386/libjsig.so +java/sun-6/lib/i386/libjsound.so +java/sun-6/lib/i386/libjsoundalsa.so +java/sun-6/lib/i386/libmanagement.so +java/sun-6/lib/i386/libmlib_image.so +java/sun-6/lib/i386/libnative_chmod.so +java/sun-6/lib/i386/libnative_chmod_g.so +java/sun-6/lib/i386/libnet.so +java/sun-6/lib/i386/libnio.so +java/sun-6/lib/i386/libnpt.so +java/sun-6/lib/i386/librmi.so +java/sun-6/lib/i386/libsplashscreen.so +java/sun-6/lib/i386/libunpack.so +java/sun-6/lib/i386/libverify.so +java/sun-6/lib/i386/libzip.so +java/sun-6/lib/i386/motif21/libmawt.so +java/sun-6/lib/i386/native_threads/libhpi.so +java/sun-6/lib/i386/server/Xusage.txt +java/sun-6/lib/i386/server/libjsig.so +java/sun-6/lib/i386/server/libjvm.so +java/sun-6/lib/i386/xawt/libmawt.so java/sun-6/lib/im/indicim.jar java/sun-6/lib/im/thaiim.jar java/sun-6/lib/images/cursors/cursors.properties.default @@ -706,11 +706,11 @@ java/sun-6/man/man1/tnameserv.1 java/sun-6/man/man1/unpack200.1 java/sun-6/plugin/desktop/sun_java.desktop java/sun-6/plugin/desktop/sun_java.png -java/sun-6/plugin/${MACHINE_ARCH}/ns7-gcc29/libjavaplugin_oji.so -java/sun-6/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji.so -@dirrm java/sun-6/plugin/${MACHINE_ARCH}/ns7-gcc29 -@dirrm java/sun-6/plugin/${MACHINE_ARCH}/ns7 -@dirrm java/sun-6/plugin/${MACHINE_ARCH} +java/sun-6/plugin/i386/ns7-gcc29/libjavaplugin_oji.so +java/sun-6/plugin/i386/ns7/libjavaplugin_oji.so +@dirrm java/sun-6/plugin/i386/ns7-gcc29 +@dirrm java/sun-6/plugin/i386/ns7 +@dirrm java/sun-6/plugin/i386 @dirrm java/sun-6/plugin/desktop @dirrm java/sun-6/plugin @dirrm java/sun-6/man/man1 @@ -767,14 +767,14 @@ java/sun-6/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji.so @dirrm java/sun-6/lib/images/cursors @dirrm java/sun-6/lib/images @dirrm java/sun-6/lib/im -@dirrm java/sun-6/lib/${MACHINE_ARCH}/xawt -@dirrm java/sun-6/lib/${MACHINE_ARCH}/server -@dirrm java/sun-6/lib/${MACHINE_ARCH}/native_threads -@dirrm java/sun-6/lib/${MACHINE_ARCH}/motif21 -@dirrm java/sun-6/lib/${MACHINE_ARCH}/jli -@dirrm java/sun-6/lib/${MACHINE_ARCH}/headless -@dirrm java/sun-6/lib/${MACHINE_ARCH}/client -@dirrm java/sun-6/lib/${MACHINE_ARCH} +@dirrm java/sun-6/lib/i386/xawt +@dirrm java/sun-6/lib/i386/server +@dirrm java/sun-6/lib/i386/native_threads +@dirrm java/sun-6/lib/i386/motif21 +@dirrm java/sun-6/lib/i386/jli +@dirrm java/sun-6/lib/i386/headless +@dirrm java/sun-6/lib/i386/client +@dirrm java/sun-6/lib/i386 @dirrm java/sun-6/lib/fonts @dirrm java/sun-6/lib/ext @dirrm java/sun-6/lib/desktop/mime/packages -- cgit v1.2.3