[arch-commits] Commit in vim/trunk (PKGBUILD)
Anatol Pomozov
anatolik at archlinux.org
Wed Jan 13 20:16:30 UTC 2016
Date: Wednesday, January 13, 2016 @ 21:16:30
Author: anatolik
Revision: 258182
Merge vim-minimal to vim
vim now uses dynamic language bindings for Ruby,Lua,Python,Perl and all these
dependencies became optional. There is no difference in depenedecies between
vim-minimal and vim.
Because vim compiles dynamic loaders for bindings its installed size is 0.45M bigger than vim-minimal.
It is only 0.45/28.12=1.6% size difference and does not justify vim-minimal package existance.
Modified:
vim/trunk/PKGBUILD
----------+
PKGBUILD | 180 ++++++++++++++++---------------------------------------------
1 file changed, 49 insertions(+), 131 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-13 20:00:47 UTC (rev 258181)
+++ PKGBUILD 2016-01-13 20:16:30 UTC (rev 258182)
@@ -6,8 +6,8 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgbase=vim
-pkgname=(vim-minimal vim gvim vim-runtime)
-pkgver=7.4.1063
+pkgname=(vim gvim vim-runtime)
+pkgver=7.4.1089
_versiondir=74
pkgrel=1
arch=(i686 x86_64)
@@ -17,31 +17,25 @@
source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
vimrc
archlinux.vim)
-sha1sums=('2efe8f5454b37ff234d93d1e146db2e616732753'
+sha1sums=('5c1859d60d8c44f409d9959149440bb5a3809afe'
'15ebf3f48693f1f219fe2d8edb7643683139eb6b'
'94f7bb87b5d06bace86bc4b3ef1372813b4eedf2')
prepare() {
- cd vim-$pkgver
+ cd vim-$pkgver/src
# define the place for the global (g)vimrc file (set to /etc/vimrc)
- sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
- src/feature.h
- sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
- src/feature.h
+ sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h
+ sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h
- (cd src && autoconf)
+ autoconf
cd "$srcdir"
- for pkg in ${pkgname[@]}
- do
- cp -a vim-$pkgver ${pkg}-build
- done
+ cp -a vim-$pkgver gvim-$pkgver
}
build() {
- cd "${srcdir}"/vim-runtime-build
-
+ cd "${srcdir}"/vim-$pkgver
./configure \
--prefix=/usr \
--localstatedir=/var/lib/vim \
@@ -53,50 +47,6 @@
--disable-gui \
--enable-multibyte \
--enable-cscope \
- --disable-netbeans \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-python3interp \
- --disable-rubyinterp \
- --disable-luainterp
-
- make
-
- cd "${srcdir}"/vim-minimal-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 \
- --disable-netbeans \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-python3interp \
- --disable-rubyinterp \
- --disable-luainterp
-
- 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=dynamic \
--enable-pythoninterp=dynamic \
@@ -103,11 +53,9 @@
--enable-python3interp=dynamic \
--enable-rubyinterp=dynamic \
--enable-luainterp=dynamic
-
make
- cd "${srcdir}"/gvim-build
-
+ cd "${srcdir}"/gvim-$pkgver
./configure \
--prefix=/usr \
--localstatedir=/var/lib/vim \
@@ -125,49 +73,59 @@
--enable-python3interp=dynamic \
--enable-rubyinterp=dynamic \
--enable-luainterp=dynamic
-
make
}
check() {
# disable tests because they seem to freeze
- cd "${srcdir}"/vim-build
+ cd "${srcdir}"/vim-$pkgver
#make test
- cd "${srcdir}"/gvim-build
+ cd "${srcdir}"/gvim-$pkgver
#make test
}
-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' 'acl')
- conflicts=('vim' 'gvim')
- provides=("vim=${pkgver}-${pkgrel}" "xxd")
+package_vim-runtime() {
+ pkgdesc='Runtime for vim and gvim'
+ backup=('etc/vimrc')
- cd "${srcdir}"/vim-minimal-build
- make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/vim-$pkgver
- # provided by (n)vi in core
- rm "${pkgdir}"/usr/bin/{ex,view}
+ (cd src && make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" installruntime install-languages installtools)
+ # man and bin files belong to 'vim'
+ rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/
- # 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
+ # Don't forget logtalk.dict
+ install -Dm644 runtime/ftplugin/logtalk.dict \
+ "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/logtalk.dict
- # Runtime provided by runtime package
- rm -r "${pkgdir}"/usr/share/vim
+ # fix FS#17216
+ sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
+ "${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/vim${_versiondir}/filetype.vim
+ sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
+ "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/changelog.vim
+
+ # rc files
+ install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+ install -Dm644 "${srcdir}"/archlinux.vim \
+ "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
+
+ # rgb.txt file
+ install -Dm644 runtime/rgb.txt \
+ "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
+
# license
- install -Dm644 runtime/doc/uganda.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+ install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
+ ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \
+ "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
}
package_vim() {
- pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)'
+ pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl')
optdepends=('python2: Python 2 language support'
'python: Python 3 language support'
@@ -174,11 +132,11 @@
'ruby: Ruby language support'
'lua: Lua language support'
'perl: Perl language support')
- conflicts=('vim-minimal' 'gvim')
- provides=('xxd')
- replaces=('vim-python3')
+ conflicts=('gvim' 'vim-minimal' 'vim-python3')
+ provides=('xxd' 'vim-minimal' 'vim-python3')
+ replaces=('vim-python3' 'vim-minimal')
- cd "${srcdir}"/vim-build
+ cd "${srcdir}"/vim-$pkgver
make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
# provided by (n)vi in core
@@ -213,7 +171,7 @@
replaces=('gvim-python3')
install=gvim.install
- cd "${srcdir}"/gvim-build
+ cd "${srcdir}"/gvim-$pkgver
make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
# provided by (n)vi in core
@@ -237,43 +195,3 @@
install -Dm644 runtime/doc/uganda.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
}
-
-package_vim-runtime() {
- pkgdesc='Runtime for vim and gvim'
- depends=('perl' 'gawk')
- backup=('etc/vimrc')
-
- cd "${srcdir}"/vim-runtime-build
-
- (cd src && make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" installruntime install-languages installtools)
- # man and bin files belong to 'vim'
- rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/
-
- # Don't forget logtalk.dict
- install -Dm644 runtime/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/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/vim${_versiondir}/filetype.vim
- sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
- "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/changelog.vim
-
- # rc files
- install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
- install -Dm644 "${srcdir}"/archlinux.vim \
- "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
-
- # rgb.txt file
- install -Dm644 runtime/rgb.txt \
- "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
-
- # license
- install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
- ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \
- "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
-}
More information about the arch-commits
mailing list