Upgrade csh.

bin/csh/Makefile

@@ -6,36 +6,66 @@
 #
 # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
 
+TCSHDIR=	${.CURDIR}/../../contrib/tcsh
+.PATH: ${TCSHDIR}
+
 PROG=	csh
-DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS
-CFLAGS+=-I${.CURDIR} -I. ${DFLAGS}
-SRCS=	alloc.c char.c const.c csh.c dir.c dol.c err.c exec.c exp.c file.c \
-	func.c glob.c hist.c init.c lex.c misc.c parse.c printf.c proc.c \
-	sem.c set.c str.c time.c const.h errnum.h
-.PATH:	${.CURDIR}/../../usr.bin/printf
+DFLAGS=	-D_PATH_TCSHELL='"${DESTDIR}/bin/${PROG}"'  
+CFLAGS+= -I${TCSHDIR} -I${.CURDIR} -I. ${DFLAGS}
+SRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
+	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
+	sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \
+	sh.set.c sh.time.c sh.h sh.char.h sh.dir.h sh.proc.h
+SRCS+=	sh.decls.h glob.c glob.h mi.termios.c mi.wait.h mi.varargs.h
+SRCS+=	tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \
+	tw.comp.c tw.color.c
+SRCS+=	ed.chared.c ed.decls.h ed.defns.c ed.h ed.init.c ed.inputl.c \
+	ed.refresh.c ed.screen.c ed.xmap.c ed.term.c ed.term.h
+SRCS+=	tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c \
+	tc.func.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \
+	tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h \
+	tc.who.c tc.h
+SRCS+=	tc.defs.c
 
 MAN1=	csh.1
 # MLINKS for Shell built in commands for which there are no userland
 # utilities of the same name are handled with the associated manpage,
 # builtin.1 in share/man/man1/.
 
-CLEANFILES+=const.h errnum.h
+DPADD+=		${LIBNCURSES} ${LIBCRYPT}
+LDADD+=		-lncurses -lcrypt
 
-const.h: errnum.h
+csh.1: tcsh.man
+	ln -sf ${.ALLSRC} ${.TARGET}
 
-errnum.h: err.c
+GENHDRS+=	ed.defns.h tc.const.h sh.err.h
+SRCS+=		${GENHDRS}
+CLEANFILES+= ${GENHDRS}
+
+ed.defns.h: ed.defns.c
 	@rm -f ${.TARGET}
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
-	@echo '#ifndef _h_sh_error' >> ${.TARGET}
-	@echo '#define _h_sh_error' >> ${.TARGET}
+	@echo '#ifndef _h_ed_defns' >> ${.TARGET}
+	@echo '#define _h_ed_defns' >> ${.TARGET}
+	grep '[FV]_' ${TCSHDIR}/ed.defns.c | grep '^#define' >> ${.TARGET}
+	@echo '#endif /* _h_ed_defns */' >> ${.TARGET}
+
+sh.err.h: sh.err.c
+	@rm -f ${.TARGET}
+	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
+	@echo '#ifndef _h_sh_err' >> ${.TARGET}
+	@echo '#define _h_sh_err' >> ${.TARGET}
 	egrep 'ERR_' ${.ALLSRC} | egrep '^#define' >> ${.TARGET}
-	@echo '#endif /* _h_sh_error */' >> ${.TARGET}
+	@echo '#endif /* _h_sh_err */' >> ${.TARGET}
 
-const.h: const.c
+tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	@rm -f ${.TARGET}
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
-	${CC} -E ${CFLAGS} ${.ALLSRC} | egrep 'Char STR' | \
+	@echo '#ifndef _h_tc_const' >> ${.TARGET}
+	@echo '#define _h_tc_const' >> ${.TARGET}
+	${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | egrep 'Char STR' | \
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> ${.TARGET}
+	@echo '#endif /* _h_tc_const */' >> ${.TARGET}
 
 .include <bsd.prog.mk>