[arch-commits] Commit in vim/repos (3 files)

[Daniel Griffiths]

    Date: Sunday, February 21, 2010 @ 23:33:17
  Author: dgriffiths
Revision: 69724

Merged revisions 69693,69722 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/vim/trunk

........
  r69693 | dgriffiths | 2010-02-21 16:33:27 -0600 (Sun, 21 Feb 2010) | 1 line
  
  Removing ruby, doesn't build properly
........
  r69722 | dgriffiths | 2010-02-21 22:32:38 -0600 (Sun, 21 Feb 2010) | 2 lines
  
  FS#16710 - Thanks drmikehenry
........

Modified:
  vim/repos/extra-x86_64/	(properties)
  vim/repos/extra-x86_64/PKGBUILD
  vim/repos/extra-x86_64/fetch_patches.sh

------------------+
 PKGBUILD         |    6 +++---
 fetch_patches.sh |    7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)


Property changes on: vim/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /vim/trunk:1-69650
   + /vim/trunk:1-69723

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-22 04:32:54 UTC (rev 69723)
+++ extra-x86_64/PKGBUILD	2010-02-22 04:33:17 UTC (rev 69724)
@@ -5,13 +5,13 @@
 _srcver=7.2
 _patchlevel=368
 pkgver=${_srcver}.${_patchlevel}
-pkgrel=1
+pkgrel=2
 pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
 arch=('i686' 'x86_64')
 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')
 

Modified: extra-x86_64/fetch_patches.sh
===================================================================
--- extra-x86_64/fetch_patches.sh	2010-02-22 04:32:54 UTC (rev 69723)
+++ extra-x86_64/fetch_patches.sh	2010-02-22 04:33:17 UTC (rev 69724)
@@ -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
 
   ########