From 495cbc5532c7d6c55d91dbc07bc9368bbfcaa4e6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 14 Aug 2018 13:55:33 +0000
Subject: [PATCH] main/tar: modernize

---
 main/tar/APKBUILD | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/main/tar/APKBUILD b/main/tar/APKBUILD
index cd710503be2..42e50ff9fe5 100644
--- a/main/tar/APKBUILD
+++ b/main/tar/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=tar
 pkgver=1.30
-pkgrel=0
+pkgrel=1
 pkgdesc="Utility used to store, backup, and transport files"
 url="https://www.gnu.org"
 arch="all"
@@ -17,18 +17,9 @@ source="ftp://ftp.gnu.org/gnu/tar/$pkgname-$pkgver.tar.xz
 #   1.29-r1:
 #     - CVE-2016-6321
 
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
+builddir="$srcdir/$pkgname-$pkgver"
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	gl_cv_func_gettimeofday_clobber=no \
 	gl_cv_func_tzset_clobber=no \
 	./configure \
@@ -37,13 +28,12 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
 
 	rm -rf "$pkgdir"/usr/lib/charset.alias