void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vim: resolve the conflict with (n)vi, remove vi vpkg support.

Browse source
This commit is contained in:
Juan RP 2012-07-15 01:08:37 +02:00
parent 9965ac1fcb
commit 2294d16d0f
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/vim/template
View file

@ -3,11 +3,9 @@ pkgname=vim
_distver=7.3 _distver=7.3
_patchver=600 _patchver=600
version=${_distver}.${_patchver} version=${_distver}.${_patchver}
revision=2 revision=3
nofetch=yes nofetch=yes
noextract=yes noextract=yes
provides="vi-$version"
replaces="vi>=0"
subpackages="vim-common vim-x11 gvim" subpackages="vim-common vim-x11 gvim"
depends="vim-common>=$version" depends="vim-common>=$version"
makedepends="mercurial ncurses-devel acl-devel pkg-config libXt-devel gtk+-devel" makedepends="mercurial ncurses-devel acl-devel pkg-config libXt-devel gtk+-devel"
@ -39,7 +37,8 @@ do_configure() {
--disable-rubyinterp --disable-cscope --disable-workshop \ --disable-rubyinterp --disable-cscope --disable-workshop \
--disable-netbeans --disable-sniff --disable-gpm \ --disable-netbeans --disable-sniff --disable-gpm \
--disable-hangulinput --disable-xim --enable-multibyte \ --disable-hangulinput --disable-xim --enable-multibyte \
--with-tlib=ncursesw" --with-tlib=ncursesw --with-ex-name=vim-ex \
--with-view-name=vim-view"
# Normal version. # Normal version.
cd $wrksrc cd $wrksrc
@ -65,4 +64,9 @@ do_build() {
do_install() { do_install() {
make DESTDIR=$DESTDIR install make DESTDIR=$DESTDIR install
# Create vim-ex symlink.
cd ${DESTDIR}/usr/bin && ln -sf vim vim-ex
rm -f ${DESTDIR}/usr/bin/{ex,view}
find ${DESTDIR}/usr/share/man -type f -name evim.1 -delete
} }

5
srcpkgs/vim/vim-x11.template
View file

@ -1,7 +1,7 @@
# Template file for 'vim-x11'. # Template file for 'vim-x11'.
# #
provides="vi-${version} vim-${version}" provides="vim-${version}"
replaces="vim>=0 vi>=0" replaces="vim>=0"
short_desc="VI iMproved - X11 version" short_desc="VI iMproved - X11 version"
long_desc="${long_desc} long_desc="${long_desc}
@ -10,5 +10,6 @@ long_desc="${long_desc}
do_install() { do_install() {
cd $wrksrc/vim-x11 cd $wrksrc/vim-x11
make DESTDIR=$DESTDIR install make DESTDIR=$DESTDIR install
rm -f ${DESTDIR}/usr/bin/{ex,view}
rm -rf $DESTDIR/usr/share rm -rf $DESTDIR/usr/share
} }