Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b533ce90c650d902b1e32f46b5007ac746ad91c4
commit b533ce90c650d902b1e32f46b5007ac746ad91c4 Author: Miklos Vajna <vmik...@frugalware.org> Date: Fri Mar 4 09:33:23 2011 +0100 openjdk-6-10-i686 - up to 1.10 - depend on icedtea-web, the mozilla plugin is now a separate pkg diff --git a/source/devel-extra/openjdk/FrugalBuild b/source/devel-extra/openjdk/FrugalBuild index 3c80b4f..90e9a58 100644 --- a/source/devel-extra/openjdk/FrugalBuild +++ b/source/devel-extra/openjdk/FrugalBuild @@ -3,10 +3,10 @@ pkgname=openjdk pkgver=6 -build=20 -icedteaver=1.9.7 +build=22 +icedteaver=1.10 javaver="$pkgver-openjdk" -pkgrel=9 +pkgrel=10 pkgdesc="Open-source Java Development Kit implementation." url="http://openjdk.java.net/"; depends=('libx11') @@ -22,30 +22,25 @@ _F_archive_name="icedtea6" # there is a new icedtea release up2date="Flasttar http://icedtea.classpath.org/download/source/|sed 's/$icedteaver/$pkgver/'" source=(http://icedtea.classpath.org/download/source/icedtea6-$icedteaver.tar.gz \ - http://download.java.net/openjdk/jdk6/promoted/b$build/openjdk-$pkgver-src-b$build-21_jun_2010.tar.gz \ - https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip \ + http://download.java.net/openjdk/jdk6/promoted/b$build/openjdk-$pkgver-src-b$build-28_feb_2011.tar.gz \ + http://icedtea.classpath.org/download/drops/jaxp144_01.zip \ https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip \ https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip \ openj{dk,re}.sh) -sha1sums=('0d79e04c665bd89e669dfbc6ffc36f9e2efb30b4' \ - '39fc162a740f16aa18afa855fea9d5daf8cf03d4' \ - '688531dfcd81ef704732ffef7d467045fd850544' \ +sha1sums=('904bd9827e6b62997468a116dfcfcfe3b2291f94' \ + '65a60153adbc8bc47fb95bb2b588a9a0b8701c95' \ + '4f11f9525a83e7842cbd14cc47d967abde093c27' \ '69a54373e169bd7b04a45de6a310a199260424b9' \ '08366a70c9e2baa516afc77bb69f9e108e906aa9' \ '3fae9758526558631c374e78b8970b7e906494ac' \ '8930417f9aece56528c6464850da32d755b401b6') NOEXTRACT=1 -if [ "$CARCH" == "i686" ]; then - _parch="i386" -elif [ "$CARCH" == "x86_64" ]; then - _parch="amd64" -fi subpkgs=('openjre' 'openjdk-source') subdescs=('Open-source Java Runtime Environment.' 'Java Development Kit source-code.') subdepends=('libgcj libjpeg>=8b libgif libuuid gtk+2-libs libxtst libffi' '') -subrodepends=('' "openjdk=$pkgver") +subrodepends=('icedtea-web' "openjdk=$pkgver") subprovides=('jre' '') subgroups=('xapps' 'devel-extra') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc') @@ -58,21 +53,18 @@ build() export HOTSPOT_BUILD_JOBS="${MAKEFLAGS/-j}" export PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" unset MAKEFLAGS - Fmake --with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 \ + Fmake --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 \ --with-xalan2-jar=/usr/share/java/xalan.jar \ - --with-jaxp-drop-zip=$Fsrcdir/jdk6-jaxp-b20.zip \ + --with-jaxp-drop-zip=$Fsrcdir/jaxp144_01.zip \ --with-jaf-drop-zip=$Fsrcdir/jdk6-jaf-b20.zip \ --with-jaxws-drop-zip=$Fsrcdir/jdk6-jaxws-b20.zip \ - --with-openjdk-src-zip=$Fsrcdir/openjdk-$pkgver-src-b$build-21_jun_2010.tar.gz + --with-openjdk-src-zip=$Fsrcdir/openjdk-$pkgver-src-b$build-28_feb_2011.tar.gz Fmkdir /usr/lib/jvm/ cd openjdk.build || return 1 Fcprel j2sdk-image /usr/lib/jvm/java-$javaver - Fmkdir /usr/lib/mozilla/plugins - Fln ../../jvm/java-$javaver/jre/lib/$_parch/IcedTeaPlugin.so \ - /usr/lib/mozilla/plugins/IcedTeaPlugin.so Fexe /etc/profile.d/openjdk.sh Fexe /etc/profile.d/openjre.sh - Fsplit openjre usr/lib/mozilla usr/lib/jvm/java-$javaver/jre \ + Fsplit openjre usr/lib/jvm/java-$javaver/jre \ etc/profile.d/openjre.sh Fsplit openjdk-source usr/lib/jvm/java-$javaver/src.zip } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
