wok-next diff vim/receipt @ rev 19675

Update some build dependencies
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Mar 24 12:53:44 2017 +0200 (2017-03-24)
parents 6fab3264ba87
children 2f73953f6cee
line diff
     1.1 --- a/vim/receipt	Fri Dec 25 15:23:46 2015 +0200
     1.2 +++ b/vim/receipt	Fri Mar 24 12:53:44 2017 +0200
     1.3 @@ -1,72 +1,63 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="vim"
     1.7 -VERSION="7.3"
     1.8 +VERSION="7.4"
     1.9  CATEGORY="editors"
    1.10  SHORT_DESC="Advanced text editor"
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12  LICENSE="other"
    1.13 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.14  WEB_SITE="http://www.vim.org/"
    1.15 -WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
    1.16  CONFIG_FILES="/etc/vim/vimrc"
    1.17  TAGS="text-editor"
    1.18  
    1.19 -DEPENDS="ncurses acl diffutils"
    1.20 -BUILD_DEPENDS="ncurses-dev acl-dev diffutils"
    1.21 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.22 +WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
    1.23 +
    1.24 +DEPENDS="ncurses acl attr diffutils"
    1.25 +# python may be removed after "ncursesw problem" solved
    1.26 +BUILD_DEPENDS="python ncurses-dev acl-dev diffutils gettext"
    1.27 +SIBLINGS="vim-tiny"
    1.28  
    1.29  # Rules to configure and make the package.
    1.30  compile_rules()
    1.31  {
    1.32 -	export LDFLAGS="$LDFLAGS -ltinfo"
    1.33 -
    1.34 -	# define the place for the global vimrc file (set to /etc/vim/vimrc)
    1.35 -	# (patch from Arch Linux PKGBUILD)
    1.36 -	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
    1.37 +	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
    1.38  
    1.39  	./configure \
    1.40 -		--prefix=/usr \
    1.41 -		--cache-file=$PWD/config.cache \
    1.42 -		--infodir=/usr/share/info \
    1.43 -		--with-features=normal \
    1.44 -		--with-x=no \
    1.45 +		--without-x \
    1.46  		--disable-gui \
    1.47  		--enable-multibyte \
    1.48 -		--disable-motif-check \
    1.49 -		--disable-athena-check \
    1.50 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    1.51 +		$CONFIGURE_ARGS &&
    1.52 +	make && make install
    1.53  
    1.54 -	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
    1.55 -	make DESTDIR=$DESTDIR install
    1.56 -	mkdir -p $DESTDIR/etc/vim
    1.57 -	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
    1.58 +	mkdir -p $install/etc/vim
    1.59 +	cp -a $src/runtime/vimrc_example.vim $install/etc/vim/vimrc
    1.60 +
    1.61 +	mkdir -p $install/usr/share/doc
    1.62 +	ln -s ../vim/vim*/doc $install/usr/share/doc/vim-$VERSION
    1.63  }
    1.64  
    1.65  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.66  genpkg_rules()
    1.67  {
    1.68 -	mkdir -p $fs/usr/share $fs/etc
    1.69 -	
    1.70 -	cp -a $install/usr/bin $fs/usr
    1.71 -	cp -a $install/usr/share/vim $fs/usr/share
    1.72 -	cp -a $install/etc/vim $fs/etc
    1.73 +	cook_copy_folders etc bin vim
    1.74  }
    1.75  
    1.76  post_install()
    1.77  {
    1.78  	cmd=$(readlink "$1/bin/vi")
    1.79  	if [ "$cmd" != '/usr/bin/vim' ]; then
    1.80 -		echo ''
    1.81 +		echo
    1.82  		echo "**** Actual VI link : $cmd"
    1.83 -		echo ''
    1.84 -		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
    1.85 +		echo
    1.86 +		echo -n 'Do you want vim for /bin/vi (y/N)? : '; read -t 30 anser
    1.87  		if [ "$anser" == 'y' ]; then
    1.88 -			echo ''
    1.89 +			echo
    1.90  			echo -n 'Removing vi link to make a new one pointing on /usr/bin/vim...'
    1.91  			rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi"
    1.92  			status
    1.93  		else
    1.94 -			echo ''
    1.95 +			echo
    1.96  			echo "Leaving /bin/vi to : $cmd"
    1.97  		fi
    1.98  	fi
    1.99 @@ -74,6 +65,5 @@
   1.100  
   1.101  post_remove()
   1.102  {
   1.103 -	# restore previous symlink
   1.104  	ln -sf /bin/busybox "$1/bin/vi"
   1.105  }