Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvi is now default

This commit is contained in:
christos 2008-08-31 05:17:31 +00:00
parent 3f1ec0f434
commit 0d6bb61e85
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.168 2008/08/16 23:59:45 gmcgarry Exp $
# $NetBSD: Makefile,v 1.169 2008/08/31 05:17:31 christos Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include <bsd.own.mk>
@ -17,7 +17,7 @@ SUBDIR= apply apropos asa at audio awk \
lex locale locate lock logger login logname look lorder m4 \
machine mail make man menuc mesg midiplay mixerctl mkcsmapper \
mkdep mkesdb mkfifo mklocale mkstr mktemp moduli msgc msgs \
netgroup netstat newgrp newsyslog nfsstat nice nl nohup \
netgroup netstat newgrp newsyslog nfsstat nice nl nohup nvi \
pagesize passwd paste patch pathchk pkill pmap pmc pr \
printenv printf progress pwhash qsubst quota radioctl rdist \
renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh rup \
@ -26,7 +26,7 @@ SUBDIR= apply apropos asa at audio awk \
tail talk tcopy tee telnet tftp time tip tn3270 touch tput \
tr true tset tsort tty ul uname unexpand unifdef \
uniq units unvis usbhidaction usbhidctl users utoppya \
uudecode uuencode uuidgen vacation vgrind vi vis vmstat vndcompress w \
uudecode uuencode uuidgen vacation vgrind vis vmstat vndcompress w \
wall wc what whatis whereis who whois window \
write xargs xinstall xlint xstr yacc yes
@ -47,10 +47,6 @@ SUBDIR+= hxtool verify_krb5_conf gss krb5-config
SUBDIR+= modstat
.endif
.if (${MKNVI} != "no")
SUBDIR+= nvi
.endif
.if (${MKSKEY} != "no")
SUBDIR+= skey skeyinfo skeyinit
.endif

10
usr.bin/nvi/build/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2008/08/29 00:02:24 gmcgarry Exp $
# $NetBSD: Makefile,v 1.6 2008/08/31 05:17:31 christos Exp $
.include <bsd.own.mk>
@ -16,7 +16,7 @@ WARNS=0
LDADD+= -lcurses
DPADD+= ${LIBCURSES}
PROG= nvi
PROG= vi
SRCS= api.c cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \
conv.c cut.c db.c db1.c delete.c ex.c ex_abbrev.c ex_append.c \
ex_args.c ex_argv.c ex_at.c ex_bang.c ex_cd.c ex_cmd.c ex_cscope.c \
@ -42,8 +42,8 @@ SRCS+= regcomp.c regerror.c regexec.c regfree.c
CPPFLAGS+=-I${DIST}/regex -D__REGEX_PRIVATE -DUSE_WIDECHAR
.endif
LINKS= ${BINDIR}/nvi ${BINDIR}/nex ${BINDIR}/nvi ${BINDIR}/nview
MLINKS= nvi.1 nex.1 nvi.1 nview.1
LINKS= ${BINDIR}/vi ${BINDIR}/ex ${BINDIR}/vi ${BINDIR}/view
MLINKS= vi.1 ex.1 vi.1 view.1
DPSRCS+=options_def.h
CLEANFILES+=options_def.h
@ -59,6 +59,6 @@ options_def.h: options.awk options.c
.PATH: ${DIST}/common
.PATH: ${DIST}/regex
BUILDSYMLINKS= ${DIST}/docs/vi.man/vi.1 nvi.1
BUILDSYMLINKS= ${DIST}/docs/vi.man/vi.1 vi.1
.include <bsd.prog.mk>