[arch-commits] CVS update of extra/editors (gvim/PKGBUILD vim/PKGBUILD)

[Tobias Kieslich]

    Date: Thursday, March 6, 2008 @ 21:07:41
  Author: tobias
    Path: /home/cvs-extra/extra/editors

Modified: gvim/PKGBUILD (1.58 -> 1.59) vim/PKGBUILD (1.18 -> 1.19)

fix manpages path and bump patches


---------------+
 gvim/PKGBUILD |   11 ++++++-----
 vim/PKGBUILD  |   11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)


Index: extra/editors/gvim/PKGBUILD
diff -u extra/editors/gvim/PKGBUILD:1.58 extra/editors/gvim/PKGBUILD:1.59
--- extra/editors/gvim/PKGBUILD:1.58	Tue Mar  4 16:48:40 2008
+++ extra/editors/gvim/PKGBUILD	Thu Mar  6 21:07:41 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.58 2008/03/04 21:48:40 tobias Exp $
+# $Id: PKGBUILD,v 1.59 2008/03/07 02:07:41 tobias Exp $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=gvim
 _srcver=7.1
-_patchlevel=266
+_patchlevel=267
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="the vim text editor with advanced features enabled, such as a gui mode"
@@ -33,9 +33,9 @@
   cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
    # 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 \
+  ./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-x=yes --disable-gpm --with-x=yes --enable-gui=gtk2 \
     --with-global-runtime=/usr/share/vim --with-vim-name=gvim \
     --enable-multibyte --enable-cscope \
     --enable-perlinterp --enable-pythoninterp --enable-rubyinterp
@@ -58,7 +58,8 @@
   ln -s gvim rgvim
 
    # delete the manpages/symlinks provided by vi package
-  find ${startdir}/pkg/usr/man -type d -name 'man1' 2> /dev/null | while read mandir; do
+  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
Index: extra/editors/vim/PKGBUILD
diff -u extra/editors/vim/PKGBUILD:1.18 extra/editors/vim/PKGBUILD:1.19
--- extra/editors/vim/PKGBUILD:1.18	Tue Mar  4 16:48:39 2008
+++ extra/editors/vim/PKGBUILD	Thu Mar  6 21:07:41 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.18 2008/03/04 21:48:39 tobias Exp $
+# $Id: PKGBUILD,v 1.19 2008/03/07 02:07:41 tobias Exp $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vim
 _srcver=7.1
-_patchlevel=266
+_patchlevel=267
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="a highly configurable, improved version of the vi text editor"
@@ -30,7 +30,7 @@
   cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
   # build party
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
+  ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \
     --with-compiledby=ArchLinux --with-features=big \
     --with-x=yes --disable-gui \
     --with-global-runtime=/usr/share/vim --with-vim-name=vim \
@@ -43,7 +43,8 @@
   ln -s vitutor vimtutor
 
    # delete the manpages/symlinks provided by vi package
-  find ${startdir}/pkg/usr/man -type d -name 'man1' 2> /dev/null | while read mandir; do
+  find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
+   while read mandir; do
     cd ${mandir}
     rm -f *.1
     ln -s rvi.1.gz rvim.1.gz
@@ -57,5 +58,5 @@
   install -Dm644 ${startdir}/pkg/usr/share/vim/vimrc_example.vim \
     ${startdir}/pkg/etc/vimrc
   # clean all settings and controls -  served by vi package
-  rm -rf ${startdir}/pkg/usr/share
+  rm -rf ${startdir}/pkg/usr/share/vim
 }