From b5f861a30e4f2bea1cad2360a40c7670f75a62d0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 13 Sep 2011 08:03:56 +0000
Subject: main/make: bugfixes from upstream

Upstream bugreports reports:
http://savannah.gnu.org/bugs/index.php?30612
http://savannah.gnu.org/bugs/index.php?30723

Fixes building of dev86.
---
 main/make/APKBUILD | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'main/make/APKBUILD')

diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index 57cdf613d7..96ba9e78db 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -1,16 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=make
 pkgver=3.82
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU make utility to maintain groups of programs"
 url="http://www.gnu.org/software/make"
 arch="all"
 license=GPL
 depends=
 subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+	make-3.82-savannah-bugs-30612-30723.patch"
 
 _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
+}
+
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
@@ -25,4 +35,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="7f7c000e3b30c6840f2e9cf86b254fac  make-3.82.tar.gz"
+md5sums="7f7c000e3b30c6840f2e9cf86b254fac  make-3.82.tar.gz
+74e598a2052f7d98e3495ea9d917ecf4  make-3.82-savannah-bugs-30612-30723.patch"
-- 
cgit v1.2.3