From 2e8aff5dd135ae5edb4fa5fff5d802fa67e10057 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 9 Mar 2018 22:54:52 +0100
Subject: community/unison: improve abuild

---
 community/unison/APKBUILD | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'community/unison')

diff --git a/community/unison/APKBUILD b/community/unison/APKBUILD
index 0327c9618f1..911b935560a 100644
--- a/community/unison/APKBUILD
+++ b/community/unison/APKBUILD
@@ -4,7 +4,7 @@ pkgname=unison
 pkgver=2.48.15.4
 _pkgver=${pkgver%.*}v${pkgver##*.}
 pkgrel=0
-pkgdesc="Unison - efficient file-synchronization tool"
+pkgdesc="Efficient file-synchronization tool"
 url="https://www.cis.upenn.edu/~bcpierce/unison/"
 # ocaml is not built for x86, armhf, s390x
 # ocaml-lablgtk is not built for aarch64
@@ -23,37 +23,41 @@ builddir="$srcdir/$pkgname-$_pkgver/src"
 
 build() {
 	cd "$builddir"
+
 	# ocamlopt is a front-end for gcc which will create optimized ocaml
 	# binaries. It will call gcc, but it hasn't implemented all gcc options.
 	# -ccopt is the way to pass arbitrary options.
-	local _cflags=""
-	for i in $CFLAGS; do _cflags="$_cflags -ccopt $i"; done
+	local _cflags=''
+	local i; for i in $CFLAGS; do
+		_cflags="$_cflags -ccopt $i"
+	done
 	export CFLAGS="$_cflags"
-	for ui in text gtk2; do
+
+	local ui; for ui in text gtk2; do
 		make -j1 clean
 		make -j1 mkProjectInfo
 		make -j1 UISTYLE="$ui" DEBUGGING=false THREADS=true
-		mv unison unison-"$ui"
+		mv unison unison-$ui
 	done
 }
 
 package() {
 	cd "$builddir"
-	install -d "$pkgdir"/usr/bin
-	install -m755 unison-text unison-fsmonitor "$pkgdir"/usr/bin
+	install -m 755 -D unison-text "$pkgdir"/usr/bin/unison-text
+	install -m 755 -D unison-fsmonitor "$pkgdir"/usr/bin/unison-fsmonitor
+
 	cd "$pkgdir"/usr/bin
 	ln -s unison-text unison
 	ln -s unison "unison-${_pkgver%.*}"
 }
 
 gui() {
-	description="Unison - efficient file-synchronization tool (GTK+2 GUI)"
-	depends="$pkgname"
+	pkgdesc="$pkgdesc (GTK+2 GUI)"
+	depends="$pkgname=$pkgver-r$pkgrel"
 	install_if="$pkgname=$pkgver-r$pkgrel gtk+2.0"
 
 	cd "$builddir"
-	install -d "$subpkgdir"/usr/bin
-	install -m755 unison-gtk2 "$subpkgdir"/usr/bin
+	install -m 755 -D unison-gtk2 "$subpkgdir"/usr/bin/unison-gtk2
 }
 
 sha512sums="658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78  unison-2.48.15v4.tar.gz
-- 
cgit v1.2.3