pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/nvi Apply various features and fixes from NetB...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ed5dedde2ff9
branches: trunk
changeset: 397009:ed5dedde2ff9
user: lukem <lukem%pkgsrc.org@localhost>
date: Fri Aug 07 16:39:20 2009 +0000
description:
Apply various features and fixes from NetBSD basesrc:
* Implement options:
expandtab
gtagsmode
matchchars
* Fix tty garbling when quitting from recovery mode.
* Don't coredump during autoindent edge case.
* Set internal version to "nvi-1.81.6nb4 (2009-08-07)"
* Crank pkgrevision to nb4.
diffstat:
editors/nvi/Makefile | 4 +-
editors/nvi/distinfo | 30 ++++++-
editors/nvi/patches/patch-aa | 6 +-
editors/nvi/patches/patch-ab | 13 +++
editors/nvi/patches/patch-ac | 14 +++
editors/nvi/patches/patch-ad | 14 +++
editors/nvi/patches/patch-ae | 14 +++
editors/nvi/patches/patch-af | 14 +++
editors/nvi/patches/patch-ag | 14 +++
editors/nvi/patches/patch-ah | 25 ++++++
editors/nvi/patches/patch-ai | 111 ++++++++++++++++++++++++++
editors/nvi/patches/patch-aj | 12 ++
editors/nvi/patches/patch-ak | 154 ++++++++++++++++++++++++++++++++++++
editors/nvi/patches/patch-al | 64 +++++++++++++++
editors/nvi/patches/patch-am | 99 +++++++++++++++++++++++
editors/nvi/patches/patch-an | 49 +++++++++++
editors/nvi/patches/patch-ao | 32 +++++++
editors/nvi/patches/patch-ap | 111 ++++++++++++++++++++++++++
editors/nvi/patches/patch-aq | 48 +++++++++++
editors/nvi/patches/patch-ar | 12 ++
editors/nvi/patches/patch-as | 16 +++
editors/nvi/patches/patch-at | 69 ++++++++++++++++
editors/nvi/patches/patch-au | 179 +++++++++++++++++++++++++++++++++++++++++++
editors/nvi/patches/patch-av | 12 ++
editors/nvi/patches/patch-aw | 14 +++
editors/nvi/patches/patch-ax | 22 +++++
editors/nvi/patches/patch-ay | 19 ++++
editors/nvi/patches/patch-az | 106 +++++++++++++++++++++++++
editors/nvi/patches/patch-ba | 7 +
29 files changed, 1277 insertions(+), 7 deletions(-)
diffs (truncated from 1417 to 300 lines):
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/Makefile
--- a/editors/nvi/Makefile Fri Aug 07 15:46:22 2009 +0000
+++ b/editors/nvi/Makefile Fri Aug 07 16:39:20 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2009/02/22 12:20:17 obache Exp $
+# $NetBSD: Makefile,v 1.37 2009/08/07 16:39:20 lukem Exp $
#
DISTNAME= nvi-1.81.6
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= editors
MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tar.bz2
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/distinfo
--- a/editors/nvi/distinfo Fri Aug 07 15:46:22 2009 +0000
+++ b/editors/nvi/distinfo Fri Aug 07 16:39:20 2009 +0000
@@ -1,6 +1,32 @@
-$NetBSD: distinfo,v 1.10 2008/12/21 23:02:24 epg Exp $
+$NetBSD: distinfo,v 1.11 2009/08/07 16:39:20 lukem Exp $
SHA1 (nvi-1.81.6.tar.bz2) = d3445ed69166102735335a2ff60d092d9a9143c6
RMD160 (nvi-1.81.6.tar.bz2) = 0db8568bea96392d9a027044177c60317c8ade36
Size (nvi-1.81.6.tar.bz2) = 1758309 bytes
-SHA1 (patch-aa) = 3dcd5033fd0d50a17dd3963640ae8f2aea2c8884
+SHA1 (patch-aa) = 05b8dedd194b09ed5af1fb62273e771ebd7f4326
+SHA1 (patch-ab) = 3687d1006015e84c1f9746b84e167602ae37b7fb
+SHA1 (patch-ac) = 3c345cb8871cb887a07ce83bbd43b1c49ebe4b33
+SHA1 (patch-ad) = d940a8c748c087aaf131817902d1f51d48b752c6
+SHA1 (patch-ae) = ad1f45c2feb26ab68626825cd5a1be1b33c30afb
+SHA1 (patch-af) = 69b9fff85c852df143eb1ff99a9d45aa7d83d2c4
+SHA1 (patch-ag) = 01df157bd10e03fe28dad7cbb06205c2cfc75691
+SHA1 (patch-ah) = c76390627309fecc852fd4fe7b73fc83aedeb060
+SHA1 (patch-ai) = 0a08e7f24adb0e6f2868e62cf6016d69ae728bb6
+SHA1 (patch-aj) = b81d2f3c320910b11dbb487fff8cd33aa2c23c04
+SHA1 (patch-ak) = 1e83a5f50fdb97c37e93536ac90e58513e81f77d
+SHA1 (patch-al) = 3d48b2af0f8651b100b82044e267b4d81b6c2772
+SHA1 (patch-am) = 65fb052102c91991af9326defeac7c729ba560b5
+SHA1 (patch-an) = a6535dfdaceb41209261d729d8b8c2da813149ea
+SHA1 (patch-ao) = 5dde6860125272f0687f5156485f3d1f43f6d93b
+SHA1 (patch-ap) = f7d23b584a9ea29cf62abf6a1a2e19e6ed120b34
+SHA1 (patch-aq) = 88b7c21c564fc817d615f3ae72fbc0dd517bc5f6
+SHA1 (patch-ar) = c2f139cc92e8a815345ae81e7cb57d2109ad4564
+SHA1 (patch-as) = ca88e0416999ad81098a41d041e51031092d2f4d
+SHA1 (patch-at) = 1fc5d51b90d282de9a8c2ed13ff85498167e98f3
+SHA1 (patch-au) = c34912b6d07acf95973426b352f55110c936a66f
+SHA1 (patch-av) = 218174e98f01ed8344aae44dcc28db77cc0fdc60
+SHA1 (patch-aw) = 678945c18fbbd9c5908aee4b1348ddfc2a3bda00
+SHA1 (patch-ax) = a93cc5271ff924d561b7d532dec280093637f42d
+SHA1 (patch-ay) = db7c5d05a28bb14fb351645de9426b34b659ed4b
+SHA1 (patch-az) = ba04f94a768c0c9d72f9810689c2f0c46e2e4e92
+SHA1 (patch-ba) = 3249565cb20d4b73acce2cc27945bddb0f9ab0da
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-aa
--- a/editors/nvi/patches/patch-aa Fri Aug 07 15:46:22 2009 +0000
+++ b/editors/nvi/patches/patch-aa Fri Aug 07 16:39:20 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2008/12/21 23:02:24 epg Exp $
+$NetBSD: patch-aa,v 1.4 2009/08/07 16:39:20 lukem Exp $
BDB 4.4 and up requires DB_CREATE or it will spew "DB_CREATE must be
specified to create databases." when nvi edits a file.
---- ../common/db.h.orig 2007-11-18 16:41:42.000000000 +0000
-+++ ../common/db.h 2008-12-21 00:18:11.000000000 +0000
+--- ../common/db.h.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../common/db.h
@@ -16,7 +16,10 @@
(env)->remove(env, path, NULL, flags)
#endif
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-ab Fri Aug 07 16:39:20 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2009/08/07 16:39:21 lukem Exp $
+
+--- ../common/exf.c.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../common/exf.c
+@@ -184,7 +184,7 @@ file_init(SCR *sp, FREF *frp, char *rcv_
+ CALLOC_RET(sp, ep, EXF *, 1, sizeof(EXF));
+ CIRCLEQ_INIT(&ep->scrq);
+ sp->c_lno = ep->c_nlines = OOBLNO;
+- ep->rcv_fd = ep->fcntl_fd = -1;
++ ep->fd = ep->rcv_fd = ep->fcntl_fd = -1;
+ F_SET(ep, F_FIRSTMODIFY);
+
+ /*
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-ac Fri Aug 07 16:39:20 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.3 2009/08/07 16:39:21 lukem Exp $
+
+--- ../catalog/dutch.base.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../catalog/dutch.base
+@@ -43,8 +43,7 @@
+ 044 "De lisp optie is niet ondersteund"
+ 045 "messages niet uitgeschakeld: %s"
+ 046 "messages niet geactiveerd: %s"
+-048 "De paragraph optie moet karakter paren bevatten"
+-049 "De section optie moet karakter paren bevatten"
++047 "set: de %s optie moet karakter paren bevatten"
+ 053 "De standaard buffer is leeg"
+ 054 "Buffer %s is leeg"
+ 055 "Bestanden met newlines in de naam kunnen niet hersteld worden"
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-ad Fri Aug 07 16:39:20 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.3 2009/08/07 16:39:21 lukem Exp $
+
+--- ../catalog/french.base.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../catalog/french.base
+@@ -43,8 +43,7 @@
+ 044 "L'option lisp n'est pas implémentée"
+ 045 "Les messages ne sont pas désactivés : %s"
+ 046 "Les messages ne sont pas activés : %s"
+-048 "L'option de paragraphe doit être en groupe de deux caractères"
+-049 "L'option de section doit être en groupe de deux caractères"
++047 "D?finition : l'option de %s doit ?tre en groupe de deux caract?res"
+ 053 "Le tampon par défaut est vide"
+ 054 "Le tampon %s est vide"
+ 055 "Les fichiers dont le nom contient des caractères de saut de ligne sont irrécupérables"
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-ae Fri Aug 07 16:39:20 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.5 2009/08/07 16:39:21 lukem Exp $
+
+--- ../catalog/german.base.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../catalog/german.base
+@@ -43,8 +43,7 @@
+ 044 "Die lisp-Option ist nicht implementiert"
+ 045 "Meldungen nicht abgeschaltet: %s"
+ 046 "Meldungen nicht eingeschaltet: %s"
+-048 "Die paragraph-Option muß Gruppen zu zwei Zeichen enthalten"
+-049 "Die section-Option muß Gruppen zu zwei Zeichen enthalten"
++047 "set: Die %s Option muss Gruppen zu zwei Zeichen enthalten"
+ 053 "Der Standardpuffer ist leer"
+ 054 "Puffer %s ist leer"
+ 055 "Dateien mit newlines im Namen sind nicht wiederherstellbar"
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-af Fri Aug 07 16:39:20 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.3 2009/08/07 16:39:21 lukem Exp $
+
+--- ../catalog/spanish.base.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../catalog/spanish.base
+@@ -43,8 +43,7 @@
+ 044 "La opci¢n lisp no est implementada"
+ 045 "mensajes no desconectados: %s"
+ 046 "mensajes no conectados: %s"
+-048 "La opci¢n de p rrafo debe estar en dos grupos de caracteres"
+-049 "La opci¢n de secci¢n debe estar en dos grupos de caracteres"
++047 "determinar: La opci¢n de %s debe estar en dos grupos de caracteres"
+ 053 "El buffer por omisi¢n est vac¡o"
+ 054 "El buffer %s est vac¡o"
+ 055 "Los archivos con nuevas l¡neas en el nombre son irrecuperables"
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-ag Fri Aug 07 16:39:20 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.3 2009/08/07 16:39:21 lukem Exp $
+
+--- ../catalog/swedish.base.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../catalog/swedish.base
+@@ -43,8 +43,7 @@
+ 044 "Lisp flaggan är inte implementerad"
+ 045 "meddelanden är inte avslagna: %s"
+ 046 "meddelanden är inte påslagna: %s"
+-048 "Paragraph flaggan måste ges i teckengrupper om två"
+-049 "Section flaggan måste ges i teckengrupper om två"
++047 "set: %s flaggan måste ges i teckengrupper om två"
+ 053 "Standardbufferten är tom"
+ 054 "Buffer %s är tom"
+ 055 "Filer med radmatning i namnet kan inte återskapas"
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-ah Fri Aug 07 16:39:20 2009 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ah,v 1.3 2009/08/07 16:39:21 lukem Exp $
+
+--- ../common/options.awk.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../common/options.awk
+@@ -2,6 +2,18 @@
+
+ /^\/\* O_[0-9A-Z_]*/ {
+- printf("#define %s %d\n", $2, cnt++);
+- next;
++ opt = $2
++ printf("#define %s %d\n", opt, cnt++)
++ ofs = FS
++ FS="\""
++ do getline
++ while ($1 != " {L(")
++ FS=ofs
++ opt_name = $2
++ if (opt_name < prev_name) {
++ printf "missorted %s: \"%s\" < \"%s\"\n", opt, opt_name, prev_name >"/dev/stderr"
++ exit 1
++ }
++ prev_name = opt_name
++ next
+ }
+ END {
diff -r 8cfc0ac96d22 -r ed5dedde2ff9 editors/nvi/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-ai Fri Aug 07 16:39:20 2009 +0000
@@ -0,0 +1,111 @@
+$NetBSD: patch-ai,v 1.3 2009/08/07 16:39:21 lukem Exp $
+
+--- ../common/options.c.orig 2007-11-19 03:41:42.000000000 +1100
++++ ../common/options.c
+@@ -48,6 +48,8 @@ static int opts_print __P((SCR *, OPT
+ *
+ * HPUX noted options and abbreviations are from "The Ultimate Guide to the
+ * VI and EX Text Editors", 1990.
++ *
++ * This list must be sorted...
+ */
+ OPTLIST const optlist[] = {
+ /* O_ALTWERASE 4.4BSD */
+@@ -76,10 +78,12 @@ OPTLIST const optlist[] = {
+ {L("directory"), NULL, OPT_STR, 0},
+ /* O_EDCOMPATIBLE 4BSD */
+ {L("edcompatible"),NULL, OPT_0BOOL, 0},
+-/* O_ESCAPETIME 4.4BSD */
+- {L("escapetime"), NULL, OPT_NUM, 0},
+ /* O_ERRORBELLS 4BSD */
+ {L("errorbells"), NULL, OPT_0BOOL, 0},
++/* O_ESCAPETIME 4.4BSD */
++ {L("escapetime"), NULL, OPT_NUM, 0},
++/* O_EXPANDTAB NetBSD 5.0 */
++ {L("expandtab"), NULL, OPT_0BOOL, 0},
+ /* O_EXRC System V (undocumented) */
+ {L("exrc"), NULL, OPT_0BOOL, 0},
+ /* O_EXTENDED 4.4BSD */
+@@ -90,6 +94,8 @@ OPTLIST const optlist[] = {
+ {L("fileencoding"),f_encoding, OPT_STR, OPT_WC},
+ /* O_FLASH HPUX */
+ {L("flash"), NULL, OPT_1BOOL, 0},
++/* O_GTAGSMODE FreeBSD/NetBSD */
++ {L("gtagsmode"),NULL, OPT_1BOOL, 0},
+ /* O_HARDTABS 4BSD */
+ {L("hardtabs"), NULL, OPT_NUM, 0},
+ /* O_ICLOWER 4.4BSD */
+@@ -120,6 +126,8 @@ OPTLIST const optlist[] = {
+ {L("lock"), NULL, OPT_1BOOL, 0},
+ /* O_MAGIC 4BSD */
+ {L("magic"), NULL, OPT_1BOOL, 0},
++/* O_MATCHCHARS netbsd 2.0 */
++ {L("matchchars"), NULL, OPT_STR, OPT_PAIRS},
+ /* O_MATCHTIME 4.4BSD */
+ {L("matchtime"), NULL, OPT_NUM, 0},
+ /* O_MESG 4BSD */
+@@ -146,7 +154,7 @@ OPTLIST const optlist[] = {
+ /* O_OPTIMIZE 4BSD */
+ {L("optimize"), NULL, OPT_1BOOL, 0},
+ /* O_PARAGRAPHS 4BSD */
+- {L("paragraphs"), f_paragraph, OPT_STR, 0},
++ {L("paragraphs"), NULL, OPT_STR, OPT_PAIRS},
+ /* O_PATH 4.4BSD */
+ {L("path"), NULL, OPT_STR, 0},
+ /* O_PRINT 4.4BSD */
+@@ -170,7 +178,7 @@ OPTLIST const optlist[] = {
+ /* O_SEARCHINCR 4.4BSD */
+ {L("searchincr"), NULL, OPT_0BOOL, 0},
+ /* O_SECTIONS 4BSD */
+- {L("sections"), f_section, OPT_STR, 0},
++ {L("sections"), NULL, OPT_STR, OPT_PAIRS},
+ /* O_SECURE 4.4BSD */
+ {L("secure"), NULL, OPT_0BOOL, OPT_NOUNSET},
+ /* O_SHELL 4BSD */
+@@ -255,7 +263,9 @@ static OABBREV const abbrev[] = {
+ {L("dir"), O_TMP_DIRECTORY}, /* 4BSD */
+ {L("eb"), O_ERRORBELLS}, /* 4BSD */
+ {L("ed"), O_EDCOMPATIBLE}, /* 4BSD */
++ {L("et"), O_EXPANDTAB}, /* NetBSD 5.0 */
+ {L("ex"), O_EXRC}, /* System V (undocumented) */
++ {L("gt"), O_GTAGSMODE}, /* FreeBSD, NetBSD */
+ {L("fe"), O_FILEENCODING},
+ {L("ht"), O_HARDTABS}, /* 4BSD */
+ {L("ic"), O_IGNORECASE}, /* 4BSD */
+@@ -307,6 +317,13 @@ opts_init(SCR *sp, int *oargs)
+ CHAR_T *wp;
+ size_t wlen;
+
++ if (sizeof optlist / sizeof optlist[0] - 1 != O_OPTIONCOUNT) {
++ fprintf(stderr, "vi: option table size error (%d != %d)\n",
++ (int)(sizeof optlist / sizeof optlist[0] - 1),
++ O_OPTIONCOUNT);
++ exit(1);
++ }
++
+ a.bp = b2;
+ b.bp = NULL;
+ a.len = b.len = 0;
+@@ -358,6 +375,7 @@ opts_init(SCR *sp, int *oargs)
+ OI(O_TMP_DIRECTORY, b2);
+ OI(O_ESCAPETIME, L("escapetime=1"));
Home |
Main Index |
Thread Index |
Old Index