Commit Graph

57 Commits

Author SHA1 Message Date
Baptiste Daroussin
6680e5a52f import nvi 2.2.0-3bbdfe4 2021-05-21 22:51:21 +02:00
Baptiste Daroussin
110d525ec6 Update nvi to 2.2.0
Main changes:
* Vim-style expandtab option
* Provides Turkish translation
* Backspace now deletes \ rather than being escaped
* T during motion commands is now VI-compatible
* Encoding related fixes, such as UTF-8 detection
* Fixed a number of memory management issues

MFC after:	3 weeks
2020-09-09 08:38:47 +00:00
Warner Losh
fddfaafd65 Remove RELEASE_CRUNCH here
If someone wants to subset, they can set MK_ICONV=no. We no longer use it for
the release.
2019-07-19 20:04:31 +00:00
Warner Losh
a35f04fba2 Adopt SRCTOP in usr.bin
Prefer ${SRCTOP}/foo over ${.CURDIR}/../../foo and ${SRCTOP}/usr.bin/foo
over ${.CURDIR}/../foo for paths in Makefiles.

Differential Revision:	https://reviews.freebsd.org/D9932
Sponsored by:		Netflix
Silence on:		arch@ (twice)
2017-03-12 18:58:44 +00:00
Glen Barber
17f1329d94 Create a package for vi(1) and related files.
Sponsored by:	The FreeBSD Foundation
2016-02-02 16:47:50 +00:00
Baptiste Daroussin
c271fa9295 Update nvi to 2.1.3 which fixes the data corruption when locale conversion
failed
2015-04-10 17:50:28 +00:00
Baptiste Daroussin
3e11bd9e2a Convert to usr.bin/ to LIBADD
Reduce overlinking
2014-11-25 14:29:10 +00:00
Brooks Davis
80189b3b09 Replace all uses of libncurses and libtermcap with their wide character
variants.  This allows usable file system images (i.e. those with both a
shell and an editor) to be created with only one copy of the curses library.

Exp-run:	antoine
PR:		189842
Discussed with:	bapt
Sponsored by:	DARPA, AFRL
2014-07-17 18:24:34 +00:00
Brooks Davis
525e2a83f6 Revert r261296. This removes the WITHOUT_NCURSESW option.
It was the wrong direction.  We will instead remove use of the
non-wide-character supporting libncurses.
2014-05-15 16:44:25 +00:00
Warner Losh
c6063d0da8 Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.
2014-05-06 04:22:01 +00:00
Brooks Davis
38e233371c Merge from CheriBSD:
commit c1acf022c533c5ae27e0cd556977eafe3f5959eb
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date:   Fri Jan 17 21:46:44 2014 +0000

    Add an option WITHOUT_NCURSESW to suppress building and linking to
    libncursesw.  While wide character support it useful we'd like to
    only need one ncurses library on embedded systems.

MFC after:	4 weeks
Sponsored by:	DARPA, AFRL
2014-01-30 21:08:36 +00:00
Peter Wemm
f0957ccae4 Update nvi-1.79 to 2.1.1-4334a8297f
This is the gsoc-2011 project to clean up and backport multibyte support
from other nvi forks in a form we can use.

USE_WIDECHAR is on unless building for the rescue crunchgen. This should
allow editing in the native locale encoding.

USE_ICONV depends on make.conf having 'WITH_ICONV=YES' for now.  This
adds the ability to do things like edit a KOI8-R file while having $LANG
set to (say) en_US.UTF-8.  iconv is used to transcode the characters for
display.

Other points:
* It uses gencat and catopen/etc instead of homegrown msg catalog stuff.
* A lot of stuff has been trimmed out, eg: the perl and tcl bindings which
  we could never use in base anyway.
* It uses ncursesw when in widechar mode.  This could be interesting.

GSoC info: http://www.google-melange.com/gsoc/proposal/review/google/gsoc2011/zy/1
Repo at: https://github.com/lichray/nvi2

