# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1659446305 -3600
# Node ID 5fb9c98c2c90e71fa607cc27f46cd2cfece14ca3
# Parent  2e4bde2eb7d9f91791dd6fa74a3d236168b353b5
updated vim and vim-tiny (8.2.0664 -> 9.0.0133)

diff -r 2e4bde2eb7d9 -r 5fb9c98c2c90 vim-tiny/receipt
--- a/vim-tiny/receipt	Tue Aug 02 10:59:59 2022 +0100
+++ b/vim-tiny/receipt	Tue Aug 02 14:18:25 2022 +0100
@@ -1,7 +1,9 @@
 # SliTaz package receipt.
 
 PACKAGE="vim-tiny"
-VERSION="8.2.0664"
+VERSION="9.0.0133"
+basever=${VERSION%.*}
+basever=${basever/./}
 CATEGORY="editors"
 TAGS="text-editor"
 SHORT_DESC="Advanced text editor without GUI."
@@ -34,6 +36,9 @@
 	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' \
 		$src/src/feature.h
 
+	# 9.0.0133 unrecognised:
+#		--disable-athena-check
+
 	./configure				\
 		--prefix=/usr			\
 		--cache-file=$PWD/config.cache	\
@@ -45,12 +50,11 @@
 		--with-vim-name=$PACKAGE	\
 		--disable-acl			\
 		--disable-motif-check		\
-		--disable-athena-check		\
 		--mandir=/usr/share/man		\
 		$CONFIGURE_ARGS &&
 	make						\
 		VIMRCLOC=/etc/vim			\
-		VIMRUNTIMEDIR=/usr/share/vim/vim82	\
+		VIMRUNTIMEDIR=/usr/share/vim/vim$basever\
 		MAKE="make -e" &&
 	make	DESTDIR=$DESTDIR install
 
@@ -68,7 +72,7 @@
 	cp -a $install/usr/share/vim	$fs/usr/share
 	cp -a $install/etc/vim		$fs/etc
 
-	rm -f $fs/usr/bin/*tutor
+	rm -f				$fs/usr/share/vim/vim$basedir/tutor/*
 }
 
 post_install()
@@ -79,12 +83,14 @@
 		echo ''
 		echo "**** Actual VI link : $cmd"
 		echo ''
-		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
+		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '
+		read -t 30 anser
 		if [ "$anser" = 'y' ]
 		  then
 			echo ''
 			action 'Removing vi link to make a new one pointing on /usr/bin/vim...'
-			rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
+			rm "$1/bin/vi" &&
+			ln -sf /usr/bin/vim-tiny "$1/bin/vi"
 			status
 		  else
 			echo ''
@@ -95,6 +101,6 @@
 
 post_remove()
 {
-	# restore previous symlink
+	# restore previous symbolic link
 	ln -sf /bin/busybox "$1/bin/vi"
 }
diff -r 2e4bde2eb7d9 -r 5fb9c98c2c90 vim/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/description.txt	Tue Aug 02 14:18:25 2022 +0100
@@ -0,0 +1,13 @@
+Vim is a highly configurable text editor built to make creating and changing
+any kind of text very efficient.
+It is included as "vi" with most UNIX systems and with Apple OS X.
+
+Vim is rock stable and is continuously being developed to become even better.
+
+Among its features are:
+
+- persistent, multi-level undo tree
+- extensive plugin system
+- support for hundreds of programming languages and file formats
+- powerful search and replace
+- integrates with many tools
diff -r 2e4bde2eb7d9 -r 5fb9c98c2c90 vim/receipt
--- a/vim/receipt	Tue Aug 02 10:59:59 2022 +0100
+++ b/vim/receipt	Tue Aug 02 14:18:25 2022 +0100
@@ -1,7 +1,9 @@
 # SliTaz package receipt.
 
 PACKAGE="vim"
-VERSION="8.2.0664"
+VERSION="9.0.0133"
+basever=${VERSION%.*}
+basever=${basever/./}
 CATEGORY="editors"
 TAGS="text-editor"
 SHORT_DESC="Advanced text editor."
@@ -33,6 +35,9 @@
 	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' \
 		$src/src/feature.h
 
+	# 9.0.0133 unrecognised:
+#		--disable-athena-check
+
 	./configure				\
 		--prefix=/usr			\
 		--cache-file=$PWD/config.cache	\
@@ -42,23 +47,24 @@
 		--disable-gui			\
 		--enable-multibyte		\
 		--disable-motif-check		\
-		--disable-athena-check		\
 		--mandir=/usr/share/man		\
 		$CONFIGURE_ARGS &&
 
 	make						\
 		VIMRCLOC=/etc/vim			\
-		VIMRUNTIMEDIR=/usr/share/vim/vim82	\
+		VIMRUNTIMEDIR=/usr/share/vim/vim$basever\
 		MAKE="make -e" &&
-	make DESTDIR=$DESTDIR install
+	make	install				\
+		DESTDIR=$DESTDIR
 
 	mkdir -p $DESTDIR/etc/vim
 	cp -a $src/runtime/vimrc_example.vim	$DESTDIR/etc/vim/vimrc
 
-	for i in GenericName Keywords ; do
+	for i in GenericName Keywords
+	  do
 		l="$(grep $i= $DESTDIR/usr/share/applications/vim.desktop)"
 		sed -i "/$i=/d;s|$i\[de].*|$l\n&|" $DESTDIR/usr/share/applications/vim.desktop
-	done
+	  done
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -80,12 +86,14 @@
 		echo ''
 		echo "**** Actual VI link : $cmd"
 		echo ''
-		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
+		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '
+		read -t 30 anser
 		if [ "$anser" = 'y' ]
 		  then
 			echo ''
-			echo -n 'Removing vi link to make a new one pointing on /usr/bin/vim...'
-			rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi"
+			echo -n 'Removing vi link to make a new one pointing to /usr/bin/vim...'
+			rm "$1/bin/vi" &&
+			ln -sf /usr/bin/vim "$1/bin/vi"
 			status
 		  else
 			echo ''
@@ -96,6 +104,6 @@
 
 post_remove()
 {
-	# restore previous symlink
+	# restore previous symbolic link
 	ln -sf /bin/busybox "$1/bin/vi"
 }