forgot to update some time

2 files changed, 51 insertions, 54 deletions

diff --git a/gvim/PKGBUILD b/gvim/PKGBUILD
index 1adb7d5..797b42d 100644
--- a/gvim/PKGBUILD
+++ b/gvim/PKGBUILD
@@ -3,18 +3,15 @@
 
 pkgname=gvim
 _srcver=7.2
-_patchlevel=132
+_patchlevel=166
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="the vim text editor with advanced features enabled, such as a gui mode"
 arch=(i686 x86_64)
 license=('custom:vim')
 url="http://www.vim.org"
-depends=("vim>=${pkgver}" 'perl' 'acl' 'libxt' 'gtk2' 'desktop-file-utils' 'python')
-makedepends=('pkgconfig')
-backup=(etc/gvimrc)
-conflicts=('gvim-devel')
-provides=('gvim-devel')
+depends=("vim=${pkgver}" 'perl' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2')
+makedepends=('pkgconfig' 'sed')
 install=${pkgname}.install
 source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
@@ -23,68 +20,49 @@ source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
 
 build()
 {
+  _versiondir="vim"$(echo ${_srcver} | sed "s/\.//")
   # patch party
   # pull in patches from vim.org (or the src cache alternatively)
-  . ${startdir}/src/fetch_patches.sh
+  . ${srcdir}/fetch_patches.sh
   get_patches || return 1
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
+  cd ${srcdir}/${_versiondir}
    # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
   ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \
     --with-compiledby=ArchLinux --with-features=big \
-    --with-x=yes --disable-gpm --with-x=yes --enable-gui=gtk2 \
-    --with-global-runtime=/usr/share/vim --with-vim-name=gvim \
+    --with-x=yes --disable-gpm --enable-gui=gtk2 \
     --enable-multibyte --enable-cscope \
-    --enable-perlinterp --enable-pythoninterp 
+    --enable-perlinterp --enable-pythoninterp --enable-rubyinterp
   make || return 1
-  # install everything first ...
-  make VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install
+   # install everything first ...
+  make VIMRCLOC=/etc DESTDIR=${pkgdir} install
 
    # ... and clean up what vim already has for us
-   # move the binary and fix the (g)* related symlinks
-  find ${startdir}/pkg/usr/bin -type l 2> /dev/null | while read symlink; do
-    rm ${symlink}
-  done
-  cd ${startdir}/pkg/usr/bin
-  rm -f gvimtutor xxd
-  ln -s gvim evim
-  ln -s gvim egview
-  ln -s gvim gview
-  ln -s gvim gvimdiff
-  ln -s gvim rgview
-  ln -s gvim rgvim
+  cd ${pkgdir}/usr/bin
+  rm -f xxd ex view vimtutor vimdiff rview rvim
+  mv vim vim-big
+  # ... make g* related symlinks point directly to the actual binary
+  ln -sf vim-big eview
+  ln -sf vim-big evim
+  ln -sf vim-big gview
+  ln -sf vim-big gvim
+  ln -sf vim-big gvimdiff
+  ln -sf vim-big rgview
+  ln -sf vim-big rgvim
 
-   # delete the manpages/symlinks provided by vi package
-  find ${startdir}/pkg/usr/share/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 vi.1.gz egview.1.gz
-    ln -s vi.1.gz gview.1.gz
-    ln -s vi.1.gz gvim.1.gz
-    ln -s vimdiff.1.gz gvimdiff.1.gz
-    ln -s vi.1.gz rgvim.1.gz
-    ln -s vi.1.gz rgview.1.gz
+   # delete the manpages/symlinks provided by vim and (n)vi package
+  find ${pkgdir}/usr/share/man -type d -name 'man1' 2> /dev/null | \
+  while read _mandir; do
+    cd ${_mandir}
+      rm -f ex.1 view.1       # provided by (n)vi
+      rm -f rvim.1 rview.1 vim.1 vimtutor.1 vimdiff.1 xxd.1  # provided by vim
   done
 
-  install -Dm644 ${startdir}/pkg/usr/share/vim/gvimrc_example.vim \
-    ${startdir}/pkg/etc/gvimrc
-   # clean all settings and controls -  served by vi package
-  rm -rf ${startdir}/pkg/usr/share/vim
+   # clean all settings and controls -  served by vim package
+  rm -rf ${pkgdir}/usr/share/vim
    # freedesktop links
-  install -D -m644 ${startdir}/src/${pkgname}.desktop \
+  install -D -m644 ${srcdir}/${pkgname}.desktop \
     ${startdir}/pkg/usr/share/applications/gvim.desktop
-  install -D -m644 ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")/runtime/vim48x48.png \
-    ${startdir}/pkg/usr/share/pixmaps/gvim.png
+  install -D -m644 ${srcdir}/${_versiondir}/runtime/vim48x48.png \
+    ${pkgdir}/usr/share/pixmaps/gvim.png
 }
-md5sums=('f0901284b338e448bfd79ccca0041254'
-         '35e04482f07c57221c9a751aaa3b8dac'
-         'd8884786979e0e520c112faf2e176f05'
-         '2be104c0372dd6dae19cb7968c03cd4f'
-         'f16f81339ea02b6e1a736264861b7fad')
-sha256sums=('914db0f2205ebd6f02878295ec2506036ea7500399db112c61a01491cd9a1d86'
-            '20894ac79672160bfc4f1d2f9f9775b34d944762d655307a91ca96d358faa04d'
-            '11607f539a4518b550bf1606b7d3a6f36c1ffdf566c058e7d94bced78034cd5b'
-            '5f2d65e755424f688b990b20bce6bd84718b9d5f7944a5332b5dee72f09493f7'
-            'ca1318de5f37712afa532e87e0a201ad4dadcfe6d3b1382d571ea4c621bd07ed')
diff --git a/gvim/gvim.install b/gvim/gvim.install
index f49c345..f52c82e 100644
--- a/gvim/gvim.install
+++ b/gvim/gvim.install
@@ -1,4 +1,11 @@
 post_install() {
+
+  echo "Create gvim related symlinks..."
+  cd usr/bin
+  rm -f vim
+  ln -sf vim-big vim
+  cd ${OLDPWD}
+
   echo "Updating desktop and mime database..."
   update-desktop-database -q
   echo -n "Updating vim help tags..."
@@ -12,6 +19,18 @@ post_upgrade() {
 }
 
 post_remove() {
+  # we recover what pacmans database knows about gvim
+  # is vim installed and well?
+  if [ -f usr/bin/vim-normal ] ; then
+    cd usr/bin
+    rm -f vim
+    ln -sf vim-normal vim
+    cd ${OLDPWD}
+    echo "Recover vim related symlinks ..."
+  else
+    # Should never be the case because gvim depends on vim
+    rm -f usr/bin/vim
+  fi
   echo -n "Updating desktop and mime database..."
   update-desktop-database
   echo "done."