wok rev 25399

updated vim and vim-tiny (8.2.0664 -> 9.0.0133)
author Hans-G?nter Theisgen
date Tue Aug 02 14:18:25 2022 +0100 (2 months ago)
parents 2e4bde2eb7d9
children 8ad223a975fa
files vim-tiny/receipt vim/description.txt vim/receipt
line diff
     1.1 --- a/vim-tiny/receipt	Tue Aug 02 10:59:59 2022 +0100
     1.2 +++ b/vim-tiny/receipt	Tue Aug 02 14:18:25 2022 +0100
     1.3 @@ -1,7 +1,9 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="vim-tiny"
     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 without GUI."
    1.14 @@ -34,6 +36,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 @@ -45,12 +50,11 @@
    1.25  		--with-vim-name=$PACKAGE	\
    1.26  		--disable-acl			\
    1.27  		--disable-motif-check		\
    1.28 -		--disable-athena-check		\
    1.29  		--mandir=/usr/share/man		\
    1.30  		$CONFIGURE_ARGS &&
    1.31  	make						\
    1.32  		VIMRCLOC=/etc/vim			\
    1.33 -		VIMRUNTIMEDIR=/usr/share/vim/vim82	\
    1.34 +		VIMRUNTIMEDIR=/usr/share/vim/vim$basever\
    1.35  		MAKE="make -e" &&
    1.36  	make	DESTDIR=$DESTDIR install
    1.37  
    1.38 @@ -68,7 +72,7 @@
    1.39  	cp -a $install/usr/share/vim	$fs/usr/share
    1.40  	cp -a $install/etc/vim		$fs/etc
    1.41  
    1.42 -	rm -f $fs/usr/bin/*tutor
    1.43 +	rm -f				$fs/usr/share/vim/vim$basedir/tutor/*
    1.44  }
    1.45  
    1.46  post_install()
    1.47 @@ -79,12 +83,14 @@
    1.48  		echo ''
    1.49  		echo "**** Actual VI link : $cmd"
    1.50  		echo ''
    1.51 -		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
    1.52 +		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '
    1.53 +		read -t 30 anser
    1.54  		if [ "$anser" = 'y' ]
    1.55  		  then
    1.56  			echo ''
    1.57  			action 'Removing vi link to make a new one pointing on /usr/bin/vim...'
    1.58 -			rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
    1.59 +			rm "$1/bin/vi" &&
    1.60 +			ln -sf /usr/bin/vim-tiny "$1/bin/vi"
    1.61  			status
    1.62  		  else
    1.63  			echo ''
    1.64 @@ -95,6 +101,6 @@
    1.65  
    1.66  post_remove()
    1.67  {
    1.68 -	# restore previous symlink
    1.69 +	# restore previous symbolic link
    1.70  	ln -sf /bin/busybox "$1/bin/vi"
    1.71  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/vim/description.txt	Tue Aug 02 14:18:25 2022 +0100
     2.3 @@ -0,0 +1,13 @@
     2.4 +Vim is a highly configurable text editor built to make creating and changing
     2.5 +any kind of text very efficient.
     2.6 +It is included as "vi" with most UNIX systems and with Apple OS X.
     2.7 +
     2.8 +Vim is rock stable and is continuously being developed to become even better.
     2.9 +
    2.10 +Among its features are:
    2.11 +
    2.12 +- persistent, multi-level undo tree
    2.13 +- extensive plugin system
    2.14 +- support for hundreds of programming languages and file formats
    2.15 +- powerful search and replace
    2.16 +- integrates with many tools
     3.1 --- a/vim/receipt	Tue Aug 02 10:59:59 2022 +0100
     3.2 +++ b/vim/receipt	Tue Aug 02 14:18:25 2022 +0100
     3.3 @@ -1,7 +1,9 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="vim"
     3.7 -VERSION="8.2.0664"
     3.8 +VERSION="9.0.0133"
     3.9 +basever=${VERSION%.*}
    3.10 +basever=${basever/./}
    3.11  CATEGORY="editors"
    3.12  TAGS="text-editor"
    3.13  SHORT_DESC="Advanced text editor."
    3.14 @@ -33,6 +35,9 @@
    3.15  	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' \
    3.16  		$src/src/feature.h
    3.17  
    3.18 +	# 9.0.0133 unrecognised:
    3.19 +#		--disable-athena-check
    3.20 +
    3.21  	./configure				\
    3.22  		--prefix=/usr			\
    3.23  		--cache-file=$PWD/config.cache	\
    3.24 @@ -42,23 +47,24 @@
    3.25  		--disable-gui			\
    3.26  		--enable-multibyte		\
    3.27  		--disable-motif-check		\
    3.28 -		--disable-athena-check		\
    3.29  		--mandir=/usr/share/man		\
    3.30  		$CONFIGURE_ARGS &&
    3.31  
    3.32  	make						\
    3.33  		VIMRCLOC=/etc/vim			\
    3.34 -		VIMRUNTIMEDIR=/usr/share/vim/vim82	\
    3.35 +		VIMRUNTIMEDIR=/usr/share/vim/vim$basever\
    3.36  		MAKE="make -e" &&
    3.37 -	make DESTDIR=$DESTDIR install
    3.38 +	make	install				\
    3.39 +		DESTDIR=$DESTDIR
    3.40  
    3.41  	mkdir -p $DESTDIR/etc/vim
    3.42  	cp -a $src/runtime/vimrc_example.vim	$DESTDIR/etc/vim/vimrc
    3.43  
    3.44 -	for i in GenericName Keywords ; do
    3.45 +	for i in GenericName Keywords
    3.46 +	  do
    3.47  		l="$(grep $i= $DESTDIR/usr/share/applications/vim.desktop)"
    3.48  		sed -i "/$i=/d;s|$i\[de].*|$l\n&|" $DESTDIR/usr/share/applications/vim.desktop
    3.49 -	done
    3.50 +	  done
    3.51  }
    3.52  
    3.53  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.54 @@ -80,12 +86,14 @@
    3.55  		echo ''
    3.56  		echo "**** Actual VI link : $cmd"
    3.57  		echo ''
    3.58 -		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
    3.59 +		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '
    3.60 +		read -t 30 anser
    3.61  		if [ "$anser" = 'y' ]
    3.62  		  then
    3.63  			echo ''
    3.64 -			echo -n 'Removing vi link to make a new one pointing on /usr/bin/vim...'
    3.65 -			rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi"
    3.66 +			echo -n 'Removing vi link to make a new one pointing to /usr/bin/vim...'
    3.67 +			rm "$1/bin/vi" &&
    3.68 +			ln -sf /usr/bin/vim "$1/bin/vi"
    3.69  			status
    3.70  		  else
    3.71  			echo ''
    3.72 @@ -96,6 +104,6 @@
    3.73  
    3.74  post_remove()
    3.75  {
    3.76 -	# restore previous symlink
    3.77 +	# restore previous symbolic link
    3.78  	ln -sf /bin/busybox "$1/bin/vi"
    3.79  }