wok diff vim/receipt @ rev 25508

Up memtest (6.10)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Feb 12 10:26:56 2023 +0000 (21 months ago)
parents 9aa1f88b45db
children 96982f54e3dc
line diff
     1.1 --- a/vim/receipt	Tue Apr 05 09:06:43 2022 +0000
     1.2 +++ b/vim/receipt	Sun Feb 12 10:26:56 2023 +0000
     1.3 @@ -1,7 +1,9 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="vim"
     1.7 -VERSION="8.2.0664"
     1.8 +VERSION="9.0.0133"
     1.9 +basever=${VERSION%.*}
    1.10 +basever=${basever/./}
    1.11  CATEGORY="editors"
    1.12  TAGS="text-editor"
    1.13  SHORT_DESC="Advanced text editor."
    1.14 @@ -33,6 +35,9 @@
    1.15  	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' \
    1.16  		$src/src/feature.h
    1.17  
    1.18 +	# 9.0.0133 unrecognised:
    1.19 +#		--disable-athena-check
    1.20 +
    1.21  	./configure				\
    1.22  		--prefix=/usr			\
    1.23  		--cache-file=$PWD/config.cache	\
    1.24 @@ -42,23 +47,24 @@
    1.25  		--disable-gui			\
    1.26  		--enable-multibyte		\
    1.27  		--disable-motif-check		\
    1.28 -		--disable-athena-check		\
    1.29  		--mandir=/usr/share/man		\
    1.30  		$CONFIGURE_ARGS &&
    1.31  
    1.32  	make						\
    1.33  		VIMRCLOC=/etc/vim			\
    1.34 -		VIMRUNTIMEDIR=/usr/share/vim/vim82	\
    1.35 +		VIMRUNTIMEDIR=/usr/share/vim/vim$basever\
    1.36  		MAKE="make -e" &&
    1.37 -	make DESTDIR=$DESTDIR install
    1.38 +	make	install				\
    1.39 +		DESTDIR=$DESTDIR
    1.40  
    1.41  	mkdir -p $DESTDIR/etc/vim
    1.42  	cp -a $src/runtime/vimrc_example.vim	$DESTDIR/etc/vim/vimrc
    1.43  
    1.44 -	for i in GenericName Keywords ; do
    1.45 +	for i in GenericName Keywords
    1.46 +	  do
    1.47  		l="$(grep $i= $DESTDIR/usr/share/applications/vim.desktop)"
    1.48  		sed -i "/$i=/d;s|$i\[de].*|$l\n&|" $DESTDIR/usr/share/applications/vim.desktop
    1.49 -	done
    1.50 +	  done
    1.51  }
    1.52  
    1.53  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.54 @@ -80,12 +86,14 @@
    1.55  		echo ''
    1.56  		echo "**** Actual VI link : $cmd"
    1.57  		echo ''
    1.58 -		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
    1.59 +		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '
    1.60 +		read -t 30 anser
    1.61  		if [ "$anser" = 'y' ]
    1.62  		  then
    1.63  			echo ''
    1.64 -			echo -n 'Removing vi link to make a new one pointing on /usr/bin/vim...'
    1.65 -			rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi"
    1.66 +			echo -n 'Removing vi link to make a new one pointing to /usr/bin/vim...'
    1.67 +			rm "$1/bin/vi" &&
    1.68 +			ln -sf /usr/bin/vim "$1/bin/vi"
    1.69  			status
    1.70  		  else
    1.71  			echo ''
    1.72 @@ -96,6 +104,6 @@
    1.73  
    1.74  post_remove()
    1.75  {
    1.76 -	# restore previous symlink
    1.77 +	# restore previous symbolic link
    1.78  	ln -sf /bin/busybox "$1/bin/vi"
    1.79  }