Sun Aug 31 12:09:48 2008 UTC ()
For now descend into old vi for virecover and doc. Unfortunately the
new vi vi.ref is now texinfo and our makeinfo is too old to deal with it.


(christos)
diff -r1.169 -r1.170 src/usr.bin/Makefile
diff -r1.12 -r1.13 src/usr.bin/vi/Makefile
cvs diff -r1.169 -r1.170 src/usr.bin/Makefile (expand / switch to unified diff)

--- src/usr.bin/Makefile 2008/08/31 05:17:31 1.169
+++ src/usr.bin/Makefile 2008/08/31 12:09:48 1.170
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.169 2008/08/31 05:17:31 christos Exp $ 1# $NetBSD: Makefile,v 1.170 2008/08/31 12:09:48 christos Exp $
2# from: @(#)Makefile 8.3 (Berkeley) 1/7/94 2# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6SUBDIR= apply apropos asa at audio awk \ 6SUBDIR= apply apropos asa at audio awk \
7 banner basename biff bthset btkey btpin \ 7 banner basename biff bthset btkey btpin \
8 bzip2 bzip2recover cal calendar cap_mkdb cdplay \ 8 bzip2 bzip2recover cal calendar cap_mkdb cdplay \
9 checknr chflags chpass cksum cmp col colcrt colrm \ 9 checknr chflags chpass cksum cmp col colcrt colrm \
10 column comm compress config crontab crunch csplit ctags cut \ 10 column comm compress config crontab crunch csplit ctags cut \
11 deroff db dirname du \ 11 deroff db dirname du \
12 eject elf2aout elf2ecoff env error expand extattr \ 12 eject elf2aout elf2ecoff env error expand extattr \
13 false fdformat fgen file find finger fmt fold fpr from \ 13 false fdformat fgen file find finger fmt fold fpr from \
14 fsplit fstat ftp gcore genassym gencat getconf getent getopt gprof \ 14 fsplit fstat ftp gcore genassym gencat getconf getent getopt gprof \
@@ -16,27 +16,27 @@ SUBDIR= apply apropos asa at audio awk \ @@ -16,27 +16,27 @@ SUBDIR= apply apropos asa at audio awk \
16 kdump ktrace ktruss lam last lastcomm ldd leave less \ 16 kdump ktrace ktruss lam last lastcomm ldd leave less \
17 lex locale locate lock logger login logname look lorder m4 \ 17 lex locale locate lock logger login logname look lorder m4 \
18 machine mail make man menuc mesg midiplay mixerctl mkcsmapper \ 18 machine mail make man menuc mesg midiplay mixerctl mkcsmapper \
19 mkdep mkesdb mkfifo mklocale mkstr mktemp moduli msgc msgs \ 19 mkdep mkesdb mkfifo mklocale mkstr mktemp moduli msgc msgs \
20 netgroup netstat newgrp newsyslog nfsstat nice nl nohup nvi \ 20 netgroup netstat newgrp newsyslog nfsstat nice nl nohup nvi \
21 pagesize passwd paste patch pathchk pkill pmap pmc pr \ 21 pagesize passwd paste patch pathchk pkill pmap pmc pr \
22 printenv printf progress pwhash qsubst quota radioctl rdist \ 22 printenv printf progress pwhash qsubst quota radioctl rdist \
23 renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh rup \ 23 renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh rup \
24 ruptime rusers rwall rwho script sdiff sdpquery sed seq shar shlock \ 24 ruptime rusers rwall rwho script sdiff sdpquery sed seq shar shlock \
25 showmount shuffle sockstat soelim sort spell split stat su systat \ 25 showmount shuffle sockstat soelim sort spell split stat su systat \
26 tail talk tcopy tee telnet tftp time tip tn3270 touch tput \ 26 tail talk tcopy tee telnet tftp time tip tn3270 touch tput \
27 tr true tset tsort tty ul uname unexpand unifdef \ 27 tr true tset tsort tty ul uname unexpand unifdef \
28 uniq units unvis usbhidaction usbhidctl users utoppya \ 28 uniq units unvis usbhidaction usbhidctl users utoppya \
29 uudecode uuencode uuidgen vacation vgrind vis vmstat vndcompress w \ 29 uudecode uuencode uuidgen vacation vgrind vi vis vmstat vndcompress w \
30 wall wc what whatis whereis who whois window \ 30 wall wc what whatis whereis who whois window \
31 write xargs xinstall xlint xstr yacc yes 31 write xargs xinstall xlint xstr yacc yes
32 32
33.if (${MKATF} != "no") 33.if (${MKATF} != "no")
34SUBDIR+= atf-compile atf-config atf-report atf-run atf-version 34SUBDIR+= atf-compile atf-config atf-report atf-run atf-version
35.endif 35.endif
36 36
37.if (${MKHESIOD} != "no") 37.if (${MKHESIOD} != "no")
38SUBDIR+= hesinfo 38SUBDIR+= hesinfo
39.endif 39.endif
40 40
41.if (${MKKERBEROS} != "no") 41.if (${MKKERBEROS} != "no")
42SUBDIR+= compile_et kdestroy kgetcred kinit klist mk_cmds string2key 42SUBDIR+= compile_et kdestroy kgetcred kinit klist mk_cmds string2key
cvs diff -r1.12 -r1.13 src/usr.bin/vi/Attic/Makefile (expand / switch to unified diff)

--- src/usr.bin/vi/Attic/Makefile 2006/10/08 21:47:21 1.12
+++ src/usr.bin/vi/Attic/Makefile 2008/08/31 12:09:48 1.13
@@ -1,17 +1,23 @@ @@ -1,17 +1,23 @@
1# $NetBSD: Makefile,v 1.12 2006/10/08 21:47:21 dogcow Exp $ 1# $NetBSD: Makefile,v 1.13 2008/08/31 12:09:48 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
 5MKOLDVI?=no
5.if ${MKSHARE} != "no" 6.if ${MKSHARE} != "no"
6SUBDIR+= catalog recover 7.if ${MKOLDVI} != "no"
 8SUBDIR+= catalog
 9.endif
 10SUBDIR+= recover
7.endif 11.endif
8 12
 13.if ${MKOLDVI} != "no"
9SUBDIR+= build 14SUBDIR+= build
 15.endif
10 16
11.if make(install) 17.if make(install)
12SUBDIR+= docs/USD.doc/edit docs/USD.doc/exref docs/USD.doc/vi.ref 18SUBDIR+= docs/USD.doc/edit docs/USD.doc/exref docs/USD.doc/vi.ref
13SUBDIR+= docs/USD.doc/vitut 19SUBDIR+= docs/USD.doc/vitut
14SUBDIR+= recover 20SUBDIR+= recover
15.endif 21.endif
16 22
17.include <bsd.subdir.mk> 23.include <bsd.subdir.mk>