Date: Sunday, August 17, 2014 @ 08:41:35 Author: td123 Revision: 220138
upgpkg: vim 7.4.408-1 bump and add a vim-minimal and vim-python3 version Modified: vim/trunk/PKGBUILD ----------+ PKGBUILD | 154 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 124 insertions(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-17 06:22:26 UTC (rev 220137) +++ PKGBUILD 2014-08-17 06:41:35 UTC (rev 220138) @@ -4,10 +4,10 @@ # Contributor: Daniel J Griffiths <ghost1...@archlinux.us> pkgbase=vim -pkgname=('vim' 'gvim' 'gvim-python3' 'vim-runtime') +pkgname=('vim-minimal' 'vim' 'vim-python3' 'gvim' 'gvim-python3' 'vim-runtime') _topver=7.4 -_patchlevel=404 -__hgrev=18fd959b07ef +_patchlevel=408 +__hgrev=4c08173b8b95 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -20,7 +20,7 @@ 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('cc1ad0cd3399af0a8fe4d5ea6dabf7e2' +md5sums=('80ab31325318c52c14184a41cb70e99b' 'SKIP' 'b9d4dcb9d3ee2e151dc4be1e94934f6a' 'f3c8931847a12949bdd14c9d48fdabb3' @@ -43,34 +43,28 @@ 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} + (cd vim/src && autoconf) - gpg --detach-sign ${pkgname}-${pkgver}.tar.xz + mv vim ${pkgbase}-${pkgver} + find ${pkgbase}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; + rm ${pkgbase}-${pkgver}/{.hgignore,.hgtags} + tar -cJf ${pkgbase}-${pkgver}.tar.xz ${pkgbase}-${pkgver}/* + rm -r ${pkgbase}-${pkgver} - scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/ - scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/ + gpg --detach-sign ${pkgbase}-${pkgver}.tar.xz + + scp ${pkgbase}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/ + scp ${pkgbase}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/ } build() { - cp -a ${pkgname}-${pkgver} vim-build + for pkg in ${pkgname[@]} + do + cp -a ${pkgbase}-${pkgver} ${pkg}-build + done - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h + cd "${srcdir}"/vim-minimal-build - (cd vim-build/src && autoconf) - - cp -a vim-build gvim-build - cp -a vim-build gvim-python3-build - - cd "${srcdir}"/vim-build - ./configure \ --prefix=/usr \ --localstatedir=/var/lib/vim \ @@ -91,6 +85,50 @@ make + cd "${srcdir}"/vim-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Arch Linux' \ + --enable-gpm \ + --enable-acl \ + --with-x=no \ + --disable-gui \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp \ + --enable-pythoninterp \ + --disable-python3interp \ + --enable-rubyinterp \ + --enable-luainterp + + make + + cd "${srcdir}"/vim-python3-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Arch Linux' \ + --enable-gpm \ + --enable-acl \ + --with-x=no \ + --disable-gui \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp \ + --disable-pythoninterp \ + --enable-python3interp \ + --enable-rubyinterp \ + --enable-luainterp + + make + cd "${srcdir}"/gvim-build ./configure \ @@ -148,11 +186,39 @@ #make test } -package_vim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' +package_vim-minimal() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with a minimal set of dependencies)' depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') - conflicts=('gvim') + conflicts=('vim' 'vim-python3' 'gvim' 'gvim-python3') + provides=("vim=${pkgver}-${pkgrel}") + cd "${srcdir}"/vim-minimal-build + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + 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 + rm -f evim.1 # this does not make sense if we have no GUI + done + + # Runtime provided by runtime package + rm -r "${pkgdir}"/usr/share/vim + + # license + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} + +package_vim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python2') + conflicts=('vim-minimal' 'vim-python3' 'gvim' 'gvim-python3') + cd "${srcdir}"/vim-build make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install @@ -175,12 +241,40 @@ "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } +package_vim-python3() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python2') + conflicts=('vim-minimal' 'vim' 'gvim' 'gvim-python3') + provides=("vim=${pkgver}-${pkgrel}") + + cd "${srcdir}"/vim-python3-build + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + 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 + rm -f evim.1 # this does not make sense if we have no GUI + done + + # Runtime provided by runtime package + rm -r "${pkgdir}"/usr/share/vim + + # license + 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' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua' 'python2') provides=("vim=${pkgver}-${pkgrel}") - conflicts=('vim') + conflicts=('vim-minimal' 'vim' 'vim-python3' 'gvim-python3') install=gvim.install cd "${srcdir}"/gvim-build @@ -215,7 +309,7 @@ 'desktop-file-utils' 'gtk2' 'lua' 'python') provides=("vim=${pkgver}-${pkgrel}" "gvim=${pkgver}-${pkgrel}") - conflicts=('vim') + conflicts=('vim-minimal' 'vim' 'vim-python3' 'gvim') install=gvim.install cd "${srcdir}"/gvim-python3-build