wok-current rev 23227

updated nano and nano-doc (4.2 -> 4.8)
author Hans-G?nter Theisgen
date Tue Mar 24 07:03:56 2020 +0100 (2020-03-24)
parents 65a24133b39d
children 8a0790e3dfda
files nano-doc/receipt nano/receipt nano/stuff/patches/sh.nanorc-4.8
line diff
     1.1 --- a/nano-doc/receipt	Tue Mar 24 06:40:21 2020 +0100
     1.2 +++ b/nano-doc/receipt	Tue Mar 24 07:03:56 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nano-doc"
     1.7 -VERSION="4.2"
     1.8 +VERSION="4.8"
     1.9  CATEGORY="doc"
    1.10  SHORT_DESC="Nano Text Editor, documentation and man pages."
    1.11  MAINTAINER="al.bobylev@gmail.com"
     2.1 --- a/nano/receipt	Tue Mar 24 06:40:21 2020 +0100
     2.2 +++ b/nano/receipt	Tue Mar 24 07:03:56 2020 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nano"
     2.7 -VERSION="4.2"
     2.8 +VERSION="4.8"
     2.9  CATEGORY="utilities"
    2.10  TAGS="text-editor"
    2.11  SHORT_DESC="Nano Text Editor."
    2.12 @@ -27,12 +27,15 @@
    2.13  # Rules to configure and make the package.
    2.14  compile_rules()
    2.15  {
    2.16 -#		--disable-wrapping-as-root no longer supported in 4.2
    2.17 +	# no longer supported in 4.2
    2.18 +	#	--disable-wrapping-as-root 
    2.19 +
    2.20  	./configure			\
    2.21  		--sysconfdir=/etc	\
    2.22  		--localstatedir=/var	\
    2.23  		--enable-utf8		\
    2.24 -		$CONFIGURE_ARGS $ARCH_ARGS &&
    2.25 +		$CONFIGURE_ARGS		\
    2.26 +		$ARCH_ARGS &&
    2.27  	make &&
    2.28  	make install
    2.29  }
    2.30 @@ -40,21 +43,24 @@
    2.31  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.32  genpkg_rules()
    2.33  {
    2.34 -	cp -a $install/* $fs
    2.35 -	rm -r $fs/usr/share/doc $fs/usr/share/locale $fs/usr/share/man
    2.36 +	cp -a $install/*	$fs
    2.37 +	rm -r			$fs/usr/share/doc
    2.38 +	rm -r			$fs/usr/share/locale
    2.39 +	rm -r			$fs/usr/share/man
    2.40  
    2.41  	# Configuration file.
    2.42  	mkdir -p $fs/etc
    2.43 -	cp $src/doc/sample.nanorc $fs/etc/nanorc
    2.44 +	cp $src/doc/sample.nanorc	$fs/etc/nanorc
    2.45  
    2.46  	cd $fs
    2.47  	patch --input=$stuff/patches/nanorc.patch \
    2.48  		etc/nanorc
    2.49 -	patch --input=$stuff/patches/sh.nanorc.patch \
    2.50 +	patch --input=$stuff/patches/sh.nanorc-$VERSION \
    2.51  		usr/share/nano/sh.nanorc
    2.52  
    2.53  	# Shrink
    2.54 -	for i in $fs/usr/share/nano/*.nanorc; do
    2.55 +	for i in $fs/usr/share/nano/*.nanorc
    2.56 +	  do
    2.57  		sed -i '/^#/d;/^$/d' $i
    2.58  	done
    2.59  }
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/nano/stuff/patches/sh.nanorc-4.8	Tue Mar 24 07:03:56 2020 +0100
     3.3 @@ -0,0 +1,8 @@
     3.4 +--- sh.nanorc.orig
     3.5 ++++ sh.nanorc
     3.6 +@@ -1,4 +1,4 @@
     3.7 +-syntax sh "(\.sh|(\.|/)(a|ba|c|da|k|mk|pdk|tc|z)sh(rc|_profile)?|/(etc/|\.)profile)$"
     3.8 ++syntax sh "\.sh$" "receipt"
     3.9 + header "^#!.*/(((a|ba|c|da|k|mk|pdk|tc|z)?sh)|(busybox|env) +sh|openrc-run|runscript)"
    3.10 + magic "(POSIX|Bourne-Again) shell script.*text"
    3.11 + comment "#"