aboutsummaryrefslogtreecommitdiffstats
path: root/main/bash/APKBUILD
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-09-25 07:06:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-09-25 07:07:06 +0000
commit15b4fa33117ac233ea3deb3927348ae3a45cd08e (patch)
tree496516343142ee6c96d9f25c7963c4c41518f0cb /main/bash/APKBUILD
parented2eb0483ad45b7886519a3b8a997b85e12758a5 (diff)
downloadaports-15b4fa33117ac233ea3deb3927348ae3a45cd08e.tar.bz2
aports-15b4fa33117ac233ea3deb3927348ae3a45cd08e.tar.xz
main/bash: fix application of patches
make sure all paches are properly applied
Diffstat (limited to 'main/bash/APKBUILD')
-rw-r--r--main/bash/APKBUILD15
1 files changed, 9 insertions, 6 deletions
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 815f6b9049..9a398f3c78 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -3,8 +3,8 @@ pkgname=bash
pkgver=4.3.025
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
-_patchbase=${_myver%.*}${_myver#*.}
-pkgrel=0
+_patchbase=${_myver/./}
+pkgrel=1
pkgdesc="The GNU Bourne Again shell"
url="http://www.gnu.org/software/bash/bash.html"
arch="all"
@@ -31,10 +31,13 @@ prepare() {
local p
cd "$_builddir"
update_config_sub || return 1
- #for p in ../bash${_patchbase}-??? ../*.patch; do
- for p in ../*.patch; do
- msg "applying patch ${p##*/}"
- patch -p0 -i $p || return 1
+ for p in $source; do
+ case $p in
+ *.patch|*/bash[0-9][0-9]-[0-9]*)
+ msg "$p"
+ patch -p0 -i "$srcdir"/${p##*/} || return 1
+ ;;
+ esac
done
}