This update moves the nano port to nano's new 2.0.x stable branch.
I would appreciate it if people who actually use nano could give
this a more thorough test.
The many patches to the syntax coloring templates merely replace
GNU's non-standard word matching regex syntax with our non-standard
one.
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/nano/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile 7 Nov 2006 15:31:37 -0000 1.47
+++ Makefile 7 Dec 2006 19:22:09 -0000
@@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.47 2006/11/07 15:31:37 naddy Exp $
-COMMENT= "small, easy to use editor"
+COMMENT= "Pico editor clone with enhancements"
-DISTNAME= nano-1.2.5
-PKGNAME= ${DISTNAME}p0
+DISTNAME= nano-2.0.1
CATEGORIES= editors
HOMEPAGE= http://www.nano-editor.org/
MAINTAINER= Christian Weisgerber <[EMAIL PROTECTED]>
-MASTER_SITES= http://www.nano-editor.org/dist/v1.2/ \
- http://www.ewtoo.org/~astyanax/nano/dist/v1.2/
+MASTER_SITES= http://www.nano-editor.org/dist/v2.0/ \
+ http://www.ewtoo.org/~astyanax/nano/dist/v2.0/
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -21,18 +20,21 @@
MODULES= devel/gettext
WANTLIB= c ncurses
-FAKE= lib
+SEPARATE_BUILD= simple
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \
LDFLAGS="-L${DEPBASE}/lib"
CONFIGURE_ARGS= --enable-all
+CONFIGURE_ARGS+=--disable-utf8 # no wide character curses
post-install:
- perl -i -pe 's:\$$SYSCONFDIR:${SYSCONFDIR}:g' \
- ${PREFIX}/man/man5/nanorc.5 \
+ perl -i -pe 's:SYSCONFDIR:${SYSCONFDIR}:g;' \
+ -e 's:PREFIX:${TRUEPREFIX}:g;' \
${PREFIX}/man/man1/nano.1 \
+ ${PREFIX}/man/man5/nanorc.5 \
${PREFIX}/info/nano.info
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nano
- ${INSTALL_DATA} ${WRKSRC}/nanorc.sample ${PREFIX}/share/examples/nano
+ ${INSTALL_DATA} ${WRKBUILD}/doc/nanorc.sample \
+ ${PREFIX}/share/examples/nano
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/nano/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 20 May 2005 21:18:13 -0000 1.10
+++ distinfo 7 Dec 2006 19:22:09 -0000
@@ -1,4 +1,4 @@
-MD5 (nano-1.2.5.tar.gz) = f2b3efbf1cf356d736740d531b6b22c4
-RMD160 (nano-1.2.5.tar.gz) = 92d694b79588fafdedc2731c2e1240bb100950f9
-SHA1 (nano-1.2.5.tar.gz) = ba55942aacf9f296a910d8f73afb7446f118830d
-SIZE (nano-1.2.5.tar.gz) = 911938
+MD5 (nano-2.0.1.tar.gz) = 8abe33be6816ad9acd17391806b42d92
+RMD160 (nano-2.0.1.tar.gz) = bce343f9f31c1cc63bd4b37a66fefcaa159a11cf
+SHA1 (nano-2.0.1.tar.gz) = 9c5e26893879355e41e417de30e9473439ceaf5d
+SIZE (nano-2.0.1.tar.gz) = 1299203
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 20 May 2005 21:18:13 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2005/05/20 21:18:13 naddy Exp $
---- Makefile.in.orig Fri May 20 21:10:08 2005
-+++ Makefile.in Fri May 20 21:10:30 2005
-@@ -224,7 +224,7 @@ nano_SOURCES = color.c \
- winio.c
-
- man_MANS = nano.1 nanorc.5
--nano_LDADD = @GLIB_LIBS@ @LIBINTL@
-+nano_LDADD = @GLIB_LIBS@ @LTLIBINTL@
- info_TEXINFOS = nano.texi
- EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
- README THANKS TODO UPGRADE config.rpath install-sh missing \
Index: patches/patch-doc_man_Makefile_in
===================================================================
RCS file: patches/patch-doc_man_Makefile_in
diff -N patches/patch-doc_man_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_man_Makefile_in 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- doc/man/Makefile.in.orig Thu Dec 7 16:56:35 2006
++++ doc/man/Makefile.in Thu Dec 7 16:56:55 2006
+@@ -586,11 +586,11 @@ uninstall-man: uninstall-man1 uninstall-
+
+
+ nano.1.html: nano.1
+- cat $< | groff -t -mandoc -Thtml > $@
++ cat $? | groff -t -mandoc -Thtml > $@
+ nanorc.5.html: nanorc.5
+- cat $< | groff -t -mandoc -Thtml > $@
++ cat $? | groff -t -mandoc -Thtml > $@
+ rnano.1.html: rnano.1
+- cat $< | groff -t -mandoc -Thtml > $@
++ cat $? | groff -t -mandoc -Thtml > $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: patches/patch-doc_man_fr_Makefile_in
===================================================================
RCS file: patches/patch-doc_man_fr_Makefile_in
diff -N patches/patch-doc_man_fr_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_man_fr_Makefile_in 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- doc/man/fr/Makefile.in.orig Thu Dec 7 16:59:14 2006
++++ doc/man/fr/Makefile.in Thu Dec 7 16:59:25 2006
+@@ -428,11 +428,11 @@ uninstall-man: uninstall-man1 uninstall-
+
+
+ nano.1.html: nano.1
+- cat $< | groff -t -mandoc -Thtml > $@
++ cat $? | groff -t -mandoc -Thtml > $@
+ nanorc.5.html: nanorc.5
+- cat $< | groff -t -mandoc -Thtml > $@
++ cat $? | groff -t -mandoc -Thtml > $@
+ rnano.1.html: rnano.1
+- cat $< | groff -t -mandoc -Thtml > $@
++ cat $? | groff -t -mandoc -Thtml > $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: patches/patch-doc_man_nano_1
===================================================================
RCS file: patches/patch-doc_man_nano_1
diff -N patches/patch-doc_man_nano_1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_man_nano_1 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/man/nano.1.orig Thu Dec 7 19:50:00 2006
++++ doc/man/nano.1 Thu Dec 7 19:50:46 2006
+@@ -224,8 +224,6 @@ http://www.nano-editor.org/
+ .PD 0
+ .TP
+ \fBnanorc\fP(5)
+-.PP
+-\fI/usr/share/doc/nano/\fP (or equivalent on your system)
+
+ .SH AUTHOR
+ Chris Allegretta <[EMAIL PROTECTED]>, et al (see \fIAUTHORS\fP and
Index: patches/patch-doc_man_nanorc_5
===================================================================
RCS file: patches/patch-doc_man_nanorc_5
diff -N patches/patch-doc_man_nanorc_5
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_man_nanorc_5 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- doc/man/nanorc.5.orig Sat Oct 28 21:21:12 2006
++++ doc/man/nanorc.5 Thu Dec 7 19:54:23 2006
+@@ -250,8 +250,7 @@ Per-user configuration file
+ .TP
+ \fBnano\fP(1)
+ .PP
+-\fI/usr/share/doc/nano/examples/nanorc.sample\fP (or equivalent on your
+-system)
++\fIPREFIX/share/examples/nano/nanorc.sample\fP
+ .SH AUTHOR
+ Chris Allegretta <[EMAIL PROTECTED]>, et al (see \fIAUTHORS\fP and
+ \fITHANKS\fP for details). This manual page was originally written by
Index: patches/patch-doc_syntax_asm_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_asm_nanorc
diff -N patches/patch-doc_syntax_asm_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_asm_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/syntax/asm.nanorc.orig Thu Jun 1 19:23:28 2006
++++ doc/syntax/asm.nanorc Thu Dec 7 17:32:53 2006
+@@ -1,7 +1,7 @@
+ ## Here is an example for assembler.
+ ##
+ syntax "asm" "\.(S|s|asm)$"
+-color red "\<[A-Z_]{2,}\>"
++color red "[[:<:]][A-Z_]{2,}[[:>:]]"
+ color brightgreen "\.(data|subsection|text)"
+ color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
+ color brightyellow
"\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
Index: patches/patch-doc_syntax_c_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_c_nanorc
diff -N patches/patch-doc_syntax_c_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_c_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- doc/syntax/c.nanorc.orig Mon Oct 2 19:13:33 2006
++++ doc/syntax/c.nanorc Thu Dec 7 17:32:53 2006
+@@ -1,13 +1,13 @@
+ ## Here is an example for C/C++.
+ ##
+ syntax "c" "\.(c(c|pp|xx)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
+-color brightred "\<[A-Z_][0-9A-Z_]+\>"
+-color green
"\<(float|double|bool|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+-color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
+-color green
"\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
+-color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
+-color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
+-color magenta "\<(goto|continue|break|return)\>"
++color brightred "[[:<:]][A-Z_][0-9A-Z_]+[[:>:]]"
++color green
"[[:<:]](float|double|bool|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)[[:>:]]"
++color green "[[:<:]]((s?size)|((u_?)?int(8|16|32|64|ptr)))_t[[:>:]]"
++color green
"[[:<:]](class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)[[:>:]]"
++color brightyellow "[[:<:]](for|if|while|do|else|case|default|switch)[[:>:]]"
++color brightyellow "[[:<:]](try|throw|catch|operator|new|delete)[[:>:]]"
++color magenta "[[:<:]](goto|continue|break|return)[[:>:]]"
+ color brightcyan
"^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+ color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'"
"'\\x[0-9A-Fa-f]{1,2}'"
+ ##
Index: patches/patch-doc_syntax_java_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_java_nanorc
diff -N patches/patch-doc_syntax_java_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_java_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- doc/syntax/java.nanorc.orig Thu Jun 8 14:49:57 2006
++++ doc/syntax/java.nanorc Thu Dec 7 17:32:53 2006
+@@ -1,11 +1,11 @@
+ ## Here is an example for Java.
+ ##
+ syntax "java" "\.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="\*/"
Index: patches/patch-doc_syntax_nanorc_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_nanorc_nanorc
diff -N patches/patch-doc_syntax_nanorc_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_nanorc_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- doc/syntax/nanorc.nanorc.orig Sat Jun 3 14:41:02 2006
++++ doc/syntax/nanorc.nanorc Thu Dec 7 17:32:53 2006
+@@ -4,11 +4,11 @@ syntax "nanorc" "\.?nanorc$"
+ ## Possible errors and parameters
+ icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
+ ## Keywords
+-icolor brightgreen
"^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>"
"^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>"
+-icolor green "^[[:space:]]*(set|unset|include|syntax)\>"
++icolor brightgreen
"^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)[[:>:]]"
"^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)[[:>:]]"
++icolor green "^[[:space:]]*(set|unset|include|syntax)[[:>:]]"
+ ## Colors
+-icolor yellow
"^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
+-icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
++icolor yellow
"^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?[[:>:]]"
++icolor magenta "^[[:space:]]*i?color[[:>:]]" "[[:<:]](start|end)="
+ ## Strings
+ icolor white ""(\\.|[^"])*""
+ ## Comments
Index: patches/patch-doc_syntax_perl_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_perl_nanorc
diff -N patches/patch-doc_syntax_perl_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_perl_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- doc/syntax/perl.nanorc.orig Thu Jun 1 19:23:28 2006
++++ doc/syntax/perl.nanorc Thu Dec 7 17:32:53 2006
+@@ -1,8 +1,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(dir)?)\>"
"\<(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(pi!
d)?|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(dir)?)[[:>:]]"
"[[:<:]](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)[[:>:]]"
+ icolor cyan start="[EMAIL PROTECTED]" end="( |[^0-9A-Z_]|-)"
+ color yellow "".*"|qq\|.*\|"
+ color white "[sm]/.*/"
Index: patches/patch-doc_syntax_pov_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_pov_nanorc
diff -N patches/patch-doc_syntax_pov_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_pov_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- doc/syntax/pov.nanorc.orig Thu Nov 2 07:32:02 2006
++++ doc/syntax/pov.nanorc Thu Dec 7 17:32:53 2006
+@@ -2,14 +2,14 @@
+ ##
+ syntax "pov" "\.(pov|POV|povray|POVRAY)$"
+ color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
+-color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
+-color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
+-color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
+-color brightred "^\<(texture)\>"
+-color brightred "\<(light_source|background)\>"
+-color brightred "\<(fog|object|camera)\>"
++color brightyellow
"[[:<:]](sphere|cylinder|translate|matrix|rotate|scale)[[:>:]]"
++color brightyellow
"[[:<:]](orthographic|location|up|right|direction|clipped_by)[[:>:]]"
++color brightyellow
"[[:<:]](fog_type|fog_offset|fog_alt|rgb|distance|transform)[[:>:]]"
++color brightred "^[[:<:]](texture)[[:>:]]"
++color brightred "[[:<:]](light_source|background)[[:>:]]"
++color brightred "[[:<:]](fog|object|camera)[[:>:]]"
+ color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+-color brightmagenta "\<(union|group|subgroup)\>"
++color brightmagenta "[[:<:]](union|group|subgroup)[[:>:]]"
+ ## Comment highlighting
+ color brightblue "//.*"
+ color brightblue start="/\*" end="\*/"
Index: patches/patch-doc_syntax_python_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_python_nanorc
diff -N patches/patch-doc_syntax_python_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_python_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/syntax/python.nanorc.orig Thu Jun 1 19:23:28 2006
++++ doc/syntax/python.nanorc Thu Dec 7 17:32:53 2006
+@@ -2,7 +2,7 @@
+ ##
+ syntax "python" "\.py$"
+ icolor brightblue "def [0-9A-Z_]+"
+-color brightcyan
"\<(and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|map|not|or|pass|print|raise|return|try|while)\>"
++color brightcyan
"[[:<:]](and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|map|not|or|pass|print|raise|return|try|while)[[:>:]]"
+ color brightgreen "["'].*[^\\]["']" "["']{3}.*[^\\]["']{3}"
+ color brightgreen start=""""[^"]" end=""""" start="'''[^']" end="'''"
+ color brightred "#.*$"
Index: patches/patch-doc_syntax_ruby_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_ruby_nanorc
diff -N patches/patch-doc_syntax_ruby_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_ruby_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- doc/syntax/ruby.nanorc.orig Fri Jul 7 15:54:38 2006
++++ doc/syntax/ruby.nanorc Thu Dec 7 17:32:53 2006
+@@ -2,13 +2,13 @@
+ ##
+ syntax "ruby" "\.rb$"
+ ## Asciibetical list of reserved words
+-color yellow
"\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
++color yellow
"[[:<:]](BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)[[:>:]]"
+ ## Constants
+-color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
++color brightblue "(\$|@|@@)?[[:<:]][A-Z]+[0-9A-Z_a-z]*"
+ ## Ruby "symbols"
+-icolor magenta "([ ]|^):[0-9A-Z_]+\>"
++icolor magenta "([ ]|^):[0-9A-Z_]+[[:>:]]"
+ ## Some unique things we want to stand out
+-color brightyellow "\<(__FILE__|__LINE__)\>"
++color brightyellow "[[:<:]](__FILE__|__LINE__)[[:>:]]"
+ ## Regular expressions
+ color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
+ ## Shell command expansion is in `backticks` or like %x{this}. These are
Index: patches/patch-doc_syntax_sh_nanorc
===================================================================
RCS file: patches/patch-doc_syntax_sh_nanorc
diff -N patches/patch-doc_syntax_sh_nanorc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_syntax_sh_nanorc 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- doc/syntax/sh.nanorc.orig Thu Jun 8 14:49:57 2006
++++ doc/syntax/sh.nanorc Thu Dec 7 17:32:53 2006
+@@ -2,11 +2,11 @@
+ ##
+ syntax "sh" "\.sh$"
+ icolor brightgreen "^[0-9A-Z_]+\(\)"
+-color green
"\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
++color green
"[[:<:]](case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)[[:>:]]"
+ color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+-color green "-[Ldefgruwx]\>"
+-color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+-color brightblue
"\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
++color green "-[Ldefgruwx][[:>:]]"
++color green "-(eq|ne|gt|lt|ge|le|s|n|z)[[:>:]]"
++color brightblue
"[[:<:]](cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)[[:>:]]"
+ icolor brightred "[EMAIL PROTECTED]"
+ color cyan "(^|[[:space:]])#.*$"
+ color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
Index: patches/patch-nanorc_sample
===================================================================
RCS file: patches/patch-nanorc_sample
diff -N patches/patch-nanorc_sample
--- patches/patch-nanorc_sample 30 Jun 2004 22:18:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-$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="[EMAIL PROTECTED]" 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 "^#.*$"
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile_in 7 Dec 2006 19:22:09 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Makefile.in.orig Thu Dec 7 16:52:54 2006
++++ src/Makefile.in Thu Dec 7 16:53:08 2006
+@@ -209,7 +209,7 @@ nano_SOURCES = browser.c \
+ utils.c \
+ winio.c
+
+-nano_LDADD = @GLIB_LIBS@ @LIBINTL@
++nano_LDADD = @GLIB_LIBS@ @LTLIBINTL@
+ all: all-am
+
+ .SUFFIXES:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/nano/pkg/PLIST,v
retrieving revision 1.17
diff -u -r1.17 PLIST
--- pkg/PLIST 7 Nov 2006 15:31:37 -0000 1.17
+++ pkg/PLIST 7 Dec 2006 19:22:09 -0000
@@ -1,10 +1,20 @@
@comment $OpenBSD: PLIST,v 1.17 2006/11/07 15:31:37 naddy Exp $
[EMAIL PROTECTED] editors/nano,slang
bin/nano
+bin/rnano
@info info/nano.info
[EMAIL PROTECTED] man/fr/
[EMAIL PROTECTED] man/fr/man1/
[EMAIL PROTECTED] @man man/fr/man1/nano.1
[EMAIL PROTECTED] @man man/fr/man1/rnano.1
[EMAIL PROTECTED] man/fr/man5/
[EMAIL PROTECTED] @man man/fr/man5/nanorc.5
@man man/man1/nano.1
[EMAIL PROTECTED] man/man1/rnano.1
@man man/man5/nanorc.5
share/examples/nano/
share/examples/nano/nanorc.sample
+share/locale/bg/LC_MESSAGES/nano.mo
share/locale/ca/LC_MESSAGES/nano.mo
share/locale/cs/LC_MESSAGES/nano.mo
share/locale/da/LC_MESSAGES/nano.mo
@@ -15,6 +25,7 @@
share/locale/eu/LC_MESSAGES/nano.mo
share/locale/fi/LC_MESSAGES/nano.mo
share/locale/fr/LC_MESSAGES/nano.mo
+share/locale/ga/LC_MESSAGES/nano.mo
share/locale/gl/LC_MESSAGES/nano.mo
share/locale/hu/LC_MESSAGES/nano.mo
share/locale/id/LC_MESSAGES/nano.mo
@@ -29,7 +40,28 @@
share/locale/pt_BR/LC_MESSAGES/nano.mo
share/locale/ro/LC_MESSAGES/nano.mo
share/locale/ru/LC_MESSAGES/nano.mo
+share/locale/rw/
+share/locale/rw/LC_MESSAGES/
+share/locale/rw/LC_MESSAGES/nano.mo
share/locale/sr/LC_MESSAGES/nano.mo
share/locale/sv/LC_MESSAGES/nano.mo
share/locale/tr/LC_MESSAGES/nano.mo
share/locale/uk/LC_MESSAGES/nano.mo
+share/locale/vi/LC_MESSAGES/nano.mo
+share/locale/zh_TW/LC_MESSAGES/nano.mo
+share/nano/
+share/nano/asm.nanorc
+share/nano/c.nanorc
+share/nano/groff.nanorc
+share/nano/html.nanorc
+share/nano/java.nanorc
+share/nano/man.nanorc
+share/nano/mutt.nanorc
+share/nano/nanorc.nanorc
+share/nano/patch.nanorc
+share/nano/perl.nanorc
+share/nano/pov.nanorc
+share/nano/python.nanorc
+share/nano/ruby.nanorc
+share/nano/sh.nanorc
+share/nano/tex.nanorc
--
Christian "naddy" Weisgerber [EMAIL PROTECTED]
