[arch-commits] CVS update of arch/build/editors/vim (PKGBUILD fetch_patches.sh)

[Tobias Kieslich]

    Date: Wednesday, August 1, 2007 @ 15:43:04
  Author: tobias
    Path: /home/cvs-arch/arch/build/editors/vim

Modified: PKGBUILD (1.1 -> 1.2) fetch_patches.sh (1.1 -> 1.2)

bring the new vi/vim/gvim layout to testing


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


Index: arch/build/editors/vim/PKGBUILD
diff -u arch/build/editors/vim/PKGBUILD:1.1 arch/build/editors/vim/PKGBUILD:1.2
--- arch/build/editors/vim/PKGBUILD:1.1	Mon Jul  9 20:26:30 2007
+++ arch/build/editors/vim/PKGBUILD	Wed Aug  1 15:43:04 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.1 2007/07/10 00:26:30 tobias Exp $
+# $Id: PKGBUILD,v 1.2 2007/08/01 19:43:04 tobias Exp $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vim
 _srcver=7.1
-_patchlevel=22
+_patchlevel=47
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="a highly configurable, improved version of the vi text editor"
@@ -22,13 +22,13 @@
 md5sums=('44c6b4914f38d6f9aa959640b89da329'
          '605cc7ae31bcc9d7864bb0bb6025f55d'
          '144aa049ba70621acf4247f0459f3ee7'
-         'fba5e33a451066494c7203d13cf0be3d')
+         'fd7aa27ca214a86eccefb414c2e0d172')
 
 build()
 {
   # pull in patches from vim.org (or the src cache alternatively)
   . ${startdir}/fetch_patches.sh
-  get_patches
+  get_patches || return 1
   cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
   # build party
@@ -43,13 +43,11 @@
   cd ${startdir}/pkg/usr/bin
   rm -f ex view rview xxd vimtutor
   ln -s vitutor vimtutor
-  ln -s vim evim
 
    # delete the manpages/symlinks provided by vi package
   find ${startdir}/pkg/usr/man -type d -name 'man1' 2> /dev/null | while read mandir; do
     cd ${mandir}
     rm -f *.1
-    ln -s evi.1.gz evim.1.gz
     ln -s rvi.1.gz rvim.1.gz
     ln -s vi.1.gz vim.1.gz
     ln -s vidiff.1.gz vimdiff.1.gz
Index: arch/build/editors/vim/fetch_patches.sh
diff -u arch/build/editors/vim/fetch_patches.sh:1.1 arch/build/editors/vim/fetch_patches.sh:1.2
--- arch/build/editors/vim/fetch_patches.sh:1.1	Mon Jul  9 20:26:30 2007
+++ arch/build/editors/vim/fetch_patches.sh	Wed Aug  1 15:43:04 2007
@@ -17,7 +17,9 @@
   echo -e "\tfetching checksumfile for patches"
   wget ${_rpath}/MD5SUMS >/dev/null 2>&1
 
+  downloads=0
   for _line in $(/bin/cat MD5SUMS); do
+    downloads=$((${downloads} + 1))
     _md5=$(echo $_line | cut -d ' ' -f1)
     _file=$(echo $_line | cut -d ' ' -f3)
     if [ -f ${SRCDEST}/vim-${_srcver}/${_file} ]; then
@@ -41,6 +43,10 @@
       return 1
     fi
   done
+  if [ ${downloads} != ${_patchlevel} ]; then
+    echo -e "Number of patches does not match the patchlevel!\nEdit the PKGBUILD accordingly!"
+    return 1
+  fi
   IFS=$_OLDIFS
   rm MD5SUMS
   cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")