From f176ff3ca9419319a89abf7a8ba34391a1ec698e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 9 Apr 2017 11:28:04 +0200
Subject: main/acct: upgrade to 6.6.3, modernize APKBUILD

---
 main/acct/APKBUILD | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'main/acct/APKBUILD')

diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD
index 53993242d2..c5f6e7510e 100644
--- a/main/acct/APKBUILD
+++ b/main/acct/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acct
-pkgver=6.6.2
+pkgver=6.6.3
 pkgrel=0
 pkgdesc="The GNU Accounting Utilities"
 url="http://www.gnu.org/software/acct/"
@@ -12,18 +12,16 @@ makedepends="linux-headers"
 install=""
 subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/acct/$pkgname-$pkgver.tar.gz"
+builddir="$srcdir"/$pkgname-$pkgver
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	#update_config_sub || return 1
-	# fix eglibc-2.16+ build issue
+	default_prepare
 	sed -i -e '/gets is a/d' \
-		lib/stdio.in.h || return 1
+		"$builddir"/lib/stdio.in.h
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	# seems like this makefile does not respect DESTDIR
 	./configure \
 		--build=$CBUILD \
@@ -31,16 +29,13 @@ build() {
 		--prefix=/usr \
 		--mandir="$pkgdir"/usr/share/man \
 		--infodir="$pkgdir"/usr/share/info \
-		--enable-linux-multiformat \
-		|| return 1
-	make LDADD="-lm lib/libgnu.la" || return 1
+		--enable-linux-multiformat
+	make LDADD="-lm lib/libgnu.la"
 }
 
 package() {
-	cd "$_builddir"
-	make prefix="$pkgdir/usr" install || return 1
+	cd "$builddir"
+	make prefix="$pkgdir/usr" install
 }
 
-md5sums="ecb1d38541b01c3434b8bea5fe02e44a  acct-6.6.2.tar.gz"
-sha256sums="8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101  acct-6.6.2.tar.gz"
-sha512sums="5942aa3d1faebb29bd6d6ff97c2ba8525dc5a9c85522c3f549ce0772042d3736e19126ddd7e10fe0681a6ac496b8d3aafda0894577a3b64c59f3b78fc222d2b3  acct-6.6.2.tar.gz"
+sha512sums="161a0c19af9cfb88689935dca0d64c94922bcf9135063349ef8c4d2bf7702864ade1b75ebab2b4fe182a7a9011b755e8608d253a30a263038bc8d57a22a92bc2  acct-6.6.3.tar.gz"
-- 
cgit v1.2.3