From 67f37a4cbfe1050cfad229dcd975c43e14432001 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Mon, 6 May 2019 11:48:02 -0300
Subject: main/minizip: modernize

- Use modern style
- Fix license
- Fix url
---
 main/minizip/APKBUILD                         | 36 +++++++++++----------------
 main/minizip/zlib-1.2.8-minizip-include.patch |  4 +--
 2 files changed, 16 insertions(+), 24 deletions(-)

(limited to 'main/minizip')

diff --git a/main/minizip/APKBUILD b/main/minizip/APKBUILD
index 7c68fbea126..f4b9c25da44 100644
--- a/main/minizip/APKBUILD
+++ b/main/minizip/APKBUILD
@@ -1,43 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=minizip
 pkgver=1.2.11
-pkgrel=0
+pkgrel=1
 pkgdesc="a library for manipulation with files from .zip archives"
 arch="all"
-license="zlib"
-url="http://zlib.net"
-depends=""
+license="Zlib"
+url="https://zlib.net"
 makedepends="automake autoconf libtool zlib-dev"
 subpackages="$pkgname-dev"
-options="!check"
+options="!check" # No testsuite
 source="https://zlib.net/zlib-$pkgver.tar.gz
 	zlib-1.2.8-minizip-include.patch"
 
-_builddir="$srcdir/zlib-$pkgver"/contrib/minizip
+builddir="$srcdir/zlib-$pkgver"/contrib/minizip
 
 prepare() {
-        local i
-        cd "$srcdir/zlib-$pkgver"
-        for i in $source; do
-                case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
+	default_prepare
+	autoreconf -fi
 }
 
 build() {
-	cd "$_builddir"
-
-	autoreconf -vif || return 1
-        ./configure --prefix=/usr \
-                --enable-static=no || return 1
-	make || return 1
+	cd "$builddir"
+	./configure --prefix=/usr \
+		--enable-static=no
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae  zlib-1.2.11.tar.gz
-870bec30f994fb2ece41ab5a7f24de08daa5d0751744232f9971a345c186db98bd00bd04f466a8a3abc10b11c15f17461255fda630dd0a4eae9635b03b93b826  zlib-1.2.8-minizip-include.patch"
+d325818f4674c7aff9e97a6446b01197d89149803b1994441fdcdbdd216206184085cb841bac73dd87472c386335b07283a28cbf852766acd99d55c63f32112d  zlib-1.2.8-minizip-include.patch"
diff --git a/main/minizip/zlib-1.2.8-minizip-include.patch b/main/minizip/zlib-1.2.8-minizip-include.patch
index e8afe95d3e9..c56e7999573 100644
--- a/main/minizip/zlib-1.2.8-minizip-include.patch
+++ b/main/minizip/zlib-1.2.8-minizip-include.patch
@@ -11,8 +11,8 @@ Include zconf.h for z_crc_t, fixes a regression from commit
 
 diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h
 index 1e9e820..835a2ba 100644
---- a/contrib/minizip/crypt.h
-+++ b/contrib/minizip/crypt.h
+--- a/crypt.h
++++ b/crypt.h
 @@ -27,6 +27,8 @@
     Encryption is not supported.
  */
-- 
cgit v1.2.3