From 1d0b213e3ae52aad3d8de7d54f8333b201bdb6ab Mon Sep 17 00:00:00 2001
From: Thierry N <thierryn1 at hispeed dot ch>
Date: Mon, 24 Aug 2009 23:50:57 +0200
Subject: jdk, maj pour la 64 bits

---
 base/jdk/Pkgfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'base/jdk/Pkgfile')

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