diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template index a97515f70d9..be58f3453c3 100644 --- a/srcpkgs/bash/template +++ b/srcpkgs/bash/template @@ -1,9 +1,9 @@ # Template build file for 'bash'. pkgname=bash _bash_distver=4.3 -_bash_patchlevel=000 +_bash_patchlevel=008 version=${_bash_distver}.${_bash_patchlevel} -revision=3 +revision=1 wrksrc=${pkgname}-${_bash_distver} build_style=gnu-configure configure_args="--without-bash-malloc --with-curses --with-installed-readline" @@ -22,17 +22,19 @@ pre_configure() { local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches" local ver=$(echo ${_bash_distver}|sed "s|\.||g") + cd ${XBPS_SRCDISTDIR}/${pkgname}-${version} if [ "${_bash_patchlevel}" -gt 000 ]; then - cd ${XBPS_SRCDISTDIR} || return 1 for p in $(seq -w 001 ${_bash_patchlevel}); do - [ -f ${XBPS_SRCDISTDIR}/bash${ver}-${p} ] && continue + if [ -f bash${ver}-${p} ]; then + continue + fi msg_normal " Fetching ${url}/bash${ver}-$p ...\n" $XBPS_FETCH_CMD ${url}/bash${ver}-$p done fi cd ${wrksrc} for p in $(seq -w 001 ${_bash_patchlevel}); do - patch -s -Np0 -i ${XBPS_SRCDISTDIR}/bash${ver}-${p} && \ + patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/bash${ver}-${p} && \ msg_normal " Applying patch bash${ver}-$p.\n" done }