diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-09-07 13:23:10 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-09-07 13:29:20 +0200 |
| commit | 156a0f4d2123722c470d3f09e5d693de3bfae63c (patch) | |
| tree | 75f63d4c416eb27f3d0524c2a27ab36d1243bb9a | |
| parent | 512620c5d5f42a04f28b77babaf092cc9e6a2b82 (diff) | |
| download | aports-156a0f4d2123722c470d3f09e5d693de3bfae63c.tar.bz2 aports-156a0f4d2123722c470d3f09e5d693de3bfae63c.tar.xz | |
testing/netsurf: cleanup and improve APKBUILD
| -rw-r--r-- | testing/netsurf/APKBUILD | 60 | ||||
| -rw-r--r-- | testing/netsurf/netsurf | 9 |
2 files changed, 41 insertions, 28 deletions
diff --git a/testing/netsurf/APKBUILD b/testing/netsurf/APKBUILD index 5187dc5c52..dff58d73d1 100644 --- a/testing/netsurf/APKBUILD +++ b/testing/netsurf/APKBUILD @@ -1,42 +1,56 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to> # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to> pkgname=netsurf pkgver=3.5 -pkgrel=0 +pkgrel=1 pkgdesc="NetSurf is a free, open source web browser." url="http://www.netsurf-browser.org" arch="all" license="GPL2" depends="" depends_dev="" -makedepends="curl-dev openssl-dev doxygen flex bison libwebp-dev lcms2-dev \ - libmng-dev gperf libglade-dev gtk+-dev libcurl libpng-dev \ - check-dev libidn-dev libharu-dev librsvg-dev libjpeg-turbo-dev" +makedepends="curl-dev openssl-dev doxygen flex bison libwebp-dev lcms2-dev + libmng-dev gperf libglade-dev gtk+-dev libcurl libpng-dev + check-dev libidn-dev libharu-dev librsvg-dev libjpeg-turbo-dev" install="" subpackages="$pkgname-doc" -source="http://download.netsurf-browser.org/netsurf/releases/source-full/${pkgname}-all-${pkgver}.tar.gz - netsurf" +source="$pkgname-$pkgver.tar.gz::http://download.netsurf-browser.org/netsurf/releases/source-full/${pkgname}-all-${pkgver}.tar.gz + netsurf" + +builddir="$srcdir"/${pkgname}-all-${pkgver} +prepare() { + default_prepare || return 1 + sed 's:-Werror::' -i "$builddir"/libsvgtiny/Makefile \ + || return 1 +} -builddir=${srcdir}/${pkgname}-all-${pkgver} build() { cd "$builddir" - sed 's:-Werror::' -i libsvgtiny/Makefile - make PREFIX=/usr TARGET=gtk - - } + make PREFIX=/usr TARGET=gtk || return 1 +} package() { cd "$builddir" - make PREFIX=/usr TARGET=gtk DESTDIR="${pkgdir}" install - mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf" - install -Dm755 "$srcdir/netsurf" "$pkgdir/usr/bin/$pkgname" - mkdir -p "$pkgdir"/usr/share/man/man1/ - install -Dm644 netsurf/Docs/netsurf-gtk.1 "$pkgdir"/usr/share/man/man1/ - } + make PREFIX=/usr TARGET=gtk DESTDIR="${pkgdir}" \ + install || return 1 + + mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf" + install -Dm755 "$srcdir/netsurf" "$pkgdir/usr/bin/$pkgname" + + mkdir -p "$pkgdir"/usr/share/man/man1/ + install -Dm644 netsurf/Docs/netsurf-gtk.1 "$pkgdir"/usr/share/man/man1/ + + mv "$pkgdir"/usr/share/netsurf/:./gtk/res/* \ + "$pkgdir"/usr/share/netsurf/ || return 1 + rmdir "$pkgdir"/usr/share/netsurf/:./gtk/res \ + "$pkgdir"/usr/share/netsurf/:./gtk \ + "$pkgdir"/usr/share/netsurf/:. || return 1 +} -md5sums="a52270702637273f4ca3ea8b2347115d netsurf-all-3.5.tar.gz -59f2a4c36945cb339d8acd6e4f798338 netsurf" -sha256sums="09184f8901a30b98b3e37e82d1d723a4f9e000c56b235ea59a9e0bb2d96fb4ed netsurf-all-3.5.tar.gz -0c35bcc46a16b8fa3a30289666c44506887f1a32520cf9cf522e71e0e4b5c38b netsurf" -sha512sums="a39eb8c11b394e4d5c1164da46d74f283f489057f70c192277d94e511a3716c86474a07a7c80ce602a53e41959f75e82312ad9f5cb365953c24445af4456e1ce netsurf-all-3.5.tar.gz -98d2319e31368b63afc01c82647e6d7bbc868775f8a26f0e65283509fb73f36b248a884d22822486402fb38fdf6cb463b2743d806c1edff32e358b4b444fde45 netsurf" +md5sums="a52270702637273f4ca3ea8b2347115d netsurf-3.5.tar.gz +8e8e6bc15f9a13678a4d2aff0132ba72 netsurf" +sha256sums="09184f8901a30b98b3e37e82d1d723a4f9e000c56b235ea59a9e0bb2d96fb4ed netsurf-3.5.tar.gz +e4eef478cbd90f276b1f3f7db178eabd325d1d3b5f6180e8db578216638535fe netsurf" +sha512sums="a39eb8c11b394e4d5c1164da46d74f283f489057f70c192277d94e511a3716c86474a07a7c80ce602a53e41959f75e82312ad9f5cb365953c24445af4456e1ce netsurf-3.5.tar.gz +5c217e061b9a2b226f920018749bae67d2a1eb3753404e08e9100660aa965e1d69c9425d409f5645e2931f2654805afe8e365fb45c50ff9acf848c79323148af netsurf" diff --git a/testing/netsurf/netsurf b/testing/netsurf/netsurf index 1a7d693e21..a615e7dda5 100644 --- a/testing/netsurf/netsurf +++ b/testing/netsurf/netsurf @@ -1,8 +1,7 @@ #!/bin/sh -shortname=`echo $LANG | cut -b1-2` -if [[ -d /usr/share/netsurf/$shortname ]]; then - /usr/bin/netsurf.elf "$@" +shortname=$(echo $LANG | cut -b1-2) +if [ -d /usr/share/netsurf/$shortname ]; then + /usr/bin/netsurf.elf "$@" else - LANG=en /usr/bin/netsurf.elf "$@" + LANG=en /usr/bin/netsurf.elf "$@" fi - |