From 1d0b213e3ae52aad3d8de7d54f8333b201bdb6ab Mon Sep 17 00:00:00 2001 From: Thierry N Date: Mon, 24 Aug 2009 23:50:57 +0200 Subject: jdk, maj pour la 64 bits --- base/jdk/.footprint | 163 +++++++++++++++++++++++----------------------------- base/jdk/.md5sum | 2 +- base/jdk/Pkgfile | 18 ++++-- 3 files changed, 84 insertions(+), 99 deletions(-) (limited to 'base/jdk') diff --git a/base/jdk/.footprint b/base/jdk/.footprint index 71e7464d8..35536f6fe 100644 --- a/base/jdk/.footprint +++ b/base/jdk/.footprint @@ -5,8 +5,8 @@ drwxr-xr-x root/root opt/ lrwxrwxrwx root/root opt/jdk -> jdk-bin-6u14 drwxr-xr-x root/root opt/jdk-bin-6u14/ -r--r--r-- root/root opt/jdk-bin-6u14/COPYRIGHT --r--r--r-- root/root opt/jdk-bin-6u14/LICENSE --r--r--r-- root/root opt/jdk-bin-6u14/README.html +-rw-r--r-- root/root opt/jdk-bin-6u14/LICENSE +-rw-r--r-- root/root opt/jdk-bin-6u14/README.html -r--r--r-- root/root opt/jdk-bin-6u14/README_ja.html -r--r--r-- root/root opt/jdk-bin-6u14/README_zh_CN.html -r--r--r-- root/root opt/jdk-bin-6u14/THIRDPARTYLICENSEREADME.txt @@ -20,7 +20,6 @@ lrwxrwxrwx root/root opt/jdk-bin-6u14/bin/ControlPanel -> ./jcontrol -rwxr-xr-x root/root opt/jdk-bin-6u14/bin/jar -rwxr-xr-x root/root opt/jdk-bin-6u14/bin/jarsigner -rwxr-xr-x root/root opt/jdk-bin-6u14/bin/java --r-xr-xr-x root/root opt/jdk-bin-6u14/bin/java-rmi.cgi -rwxr-xr-x root/root opt/jdk-bin-6u14/bin/javac -rwxr-xr-x root/root opt/jdk-bin-6u14/bin/javadoc -rwxr-xr-x root/root opt/jdk-bin-6u14/bin/javah @@ -3517,12 +3516,9 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/include/linux/ -r--r--r-- root/root opt/jdk-bin-6u14/include/linux/jawt_md.h -r--r--r-- root/root opt/jdk-bin-6u14/include/linux/jni_md.h drwxr-xr-x root/root opt/jdk-bin-6u14/jre/ -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/.systemPrefs/ --rw-r--r-- root/root opt/jdk-bin-6u14/jre/.systemPrefs/.system.lock (EMPTY) --rw-r--r-- root/root opt/jdk-bin-6u14/jre/.systemPrefs/.systemRootModFile (EMPTY) -r--r--r-- root/root opt/jdk-bin-6u14/jre/COPYRIGHT --r--r--r-- root/root opt/jdk-bin-6u14/jre/LICENSE --r--r--r-- root/root opt/jdk-bin-6u14/jre/README +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/LICENSE +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/README -r--r--r-- root/root opt/jdk-bin-6u14/jre/THIRDPARTYLICENSEREADME.txt -r--r--r-- root/root opt/jdk-bin-6u14/jre/Welcome.html drwxr-xr-x root/root opt/jdk-bin-6u14/jre/bin/ @@ -3544,11 +3540,66 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/javaws/ lrwxrwxrwx root/root opt/jdk-bin-6u14/jre/javaws/javaws -> ../bin/javaws drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/ -rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/alt-rt.jar +drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/ +drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/headless/ +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/headless/libmawt.so +drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/jli/ +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/jli/libjli.so +-r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/amd64/jvm.cfg +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libJdbcOdbc.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libattach.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libawt.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libcmm.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libdcpr.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libdeploy.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libdt_socket.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libfontmanager.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libhprof.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libinstrument.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libioser12.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libj2gss.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libj2pcsc.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libj2pkcs11.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjaas_unix.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjava.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjava_crw_demo.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjavaplugin_jni.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjawt.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjdwp.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjpeg.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjsig.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjsound.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libjsoundalsa.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libmanagement.so +lrwxrwxrwx root/root opt/jdk-bin-6u14/jre/lib/amd64/libmawt.so -> xawt/libmawt.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libmlib_image.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libnative_chmod.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libnative_chmod_g.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libnet.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libnio.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libnpjp2.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libnpt.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/librmi.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libsaproc.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libsplashscreen.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libunpack.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libverify.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/libzip.so +drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/motif21/ +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/motif21/libmawt.so +drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/native_threads/ +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/native_threads/libhpi.so +drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/server/ +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/amd64/server/Xusage.txt +lrwxrwxrwx root/root opt/jdk-bin-6u14/jre/lib/amd64/server/libjsig.so -> ../libjsig.so +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/server/libjvm.so +drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/xawt/ +-rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/amd64/xawt/libmawt.so drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/applet/ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/audio/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/audio/soundbank.gm -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/calendars.properties --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/charsets.jar +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/charsets.pack -rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/classlist drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/cmm/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/cmm/CIEXYZ.pf @@ -3557,7 +3608,7 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/cmm/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/cmm/PYCC.pf -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/cmm/sRGB.pf -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/content-types.properties --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/deploy.jar +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/deploy.pack drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/deploy/ -rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/deploy/ffjcext.zip -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/deploy/java-icon.ico @@ -3661,7 +3712,7 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/desktop/mime/packages/ -r-xr-xr-x root/root opt/jdk-bin-6u14/jre/lib/desktop/mime/packages/x-java-jnlp-file.xml drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/ext/ -rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/ext/dnsns.jar --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/ext/localedata.jar +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/ext/localedata.pack -rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/ext/meta-index -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/ext/sunjce_provider.jar -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/ext/sunpkcs11.jar @@ -3692,68 +3743,6 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/fonts/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/fonts/LucidaTypewriterBold.ttf -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/fonts/LucidaTypewriterRegular.ttf -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/fonts/fonts.dir -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/ -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/client/ --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/i386/client/Xusage.txt --r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/i386/client/classes.jsa -lrwxrwxrwx root/root opt/jdk-bin-6u14/jre/lib/i386/client/libjsig.so -> ../libjsig.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/client/libjvm.so -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/headless/ --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/headless/libmawt.so -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/jli/ --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/jli/libjli.so --r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/i386/jvm.cfg --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libJdbcOdbc.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libattach.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libawt.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libcmm.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libdcpr.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libdeploy.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libdt_socket.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libfontmanager.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libhprof.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libinstrument.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libioser12.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libj2gss.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libj2pcsc.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libj2pkcs11.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjaas_unix.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjava.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjava_crw_demo.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjavaplugin_jni.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjavaplugin_nscp.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjavaplugin_nscp_gcc29.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjawt.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjdwp.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjpeg.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjsig.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjsound.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libjsoundalsa.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libmanagement.so -lrwxrwxrwx root/root opt/jdk-bin-6u14/jre/lib/i386/libmawt.so -> xawt/libmawt.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libmlib_image.so --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/i386/libnative_chmod.so --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/i386/libnative_chmod_g.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libnet.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libnio.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libnpjp2.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libnpt.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/librmi.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libsaproc.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libsplashscreen.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libunpack.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libverify.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/libzip.so -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/motif21/ --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/motif21/libmawt.so -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/native_threads/ --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/native_threads/libhpi.so -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/server/ --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/i386/server/Xusage.txt -lrwxrwxrwx root/root opt/jdk-bin-6u14/jre/lib/i386/server/libjsig.so -> ../libjsig.so --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/server/libjvm.so -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/xawt/ --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/i386/xawt/libmawt.so drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/im/ -rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/im/indicim.jar -rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/im/thaiim.jar @@ -3772,10 +3761,10 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/images/icons/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/images/icons/sun-java_HighContrast.png -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/images/icons/sun-java_HighContrastInverse.png -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/images/icons/sun-java_LowContrast.png --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/javaws.jar +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/javaws.pack -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/jce.jar -rwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/jexec --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/jsse.jar +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/jsse.pack -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/jvm.hprof.txt drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/locale/ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/locale/de/ @@ -3832,11 +3821,11 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/oblique-fonts/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/oblique-fonts/LucidaTypewriterOblique.ttf -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/oblique-fonts/fonts.dir --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/plugin.jar +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/plugin.pack -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/psfont.properties.ja -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/psfontj2d.properties -rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/resources.jar --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/rt.jar +-rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/rt.pack drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/security/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/security/US_export_policy.jar -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/security/cacerts @@ -3846,7 +3835,6 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/security/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/security/local_policy.jar drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/servicetag/ -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/servicetag/jdk_header.png --rw-r--r-- root/root opt/jdk-bin-6u14/jre/lib/servicetag/registration.xml -r--r--r-- root/root opt/jdk-bin-6u14/jre/lib/sound.properties drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/zi/ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/lib/zi/Africa/ @@ -4310,11 +4298,6 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/plugin/ drwxr-xr-x root/root opt/jdk-bin-6u14/jre/plugin/desktop/ -rw-r--r-- root/root opt/jdk-bin-6u14/jre/plugin/desktop/sun_java.desktop -r--r--r-- root/root opt/jdk-bin-6u14/jre/plugin/desktop/sun_java.png -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/plugin/i386/ -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/plugin/i386/ns7-gcc29/ --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/plugin/i386/ns7-gcc29/libjavaplugin_oji.so -drwxr-xr-x root/root opt/jdk-bin-6u14/jre/plugin/i386/ns7/ --rwxr-xr-x root/root opt/jdk-bin-6u14/jre/plugin/i386/ns7/libjavaplugin_oji.so drwxr-xr-x root/root opt/jdk-bin-6u14/lib/ -rw-r--r-- root/root opt/jdk-bin-6u14/lib/ct.sym -rw-r--r-- root/root opt/jdk-bin-6u14/lib/dt.jar @@ -4324,7 +4307,7 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/lib/ -rwxr-xr-x root/root opt/jdk-bin-6u14/lib/jexec -r--r--r-- root/root opt/jdk-bin-6u14/lib/orb.idl -rw-r--r-- root/root opt/jdk-bin-6u14/lib/sa-jdi.jar --rw-r--r-- root/root opt/jdk-bin-6u14/lib/tools.jar +-rw-r--r-- root/root opt/jdk-bin-6u14/lib/tools.pack drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/ drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/etc/ -rw-r--r-- root/root opt/jdk-bin-6u14/lib/visualvm/etc/visualvm.clusters @@ -4504,11 +4487,11 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/config/Services/ drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/ drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/ drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk15/ -drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk15/linux/ --rw-r--r-- root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk15/linux/libprofilerinterface.so +drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk15/linux-amd64/ +-rw-r--r-- root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk16/ -drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk16/linux/ --rw-r--r-- root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk16/linux/libprofilerinterface.so +drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk16/linux-amd64/ +-rw-r--r-- root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so -rw-r--r-- root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/jfluid-server-15.jar -rw-r--r-- root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/lib/jfluid-server.jar drwxr-xr-x root/root opt/jdk-bin-6u14/lib/visualvm/profiler3/modules/ @@ -4606,7 +4589,6 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/man/ja_JP.eucJP/man1/ -rw-r--r-- root/root opt/jdk-bin-6u14/man/ja_JP.eucJP/man1/javadoc.1.gz -rw-r--r-- root/root opt/jdk-bin-6u14/man/ja_JP.eucJP/man1/javah.1.gz -rw-r--r-- root/root opt/jdk-bin-6u14/man/ja_JP.eucJP/man1/javap.1.gz --rw-r--r-- root/root opt/jdk-bin-6u14/man/ja_JP.eucJP/man1/javaws.1.gz -rw-r--r-- root/root opt/jdk-bin-6u14/man/ja_JP.eucJP/man1/jconsole.1.gz -rw-r--r-- root/root opt/jdk-bin-6u14/man/ja_JP.eucJP/man1/jdb.1.gz -rw-r--r-- root/root opt/jdk-bin-6u14/man/ja_JP.eucJP/man1/jhat.1.gz @@ -4676,9 +4658,6 @@ drwxr-xr-x root/root opt/jdk-bin-6u14/man/man1/ -r--r--r-- root/root opt/jdk-bin-6u14/man/man1/wsgen.1.gz -r--r--r-- root/root opt/jdk-bin-6u14/man/man1/wsimport.1.gz -r--r--r-- root/root opt/jdk-bin-6u14/man/man1/xjc.1.gz --r--r--r-- root/root opt/jdk-bin-6u14/register.html --r--r--r-- root/root opt/jdk-bin-6u14/register_ja.html --r--r--r-- root/root opt/jdk-bin-6u14/register_zh_CN.html drwxr-xr-x root/root opt/jdk-bin-6u14/sample/ drwxr-xr-x root/root opt/jdk-bin-6u14/sample/javac/ drwxr-xr-x root/root opt/jdk-bin-6u14/sample/javac/processing/ diff --git a/base/jdk/.md5sum b/base/jdk/.md5sum index 2a6e945bb..9d8135853 100644 --- a/base/jdk/.md5sum +++ b/base/jdk/.md5sum @@ -1,2 +1,2 @@ -769b646d5361aa76c3b79ae38eaed932 jdk-6u14-linux-i586.bin +6e866db04748296fc34ed83a92420403 jdk-6u14-dlj-linux-amd64.bin de7a4680727f1b66d47c0087ed739c48 jdk.sh diff --git a/base/jdk/Pkgfile b/base/jdk/Pkgfile index 471bf40ad..9d1c39850 100644 --- a/base/jdk/Pkgfile +++ b/base/jdk/Pkgfile @@ -7,21 +7,27 @@ name=jdk version=6u14 release=1 -source=(http://www.nutyx.org/files/$name-$version-linux-i586.bin \ +[ "`uname -m`" == "i686" ] && _ARCH=i586 +[ "`uname -m`" == "x86_64" ] && _ARCH=amd64 + +source=(http://download.java.net/dlj/binaries/$name-$version-dlj-linux-${_ARCH}.bin \ jdk.sh ) build() { mkdir -p $PKG/etc/profile.d/ mv jdk.sh $PKG/etc/profile.d/ - chmod 755 $name-$version-linux-i586.bin - ./jdk-$version-linux-i586.bin + chmod 755 $name-$version-dlj-linux-${_ARCH}.bin + ./jdk-$version-dlj-linux-${_ARCH}.bin cd jdk1.6.0_14 install -v -m755 -d $PKG/opt/jdk-bin-$version mv -v * $PKG/opt/jdk-bin-$version - ln -v -sf xawt/libmawt.so \ - $PKG/opt/jdk-bin-$version/jre/lib/i386/ +if [ "`uname -m`" == "i686" ]; then + _ARCH=i386 +fi + ln -v -sf xawt/libmawt.so \ + $PKG/opt/jdk-bin-$version/jre/lib/${_ARCH}/ sed -i 's@XINERAMA@FAKEEXTN@g' \ - $PKG/opt/jdk-bin-$version/jre/lib/i386/xawt/libmawt.so + $PKG/opt/jdk-bin-$version/jre/lib/${_ARCH}/xawt/libmawt.so ln -v -nsf jdk-bin-$version $PKG/opt/jdk } -- cgit v1.2.3-70-g09d2