[arch-commits] Commit in vi/repos (testing-i686 testing-i686/PKGBUILD)

[Tobias Kieslich]

    Date: Wednesday, October 29, 2008 @ 14:56:25
  Author: tobias
Revision: 17437

Merged revisions 17430 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/vi/trunk

........
  r17430 | tobias | 2008-10-29 19:34:20 +0100 (Wed, 29 Oct 2008) | 1 line
  
  upgpkg: vi 7.2.25-1
........

Modified:
  vi/repos/testing-i686/	(properties)
  vi/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)


Property changes on: vi/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /vi/trunk:1-12021
   + /vi/trunk:1-17436

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-10-29 18:45:46 UTC (rev 17436)
+++ testing-i686/PKGBUILD	2008-10-29 18:56:25 UTC (rev 17437)
@@ -3,7 +3,7 @@
 
 pkgname=vi
 _srcver=7.2
-_patchlevel=13
+_patchlevel=25
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="a highly configurable, improved version of the vi text editor (basic version)"
@@ -45,14 +45,18 @@
   make || return 1
   make  VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install
   cd ${startdir}/pkg/usr/bin
-  rm -f vim rvim view rview
+  rm -f vim rvim view rview vidiff
   ln -s vi evi
 
+  # delete the manpages for vidiff, we don't bother with that symlink since vidiff doesn't work
+  find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
+   while read mandir; do
+    cd ${mandir}
+    rm -f vidiff.1
+  done
+
   _runtimedir="${startdir}/pkg/usr/share/vim/"
   update_runtime
-  # kill vim and x specific stuff
-  #sed -i '/vms/,+4 d;/Convenient command/,+3 d;/mouse work/,+2 d'\
-  #  ${startdir}/pkg/usr/share/vim/vimrc_example.vim
   install -Dm644 ${startdir}/pkg/usr/share/vim/vimrc_example.vim \
     ${startdir}/pkg/etc/virc
   rm -f ${startdir}/pkg/usr/share/vim/gvimrc_example.vim