[Frugalware-git] frugalware-current: j2sdk-6-20-i686

Miklos Vajna vmiklos at frugalware.org
Thu Jan 28 03:23:14 CET 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb4344d8cf432206581608ceeb09773731944cd9

commit eb4344d8cf432206581608ceeb09773731944cd9
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Thu Jan 28 03:22:20 2010 +0100

j2sdk-6-20-i686

- fix mozilla plugin symlink for firefox36

diff --git a/source/devel-extra/j2sdk/FrugalBuild b/source/devel-extra/j2sdk/FrugalBuild
index d3e6a0b..82ef087 100644
--- a/source/devel-extra/j2sdk/FrugalBuild
+++ b/source/devel-extra/j2sdk/FrugalBuild
@@ -5,7 +5,7 @@ pkgname=j2sdk
pkgver=6
update=18
realver=${pkgver}u$update
-pkgrel=19
+pkgrel=20
pkgdesc="Sun's java development kit"
url="http://java.sun.com/j2se/downloads.html"
rodepends=('j2re')
@@ -14,9 +14,11 @@ archs=('i686' 'x86_64')
up2date="elinks -dump https://jdk-distros.dev.java.net/developer.html|grep 'jdk-[0-9].*bin$'|sed 's/.*jdk-\(.*\)-dlj-linux.*/\1/;s/u$update//;q'"
if [ "$CARCH" == "i686" ]; then
_arch="i586"
+	_parch="i686"
sha1sums=('f7d0cefd581f523ac96ca99eb54ba4116fa29e0a')
elif [ "$CARCH" == "x86_64" ]; then
_arch="amd64"
+	_parch="$arch"
sha1sums=('4c16d02ecb7b0f729e3888da67310f7ea2e9f668')
fi
source=(http://dlc.sun.com/dlj/binaries/jdk-$realver-dlj-linux-$_arch.bin \
@@ -44,13 +46,8 @@ build() {
mv linux-jdk $Fdestdir/usr/lib/java
Fexe /etc/profile.d/j2re.sh
Fexe /etc/profile.d/$pkgname.sh
-	if [ "$CARCH" == "i686" ]; then
-		Fln /usr/lib/java/jre/plugin/i386/ns7/libjavaplugin_oji.so \
-			/usr/lib/mozilla/plugins/libjavaplugin_oji.so
-	else
-		Fln /usr/lib/java/jre/lib/amd64/libnpjp2.so \
-			/usr/lib/mozilla/plugins/libnpjp2.so
-	fi
+	Fln /usr/lib/java/jre/lib/$_parch/libnpjp2.so \
+		/usr/lib/mozilla/plugins/libnpjp2.so
Fsplit j2re usr/lib/mozilla
if [ "$CARCH" == "i686" ]; then
sed -i 's/XINERAMA/FAKEEXTN/g' $Fdestdir/usr/lib/java/jre/lib/i386/xawt/libmawt.so


More information about the Frugalware-git mailing list