diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
commit | f5e137fdf748b757bacfc50577e5d48a693d31c4 (patch) | |
tree | c75bdfef17b69eff3b8bb20b285c880d7f9183c0 /extra/icedtea-web/PKGBUILD | |
parent | 300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff) | |
parent | dd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chntpw/PKGBUILD
community/hardinfo/PKGBUILD
community/obconf/obconf.install
community/xplc/PKGBUILD
community/zziplib/PKGBUILD
core/rp-pppoe/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/icon-naming-utils/PKGBUILD
extra/lxmenu-data/PKGBUILD
extra/openbox/PKGBUILD
extra/phonon-xine/PKGBUILD
extra/qt/PKGBUILD
extra/zope-interface/PKGBUILD
libre/pacman/PKGBUILD
libre/pacman/pacman.conf.mips64el
libre/pacman/rePKGBUILD
testing/coreutils/PKGBUILD
testing/net-tools/PKGBUILD
Diffstat (limited to 'extra/icedtea-web/PKGBUILD')
-rw-r--r-- | extra/icedtea-web/PKGBUILD | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 0261f01c1..e581efeaf 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,57 +1,56 @@ -# $Id: PKGBUILD 117733 2011-04-04 17:37:15Z andyrtr $ +# $Id: PKGBUILD 127010 2011-06-09 16:03:05Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.0.2 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgver=1.1 +pkgrel=2 +arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'xulrunner') -install=$pkgname.install -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - fix-man-location.patch) -md5sums=('4b5d80f4b82e53f4947e6782a0472d54' - '58e305aa0d27d59f543d9cfddc6e175a') +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +md5sums=('a7d70cb446c38213e554d4bdfb926f63') build() { _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgname-$pkgver" - patch -Np0 -i $srcdir/fix-man-location.patch - autoreconf -v ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ --datarootdir=/usr/share make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + + package_icedtea-web() { pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" depends=('openjdk6' 'gtk2' 'desktop-file-utils') - - if [ "${CARCH}" = "x86_64" ]; then - _arch=amd64 - else - _arch=i586 - fi + install=$pkgname.install _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + # possible make target (see bottom of Makefile.am: install-exec-local install-data-local + make DESTDIR="$pkgdir" install-exec-local install-data-local + # Install desktop files. install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} install -m644 javaws.png ${pkgdir}/usr/share/pixmaps install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications # remove splitted doc files - rm -vrf ${pkgdir}/usr/share/doc + rm -rf ${pkgdir}/usr/share/doc # link binaries into /usr/bin + jre/bin install -m755 -d ${pkgdir}/usr/bin + install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin pushd ${pkgdir}/${_jvmdir}/bin for file in *; do ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin @@ -61,7 +60,7 @@ package_icedtea-web() { # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ - ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ + ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ } package_icedtea-web-doc() { @@ -72,11 +71,12 @@ package_icedtea-web-doc() { _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgbase-$pkgver" - install -m755 -d $pkgdir/${_jvmdir}/jre/lib +# install -m755 -d $pkgdir/${_jvmdir}/jre/lib make DESTDIR="$pkgdir" install-data-local # remove javaws about and man page - rm -vrf ${pkgdir}/usr/lib - rm -vrf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/lib + rm -rf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems } -# plugin test here http://www.java.com/en/download/help/testvm.xml
\ No newline at end of file +# plugin test here http://www.java.com/en/download/help/testvm.xml |