From d35888a50f92b2bad7e830fe29e41d217ef75a49 Mon Sep 17 00:00:00 2001
From: TBK <tbk@jjtc.dk>
Date: Thu, 22 Mar 2018 07:39:39 +0100
Subject: main/iniparser: upgrade to 4.1

---
 main/iniparser/APKBUILD    | 54 +++++++++++++++++-----------------------------
 main/iniparser/rpath.patch | 10 ++++-----
 2 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/main/iniparser/APKBUILD b/main/iniparser/APKBUILD
index cb266f2b87..316aa74cd8 100644
--- a/main/iniparser/APKBUILD
+++ b/main/iniparser/APKBUILD
@@ -1,52 +1,38 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iniparser
-pkgver=4.0
-pkgrel=1
+pkgver=4.1
+pkgrel=0
 pkgdesc="C library for parsing "INI-style" files"
 url="http://ndevilla.free.fr/iniparser/"
 arch="all"
 license="MIT"
 depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
+makedepends="bash"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz
 	rpath.patch"
+builddir="$srcdir"/iniparser-$pkgver
 
-_builddir="$srcdir"/iniparser-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	cd "$builddir"
+#	make CC="${CC:-gcc}" CFLAGS="${CFLAGS} -fPIC" LDFLAGS="$LDFLAGS" \
+#		libiniparser.so
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make CC="${CC:-gcc}" CFLAGS="${CFLAGS} -fPIC" LDFLAGS="$LDFLAGS" \
-		libiniparser.so || return 11
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	install -d "$pkgdir"/usr/lib "$pkgdir"/usr/include || return 1
-	install -m 644 src/dictionary.h "$pkgdir"/usr/include/dictionary.h \
-		|| return 1
-	install -m 644 src/iniparser.h "$pkgdir"/usr/include/iniparser.h \
-		|| return 1
-	install -m 755 libiniparser.so.0 "$pkgdir"/usr/lib/libiniparser.so.0 \
-		|| return 1
-	ln -s libiniparser.so.0 "$pkgdir"/usr/lib/libiniparser.so \
-		|| return 1
+	cd "$builddir"
+	install -d "$pkgdir"/usr/lib "$pkgdir"/usr/include
+	install -m 644 src/dictionary.h "$pkgdir"/usr/include/dictionary.h
+	install -m 644 src/iniparser.h "$pkgdir"/usr/include/iniparser.h
+	install -m 755 libiniparser.so.1 "$pkgdir"/usr/lib/libiniparser.so.1
+	ln -s libiniparser.so.1 "$pkgdir"/usr/lib/libiniparser.so
 }
 
-md5sums="94c7278f8d22de1a31320219b27634b0  iniparser-4.0.tar.gz
-41616be03aa5bfc59c9420792aa91a92  rpath.patch"
-sha256sums="e0bbd664bb3f0d64c21ac2d67a843b1c7a3a9710e96393344d170ab8b33e92ba  iniparser-4.0.tar.gz
-8f8c3888bff71dc05b6937f432c298db2be75938b5ccea2388f00343e0820f53  rpath.patch"
-sha512sums="86080d4e4cb85e252f9c75116d9a548a2f08f2131e269834a0d16597da4e4c5790dff8304be082f2a8dcc75d17585e9a8fad3f0f4766bff8914f6ef2b0d6fa05  iniparser-4.0.tar.gz
-bf517a9d311b887eb59cd2e296601cbd1e217965cd67cdcf90dc0604bef40365978f062c8252abb21a7eb6b8ae11c0a175317fee33af01c332f5390ae0115bd5  rpath.patch"
+sha512sums="a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968  iniparser-4.1.tar.gz
+db7bdab6f8faafd47c8b50104e1a461fbd9324b75482b1455a8fc059c07278e7e60f088a3f712b0ade05a9bb989168d17684455b9863018f22a61e0190a888c6  rpath.patch"
diff --git a/main/iniparser/rpath.patch b/main/iniparser/rpath.patch
index eafa5d450a..ef7097fbea 100644
--- a/main/iniparser/rpath.patch
+++ b/main/iniparser/rpath.patch
@@ -1,10 +1,10 @@
---- ./Makefile.orig
-+++ ./Makefile
-@@ -18,7 +18,6 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,6 @@
  
  SHLD = ${CC} ${CFLAGS}
  LDSHFLAGS = -shared -Wl,-Bsymbolic
 -LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
  
- # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX)
- # RANLIB  = ranlib
+ # .so.0 is for version 3.x, .so.1 is 4.x
+ SO_TARGET ?= libiniparser.so.1
-- 
cgit v1.2.3