diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-09-10 15:20:21 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-09-10 15:32:24 +0200 |
| commit | c78ee4be2a6fd878bfd678a65798cfc1c0425ad8 (patch) | |
| tree | db22f3d7fee29144ef7125a6eab711237ecee00f /main | |
| parent | ced552edf665cd23d8bf1097075551ac1280cf31 (diff) | |
| download | aports-c78ee4be2a6fd878bfd678a65798cfc1c0425ad8.tar.bz2 aports-c78ee4be2a6fd878bfd678a65798cfc1c0425ad8.tar.xz | |
main/graphviz: cleanup and rebuild to fix install_if for -doc subpackage
Diffstat (limited to 'main')
| -rw-r--r-- | main/graphviz/APKBUILD | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD index 397af56526..97e114ae33 100644 --- a/main/graphviz/APKBUILD +++ b/main/graphviz/APKBUILD @@ -1,17 +1,19 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=graphviz pkgver=2.38.0 -pkgrel=5 +pkgrel=6 pkgdesc="Graph Visualization Tools" url="http://www.graphviz.org/" arch="all" license="EPL" depends="" -depends_dev="zlib-dev libpng-dev libjpeg-turbo-dev expat-dev freetype-dev - bison m4 flex fontconfig-dev libtool libsm-dev libxext-dev cairo-dev - pango-dev librsvg-dev gmp-dev lua5.2-dev gtk+2.0-dev swig python-dev" -makedepends="$depends_dev" +depends_dev="zlib-dev libpng-dev libjpeg-turbo-dev expat-dev + fontconfig-dev libsm-dev libxext-dev cairo-dev pango-dev + librsvg-dev gmp-dev freetype-dev" +makedepends="$depends_dev flex swig python-dev m4 libtool + bison gtk+2.0-dev python-dev lua5.2-dev libltdl" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" subpackages="$pkgname-dev $pkgname-doc py-gv:py lua-$pkgname:_lua @@ -23,22 +25,21 @@ source="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$pkgver.tar CVE-2014-9157.patch " -_builddir="$srcdir"/graphviz-$pkgver +builddir="$srcdir"/graphviz-$pkgver prepare() { - local i - cd "$_builddir" + default_prepare + + cd "$builddir" update_config_sub || return 1 - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done - # use /usr/lib instead of /usr/lib64 - sed -i -e 's/LIBPOSTFIX="64"/LIBPOSTFIX=/' configure || return 1 + + # Use /usr/lib instead of /usr/lib64. + sed -i -e 's/LIBPOSTFIX="64"/LIBPOSTFIX=/' \ + configure || return 1 } build() { - cd "$_builddir" + cd "$builddir" + LUA=lua5.2 \ LUA_CFLAGS="$(pkg-config --cflags lua5.2)" \ LUA_LIBS="$(pkg-config --libs lua5.2)" \ @@ -47,6 +48,10 @@ build() { --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ + --without-included-ltdl \ + --disable-ltdl-install \ + --disable-silent-rules \ + --enable-ltdl \ --with-x \ --disable-static \ --disable-dependency-tracking \ @@ -59,20 +64,24 @@ build() { --with-jpeg \ --with-rsvg \ || return 1 + if [ "$CARCH" = "x86_64" ]; then # the configure script thinks we have sincos. we dont. sed -i -e '/HAVE_SINCOS/d' config.h || return 1 fi + make || return 1 } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" \ pkgconfigdir=/usr/lib/pkgconfig \ install || return 1 + mkdir -p "$pkgdir"/usr/share/doc - mv "$pkgdir"/usr/share/graphviz/doc "$pkgdir"/usr/share/doc/graphviz || return 1 + mv "$pkgdir"/usr/share/graphviz/doc \ + "$pkgdir"/usr/share/doc/graphviz || return 1 } py() { @@ -107,6 +116,7 @@ graphs() { mv "$pkgdir"/usr/share/graphviz/graphs \ "$subpkgdir"/usr/share/graphviz/ } + md5sums="5b6a829b2ac94efcd5fa3c223ed6d3ae graphviz-2.38.0.tar.gz 6e30f6cb07c20d92fe280586c56104eb graphviz.trigger bce8a9ae4c3a8c52c1bcf0e03d5ce364 0001-clone-nameclash.patch |