From 49240324ae699776f33d861d3ae7359350abd710 Mon Sep 17 00:00:00 2001
From: Lee Starnes <lee@canned-death.us>
Date: Sat, 18 Apr 2020 10:20:47 +0000
Subject: rename user/ffcall to libffcall; clean up others

---
 user/clisp/APKBUILD      |  3 +--
 user/ffcall/APKBUILD     | 39 ---------------------------------------
 user/libffcall/APKBUILD  | 38 ++++++++++++++++++++++++++++++++++++++
 user/libsigsegv/APKBUILD |  8 +-------
 4 files changed, 40 insertions(+), 48 deletions(-)
 delete mode 100644 user/ffcall/APKBUILD
 create mode 100644 user/libffcall/APKBUILD

diff --git a/user/clisp/APKBUILD b/user/clisp/APKBUILD
index bdca17a85..f1d347305 100644
--- a/user/clisp/APKBUILD
+++ b/user/clisp/APKBUILD
@@ -10,12 +10,11 @@ url="https://clisp.sourceforge.io"
 arch="all"
 license="GPL-2.0-only"
 depends="libsigsegv"
-depends_dev="libsigsegv-dev ffcall ncurses-dev"
+depends_dev="libsigsegv-dev libffcall ncurses-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	no-page.h.patch"
-builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	default_prepare
diff --git a/user/ffcall/APKBUILD b/user/ffcall/APKBUILD
deleted file mode 100644
index 6cc0f8685..000000000
--- a/user/ffcall/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Contributor: Will Sinatra <wpsinatra@gmail.com>
-# Contributor: Lee Starnes <lee@canned-death.us>
-# Maintainer: Lee Starnes <lee@canned-death.us>
-pkgname=ffcall
-pkgver=2.2
-pkgrel=0
-pkgdesc="C library for implementing foreign function calls in embedded interpreterts"
-url="https://www.gnu.org/software/libffcall"
-arch="all"
-license="GPL-2.0-or-later"
-makedepends="$depends_dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://ftp.gnu.org/gnu/libffcall/libffcall-$pkgver.tar.gz"
-builddir="$srcdir/"/libffcall-$pkgver
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	# Fails to build if building in parallel
-	make -j1
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" htmldir=/usr/share/doc/ffcall install
-
-}
-
-sha512sums="b9d3ca4c67ab92915a8183d850153e585dcb58ceb2199a104426a7aae363d37017b1226440acd18a2db0cc207e044f71e932857189964261e8eaa6de5cef1731  libffcall-2.2.tar.gz"
diff --git a/user/libffcall/APKBUILD b/user/libffcall/APKBUILD
new file mode 100644
index 000000000..67635fcf3
--- /dev/null
+++ b/user/libffcall/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Will Sinatra <wpsinatra@gmail.com>
+# Contributor: Lee Starnes <lee@canned-death.us>
+# Maintainer: Lee Starnes <lee@canned-death.us>
+pkgname=libffcall
+pkgver=2.2
+pkgrel=0
+pkgdesc="C library for implementing foreign function calls in embedded interpreterts"
+url="https://www.gnu.org/software/libffcall"
+arch="all"
+license="GPL-2.0+"
+makedepends="$depends_dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://ftp.gnu.org/gnu/libffcall/libffcall-$pkgver.tar.gz"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	# Fails to build if building in parallel
+	make -j1
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" htmldir=/usr/share/doc/ffcall install
+
+}
+
+sha512sums="b9d3ca4c67ab92915a8183d850153e585dcb58ceb2199a104426a7aae363d37017b1226440acd18a2db0cc207e044f71e932857189964261e8eaa6de5cef1731  libffcall-2.2.tar.gz"
diff --git a/user/libsigsegv/APKBUILD b/user/libsigsegv/APKBUILD
index 05d266d3a..bb21149a3 100644
--- a/user/libsigsegv/APKBUILD
+++ b/user/libsigsegv/APKBUILD
@@ -7,12 +7,11 @@ pkgrel=0
 pkgdesc="A library for handling page faults in user mode"
 url="https://www.gnu.org/software/libsigsegv"
 arch="all"
-license="GPL-2.0-or-later"
+license="GPL-2.0+"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev"
 source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	./configure \
@@ -31,11 +30,6 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	rm -r "$pkgdir"/usr/include
-}
-
-dev() {
-	install -D -m 0444 "$builddir"/src/sigsegv.h "$subpkgdir"/usr/include/sigsegv.h
 }
 
 sha512sums="27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913  libsigsegv-2.12.tar.gz"
-- 
cgit v1.2.3-70-g09d2