From 45304ec23139920de89cd91fe414ca67649bdb04 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 2 Mar 2018 16:56:15 -0600
Subject: harmony/graphviz: merge Alpine 3.8 changes

---
 harmony/graphviz/APKBUILD | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'harmony')

diff --git a/harmony/graphviz/APKBUILD b/harmony/graphviz/APKBUILD
index 929d59b80..2501e7a98 100644
--- a/harmony/graphviz/APKBUILD
+++ b/harmony/graphviz/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Contributor: Sören Tempel <soeren/alpine@soeren-tempel.net>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=graphviz
@@ -19,12 +19,20 @@ install="$pkgname.pre-deinstall"
 triggers="$pkgname.trigger=/usr/lib/graphviz"
 subpackages="$pkgname-dev $pkgname-doc lua-$pkgname:_lua
 	$pkgname-gtk $pkgname-graphs guile-$pkgname:guile"
-source="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$pkgver.tar.gz
+source="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$pkgver.tar.bz2
 	$pkgname.trigger
 	0001-clone-nameclash.patch
 	"
 
-builddir="$srcdir"/graphviz-$pkgver
+prepare() {
+	# Rename unpacked directory with hash in the name to something sane...
+	mv "$srcdir"/$pkgname-stable_release_$pkgver-* "$builddir"
+
+	default_prepare
+
+	cd "$builddir"
+	./autogen.sh NOCONFIG
+}
 
 build() {
 	cd "$builddir"
@@ -45,8 +53,10 @@ build() {
 		--with-x \
 		--disable-static \
 		--disable-dependency-tracking \
+		--enable-java=no \
 		--enable-lua=yes \
 		--enable-python34=yes \
+		--enable-tcl=no \
 		--without-mylibgd \
 		--with-ipsepcola \
 		--with-pangocairo \
@@ -105,6 +115,6 @@ graphs() {
 		"$subpkgdir"/usr/share/graphviz/
 }
 
-sha512sums="a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5  graphviz-2.40.1.tar.gz
+sha512sums="4e819b3906f3b8e31245a021acd6fae4a1bc55df0a4df6b57a3578a62017e9db0b474a38f3f54682b9e9136d332f2374feee308af489e2848f8bc303ffab58ac  graphviz-2.40.1.tar.bz2
 50947e6a11929f724759266f7716d52d10923eba6d59704ab39e4bdf18f8471d548c2b11ab051dd4b67cb82742aaf54d6358890d049d5b5982f3383b65f7ae8c  graphviz.trigger
 aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d  0001-clone-nameclash.patch"
-- 
cgit v1.2.3-70-g09d2