main/libexecinfo: modernize, fix url, fix license

4 files changed, 37 insertions, 49 deletions

diff --git a/main/libexecinfo/10-execinfo.patch b/main/libexecinfo/10-execinfo.patch
index 03b5af0ca20..44db53026ad 100644
--- a/main/libexecinfo/10-execinfo.patch
+++ b/main/libexecinfo/10-execinfo.patch
@@ -1,5 +1,5 @@
---- execinfo.c.orig
-+++ execinfo.c
+--- a/execinfo.c.orig
++++ b/execinfo.c
 @@ -69,7 +69,8 @@
  char **
  backtrace_symbols(void *const *buffer, int size)
diff --git a/main/libexecinfo/20-define-gnu-source.patch b/main/libexecinfo/20-define-gnu-source.patch
index 0ba1fc1f7e6..7255ecdd6a8 100644
--- a/main/libexecinfo/20-define-gnu-source.patch
+++ b/main/libexecinfo/20-define-gnu-source.patch
@@ -1,5 +1,5 @@
---- execinfo.c.orig
-+++ execinfo.c
+--- a/execinfo.c.orig
++++ b/execinfo.c
 @@ -26,6 +26,7 @@
   * $Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $
   */
@@ -8,15 +8,15 @@
  #include <sys/types.h>
  #include <sys/uio.h>
  #include <dlfcn.h>
---- stacktraverse.c.orig
-+++ stacktraverse.c
+--- a/stacktraverse.c.orig
++++ b/stacktraverse.c
 @@ -1,3 +1,4 @@
 +#define _GNU_SOURCE
  #include <stddef.h>
  
  #include "stacktraverse.h"
---- test.c.orig
-+++ test.c
+--- a/test.c.orig
++++ b/test.c
 @@ -1,3 +1,4 @@
 +#define _GNU_SOURCE
  #include <stdio.h>
diff --git a/main/libexecinfo/30-linux-makefile.patch b/main/libexecinfo/30-linux-makefile.patch
index 3bc89279547..6bc8a899d25 100644
--- a/main/libexecinfo/30-linux-makefile.patch
+++ b/main/libexecinfo/30-linux-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig
-+++ Makefile
+--- a/Makefile.orig
++++ b/Makefile
 @@ -23,24 +23,25 @@
  # SUCH DAMAGE.
  #
diff --git a/main/libexecinfo/APKBUILD b/main/libexecinfo/APKBUILD
index 2a3a15306b7..0e91c2ca359 100644
--- a/main/libexecinfo/APKBUILD
+++ b/main/libexecinfo/APKBUILD
@@ -1,62 +1,50 @@
 # Contributor: Philipp Andronov <filipp.andronov@gmail.com>
 # Maintainer: Matt Smith <mcs@darkregion.net>
-
 pkgname=libexecinfo
 pkgver=1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility."
+options="!check" # No testsuite
 url="https://www.freshports.org/devel/libexecinfo"
 arch="all"
-license="BSD"
-depends=
-makedepends=
-install=
-subpackages="${pkgname}-dev"
+license="BSD-2-Clause"
+subpackages="$pkgname-static ${pkgname}-dev"
 source="http://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2
 	10-execinfo.patch
 	20-define-gnu-source.patch
 	30-linux-makefile.patch
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	patch -p0 -i "$srcdir"/10-execinfo.patch
-	patch -p0 -i "$srcdir"/20-define-gnu-source.patch
-	patch -p0 -i "$srcdir"/30-linux-makefile.patch
-}
-
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS="${CFLAGS} -fno-omit-frame-pointer"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 
-	install -D -m755 "$_builddir"/execinfo.h \
-		"$pkgdir"/usr/include/execinfo.h || return 1
-	install -D -m755 "$_builddir"/stacktraverse.h \
-		"$pkgdir"/usr/include/stacktraverse.h || return 1
-	install -D -m755 "$_builddir"/libexecinfo.a \
-		"$pkgdir"/usr/lib/libexecinfo.a || return 1
-	install -D -m755 "$_builddir"/libexecinfo.so.1 \
-		"$pkgdir"/usr/lib/libexecinfo.so.1 || return 1
+	install -D -m755 "$builddir"/execinfo.h \
+		"$pkgdir"/usr/include/execinfo.h
+	install -D -m755 "$builddir"/stacktraverse.h \
+		"$pkgdir"/usr/include/stacktraverse.h
+	install -D -m755 "$builddir"/libexecinfo.a \
+		"$pkgdir"/usr/lib/libexecinfo.a
+	install -D -m755 "$builddir"/libexecinfo.so.1 \
+		"$pkgdir"/usr/lib/libexecinfo.so.1
 	ln -s /usr/lib/libexecinfo.so.1 \
-		"$pkgdir"/usr/lib/libexecinfo.so || return 1
+		"$pkgdir"/usr/lib/libexecinfo.so
+}
+
+static() {
+	depends=""
+	pkgdesc="$pkgdesc (static library)"
+
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
 }
 
-md5sums="8e9e81c554c1c5d735bc877448e92b91  libexecinfo-1.1.tar.bz2
-594e9f7b86780f2f0c623443dec7ca04  10-execinfo.patch
-8536668cd1813aa689f12d36c470c0a5  20-define-gnu-source.patch
-7dfdae632685a5331ca8317395132066  30-linux-makefile.patch"
-sha256sums="c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f  libexecinfo-1.1.tar.bz2
-eff078913cf0baeff6e0442ec5c77d1b25d97d13a6d66d25f5576fd25486d752  10-execinfo.patch
-020c73643ac91df9e90532499404fdc10e3ca0d0e6979a8c1610ac340cabe8d6  20-define-gnu-source.patch
-4e310e178c27ecad1ccb7ced06719428ab44bd30163eb7042c5eb2f285f892cb  30-linux-makefile.patch"
 sha512sums="51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c  libexecinfo-1.1.tar.bz2
-a38f75d305518d3432807735456b32b223e89e0d08860e2dfafb5ad3b507de92d4fa60e4bb11978e3dbf20d68be05da42237ced7db625304b49a5288b90be232  10-execinfo.patch
-f335effbbb5425a4b1031fd8a4358f777825a5979f099d01357fab5715065e9f7439f118d155f124b1a15b1e91cd3a4e9a20793806d121f605775f148aea0102  20-define-gnu-source.patch
-3596aef8c6d0593afd063c2295ede3473d33afa52eafa5258bb48fcd472a36f987196c7de647b2b408a5a02138de9f36253d93f7a9f061e2bb6082fc429acb76  30-linux-makefile.patch"
+cd35c9046d88b39b05bc36faffb1e71ae3b2140632da7da37f374fff671d4ad812eebd0581011ff9e3b25d3cb4bc962cf35957074f713817b3b617511425af1a  10-execinfo.patch
+c961b2f86cba291e8c69a507e3880354ad7369fd04c8948d54c4db0578fe30cca8f4250742cb63d1ab6e5875988f04c4729256197030369404f0e925f299a66c  20-define-gnu-source.patch
+13d3df88a6dabd78ee2cf50092511f5a10f0e5ff3d81dbacb182fcf85ceb0c13a5f0252397b4eb0ac57f8d8bd3fc3af6c05865d6398cbc1517f347210c5750da  30-linux-makefile.patch"