* maintenance update to 1.2.4
* fix regular expressions in nanorc.sample; pointed out by Jacek Wotka
This commit is contained in:
naddy
parent
6821437f9e
commit
08d729e5a8
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.39 2004/04/18 17:38:37 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.40 2004/06/30 22:18:45 naddy Exp $
|
||||
|
||||
COMMENT= "small, easy to use editor"
|
||||
|
||||
DISTNAME= nano-1.2.3
|
||||
DISTNAME= nano-1.2.4
|
||||
CATEGORIES= editors
|
||||
HOMEPAGE= http://www.nano-editor.org/
|
||||
|
||||
@ -23,7 +23,7 @@ FLAVOR?=
|
||||
MODULES= gettext
|
||||
|
||||
CONFIGURE_STYLE=autoconf
|
||||
AUTOCONF_VERSION=2.57
|
||||
AUTOCONF_VERSION=2.59
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
CONFIGURE_ARGS= --enable-all
|
||||
@ -36,7 +36,8 @@ CONFIGURE_ARGS+=--with-slang="${LOCALBASE}"
|
||||
post-install:
|
||||
perl -i -pe 's:\$$SYSCONFDIR:${SYSCONFDIR}:g' \
|
||||
${PREFIX}/man/man5/nanorc.5 \
|
||||
${PREFIX}/man/man1/nano.1
|
||||
${PREFIX}/man/man1/nano.1 \
|
||||
${PREFIX}/info/nano.info
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nano
|
||||
${INSTALL_DATA} ${WRKSRC}/nanorc.sample ${PREFIX}/share/examples/nano
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (nano-1.2.3.tar.gz) = fc70be5daee7f712675ac76690f71d50
|
||||
RMD160 (nano-1.2.3.tar.gz) = edc505e490f596f02fe8c380dc35ef47bb48146f
|
||||
SHA1 (nano-1.2.3.tar.gz) = 93b2f30da3043fc3cc46f5815759f4ca6dcbb43f
|
||||
MD5 (nano-1.2.4.tar.gz) = 2c513310ec5e8b63abaecaf48670ac7a
|
||||
RMD160 (nano-1.2.4.tar.gz) = 8e56765f61bc4e9cd2db1273bd287a2678cb6ac6
|
||||
SHA1 (nano-1.2.4.tar.gz) = 03a321011c2ceb00da20e15b15ed9ee9dee98c97
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
$OpenBSD: patch-files_c,v 1.1 2003/10/26 16:05:29 naddy Exp $
|
||||
--- files.c.orig 2003-08-06 05:15:15.000000000 +0200
|
||||
+++ files.c 2003-10-26 16:58:31.000000000 +0100
|
||||
@@ -1701,16 +1701,17 @@ int do_writeout(const char *path, int ex
|
||||
#ifdef NANO_EXTRA
|
||||
static int did_cred = 0;
|
||||
#endif
|
||||
+ static char *writepath = NULL;
|
||||
|
||||
#if !defined(DISABLE_BROWSER) || (!defined(DISABLE_MOUSE) && defined(NCURSES_MOUSE_VERSION))
|
||||
currshortcut = writefile_list;
|
||||
#endif
|
||||
|
||||
- answer = mallocstrcpy(answer, path);
|
||||
+ writepath = mallocstrcpy(writepath, path);
|
||||
|
||||
if (exiting && ISSET(TEMP_OPT)) {
|
||||
if (filename[0] != '\0') {
|
||||
- i = write_file(answer, 0, 0, 0);
|
||||
+ i = write_file(writepath, 0, 0, 0);
|
||||
display_main_list();
|
||||
return i;
|
||||
} else {
|
||||
@@ -1751,24 +1752,24 @@ int do_writeout(const char *path, int ex
|
||||
"%s%s%s", _("Write Selection to File"), formatstr, backupstr);
|
||||
} else {
|
||||
if (append == 2)
|
||||
- i = statusq(1, writefile_list, answer, 0,
|
||||
+ i = statusq(1, writefile_list, writepath, 0,
|
||||
"%s%s%s", _("File Name to Prepend to"), formatstr, backupstr);
|
||||
else if (append == 1)
|
||||
- i = statusq(1, writefile_list, answer, 0,
|
||||
+ i = statusq(1, writefile_list, writepath, 0,
|
||||
"%s%s%s", _("File Name to Append to"), formatstr, backupstr);
|
||||
else
|
||||
- i = statusq(1, writefile_list, answer, 0,
|
||||
+ i = statusq(1, writefile_list, writepath, 0,
|
||||
"%s%s%s", _("File Name to Write"), formatstr, backupstr);
|
||||
}
|
||||
#else
|
||||
if (append == 2)
|
||||
- i = statusq(1, writefile_list, answer,
|
||||
+ i = statusq(1, writefile_list, writepath,
|
||||
"%s", _("File Name to Prepend to"));
|
||||
else if (append == 1)
|
||||
- i = statusq(1, writefile_list, answer,
|
||||
+ i = statusq(1, writefile_list, writepath,
|
||||
"%s", _("File Name to Append to"));
|
||||
else
|
||||
- i = statusq(1, writefile_list, answer,
|
||||
+ i = statusq(1, writefile_list, writepath,
|
||||
"%s", _("File Name to Write"));
|
||||
#endif /* !NANO_SMALL */
|
||||
|
||||
56
editors/nano/patches/patch-nanorc_sample
Normal file
56
editors/nano/patches/patch-nanorc_sample
Normal file
@ -0,0 +1,56 @@
|
||||
$OpenBSD: patch-nanorc_sample,v 1.1 2004/06/30 22:18:45 naddy Exp $
|
||||
--- nanorc.sample.orig Thu Jul 1 00:05:22 2004
|
||||
+++ nanorc.sample Thu Jul 1 00:06:29 2004
|
||||
@@ -107,9 +107,9 @@
|
||||
## to set the background color to black or white.
|
||||
##
|
||||
# syntax "c-file" "\.(c|h)$"
|
||||
-# color red "\<[A-Z_]{2,}\>"
|
||||
-# color green "\<(float|char|int|void|static|const|struct)\>"
|
||||
-# color brightyellow "\<(if|while|do|else|case|switch)\>"
|
||||
+# color red "[[:<:]][A-Z_]{2,}[[:>:]]"
|
||||
+# color green "[[:<:]](float|char|int|void|static|const|struct)[[:>:]]"
|
||||
+# color brightyellow "[[:<:]](if|while|do|else|case|switch)[[:>:]]"
|
||||
# color brightcyan "^#( )*(define|include|ifn?def|endif|elif|else|if)"
|
||||
##
|
||||
## You will in general want your comments and strings to come last,
|
||||
@@ -173,8 +173,8 @@
|
||||
## Here is an example for perl
|
||||
##
|
||||
# syntax "perl" "\.p[lm]$"
|
||||
-# color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
|
||||
-# color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
|
||||
+# color red "[[:<:]](accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)[[:>:]]"
|
||||
+# color magenta "[[:<:]](continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)[[:>:]]"
|
||||
# color cyan start="[$@%]" end="( |\\W|-)"
|
||||
# color yellow "".*"|qq\|.*\|"
|
||||
# color white "[sm]/.*/"
|
||||
@@ -185,11 +185,11 @@
|
||||
## Here is an example for Java source
|
||||
##
|
||||
# syntax "Java source" "\.java$"
|
||||
-# color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
|
||||
-# color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
|
||||
-# color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
|
||||
+# color green "[[:<:]](boolean|byte|char|double|float|int|long|new|short|this|transient|void)[[:>:]]"
|
||||
+# color red "[[:<:]](break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)[[:>:]]"
|
||||
+# color cyan "[[:<:]](abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)[[:>:]]"
|
||||
# color red ""[^\"]*""
|
||||
-# color yellow "\<(true|false|null)\>"
|
||||
+# color yellow "[[:<:]](true|false|null)[[:>:]]"
|
||||
# color blue "//.*"
|
||||
# color blue start="/\*" end="\*/"
|
||||
# color brightblue start="/\*\*" end="\*/"
|
||||
@@ -201,8 +201,8 @@
|
||||
# color white "^ *(set|unset).*$"
|
||||
# color cyan "^ *(set|unset) (autoindent|backup|const|cut|fill|keypad|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|regexp|smooth|speller|suspend|tabsize|tempfile|historylog|view)"
|
||||
# color brightwhite "^ *syntax [^ ]*"
|
||||
-# color brightblue "^ *set\>" "^ *unset\>" "^ *syntax\>"
|
||||
-# color white "^ *color\>.*"
|
||||
-# color yellow "^ *color (bright)?(white|black|red|blue|green|yellow|magenta|cyan)\>"
|
||||
-# color magenta "^ *color\>"
|
||||
+# color brightblue "^ *set[[:>:]]" "^ *unset[[:>:]]" "^ *syntax[[:>:]]"
|
||||
+# color white "^ *color[[:>:]].*"
|
||||
+# color yellow "^ *color (bright)?(white|black|red|blue|green|yellow|magenta|cyan)[[:>:]]"
|
||||
+# color magenta "^ *color[[:>:]]"
|
||||
# color green "^#.*$"
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-search_c,v 1.1 2003/10/26 16:05:29 naddy Exp $
|
||||
--- search.c.orig 2003-07-03 03:18:06.000000000 +0200
|
||||
+++ search.c 2003-10-26 16:58:31.000000000 +0100
|
||||
@@ -769,8 +769,12 @@ int do_replace(void)
|
||||
|
||||
int do_gotoline(int line, int save_pos)
|
||||
{
|
||||
+ static char *linestr = NULL;
|
||||
+
|
||||
+ linestr = mallocstrcpy(linestr, answer);
|
||||
+
|
||||
if (line <= 0) { /* Ask for it */
|
||||
- int st = statusq(FALSE, goto_list, line != 0 ? answer : "",
|
||||
+ int st = statusq(FALSE, goto_list, line != 0 ? linestr : "",
|
||||
#ifndef NANO_SMALL
|
||||
NULL,
|
||||
#endif
|
||||
Loading…
x
Reference in New Issue
Block a user