head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.106 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.104 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.102 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.100 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.98 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.96 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.94 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.92 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.90 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.88 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.86 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.84 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.82 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.80 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.78 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.76 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.74 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.72 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.70 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.68 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.66 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.64 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.62 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.58 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.38 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.60 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.56 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.54 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.52 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.50 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.48 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.46 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.44 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.42 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.40 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.36 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.34 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.32 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.30 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.28 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.26 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.24 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.22 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.20 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.18 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.16 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.14 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.12 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.10 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.8 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.6 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.4 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.2 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.3.0.28 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.26 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.24 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.22 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.20 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.18 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.16 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.14 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.12 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.10 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.8 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.6 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.4 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.2 pkgsrc-2009Q3-base:1.3 pkgsrc-2008Q4:1.2.0.8 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.6 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.4 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.2 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.1.0.12 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.10 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.8 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.6 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.4 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.4 date 2013.01.23.17.26.07; author wiz; state Exp; branches; next 1.3; 1.3 date 2009.08.07.16.39.21; author lukem; state Exp; branches; next 1.2; 1.2 date 2008.04.15.11.58.12; author wiz; state dead; branches; next 1.1; 1.1 date 2006.12.12.03.37.30; author dogcow; state Exp; branches; next ; desc @@ 1.4 log @Fix build with automake-1.13. While here, use a better WRKSRC and rebase patches. @ text @$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")); OI(O_KEYTIME, L("keytime=6")); + OI(O_MATCHCHARS, L("matchchars=()[]{}<>")); OI(O_MATCHTIME, L("matchtime=7")); (void)SPRINTF(b2, SIZE(b2), L("msgcat=%s"), _PATH_MSGCAT); OI(O_MSGCAT, b2); @@@@ -708,6 +726,14 @@@@ badnum: INT2CHAR(sp, name, STRLEN(nam break; } + /* Check for strings that must have even length */ + if (F_ISSET(op, OPT_PAIRS) && STRLEN(sep) & 1) { + msgq_wstr(sp, M_ERR, name, + "047|set: the %s option must be in two character groups"); + rval = 1; + break; + } + /* * Do nothing if the value is unchanged, the underlying * functions can be expensive. @ 1.3 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- ../common/options.c.orig 2007-11-19 03:41:42.000000000 +1100 +++ ../common/options.c @ 1.2 log @Update to 1.81.6: Changes since 1.81.5 * various compilation fixes * support for newer DBs * tcl support compiles again @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.1 2006/12/12 03:37:30 dogcow Exp $ d3 73 a75 3 --- ../common/db.c.orig 2001-08-19 07:52:00.000000000 +1000 +++ ../common/db.c 2006-12-03 15:21:22.000000000 +1000 @@@@ -94,6 +94,7 @@@@ a77 2 size_t nlen; + char *c_lp; d79 21 a99 10 /* * The underlying recno stuff handles zero by returning NULL, but @@@@ -164,7 +165,9 @@@@ nlen = 1024; retry: /* data.size contains length in bytes */ - BINC_GOTO(sp, (char *)ep->c_lp, ep->c_blen, nlen); + c_lp = (char *) ep->c_lp; + BINC_GOTO(sp, c_lp, ep->c_blen, nlen); + ep->c_lp = (CHAR_T *) c_lp; d101 11 a111 2 /* Get the line from the underlying database. */ memset(&key, 0, sizeof(key)); @ 1.1 log @Patches to avoid lvalue casting. Fixes PR/35179 and issues with gcc4. No new functionality. @ text @d1 1 a1 1 $NetBSD$ @