Obtained from:  Zhihao Yuan <lichray@gmail.com>
2013-08-11 20:03:12 +00:00
Ed Schouten
b7946da96b Build usr.bin/ with WARNS=6 by default.
Also add some missing $FreeBSD$ to keep svn happy.
2010-01-02 10:27:05 +00:00
Ruslan Ermilov
bd2e7b7478 Replaced afterinstall: with equivalent FILES and SYMLINKS. 2004-10-18 17:16:01 +00:00
Ruslan Ermilov
47d7e8a96f Fixed style of DPADD and LDADD assignments as per style.Makefile(5). 2004-02-05 22:44:25 +00:00
Andrey A. Chernov
3232f62c25 FIx catalog name I overlook in prev. obsolete locales removing
Submitted by:   ru
2003-06-23 13:08:22 +00:00
Andrey A. Chernov
1d35769ff1 Remove deprecated locale names 2003-06-10 01:54:10 +00:00
Peter Wemm
96ca3aa8db Unifdef has got some crack-smoking exit values:
"The unifdef utility exits 0 if the output is an exact copy of the input,
    1 if not, and 2 if in trouble."

This causes an 'Error code 1 (ignored)' in the world output, which upsets
the whereintheworld scripts that the tinderboxes use.

However, this stuff here is a relic.  We do not enable HAVE_TCL_INTERP
nor HAVE_PERL_INTERP..  The Makefile hooks to turn them on have gone ages
ago, and this stuff was here for release building purposes only.  Rather
than fight with the tinderbox builds, clean house a bit and remove the
last remaining unused relics of this stuff.
2003-01-04 20:24:27 +00:00
Ruslan Ermilov
d2893b161b Drop support for COPY, -c has been the default mode of install(1)
for a long time now.

Approved by:	bde
2002-07-29 09:40:17 +00:00
Ruslan Ermilov
0b87f79976 s/${INSTALL} -c/${INSTALL} ${COPY}/ 2002-07-18 12:07:49 +00:00
Mark Murray
ccde38c38d Remove Perl and TCL/TK bits, neither of which are in the base system
(anymore).
2002-05-18 14:27:17 +00:00
Mark Murray
e35f9517d6 Remove NO_WERRORs and WARNS=n's. To be revisited after GCC3. 2002-02-08 23:07:37 +00:00
Mark Murray
e4d5827537 Protect this against the to-come WARNS=2 default. 2001-12-11 23:05:06 +00:00
Dima Dorfman
ca0589467f Style fix: use .else where appropriate.
PR:		29489
Submitted by:	Joseph Mallett <jmallett@xMach.org>
2001-08-09 07:03:11 +00:00
Andrey A. Chernov
0503c005e0 Add more *.US-ASCII entries 2001-06-10 20:53:18 +00:00
Andrey A. Chernov
092b7f296c Understand new locale names and Latin15 2001-06-10 17:26:35 +00:00
Ruslan Ermilov
3c4869d927 Drop support for -DRELEASE_BUILD_FIXIT and -DCRUNCHED_BINARY in
${CFLAGS}.  The only supported method thus is -DRELEASE_CRUNCH.
2001-04-03 13:34:35 +00:00
Ruslan Ermilov
dc12be5258 MAN[1-9] -> MAN. 2001-03-27 10:52:19 +00:00
Alexey Zelkin
86bbb70c13 Install Ukrainian message catalog. 2000-08-22 22:00:57 +00:00
Mark Murray
c8d0d39eb8 Perl support in vi is broken if perl has thread support built in.
Document this. Minor nitpick in other comments.
1999-09-04 10:27:12 +00:00
Peter Wemm
1da5e923ab We're using ncurses now. 1999-08-30 08:28:47 +00:00
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
Peter Wemm
766e996f98 The perlinterp option builds and works, but I'm not so sure how it'll go
in a release or buildworld environment, so I'll leave it disabled.
1998-12-16 04:02:56 +00:00
Satoshi Asami
ff5fcc93d4 Remove tcl from /usr/src, according to prior agreement. BTW, tcl-8.0 *is*
a port so there is nothing to be done on that side now.

Approved by:	jkh
===
To: "Jordan K. Hubbard" <jkh@time.cdrom.com>
cc: Andreas Klemm <andreas@klemm.gtn.com>, current@freebsd.org
Subject: Re: Make this a relese coordinator decision (was Re: ports-current/packages-current discontinued)
From: David Greenman <dg@root.com>
Date: Sun, 03 Aug 1997 20:23:31 -0700

