vim: 7.3 updated from abs

10 files changed, 170 insertions, 146 deletions

diff --git a/abs/extra/vim/Adding b/abs/extra/vim/Adding
deleted file mode 100644
index e69de29..0000000
--- a/abs/extra/vim/Adding
+++ /dev/null
diff --git a/abs/extra/vim/Computing b/abs/extra/vim/Computing
deleted file mode 100644
index e69de29..0000000
--- a/abs/extra/vim/Computing
+++ /dev/null
diff --git a/abs/extra/vim/Creating b/abs/extra/vim/Creating
deleted file mode 100644
index e69de29..0000000
--- a/abs/extra/vim/Creating
+++ /dev/null
diff --git a/abs/extra/vim/Extracting b/abs/extra/vim/Extracting
deleted file mode 100644
index e69de29..0000000
--- a/abs/extra/vim/Extracting
+++ /dev/null
diff --git a/abs/extra/vim/PKGBUILD b/abs/extra/vim/PKGBUILD
index 942f1a7..d0c30fd 100644
--- a/abs/extra/vim/PKGBUILD
+++ b/abs/extra/vim/PKGBUILD
@@ -1,61 +1,67 @@
-# $Id: PKGBUILD 89882 2010-09-04 16:50:25Z ibiru $
+# $Id: PKGBUILD 163486 2012-07-13 05:33:54Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=vim
-pkgname=(vim gvim vim-runtime)
+pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=3
+_patchlevel=600
+__hgrev=11d40fc82f11
+_versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-__hgrev=073ff46fe3
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
-makedepends=('gpm' 'perl' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2'
-             'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed')
-options=(force)
-source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
-        vimrc archlinux.vim gvim.desktop)
-md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
-         'e57777374891063b9ca48a1fe392ac05'
-         '10353a61aadc3f276692d0e17db1478e'
-         '2be104c0372dd6dae19cb7968c03cd4f')
-
-__hgroot='http://vim.googlecode.com/hg/'
-__hgrepo='vim'
-__hgbranch='default'
-
-_versiondir="vim${_topver//./}"
-
-##### Build #####
-
-build() {
-  cd ${srcdir}
-
-  msg2 'Checking out source from Mercurial...'
-
-  if [[ -d ${__hgrepo} ]]; then
-    cd ${__hgrepo}
-    hg pull -b ${__hgbranch}|| warning 'hg pull failed!'
-    hg update -r ${__hgrev}
-  else
-    hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
-    cd ${__hgrepo}
-  fi
-
+makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
+source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
+        "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
+        'pythoncomplete.vim::http://www.vim.org/scripts/download_script.php?src_id=10872'
+        'vimrc'
+        'archlinux.vim'
+        'gvim.desktop')
+sha1sums=('a1c54bde75476ace5d24d4c17f7a81818e80dfda'
+          '14d62fe89d8292a6d2f7c46e8c61bd59bbd01083'
+          '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
+          '3494baf53a63581ba69f86a81293640ff681c5c5'
+          '25dd3c2ce436e73a367c8f73b68f7f6889682437'
+          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
+
+# source PKGBUILD && mksource
+mksource() {
+
+  [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
+
+  __hgroot='http://vim.googlecode.com/hg/'
+  __hgrepo='vim'
+  __hgbranch='default'
+
+  hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
+
+  pushd ${__hgrepo}
   if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then
-    warning 'You are not building the latest revision!'
-    warning "Consider updating __hgrev to $(hg id -r ${__hgbranch})."
-    sleep 10
+    printf 'You are not building the latest revision!\n'
+    printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n"
   fi
+  popd
+
+  mv vim ${pkgname}-${pkgver}
+  find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \;
+  rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
+  tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
+  rm -r ${pkgname}-${pkgver}
+  #gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
+}
 
-  cd ..
-  rm -rf vim-build gvim-build
-  rsync -a --exclude='.hg/' ${__hgrepo}/ vim-build
+build() {
+  # remove -O2 because there is a crash with python because of it
+  # fedora br: https://bugzilla.redhat.com/show_bug.cgi?id=817196
+  export CFLAGS="${CFLAGS/-O2 /}"
 
-  msg2 'Patching...'
+  cd "${srcdir}"
+
+  cp -a ${pkgname}-${pkgver} vim-build
 
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
@@ -67,48 +73,56 @@ build() {
     vim-build/src/configure.in
   (cd vim-build/src && autoconf)
 
-  msg2 'Building...'
-
   cp -a vim-build gvim-build
 
-  cd ${srcdir}/vim-build
+  cd "${srcdir}"/vim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --mandir=/usr/share/man --with-compiledby=ArchLinux \
-    --with-features=big --enable-gpm --enable-acl --with-x=no \
+    --with-features=big --with-compiledby=ArchLinux \
+    --enable-gpm --enable-acl --with-x=no \
     --disable-gui --enable-multibyte --enable-cscope \
     --disable-netbeans --enable-perlinterp --disable-pythoninterp \
-    --disable-rubyinterp
+    --disable-python3interp --disable-rubyinterp --disable-luainterp
 
   make
 
-  cd ${srcdir}/gvim-build
+  cd "${srcdir}"/gvim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --mandir=/usr/share/man --with-compiledby=ArchLinux \
-    --with-features=big --enable-gpm --enable-acl --with-x=yes \
+    --with-features=big --with-compiledby=ArchLinux \
+    --enable-gpm --enable-acl --with-x=yes \
     --enable-gui=gtk2 --enable-multibyte --enable-cscope \
     --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --enable-rubyinterp
+    --disable-python3interp --enable-rubyinterp --enable-luainterp
 
   make
 }
 
-##### Packaging #####
+check() {
+  # disable tests because they seem to freeze
+
+  cd "${srcdir}"/vim-build
+
+  #make test
+
+  cd "${srcdir}"/gvim-build
+
+  #make test
+}
 
 package_vim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm')
   conflicts=('gvim')
 
-  cd ${srcdir}/vim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd "${srcdir}"/vim-build
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
-  rm ${pkgdir}/usr/bin/{ex,view}
+  rm "${pkgdir}"/usr/bin/{ex,view}
 
   # delete some manpages
-  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+  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
@@ -116,89 +130,87 @@ package_vim() {
   done
 
   # Runtime provided by runtime package
-  rm -r ${pkgdir}/usr/share/vim
+  rm -r "${pkgdir}"/usr/share/vim
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/vim
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/vim/license.txt
+  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_gvim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl' 'python2' 'ruby' 'libxt'
-           'desktop-file-utils' 'gtk2')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
+           'desktop-file-utils' 'gtk2' 'lua' 'python2')
   provides=("vim=${pkgver}-${pkgrel}")
   conflicts=('vim')
   install=gvim.install
 
-  cd ${srcdir}/gvim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd "${srcdir}"/gvim-build
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
-  rm ${pkgdir}/usr/bin/{ex,view}
+  rm "${pkgdir}"/usr/bin/{ex,view}
 
   # delete some manpages
-  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+  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
   done
 
   # Move the runtime for later packaging
-  mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install
+  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
 
   # freedesktop links
-  install -Dm644 ${srcdir}/gvim.desktop \
-    ${pkgdir}/usr/share/applications/gvim.desktop
-  install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png
+  install -Dm644 "${srcdir}"/gvim.desktop \
+    "${pkgdir}"/usr/share/applications/gvim.desktop
+  install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/gvim
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/gvim/license.txt
+   install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_vim-runtime() {
   pkgdesc='Runtime for vim and gvim'
-  backup=(etc/vimrc)
+  depends=('perl' 'gawk')
+  backup=('etc/vimrc')
 
   # Install the runtime split from gvim
-  install -dm755 ${pkgdir}/usr/share
-  mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim
+  install -dm755 "${pkgdir}"/usr/share
+  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
 
   # Don't forget logtalk.dict
-  install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \
-    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+  install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
 
   # fix FS#17216
   sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
-    ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
 
   # patch filetype.vim for better handling of pacman related files
   sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
-    ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
   sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
-    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
 
   # make Aaron happy
-  install -Dm644 ${srcdir}/pythoncomplete.vim \
-    ${pkgdir}/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
+  install -Dm644 "${srcdir}"/pythoncomplete.vim \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
   
   # rc files
-  install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc
-  install -Dm644 ${srcdir}/archlinux.vim \
-    ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim
+  install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+  install -Dm644 "${srcdir}"/archlinux.vim \
+    "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
+
+  # rgb.txt file
+  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/vim-runtime
+  install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
   ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/vim-runtime/license.txt
+    "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
 }
 
 # vim:set sw=2 sts=2 et:
-md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
-         '4ebb9bafd2e31542daff1ed17e327758'
-         '10353a61aadc3f276692d0e17db1478e'
-         '2be104c0372dd6dae19cb7968c03cd4f')
-
diff --git a/abs/extra/vim/Removing b/abs/extra/vim/Removing
deleted file mode 100644
index e69de29..0000000
--- a/abs/extra/vim/Removing
+++ /dev/null
diff --git a/abs/extra/vim/__changelog b/abs/extra/vim/__changelog
deleted file mode 100644
index 4cce0eb..0000000
--- a/abs/extra/vim/__changelog
+++ /dev/null
@@ -1,7 +0,0 @@
-Remove mouse support from  /etc/vimrc.  This new found ability is truely annoying.
-#               Changes to remove mouse support  VERY IMPORTANT!
-##############################################################
-   sed -i "s/mouse=a/mouse-=a/g" $startdir/pkg/etc/vimrc
-#################################################################
-
-
diff --git a/abs/extra/vim/gvim.desktop b/abs/extra/vim/gvim.desktop
index 8c99660..675357d 100644
--- a/abs/extra/vim/gvim.desktop
+++ b/abs/extra/vim/gvim.desktop
@@ -1,42 +1,63 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=gVim
-Name[eo]=VIM-fasado
-Name[sv]=gVim
-Name[xx]=xx
-Comment=GTK2 enhanced vim text editor
-Comment[ar]=محرر نصوص
-Comment[bg]=Текст Редактор
-Comment[de]=Texteditor
-Comment[el]=Διορθωτής Κειμένου
-Comment[eo]=Tekstredaktilo
-Comment[et]=Tekstiredaktor
-Comment[eu]=Testu Editorea
-Comment[fi]=Tekstieditori
-Comment[he]=עורך טקסט
-Comment[is]=Textaritill
-Comment[ja]=テキストエディタ
-Comment[lt]=Teksto redaktorius
-Comment[mt]=Editur tat-test
-Comment[pt_BR]=Editor de Texto
-Comment[ro]=Editor de text
-Comment[ru]=редактор
-Comment[sk]=Textový editor
-Comment[sl]=Urejevalnik besedil
-Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷
-Comment[tr]=Metin Düzenleyici
-Comment[uk]=Редактор текстів
-Comment[vi]=Trình soạn văn bản
-Comment[xx]=xx
-Comment[zh_CN]=文本编辑器
-Comment[zh_TW]=文字編輯器
-GenericName=Text Editor
-Type=Application
-TryExec=gvim
-Exec=gvim
+Name=Vi IMproved
+Name[bg]=Vi Ðåäàêòîð
+Name[ca]=Vi Millorat
+Name[da]=Vi forbedret
+Name[eo]=VIM
+Name[et]=Täiustatud Vi (vim)
+Name[fr]=Vi étendu (VIM)
+Name[he]=רפושמ Vi
+Name[hu]=Vi
+Name[is]=Vi IMproved ritillinn
+Name[it]=Vi iMproved
+Name[no]=Vi IMproved (forbedret VI)
+Name[pl]=Poprawiony VI (vim)
+Name[ro]=VIM
+Name[ru]=Улучшенный VI
+Name[sk]=Vi IMpreved
+Name[sl]=Izboljšani vi (vim)
+Name[sv]=Förbättrad Vi
+Name[zh_CN.GB2312]=改进的 Vi
+Comment=Powerful text editor with scripting functions and macro recorder
+Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
+Comment[ca]=Editor vi potent
+Comment[cs]=Mocný textový editor vi
+Comment[da]=En kraftig vi tekstbehandler
+Comment[de]=Ein leistungsfähiger vi-Editor
+Comment[el]=Πανίσχυρος διορθωτής vi
+Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
+Comment[es]=Una versión mejorada del editor vi
+Comment[et]=Võimas tekstiredaktor vi
+Comment[fi]=Tehokas vi-tekstieditori
+Comment[fr]=Éditeur vi puissant
+Comment[gl]=Potente editor vi
+Comment[he]=Vi המצועה בר ךרועה
+Comment[hr]=Napredni vi uređivač
+Comment[hu]=Vi szövegszerkesztő
+Comment[is]=Öflug útgáfa vi ritilsins
+Comment[it]=Un editor vi potenziato
+Comment[ja]=強力なViエディタ
+Comment[lt]=Galingas vi redaktorius
+Comment[mk]=Моќен VI уредувач
+Comment[nl]=Krachtige vi-editor
+Comment[no]=En kraftig vi-redigerer
+Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
+Comment[pl]=Edytor vi
+Comment[pt]=Um poderoso editor de texto
+Comment[ro]=Un editor de texte VI, puternic
+Comment[ru]=Мощный текстовый редактор vi
+Comment[sk]=Silný textový procesor vi
+Comment[sl]=Zmogljivi urejevalnik vi
+Comment[sr]=Moćni vi editor
+Comment[sv]=En kraftfull texteditor
+Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Güçlü vi düzenleyicisi
+Comment[uk]=Потужний редактор vi
+Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=gvim -f %F
 Icon=gvim
+Type=Application
 Terminal=false
-X-MultipleArgs=false
-Categories=GTK;Application;Utility;TextEditor;
-MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt;
+X-XClassHintResName=VIM
+Categories=Utility;TextEditor;
diff --git a/abs/extra/vim/gvim.install b/abs/extra/vim/gvim.install
index 0a8d3b0..2eaa605 100644
--- a/abs/extra/vim/gvim.install
+++ b/abs/extra/vim/gvim.install
@@ -1,7 +1,5 @@
 post_install() {
-  echo -n "Updating desktop and mime database..."
   update-desktop-database -q
-  echo "done."
 }
 
 post_upgrade() {
diff --git a/abs/extra/vim/vimrc b/abs/extra/vim/vimrc
index 9b4eaac..92d3ff9 100644
--- a/abs/extra/vim/vimrc
+++ b/abs/extra/vim/vimrc
@@ -9,7 +9,7 @@
 " This line should not be removed as it ensures that various options are
 " properly set to work with the Vim-related packages.
 runtime! archlinux.vim
-set mouse-=a
+
 " If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
 " Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual
 " and configure vim to your own liking!