LinHES 6.01.00

3 files changed, 27 insertions, 17 deletions

diff --git a/abs/core/vi/PKGBUILD b/abs/core/vi/PKGBUILD
index 1165431..b65cb93 100644
--- a/abs/core/vi/PKGBUILD
+++ b/abs/core/vi/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 3026 2008-06-18 02:38:15Z eric $
+# $Id: PKGBUILD 17437 2008-10-29 18:56:25Z tobias $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vi
-_srcver=7.1
-_patchlevel=330
+_srcver=7.2
+_patchlevel=148
 pkgver=${_srcver}.${_patchlevel}
-pkgrel=10
+pkgrel=3
 pkgdesc="a highly configurable, improved version of the vi text editor (basic version)"
 arch=(i686 x86_64)
 license=('custom:vim')
 url="http://www.vim.org"
 groups=('base')
 depends=('glibc' 'ncurses' 'coreutils')
-makedepends=('wget' 'sed' 'grep')
+makedepends=('wget' 'sed' 'grep' 'gettext')
 backup=(etc/virc)
 install=${pkgname}.install
 # we need the extra-stuff to get all patches applied smoothly
@@ -20,9 +20,6 @@ source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
         fetch_patches.sh fetch_runtime.sh)
-md5sums=('44c6b4914f38d6f9aa959640b89da329' '605cc7ae31bcc9d7864bb0bb6025f55d' \
-         '144aa049ba70621acf4247f0459f3ee7' '0fbebfbf8464b1e65fb6a9ca4bddefe1' \
-         '92e3dc8844d446c1ecd28e7257a47cb7')
 
 build()
 {
@@ -45,18 +42,30 @@ build()
   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
   install -dm755 ${startdir}/pkg/usr/share/licenses/vim
   cd ${startdir}/pkg/usr/share/licenses/vim
   ln -s ../../vim/doc/uganda.txt license.txt
+
+#               Changes to remove mouse support  VERY IMPORTANT!
+  ########################################################################################
+   sed -i "s/mouse=a/mouse-=a/g" $startdir/pkg/etc/virc
+
+
+  ############################################################################
+
 }
diff --git a/abs/core/vi/__changelog b/abs/core/vi/__changelog
new file mode 100644
index 0000000..47cbb5f
--- /dev/null
+++ b/abs/core/vi/__changelog
@@ -0,0 +1,3 @@
+Remove mouse support from  /etc/vimrc.  This new found ability is truely annoying.
+
+
diff --git a/abs/core/vi/fetch_patches.sh b/abs/core/vi/fetch_patches.sh
index 1f38e42..2ce1019 100644
--- a/abs/core/vi/fetch_patches.sh
+++ b/abs/core/vi/fetch_patches.sh
@@ -17,7 +17,7 @@ get_patches() {
   echo -e "\tfetching checksumfile for patches"
   wget ${_rpath}/MD5SUMS >/dev/null 2>&1
 
-  downloads=0
+  downloads=-1
   for _line in $(/bin/cat MD5SUMS); do
     downloads=$((${downloads} + 1))
     _md5=$(echo $_line | cut -d ' ' -f1)
@@ -42,10 +42,8 @@ get_patches() {
       return 1
     fi
   done
-
-  ## TEMPFIX stupid fuckup upstream
-  mv ./7.1.126ne ./7.1.126
-  downloads=$((${downloads} - 1))
+  cd $startdir/src/patches
+  rm 7.2.001-100.gz
   ########
 
   if [ ${downloads} != ${_patchlevel} ]; then