Date: Sunday, February 21, 2010 @ 23:32:38 Author: dgriffiths Revision: 69722
FS#16710 - Thanks drmikehenry Modified: vim/trunk/PKGBUILD vim/trunk/fetch_patches.sh ------------------+ PKGBUILD | 6 +++--- fetch_patches.sh | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-02-22 04:08:20 UTC (rev 69721) +++ PKGBUILD 2010-02-22 04:32:38 UTC (rev 69722) @@ -11,7 +11,7 @@ license=('custom:vim') url="http://www.vim.org" depends=('gpm' 'coreutils' 'perl') -makedepends=('wget' 'sed' 'grep' 'gettext' 'curl') +makedepends=('wget' 'sed' 'grep' 'gettext' 'curl' 'rsync' 'ruby') backup=(etc/vimrc) install=${pkgname}.install # we need the extra-stuff to get all patches applied smoothly @@ -20,7 +20,7 @@ ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \ fetch_patches.sh fetch_runtime.sh vimrc archlinux.vim) md5sums=('f0901284b338e448bfd79ccca0041254' '35e04482f07c57221c9a751aaa3b8dac' \ - 'd8884786979e0e520c112faf2e176f05' '159d4d11ecaf85c06623a02c1f843d01' \ + 'd8884786979e0e520c112faf2e176f05' '9c8f6b302fc3f343962686b8cf4a0350' \ '45c1c3c6aff7de0d8fc2a9d8cd5cec7d' '3f42c68545b5b1afb2e9a5b2731ef063' \ '10353a61aadc3f276692d0e17db1478e') @@ -39,7 +39,7 @@ --with-compiledby=ArchLinux --with-features=big \ --enable-gpm --enable-acl --with-x=no --disable-gui \ --enable-multibyte --enable-cscope \ - --enable-perlinterp + --enable-perlinterp --enable-rubyinterp #--with-global-runtime=/usr/share/vim --with-vim-name=vim \ make || return 1 } Modified: fetch_patches.sh =================================================================== --- fetch_patches.sh 2010-02-22 04:08:20 UTC (rev 69721) +++ fetch_patches.sh 2010-02-22 04:32:38 UTC (rev 69722) @@ -7,12 +7,11 @@ let _patchlevel=$_patchlevel+1 _currpatch=$(cat MD5SUMS | wc -l) sed -i "${_patchlevel},\$d" MD5SUMS - cat MD5SUMS | awk '{ print $2 }' | sed -e \ - "s|^|ftp://ftp.vim.org/pub/vim/patches/${_srcver}/|" | \ - xargs -P 0 -r -n 1 wget -nv + rsync -avzcP "ftp.nluug.nl::Vim/patches/${_srcver}/${_srcver}.*" . md5sum -c MD5SUMS > /dev/null || return 1 + > vim.full.patch.log for file in $(cat MD5SUMS | awk '{ print $2 }') - do patch -p0 < $file > vim.full.patch.log; done + do patch -d ${_versiondir} -p0 < $file >> vim.full.patch.log || return 1; done ########