main/graphviz: modernize and cleanup abuild, fix license

1 files changed, 21 insertions, 19 deletions

diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD
index 694fbef875..203bb83b54 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -7,23 +7,21 @@ pkgrel=0
 pkgdesc="Graph Visualization Tools"
 url="http://www.graphviz.org/"
 arch="all"
-license="EPL"
-depends=""
+license="EPL-1.0"
 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 python2-dev m4 libtool
-	bison gtk+2.0-dev python2-dev lua5.2-dev libltdl"
+	bison gtk+2.0-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
-	$pkgname-gtk $pkgname-graphs"
+	$pkgname-gtk $pkgname-graphs::noarch"
 source="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$pkgver.tar.gz
 	$pkgname.trigger
 	0001-clone-nameclash.patch
 	"
-
-builddir="$srcdir"/graphviz-$pkgver
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -51,57 +49,61 @@ build() {
 		--with-gdk-pixbuf \
 		--with-png \
 		--with-jpeg \
-		--with-rsvg \
-		|| return 1
+		--with-rsvg
 
 	if [ "$CARCH" = "x86_64" ]; then
 		# the configure script thinks we have sincos. we dont.
-		sed -i -e '/HAVE_SINCOS/d' config.h || return 1
+		sed -i -e '/HAVE_SINCOS/d' config.h
 	fi
 
-	make || return 1
+	make
 }
 
 package() {
 	cd "$builddir"
+
 	make DESTDIR="$pkgdir" \
 		pkgconfigdir=/usr/lib/pkgconfig \
-		install || return 1
+		install
 
 	mkdir -p "$pkgdir"/usr/share/doc
 	mv "$pkgdir"/usr/share/graphviz/doc \
-		"$pkgdir"/usr/share/doc/graphviz || return 1
+		"$pkgdir"/usr/share/doc/graphviz
 }
 
 py() {
 	pkgdesc="Python extension for graphviz"
+
 	mkdir -p "$subpkgdir"/usr/lib/graphviz \
-		"$subpkgdir"/usr/lib || return 1
+		"$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/graphviz/python* \
-		"$subpkgdir"/usr/lib/graphviz || return 1
+		"$subpkgdir"/usr/lib/graphviz
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
 _lua() {
 	pkgdesc="Lua extension for graphviz"
+
 	mkdir -p "$subpkgdir"/usr/lib/graphviz \
-		"$subpkgdir"/usr/lib/lua || return 1
+		"$subpkgdir"/usr/lib/lua
 	mv "$pkgdir"/usr/lib/graphviz/lua \
-		"$subpkgdir"/usr/lib/graphviz || return 1
+		"$subpkgdir"/usr/lib/graphviz
 	mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/
 }
 
 gtk() {
 	pkgdesc="Gtk extension for graphviz"
-	mkdir -p "$subpkgdir"/usr/lib/graphviz || return 1
+
+	mkdir -p "$subpkgdir"/usr/lib/graphviz
 	mv "$pkgdir"/usr/lib/graphviz/libgvplugin_g?k* \
 		"$pkgdir"/usr/lib/graphviz/libgvplugin_rsvg* \
-		"$subpkgdir"/usr/lib/graphviz || return 1
+		"$subpkgdir"/usr/lib/graphviz
 }
 
 graphs() {
 	pkgdesc="Demo graphs for graphviz"
-	mkdir -p "$subpkgdir"/usr/share/graphviz || return 1
+
+	mkdir -p "$subpkgdir"/usr/share/graphviz
 	mv "$pkgdir"/usr/share/graphviz/graphs \
 		"$subpkgdir"/usr/share/graphviz/
 }