wok rev 21517

updated nano and nano-doc (2.6.1 -> 4.2)
author Hans-G?nter Theisgen
date Fri May 03 15:33:28 2019 +0100 (17 months ago)
parents 4e6f31d3d204
children 0bae549e1050
files nano-doc/receipt nano/receipt nano/stuff/patches/nanorc.patch nano/stuff/patches/sh.nanorc.patch
line diff
     1.1 --- a/nano-doc/receipt	Fri May 03 13:39:55 2019 +0100
     1.2 +++ b/nano-doc/receipt	Fri May 03 15:33:28 2019 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nano-doc"
     1.7 -VERSION="2.6.1"
     1.8 +VERSION="4.2"
     1.9  CATEGORY="doc"
    1.10 -SHORT_DESC="Nano Text Editor, documentation and man pages"
    1.11 +SHORT_DESC="Nano Text Editor, documentation and man pages."
    1.12  MAINTAINER="al.bobylev@gmail.com"
    1.13  LICENSE="GPL3"
    1.14  WEB_SITE="https://nano-editor.org/"
    1.15 @@ -13,5 +13,7 @@
    1.16  genpkg_rules()
    1.17  {
    1.18  	mkdir -p $fs/usr/share
    1.19 -	cp -a $install/usr/share/doc $install/usr/share/man $fs/usr/share
    1.20 +
    1.21 +	cp -a $install/usr/share/doc	$fs/usr/share
    1.22 +	cp -a $install/usr/share/man	$fs/usr/share
    1.23  }
     2.1 --- a/nano/receipt	Fri May 03 13:39:55 2019 +0100
     2.2 +++ b/nano/receipt	Fri May 03 15:33:28 2019 +0100
     2.3 @@ -1,22 +1,24 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nano"
     2.7 -VERSION="2.6.1"
     2.8 +VERSION="4.2"
     2.9  CATEGORY="utilities"
    2.10 -SHORT_DESC="Nano Text Editor"
    2.11 +TAGS="text-editor"
    2.12 +SHORT_DESC="Nano Text Editor."
    2.13  MAINTAINER="pankso@slitaz.org"
    2.14  LICENSE="GPL3"
    2.15  WEB_SITE="https://nano-editor.org/"
    2.16 +
    2.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.18  WGET_URL="${WEB_SITE}dist/v${VERSION%.*}/$TARBALL"
    2.19 -TAGS="text-editor"
    2.20 +
    2.21 +SUGGESTED="gpm"
    2.22 +DEPENDS="ncursesw zlib"
    2.23 +BUILD_DEPENDS="groff ncursesw-dev zlib-dev"
    2.24 +SPLIT="nano-doc"
    2.25 +
    2.26  HOST_ARCH="i486 arm"
    2.27  
    2.28 -DEPENDS="ncursesw zlib"
    2.29 -SUGGESTED="gpm"
    2.30 -BUILD_DEPENDS="ncursesw-dev zlib-dev groff"
    2.31 -SPLIT="nano-doc"
    2.32 -
    2.33  # Handle cross compilation
    2.34  case "$ARCH" in
    2.35  	arm*) BUILD_DEPENDS="ncursesw-dev zlib-dev" ;;
    2.36 @@ -25,13 +27,14 @@
    2.37  # Rules to configure and make the package.
    2.38  compile_rules()
    2.39  {
    2.40 -	./configure \
    2.41 -		--sysconfdir=/etc \
    2.42 -		--localstatedir=/var \
    2.43 -		--disable-wrapping-as-root \
    2.44 -		--enable-utf8 \
    2.45 +#		--disable-wrapping-as-root no longer supported in 4.2
    2.46 +	./configure			\
    2.47 +		--sysconfdir=/etc	\
    2.48 +		--localstatedir=/var	\
    2.49 +		--enable-utf8		\
    2.50  		$CONFIGURE_ARGS $ARCH_ARGS &&
    2.51 -	make && make install
    2.52 +	make &&
    2.53 +	make install
    2.54  }
    2.55  
    2.56  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.57 @@ -40,10 +43,15 @@
    2.58  	cp -a $install/* $fs
    2.59  	rm -r $fs/usr/share/doc $fs/usr/share/locale $fs/usr/share/man
    2.60  
    2.61 -	# Config file.
    2.62 +	# Configuration file.
    2.63  	mkdir -p $fs/etc
    2.64  	cp $src/doc/nanorc.sample $fs/etc/nanorc
    2.65 -	cd $fs; patch -p0 < $stuff/nano.patch
    2.66 +
    2.67 +	cd $fs
    2.68 +	patch --input=$stuff/patches/nanorc.patch \
    2.69 +		etc/nanorc
    2.70 +	patch --input=$stuff/patches/sh.nanorc.patch \
    2.71 +		usr/share/nano/sh.nanorc
    2.72  
    2.73  	# Shrink
    2.74  	for i in $fs/usr/share/nano/*.nanorc; do
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/nano/stuff/patches/nanorc.patch	Fri May 03 15:33:28 2019 +0100
     3.3 @@ -0,0 +1,191 @@
     3.4 +--- etc/nanorc.orig	2019-05-03 14:19:11.780800756 +0100
     3.5 ++++ etc/nanorc	2019-05-03 14:32:51.179322558 +0100
     3.6 +@@ -1,7 +1,6 @@
     3.7 + ## Sample initialization file for GNU nano.
     3.8 +-##
     3.9 +-## This file should not be in DOS or Mac format, and characters
    3.10 +-## specially interpreted by the shell should not be escaped here.
    3.11 ++## /etc/nanorc: system-wide initialization file for nano.
    3.12 ++## ~/.nanorc:   personal config file.
    3.13 + ##
    3.14 + ## To make sure an option is disabled, use "unset <option>".
    3.15 + ##
    3.16 +@@ -62,7 +61,7 @@
    3.17 + # set fill -8
    3.18 + 
    3.19 + ## Remember the used search/replace strings for the next session.
    3.20 +-# set historylog
    3.21 ++set historylog
    3.22 + 
    3.23 + ## Scroll the buffer contents per half-screen instead of per line.
    3.24 + # set jumpyscrolling
    3.25 +@@ -84,7 +83,7 @@
    3.26 + ## mouse clicks can be used to place the cursor, set the mark (with a
    3.27 + ## double click), and execute shortcuts.  The mouse will work in the X
    3.28 + ## Window System, and on the console when gpm is running.
    3.29 +-# set mouse
    3.30 ++set mouse
    3.31 + 
    3.32 + ## Switch on multiple file buffers (inserting a file will put it into
    3.33 + ## a separate buffer).
    3.34 +@@ -161,7 +160,7 @@
    3.35 + # set suspend
    3.36 + 
    3.37 + ## Use this tab size instead of the default; it must be greater than 0.
    3.38 +-# set tabsize 8
    3.39 ++set tabsize 4
    3.40 + 
    3.41 + ## Convert typed tabs to spaces.
    3.42 + # set tabstospaces
    3.43 +@@ -305,3 +304,151 @@
    3.44 + #unbind M-J main
    3.45 + #unbind M-T main
    3.46 + #set multibuffer
    3.47 ++
    3.48 ++
    3.49 ++
    3.50 ++## Assembler
    3.51 ++# include "/usr/share/nano/asm.nanorc"
    3.52 ++
    3.53 ++## Autoconf
    3.54 ++# include "/usr/share/nano/autoconf.nanorc"
    3.55 ++
    3.56 ++## AWK
    3.57 ++# include "/usr/share/nano/awk.nanorc"
    3.58 ++
    3.59 ++## C/C++
    3.60 ++include "/usr/share/nano/c.nanorc"
    3.61 ++
    3.62 ++## Changelogs
    3.63 ++# include "/usr/share/nano/changelog.nanorc"
    3.64 ++
    3.65 ++## CMake
    3.66 ++# include "/usr/share/nano/cmake.nanorc"
    3.67 ++
    3.68 ++## CSS
    3.69 ++include "/usr/share/nano/css.nanorc"
    3.70 ++
    3.71 ++## Apt's sources.list
    3.72 ++# include "/usr/share/nano/debian.nanorc"
    3.73 ++
    3.74 ++## Default
    3.75 ++include "/usr/share/nano/default.nanorc"
    3.76 ++
    3.77 ++## Emacs Lisp
    3.78 ++# include "/usr/share/nano/elisp.nanorc"
    3.79 ++
    3.80 ++## Fortran 90/95
    3.81 ++# include "/usr/share/nano/fortran.nanorc"
    3.82 ++
    3.83 ++## Gentoo ebuilds/eclasses
    3.84 ++# include "/usr/share/nano/gentoo.nanorc"
    3.85 ++
    3.86 ++## Go
    3.87 ++# include "/usr/share/nano/go.nanorc"
    3.88 ++
    3.89 ++## Groff
    3.90 ++# include "/usr/share/nano/groff.nanorc"
    3.91 ++
    3.92 ++## Guile Scheme
    3.93 ++# include "/usr/share/nano/guile.nanorc"
    3.94 ++
    3.95 ++## HTML
    3.96 ++# include "/usr/share/nano/html.nanorc"
    3.97 ++
    3.98 ++## Java
    3.99 ++# include "/usr/share/nano/java.nanorc"
   3.100 ++
   3.101 ++## Javascript
   3.102 ++include "/usr/share/nano/javascript.nanorc"
   3.103 ++
   3.104 ++## JSON
   3.105 ++# include "/usr/share/nano/json.nanorc"
   3.106 ++
   3.107 ++## Lua
   3.108 ++# include "/usr/share/nano/lua.nanorc"
   3.109 ++
   3.110 ++## Makefiles
   3.111 ++include "/usr/share/nano/makefile.nanorc"
   3.112 ++
   3.113 ++## Manpages
   3.114 ++include "/usr/share/nano/man.nanorc"
   3.115 ++
   3.116 ++## Magicpoint presentations
   3.117 ++# include "/usr/share/nano/mgp.nanorc"
   3.118 ++
   3.119 ++## Quoted emails (under e.g. mutt)
   3.120 ++include "/usr/share/nano/mutt.nanorc"
   3.121 ++
   3.122 ++## Nanorc files
   3.123 ++include "/usr/share/nano/nanorc.nanorc"
   3.124 ++
   3.125 ++## nftables
   3.126 ++# include "/usr/share/nano/nftables.nanorc"
   3.127 ++
   3.128 ++## C/C++/Obj-C
   3.129 ++# include "/usr/share/nano/objc.nanorc"
   3.130 ++
   3.131 ++## OCaml
   3.132 ++# include "/usr/share/nano/ocaml.nanorc"
   3.133 ++
   3.134 ++## Patch files
   3.135 ++include "/usr/share/nano/patch.nanorc"
   3.136 ++
   3.137 ++## Perl
   3.138 ++# include "/usr/share/nano/perl.nanorc"
   3.139 ++
   3.140 ++## PHP
   3.141 ++include "/usr/share/nano/php.nanorc"
   3.142 ++
   3.143 ++## PO files
   3.144 ++include "/usr/share/nano/po.nanorc"
   3.145 ++
   3.146 ++## PostgreSQL
   3.147 ++# include "/usr/share/nano/postgresql.nanorc"
   3.148 ++
   3.149 ++## POV-Ray
   3.150 ++# include "/usr/share/nano/pov.nanorc"
   3.151 ++
   3.152 ++## Python
   3.153 ++include "/usr/share/nano/python.nanorc"
   3.154 ++
   3.155 ++## Ruby
   3.156 ++# include "/usr/share/nano/ruby.nanorc"
   3.157 ++
   3.158 ++## Bourne shell scripts
   3.159 ++include "/usr/share/nano/sh.nanorc"
   3.160 ++
   3.161 ++## RPM spec files
   3.162 ++# include "/usr/share/nano/spec.nanorc"
   3.163 ++
   3.164 ++## Tcl files
   3.165 ++# include "/usr/share/nano/tcl.nanorc"
   3.166 ++
   3.167 ++## TeX files
   3.168 ++# include "/usr/share/nano/tex.nanorc"
   3.169 ++
   3.170 ++## Texinfo files
   3.171 ++# include "/usr/share/nano/texinfo.nanorc"
   3.172 ++
   3.173 ++## XML files
   3.174 ++include "/usr/share/nano/xml.nanorc"
   3.175 ++
   3.176 ++
   3.177 ++## Config file - By SliTaz
   3.178 ++syntax "conf" "\.?conf$"
   3.179 ++## Keywords
   3.180 ++icolor brightgreen "="
   3.181 ++## Comments
   3.182 ++icolor cyan "^[[:space:]]*#.*$"
   3.183 ++
   3.184 ++## HTML - With modification for SliTaz.
   3.185 ++syntax "HTML" "\.html$"
   3.186 ++color brightblue start="<" end=">"
   3.187 ++color red "&[^; 	]*;"
   3.188 ++color brightwhite start="<!DOCTYPE" end=">" start="<title>" end="</title>" start="<!--" end="-->"
   3.189 ++color brightcyan start="<meta" end=">" start="<link" end=">"
   3.190 ++color brightyellow "<p>|</p>|<pre>|</pre>|<li>|</li>"
   3.191 ++color yellow "<ul>|</ul>|<hr>|<hr />"
   3.192 ++color brightred "href=|name=|rel=|http-equiv=|content=|title=|type|style"
   3.193 ++color brightgreen "<h1>|</h1>|<h2>|</h2>|<h3>|</h3>|<h4>|</h4>|<h5>|</h5>|<h6>|</h6>"
   3.194 ++
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/nano/stuff/patches/sh.nanorc.patch	Fri May 03 15:33:28 2019 +0100
     4.3 @@ -0,0 +1,10 @@
     4.4 +--- usr/share/nano/sh.nanorc.orig	2019-05-03 14:18:58.000000000 +0100
     4.5 ++++ usr/share/nano/sh.nanorc	2019-05-03 14:40:18.301809444 +0100
     4.6 +@@ -1,6 +1,6 @@
     4.7 + ## Here is an example for Bourne shell scripts.
     4.8 + 
     4.9 +-syntax sh "(\.sh|\.(a|ba|c|da|k|mk|pdk|tc|z)(sh|shrc|sh_profile)|/(etc/|\.)profile)$"
    4.10 ++syntax sh "\.sh$" "receipt"
    4.11 + header "^#!.*/(((a|ba|c|da|k|mk|pdk|tc|z)?sh)|(busybox|env) +sh|openrc-run|runscript)"
    4.12 + magic "(POSIX|Bourne-Again) shell script.*text"
    4.13 + linter dash -n