Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb0a0bcdee54e3f11a5e413691c43c155ee031b2
commit eb0a0bcdee54e3f11a5e413691c43c155ee031b2 Author: crazy <[email protected]> Date: Fri Nov 20 22:14:51 2015 +0100 nano-2.4.3-1-x86_64 * Version bump * addpt patch to 2.4 series diff --git a/source/apps/nano/FrugalBuild b/source/apps/nano/FrugalBuild index 09e94b4..c283fa1 100644 --- a/source/apps/nano/FrugalBuild +++ b/source/apps/nano/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren <[email protected]> pkgname=nano -pkgver=2.2.6 -pkgrel=2 +pkgver=2.4.3 +pkgrel=1 pkgdesc="Free Pico clone with some new features." url="http://www.nano-editor.org/"; depends=('ncurses>=5.6-2') @@ -11,17 +11,17 @@ rodepends=('aspell') groups=('apps') archs=('i686' 'x86_64' 'arm') up2date="lynx -dump $url | grep -m1 'Latest Version' | sed -r 's|.* (\S+) \(stable\).*|\1|'" -source=($url/dist/v2.2/$pkgname-$pkgver.tar.gz nano-config.patch frugalbuild.nanorc) +source=($url/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.gz nano-config.patch frugalbuild.nanorc) backup=('etc/nanorc') -sha1sums=('f2a628394f8dda1b9f28c7e7b89ccb9a6dbd302a' \ - '8fcd01184b1bfa032356cce785cec2c7f4cd88f7' \ +sha1sums=('a64650f2bebf2d3638b59657abd419a0c9c55a78' \ + '56f9e7f2e77ab6ce9ca1d491470f0dcd46ef6720' \ 'a54fad3a4e7a2176a95f24be2897bb1b5d42f0ba') build() { - Fbuild --enable-utf8 - Ffilerel doc/nanorc.sample /etc/nanorc - Ffile /usr/share/$pkgname/frugalbuild.nanorc - Fdocrel doc/nanorc.sample + Fbuild --enable-utf8 + Ffilerel doc/nanorc.sample /etc/nanorc + Ffile /usr/share/$pkgname/frugalbuild.nanorc + Fdocrel doc/nanorc.sample } # optimization OK diff --git a/source/apps/nano/nano-config.patch b/source/apps/nano/nano-config.patch index 82a744a..80b0989 100644 --- a/source/apps/nano/nano-config.patch +++ b/source/apps/nano/nano-config.patch @@ -1,52 +1,61 @@ -diff -aur nano-2.2.3/doc/nanorc.sample.in nano-2.2.3-2/doc/nanorc.sample.in ---- nano-2.2.3/doc/nanorc.sample.in 2009-12-15 12:01:26.000000000 -0600 -+++ nano-2.2.3-2/doc/nanorc.sample.in 2010-04-01 08:49:50.000000000 -0500 -@@ -19,7 +19,7 @@ +diff -Naur nano-2.4.3/doc/nanorc.sample.in nano-2.4.3-fix/doc/nanorc.sample.in +--- nano-2.4.3/doc/nanorc.sample.in 2015-08-30 18:38:50.000000000 +0200 ++++ nano-2.4.3-fix/doc/nanorc.sample.in 2015-11-20 22:08:44.546838719 +0100 +@@ -24,7 +24,7 @@ # set autoindent - ## Backup files to filename~. + ## Back up files to the current filename plus a tilde. -# set backup +set backup ## The directory to put unique backup files in. # set backupdir "" -@@ -35,7 +35,7 @@ +@@ -39,7 +39,7 @@ + ## paragraphs. They cannot contain blank characters. Only closing ## punctuation, optionally followed by closing brackets, can end ## sentences. - ## -# set brackets ""')>]}" +set brackets ""')>]}" - ## Do case sensitive searches by default. + ## Do case-sensitive searches by default. # set casesensitive -@@ -45,7 +45,7 @@ +@@ -49,7 +49,7 @@ # set const - ## Use cut to end of line by default. + ## Use cut-to-end-of-line by default. -# set cut +set cut ## Set the line length for wrapping text and justifying paragraphs. - ## If fill is 0 or less, the line length will be the screen width less -@@ -60,7 +60,7 @@ + ## If the value is 0 or less, the wrapping point will be the screen +@@ -57,7 +57,7 @@ + # set fill -8 + + ## Enable ~/.nano_history for saving and reading search/replace strings. +-# set historylog ++set historylog + + ## Enable vim-style lock-files. This is just to let a vim user know you + ## are editing a file [s]he is trying to edit and vice versa. There are +@@ -67,7 +67,7 @@ + ## The opening and closing brackets that can be found by bracket ## searches. They cannot contain blank characters. The former set must ## come before the latter set, and both must be in the same order. - ## -# set matchbrackets "(<[{)>]}" +set matchbrackets "(<[{)>]}" ## Use the blank line below the titlebar as extra editing space. # set morespace -@@ -76,7 +76,7 @@ - ## separate buffer). You must have configured with --enable-multibuffer - ## for this to work. - ## +@@ -80,7 +80,7 @@ + + ## Switch on multiple file buffers (inserting a file will put it into + ## a separate buffer). -# set multibuffer +set multibuffer ## Don't convert files from DOS/Mac format. # set noconvert -@@ -91,7 +91,7 @@ +@@ -95,7 +95,7 @@ # set nonewlines ## Don't wrap text at all. @@ -55,16 +64,16 @@ diff -aur nano-2.2.3/doc/nanorc.sample.in nano-2.2.3-2/doc/nanorc.sample.in ## Set operating directory. nano will not read or write files outside ## this directory and its subdirectories. Also, the current directory -@@ -108,7 +108,7 @@ +@@ -113,7 +113,7 @@ + ## paragraphs. They cannot contain blank characters. Only closing ## punctuation, optionally followed by closing brackets, can end ## sentences. - ## -# set punct "!.?" +set punct "!.?" ## Do quick statusbar blanking. Statusbar messages will disappear after ## 1 keystroke instead of 26. Note that "const" overrides this. -@@ -129,7 +129,7 @@ +@@ -134,7 +134,7 @@ # set rebindkeypad ## Do extended regular expression searches by default. @@ -73,122 +82,36 @@ diff -aur nano-2.2.3/doc/nanorc.sample.in nano-2.2.3-2/doc/nanorc.sample.in ## Make the Home key smarter. When Home is pressed anywhere but at the ## very beginning of non-whitespace characters on a line, the cursor -@@ -147,7 +147,7 @@ +@@ -151,7 +151,7 @@ + ## Use this spelling checker instead of the internal one. This option ## does not properly have a default value. - ## -# set speller "aspell -x -c" +set speller "aspell -x -c" ## Allow nano to be suspended. # set suspend -@@ -234,79 +234,82 @@ - - - ## Nanorc files --# include "@PKGDATADIR@/nanorc.nanorc" -+include "@PKGDATADIR@/nanorc.nanorc" - - ## C/C++ --# include "@PKGDATADIR@/c.nanorc" -+include "@PKGDATADIR@/c.nanorc" - - ## Makefiles --# include "@PKGDATADIR@/makefile.nanorc" -+include "@PKGDATADIR@/makefile.nanorc" - - ## Cascading Style Sheets --# include "@PKGDATADIR@/css.nanorc" -+include "@PKGDATADIR@/css.nanorc" - - ## Debian files --# include "@PKGDATADIR@/debian.nanorc" -+include "@PKGDATADIR@/debian.nanorc" - - ## Gentoo files --# include "@PKGDATADIR@/gentoo.nanorc" -+include "@PKGDATADIR@/gentoo.nanorc" - - ## HTML --# include "@PKGDATADIR@/html.nanorc" -+include "@PKGDATADIR@/html.nanorc" - - ## PHP --# include "@PKGDATADIR@/php.nanorc" -+include "@PKGDATADIR@/php.nanorc" - - ## TCL --# include "@PKGDATADIR@/tcl.nanorc" -+include "@PKGDATADIR@/tcl.nanorc" - - ## TeX --# include "@PKGDATADIR@/tex.nanorc" -+include "@PKGDATADIR@/tex.nanorc" - - ## Quoted emails (under e.g. mutt) --# include "@PKGDATADIR@/mutt.nanorc" -+include "@PKGDATADIR@/mutt.nanorc" - - ## Patch files --# include "@PKGDATADIR@/patch.nanorc" -+include "@PKGDATADIR@/patch.nanorc" - - ## Manpages --# include "@PKGDATADIR@/man.nanorc" -+include "@PKGDATADIR@/man.nanorc" - - ## Groff --# include "@PKGDATADIR@/groff.nanorc" -+include "@PKGDATADIR@/groff.nanorc" - - ## Perl --# include "@PKGDATADIR@/perl.nanorc" -+include "@PKGDATADIR@/perl.nanorc" - - ## Python --# include "@PKGDATADIR@/python.nanorc" -+include "@PKGDATADIR@/python.nanorc" - - ## Ruby --# include "@PKGDATADIR@/ruby.nanorc" -+include "@PKGDATADIR@/ruby.nanorc" - - ## Java --# include "@PKGDATADIR@/java.nanorc" -+include "@PKGDATADIR@/java.nanorc" - - ## Fortran --# include "@PKGDATADIR@/fortran.nanorc" -+include "@PKGDATADIR@/fortran.nanorc" - - ## Objective-C --# include "@PKGDATADIR@/objc.nanorc" -+include "@PKGDATADIR@/objc.nanorc" - - ## OCaml --# include "@PKGDATADIR@/ocaml.nanorc" -+include "@PKGDATADIR@/ocaml.nanorc" - - ## AWK --# include "@PKGDATADIR@/awk.nanorc" -+include "@PKGDATADIR@/awk.nanorc" - - ## Assembler --# include "@PKGDATADIR@/asm.nanorc" -+include "@PKGDATADIR@/asm.nanorc" +@@ -183,10 +183,10 @@ + + ## Paint the interface elements of nano. + ## This is an example; by default there are no colors. +-# set titlecolor brightwhite,blue +-# set statuscolor brightwhite,green +-# set keycolor green +-# set functioncolor yellow ++set titlecolor brightwhite,blue ++set statuscolor brightwhite,green ++set keycolor green ++set functioncolor yellow + + + ## Setup of syntax coloring. +@@ -231,7 +231,7 @@ + ## them easier to remember and faster to type using nano's -Y option. + ## + ## To include all existing syntax definitions, you can do: +-# include "@PKGDATADIR@/*.nanorc" ++include "@PKGDATADIR@/*.nanorc" - ## Bourne shell scripts --# include "@PKGDATADIR@/sh.nanorc" -+include "@PKGDATADIR@/sh.nanorc" - ## POV-Ray --# include "@PKGDATADIR@/pov.nanorc" -+include "@PKGDATADIR@/pov.nanorc" - - ## XML-type files --# include "@PKGDATADIR@/xml.nanorc" -+include "@PKGDATADIR@/xml.nanorc" -+ -+## FrugalBuild -+include "@PKGDATADIR@/frugalbuild.nanorc" -Only in nano-2.2.3-2/doc: nanorc.sample.in~ + ## Key bindings. _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
