libre/vim: update pkgbuild

1 files changed, 19 insertions, 36 deletions

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index 013a094d7..87bcf9bbf 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -6,37 +6,25 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=vim
-pkgname=('vim-minimal' 'vim' 'vim-python3' 'gvim' 'gvim-python3' 'vim-runtime')
-# list of tags can be found at https://code.google.com/p/vim/source/list
-_topver=7.4
-_patchlevel=778
-_tag=v${_topver/./-}-${_patchlevel}
-_versiondir="vim${_topver//./}"
-pkgver=${_topver}.${_patchlevel}
+pkgname=(vim-minimal vim vim-python3 gvim gvim-python3 vim-runtime)
+pkgver=7.4.854
+_versiondir=74
 pkgrel=1.parabola1
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 license=('custom:vim')
-url="http://www.vim.org"
-makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua' 'mercurial')
-# It would be great to use downloadable archives https://vim.googlecode.com/archive/$tag.tar.gz
-# unfortunately its content changes each time you download one (files modification date is different)
-source=("${pkgbase}-repo::hg+https://vim.googlecode.com/hg#tag=${_tag}"
-        'vimrc'
-        'parabola.vim'
-        'gvim.desktop')
+url='http://www.vim.org'
+makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 lua mercurial)
+source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
+        vimrc
+        parabola.vim
+        gvim.desktop)
 sha1sums=('SKIP'
           '7bacf26cb66f6c36184a62bc306ef33bfe892686'
           'a72ca0f8d941ff221598091338d9c1bf75a3494b'
           '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
 
 prepare() {
-  cd ${pkgbase}-repo
-
-  _latesttag=$(hg parents --template '{latesttag}' -r default)
-  if (( $_tag != $_latesttag )); then
-    printf 'You are not building the latest revision!\n'
-    printf "Consider updating to tag $_latesttag.\n"
-  fi
+  cd vim-$pkgver
 
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
@@ -46,10 +34,10 @@ prepare() {
 
   (cd src && autoconf)
 
-  cd ..
+  cd "$srcdir"
   for pkg in ${pkgname[@]}
   do
-    cp -a ${pkgbase}-repo ${pkg}-build
+    cp -a vim-$pkgver ${pkg}-build
   done
 }
 
@@ -189,13 +177,10 @@ build() {
 
 check() {
   # disable tests because they seem to freeze
-
   cd "${srcdir}"/vim-build
-
   #make test
 
   cd "${srcdir}"/gvim-build
-
   #make test
 }
 
@@ -366,17 +351,17 @@ package_vim-runtime() {
 
   # Don't forget logtalk.dict
   install -Dm644 runtime/ftplugin/logtalk.dict \
-    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+    "${pkgdir}"/usr/share/vim/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/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/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/vim${_versiondir}/ftplugin/changelog.vim
 
   # rc files
   install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
@@ -385,12 +370,10 @@ package_vim-runtime() {
 
   # rgb.txt file
   install -Dm644 runtime/rgb.txt \
-    "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
+    "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
 
   # license
   install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
+  ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
 }
-
-# vim:set sw=2 sts=2 et: