# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1585029836 -3600
# Node ID 84e8c7b071601c3f672248508886d1f9945bf4da
# Parent  65a24133b39d40d018dda67c67c932559ae136da
updated nano and nano-doc (4.2 -> 4.8)

diff -r 65a24133b39d -r 84e8c7b07160 nano-doc/receipt
--- a/nano-doc/receipt	Tue Mar 24 06:40:21 2020 +0100
+++ b/nano-doc/receipt	Tue Mar 24 07:03:56 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nano-doc"
-VERSION="4.2"
+VERSION="4.8"
 CATEGORY="doc"
 SHORT_DESC="Nano Text Editor, documentation and man pages."
 MAINTAINER="al.bobylev@gmail.com"
diff -r 65a24133b39d -r 84e8c7b07160 nano/receipt
--- a/nano/receipt	Tue Mar 24 06:40:21 2020 +0100
+++ b/nano/receipt	Tue Mar 24 07:03:56 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nano"
-VERSION="4.2"
+VERSION="4.8"
 CATEGORY="utilities"
 TAGS="text-editor"
 SHORT_DESC="Nano Text Editor."
@@ -27,12 +27,15 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-#		--disable-wrapping-as-root no longer supported in 4.2
+	# no longer supported in 4.2
+	#	--disable-wrapping-as-root 
+
 	./configure			\
 		--sysconfdir=/etc	\
 		--localstatedir=/var	\
 		--enable-utf8		\
-		$CONFIGURE_ARGS $ARCH_ARGS &&
+		$CONFIGURE_ARGS		\
+		$ARCH_ARGS &&
 	make &&
 	make install
 }
@@ -40,21 +43,24 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
-	rm -r $fs/usr/share/doc $fs/usr/share/locale $fs/usr/share/man
+	cp -a $install/*	$fs
+	rm -r			$fs/usr/share/doc
+	rm -r			$fs/usr/share/locale
+	rm -r			$fs/usr/share/man
 
 	# Configuration file.
 	mkdir -p $fs/etc
-	cp $src/doc/sample.nanorc $fs/etc/nanorc
+	cp $src/doc/sample.nanorc	$fs/etc/nanorc
 
 	cd $fs
 	patch --input=$stuff/patches/nanorc.patch \
 		etc/nanorc
-	patch --input=$stuff/patches/sh.nanorc.patch \
+	patch --input=$stuff/patches/sh.nanorc-$VERSION \
 		usr/share/nano/sh.nanorc
 
 	# Shrink
-	for i in $fs/usr/share/nano/*.nanorc; do
+	for i in $fs/usr/share/nano/*.nanorc
+	  do
 		sed -i '/^#/d;/^$/d' $i
 	done
 }
diff -r 65a24133b39d -r 84e8c7b07160 nano/stuff/patches/sh.nanorc-4.8
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nano/stuff/patches/sh.nanorc-4.8	Tue Mar 24 07:03:56 2020 +0100
@@ -0,0 +1,8 @@
+--- sh.nanorc.orig
++++ sh.nanorc
+@@ -1,4 +1,4 @@
+-syntax sh "(\.sh|(\.|/)(a|ba|c|da|k|mk|pdk|tc|z)sh(rc|_profile)?|/(etc/|\.)profile)$"
++syntax sh "\.sh$" "receipt"
+ header "^#!.*/(((a|ba|c|da|k|mk|pdk|tc|z)?sh)|(busybox|env) +sh|openrc-run|runscript)"
+ magic "(POSIX|Bourne-Again) shell script.*text"
+ comment "#"