# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1650728086 -3600
# Node ID dd4fe41206e81fabd784e743d674a5ada7466e30
# Parent 17a0bbb74ccd7eaa360b4bf3fe5cfbbf5e809dff
updated nano and nano-doc (4.8 -> 6.2)
diff -r 17a0bbb74ccd -r dd4fe41206e8 nano-doc/receipt
--- a/nano-doc/receipt Sat Apr 23 15:05:31 2022 +0100
+++ b/nano-doc/receipt Sat Apr 23 16:34:46 2022 +0100
@@ -1,7 +1,7 @@
# SliTaz package receipt.
PACKAGE="nano-doc"
-VERSION="4.8"
+VERSION="6.2"
CATEGORY="doc"
SHORT_DESC="Nano Text Editor, documentation and man pages."
MAINTAINER="al.bobylev@gmail.com"
@@ -12,9 +12,7 @@
genpkg_rules()
{
- mkdir -p $fs/usr/share
-
- cp -a $install/usr/share/doc $fs/usr/share
- cp -a $install/usr/share/man $fs/usr/share
+ cook_copy_folders doc
+ cook_copy_folders man
}
diff -r 17a0bbb74ccd -r dd4fe41206e8 nano-lang/receipt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nano-lang/receipt Sat Apr 23 16:34:46 2022 +0100
@@ -0,0 +1,17 @@
+# SliTaz package receipt.
+
+PACKAGE="nano-lang"
+VERSION="6.2"
+CATEGORY="localization"
+SHORT_DESC="Nano Text Editor - localised messages."
+MAINTAINER="maintainer@slitaz.org"
+LICENSE="GPL3"
+WEB_SITE="https://nano-editor.org/"
+
+WANTED="nano"
+
+genpkg_rules()
+{
+ cook_copy_folders locale
+}
+
diff -r 17a0bbb74ccd -r dd4fe41206e8 nano/receipt
--- a/nano/receipt Sat Apr 23 15:05:31 2022 +0100
+++ b/nano/receipt Sat Apr 23 16:34:46 2022 +0100
@@ -1,7 +1,7 @@
# SliTaz package receipt.
PACKAGE="nano"
-VERSION="4.8"
+VERSION="6.2"
CATEGORY="utilities"
TAGS="text-editor"
SHORT_DESC="Nano Text Editor."
@@ -12,10 +12,10 @@
TARBALL="$PACKAGE-$VERSION.tar.gz"
WGET_URL="${WEB_SITE}dist/v${VERSION%.*}/$TARBALL"
-SUGGESTED="gpm"
+SUGGESTED="gpm nano-doc nano-lang"
DEPENDS="ncursesw zlib"
-BUILD_DEPENDS="groff ncursesw-dev zlib-dev"
-SPLIT="nano-doc"
+BUILD_DEPENDS="groff ncursesw-dev patch zlib-dev"
+SPLIT="nano-doc nano-lang"
HOST_ARCH="i486 arm"
@@ -59,14 +59,14 @@
cp $src/doc/sample.nanorc $fs/etc/nanorc
cd $fs
- patch --input=$stuff/patches/nanorc.patch \
+ patch --input=$stuff/patches/etc_nanorc-$VERSION \
etc/nanorc
- patch --input=$stuff/patches/sh.nanorc-$VERSION \
+ patch --input=$stuff/patches/usr_share_nano_sh.nanorc-$VERSION \
usr/share/nano/sh.nanorc
- # Shrink
+ # Shrink (delete comment lines and empty lines)
for i in $fs/usr/share/nano/*.nanorc
do
sed -i '/^#/d;/^$/d' $i
- done
+ done
}
diff -r 17a0bbb74ccd -r dd4fe41206e8 nano/stuff/patches/etc_nanorc-6.2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nano/stuff/patches/etc_nanorc-6.2 Sat Apr 23 16:34:46 2022 +0100
@@ -0,0 +1,191 @@
+--- etc/nanorc.original
++++ etc/nanorc
+@@ -1,5 +1,8 @@
+ ## Sample initialization file for GNU nano.
+ ##
++## /etc/nanorc: system-wide initialization file for nano.
++## ~/.nanorc: personal config file.
++
+ ## For the options that take parameters, the default value is shown.
+ ## Other options are unset by default. To make sure that an option
+ ## is disabled, you can use "unset ".
+@@ -63,7 +66,7 @@
+ # set guidestripe 75
+
+ ## Remember the used search/replace strings for the next session.
+-# set historylog
++set historylog
+
+ ## Display a "scrollbar" on the righthand side of the edit window.
+ # set indicator
+@@ -95,7 +98,7 @@
+ ## mouse clicks can be used to place the cursor, set the mark (with a
+ ## double click), and execute shortcuts. The mouse will work in the
+ ## X Window System, and on the console when gpm is running.
+-# set mouse
++set mouse
+
+ ## Switch on multiple file buffers (inserting a file will put it into
+ ## a separate buffer).
+@@ -172,7 +175,7 @@
+ # set stateflags
+
+ ## Use this tab size instead of the default; it must be greater than 0.
+-# set tabsize 8
++set tabsize 4
+
+ ## Convert each typed tab to the fitting number of spaces.
+ # set tabstospaces
+@@ -243,9 +246,150 @@
+ # include "/usr/share/nano/*.nanorc"
+
+ ## Or you can select just the ones you need. For example:
++## Assembler
++# include "/usr/share/nano/asm.nanorc"
++
++## Autoconf
++# include "/usr/share/nano/autoconf.nanorc"
++
++## AWK
++# include "/usr/share/nano/awk.nanorc"
++
++## C/C++
++include "/usr/share/nano/c.nanorc"
++
++## Changelogs
++# include "/usr/share/nano/changelog.nanorc"
++
++## CMake
++# include "/usr/share/nano/cmake.nanorc"
++
++## CSS
++include "/usr/share/nano/css.nanorc"
++
++## Apt's sources.list
++# include "/usr/share/nano/debian.nanorc"
++
++## Default
++include "/usr/share/nano/default.nanorc"
++
++## Emacs Lisp
++# include "/usr/share/nano/elisp.nanorc"
++
++## Fortran 90/95
++# include "/usr/share/nano/fortran.nanorc"
++
++## Gentoo ebuilds/eclasses
++# include "/usr/share/nano/gentoo.nanorc"
++
++## Go
++# include "/usr/share/nano/go.nanorc"
++
++## Groff
++# include "/usr/share/nano/groff.nanorc"
++
++## Guile Scheme
++# include "/usr/share/nano/guile.nanorc"
++
++## HTML
+ # include "/usr/share/nano/html.nanorc"
+-# include "/usr/share/nano/python.nanorc"
+-# include "/usr/share/nano/sh.nanorc"
++
++## Java
++# include "/usr/share/nano/java.nanorc"
++
++## Javascript
++include "/usr/share/nano/javascript.nanorc"
++
++## JSON
++# include "/usr/share/nano/json.nanorc"
++
++## Lua
++# include "/usr/share/nano/lua.nanorc"
++
++## Makefiles
++include "/usr/share/nano/makefile.nanorc"
++
++## Manpages
++include "/usr/share/nano/man.nanorc"
++
++## Magicpoint presentations
++# include "/usr/share/nano/mgp.nanorc"
++
++## Quoted emails (under e.g. mutt)
++include "/usr/share/nano/mutt.nanorc"
++
++## Nanorc files
++include "/usr/share/nano/nanorc.nanorc"
++
++## nftables
++# include "/usr/share/nano/nftables.nanorc"
++
++## C/C++/Obj-C
++# include "/usr/share/nano/objc.nanorc"
++
++## OCaml
++# include "/usr/share/nano/ocaml.nanorc"
++
++## Patch files
++include "/usr/share/nano/patch.nanorc"
++
++## Perl
++# include "/usr/share/nano/perl.nanorc"
++
++## PHP
++include "/usr/share/nano/php.nanorc"
++
++## PO files
++include "/usr/share/nano/po.nanorc"
++
++## PostgreSQL
++# include "/usr/share/nano/postgresql.nanorc"
++
++## POV-Ray
++# include "/usr/share/nano/pov.nanorc"
++
++## Python
++include "/usr/share/nano/python.nanorc"
++
++## Ruby
++# include "/usr/share/nano/ruby.nanorc"
++
++## Bourne shell scripts
++include "/usr/share/nano/sh.nanorc"
++
++## RPM spec files
++# include "/usr/share/nano/spec.nanorc"
++
++## Tcl files
++# include "/usr/share/nano/tcl.nanorc"
++
++## TeX files
++# include "/usr/share/nano/tex.nanorc"
++
++## Texinfo files
++# include "/usr/share/nano/texinfo.nanorc"
++
++## XML files
++include "/usr/share/nano/xml.nanorc"
++
++
++## Config file - By SliTaz
++syntax "conf" "\.?conf$"
++## Keywords
++icolor brightgreen "="
++## Comments
++icolor cyan "^[[:space:]]*#.*$"
++
++## HTML - With modification for SliTaz.
++syntax "HTML" "\.html$"
++color brightblue start="<" end=">"
++color red "&[^; ]*;"
++color brightwhite start="" start="" end=" " start=""
++color brightcyan start=" |
|| || "
++color yellow "| | "
++color brightred "href=|name=|rel=|http-equiv=|content=|title=|type|style"
++color brightgreen "| || || || || || "
+
+ ## In /usr/share/nano/extra/ you can find some syntaxes that are
+ ## specific for certain distros or for some less common languages.
diff -r 17a0bbb74ccd -r dd4fe41206e8 nano/stuff/patches/usr_share_nano_sh.nanorc-6.2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nano/stuff/patches/usr_share_nano_sh.nanorc-6.2 Sat Apr 23 16:34:46 2022 +0100
@@ -0,0 +1,8 @@
+--- usr/share/nano/sh.nanorc.original
++++ usr/share/nano/sh.nanorc
+@@ -3,4 +3,4 @@
+-syntax sh "(\.sh|(\.|/)(a|ba|c|da|k|mk|pdk|tc|z)sh(rc|_profile)?|/(etc/|\.)profile)$"
++syntax sh "\.sh$" "receipt"
+ header "^#!.*/((env[[:blank:]]+)?((a|ba|c|da|k|mk|pdk|tc|z)?sh)|busybox[[:blank:]]+sh|openrc-run|runscript)\>"
+ header "-\*-.*shell-script.*-\*-"
+ magic "(POSIX|Bourne-Again) shell script.*text"