>decision is, I'll respect it.

   Another chance to architect people's principles...I can hardly wait. Seems
quite appropriate for a Sunday - I just need to get one of those collection
plates (and money envelopes) so I can profit, too. :-)
   Tcl stays in /usr/src for now, but it needs to be kept up to date; same
for perl. If Jordan doesn't have "setup" (written in tcl) ready for 3.0,
then tcl will be yanked prior to the 3.0 release (and made into a port).
   As for the ports tree only supporting the last FreeBSD release, this seems
sensible to me. The "ports" have always been a moving target between releases
and the problem is only going to get worse when we expand to supporting other
processor architectures. In any case, Satoshi is and always has been in charge
of the ports tree and whatever he wants to do with it (within reason :-)) is
his decision.
   Does this cover the issue completely? I admit to deleting messages in this
thread with unusual fervor (people have FAR too much time on their hands!).
There's a fair bit of reasoning behind the above, but since everyone is sick
of arguing about this, I'll spare you the analysis.

-DG

David Greenman
Core-team/Principal Architect, The FreeBSD Project
1998-09-05 12:25:55 +00:00
Warner Losh
205a8ea824 $@ is deprecated, use ${.TARGET} instead. Ditto for other single character
$n.
PR:		 conf/3273
1998-06-09 04:07:23 +00:00
Wolfram Schneider
eb00d48411 Polish message catalogs for vi.
Submitted by: abial@warman.org.pl
PR:         4522
1997-09-22 23:14:37 +00:00
Satoshi Asami
00411e3f12 Fix 1.17 properly by adding ${DESTDIR} in front. (I know this part is
not enabled now.)
1997-08-19 01:52:11 +00:00
Peter Wemm
92aa56df40 Drop the TCL hook for the time being until the tcl dust settles some more. 1997-08-18 05:25:14 +00:00
Andreas Klemm
4e0636b91d Fixed another make world stopper ;)
If TCLINTERP is defined, CFLAGS needs an additional include path:
	 -I/usr/include/tcl
Otherwise tcl.h can't be found during make world.
1997-08-17 21:33:39 +00:00
Jordan K. Hubbard
4dfa17296a Enable GLOBAL tags support. 1997-04-18 23:44:54 +00:00
Peter Wemm
a1b0f30719 Oops. Broke golden rule #1: test everything before commit. :-] 1997-04-12 14:34:02 +00:00
Peter Wemm
0be88738f6 Respect NOTCL, don't link with libtcl for the scripting support if
we're not building it.
1997-04-12 14:28:13 +00:00
Peter Wemm
c115df18cd Revert $FreeBSD$ to $Id$ 1997-02-22 19:58:13 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Bruce Evans
015a0dc2e4 Use ${COPY} instead of -c for installing non-source files. 1997-01-01 04:22:23 +00:00
Peter Wemm
9a42f83552 When using the perl5 extensions, ask perl itself what the pathnames are,
don't just hard code them into the Makefile.

(This is the optional stuff to use perl scripts as a vi scripting language.
 eg, to load a sample script, type:   :perl do 'wc.pl';
 this loads /usr/share/vi/perl/wc.pl to add the "wc" command. Then, one can
 do this:   :perl wc   Yes, this is a trivial example. There are more
 useful examples, eg 'make' output parsing along the lines of emacs's
 "compile" mode.  The tcl extension is similar and enabled by default since
 we ship with tcl.)
1996-12-30 09:24:19 +00:00
Andrey A. Chernov
6e1b71c5b8 Link Dutch catalog with nl_NL instead of da_DK 1996-12-08 14:05:08 +00:00
Andrey A. Chernov
7be3905425 Add ru_RU as alias to ru_SU 1996-11-21 10:13:25 +00:00
Paul Richards
b345ce1b4c Added a missing \ for installing perl modules.
2.2 and 2.1.6 candidate.
1996-11-10 15:49:49 +00:00
Joerg Wunsch
647518cf5a Merge from the 2.2 branch: avoid including the API stuff when building
vi for the fixit floppy.  Perhaps we'll find a more elegant solution
some day, by now it has proven to work reasonably.
1996-11-09 16:54:33 +00:00