From b37ee9de1a430956d9e5958ebd9d7e0dbfc79327 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Sep 2011 23:14:49 +0000 Subject: Fri Sep 2 23:14:49 UTC 2011 --- extra/vim/PKGBUILD | 95 ++++++++++++++++++++++++++------------------------ extra/vim/gvim.desktop | 3 +- extra/vim/gvim.install | 2 -- 3 files changed, 50 insertions(+), 50 deletions(-) (limited to 'extra/vim') diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 69e156492..d26b48d47 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 133479 2011-07-28 14:12:10Z heftig $ +# $Id: PKGBUILD 136823 2011-09-01 21:33:21Z eric $ # Contributor: Jan "heftig" Steffens # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths pkgbase=vim -pkgname=(vim gvim vim-runtime) +pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=266 +_patchlevel=289 pkgver=${_topver}.${_patchlevel} -__hgrev=124a81f12ca4 +__hgrev=ba9f075a347d pkgrel=1 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" -makedepends=('gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' - 'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed') +makedepends=('gawk' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' + 'mercurial' 'rsync') source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 vimrc archlinux.vim gvim.desktop) md5sums=('6e7adfbd5d26c1d161030ec203a7f243' 'e57777374891063b9ca48a1fe392ac05' '10353a61aadc3f276692d0e17db1478e' - '63558c0b3509caea0d0f2b9274049c2a') + 'd90413bd21f400313a785bb4010120cd') __hgroot='http://vim.googlecode.com/hg/' __hgrepo='vim' @@ -31,7 +31,7 @@ _versiondir="vim${_topver//./}" ##### Build ##### build() { - cd ${srcdir} + cd "${srcdir}" msg2 'Checking out source from Mercurial...' @@ -70,7 +70,7 @@ build() { 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 \ @@ -81,14 +81,14 @@ build() { 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 \ --enable-gui=gtk2 --enable-multibyte --enable-cscope \ --enable-netbeans --enable-perlinterp --enable-pythoninterp \ - --enable-rubyinterp + --enable-python3interp --enable-rubyinterp make } @@ -100,14 +100,14 @@ package_vim() { depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl') 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 @@ -115,84 +115,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/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>=2.7.1' 'ruby' 'libxt' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2') 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/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/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: diff --git a/extra/vim/gvim.desktop b/extra/vim/gvim.desktop index 4f0d294ed..675357da5 100644 --- a/extra/vim/gvim.desktop +++ b/extra/vim/gvim.desktop @@ -58,7 +58,6 @@ MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;tex Exec=gvim -f %F Icon=gvim Type=Application -Terminal=0 +Terminal=false X-XClassHintResName=VIM -MapNotify=false Categories=Utility;TextEditor; diff --git a/extra/vim/gvim.install b/extra/vim/gvim.install index 0a8d3b0a9..2eaa60550 100644 --- a/extra/vim/gvim.install +++ b/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() { -- cgit v1.2.3-54-g00ecf