wok diff gvim/receipt @ rev 23886
glibc: fix for binutils 2.29
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Jul 16 09:15:37 2020 +0000 (2020-07-16) |
parents | da0a38e4800e |
children | af8d823a3077 |
line diff
1.1 --- a/gvim/receipt Sat Dec 21 11:45:45 2019 +0100 1.2 +++ b/gvim/receipt Thu Jul 16 09:15:37 2020 +0000 1.3 @@ -1,19 +1,19 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="gvim" 1.7 -VERSION="8.1" 1.8 +VERSION="8.2" 1.9 CATEGORY="editors" 1.10 TAGS="text-editor" 1.11 SHORT_DESC="Advanced text editor, with gtk+ GUI." 1.12 MAINTAINER="erjo@slitaz.org" 1.13 LICENSE="other" 1.14 WEB_SITE="https://www.vim.org/" 1.15 -PROVIDES="xxd" 1.16 1.17 SOURCE="vim" 1.18 TARBALL="$SOURCE-$VERSION.tar.bz2" 1.19 WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL" 1.20 1.21 +PROVIDES="xxd" 1.22 DEPENDS="gtk+ ncurses xorg-libXau xorg-libXdmcp xorg-libXt" 1.23 BUILD_DEPENDS="gtk+-dev" 1.24 CONFIG_FILES="/etc/vim/vimrc" 1.25 @@ -44,7 +44,10 @@ 1.26 --disable-motif-check \ 1.27 $CONFIGURE_ARGS && 1.28 1.29 - make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim81 MAKE="make -e" && 1.30 + make \ 1.31 + VIMRCLOC=/etc/vim \ 1.32 + VIMRUNTIMEDIR=/usr/share/vim/vim82 \ 1.33 + MAKE="make -e" && 1.34 make DESTDIR=$DESTDIR install 1.35 1.36 mkdir -p $DESTDIR/etc/vim 1.37 @@ -54,10 +57,9 @@ 1.38 # Rules to gen a SliTaz package suitable for Tazpkg. 1.39 genpkg_rules() 1.40 { 1.41 - mkdir -p \ 1.42 - $fs/usr/share/icons/hicolor/16x16/apps \ 1.43 - $fs/usr/share/applications \ 1.44 - $fs/etc 1.45 + mkdir -p $fs/usr/share/icons/hicolor/16x16/apps 1.46 + mkdir -p $fs/usr/share/applications 1.47 + mkdir -p $fs/etc 1.48 1.49 cp -a $install/usr/bin $fs/usr 1.50 cp -a $install/usr/share/vim $fs/usr/share 1.51 @@ -69,17 +71,19 @@ 1.52 post_install() 1.53 { 1.54 cmd=$(readlink "$1/bin/vi") 1.55 - if [ ! "$cmd" = '/usr/bin/vim' ]; then 1.56 + if [ ! "$cmd" = '/usr/bin/vim' ] 1.57 + then 1.58 echo "" 1.59 echo "**** Actual VI link : $cmd" 1.60 echo "" 1.61 echo -n "Do you want vim for /bin/vi (y/N) ? : "; read -t 30 answer 1.62 - if [ "$answer" = 'y' ]; then 1.63 + if [ "$answer" = 'y' ] 1.64 + then 1.65 echo "" 1.66 echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..." 1.67 rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi" 1.68 status 1.69 - else 1.70 + else 1.71 echo "" 1.72 echo "Leaving /bin/vi to : $cmd" 1.73 fi