From 608f4f33e69d4e661e4f588b525bc05dc1b6b5ba Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 10 Jul 2020 16:37:17 +0000
Subject: user/fish: Update to 3.1.2, migrate to CMake, etc

---
 user/fish/APKBUILD | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'user')

diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD
index 9754c4a0b..08e2a6e47 100644
--- a/user/fish/APKBUILD
+++ b/user/fish/APKBUILD
@@ -1,34 +1,35 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=fish
-pkgver=3.0.2
+pkgver=3.1.2
 pkgrel=0
 pkgdesc="Modern interactive commandline shell"
 url="http://www.fishshell.com"
 arch="all"
-options="!check"  # No test suite.
 license="BSD-3-Clause AND BSD-2-Clause AND GPL-2.0+ AND GPL-2.0-only AND ISC"
-depends="bc"
+depends="bc groff"
 depends_dev="$pkgname-tools"
-makedepends="libtool doxygen ncurses-dev pcre2-dev"
+checkdepends="expect"
+makedepends="cmake doxygen ncurses-dev pcre2-dev"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-tools::noarch"
 source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+		-DCURSES_NEED_NCURSES=ON \
+		-Bbuild .
+	make -C build
+}
+
+check() {
+	make -C build test
 }
 
 package() {
-	make install DESTDIR="$pkgdir"
-	rm -fr "$pkgdir"/usr/share/$pkgname/groff
+	make -C build install DESTDIR="$pkgdir"
 }
 
 dev() {
@@ -53,4 +54,4 @@ tools() {
 	mv "$pkgdir"/usr/share/$pkgname/tools "$subpkgdir"/usr/share/$pkgname
 }
 
-sha512sums="cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3  fish-3.0.2.tar.gz"
+sha512sums="b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563  fish-3.1.2.tar.gz"
-- 
cgit v1.2.3-60-g2f50