Upgrade to 6.10

bin/csh/Makefile

@@ -16,7 +16,7 @@ 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
+	sh.set.c sh.time.c sh.char.h sh.dir.h sh.proc.h sh.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
@@ -26,8 +26,7 @@ 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
+GENHDRS= ed.defns.h sh.err.h tc.const.h tc.defs.c
-GENHDRS= ed.defns.h sh.err.h tc.const.h
 SRCS+=	${GENHDRS}
 
 MAN1=	csh.1
@@ -41,11 +40,20 @@ LDADD=	-ltermcap -lcrypt
 
 LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
 
-CLEANFILES= ${GENHDRS} csh.1
+CLEANFILES= ${GENHDRS} gethost csh.1
 
 csh.1: tcsh.man
 	ln -sf ${.ALLSRC} ${.TARGET}
 
+gethost: gethost.c sh.err.h tc.const.h sh.h
+	@rm -f ${.TARGET}
+	${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${TCSHDIR}/gethost.c
+
+tc.defs.c: gethost ${.CURDIR}/host.defs
+	@rm -f ${.TARGET}
+	@echo "/* Do not edit this file, make creates it */" > ${.TARGET}
+	./gethost ${.CURDIR}/host.defs >> ${.TARGET}
+
 ed.defns.h: ed.defns.c
 	@rm -f ${.TARGET}
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
@@ -59,7 +67,7 @@ sh.err.h: sh.err.c
 	@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}
+	grep 'ERR_' ${.ALLSRC} | grep '^#define' >> ${.TARGET}
 	@echo '#endif /* _h_sh_err */' >> ${.TARGET}
 
 tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
@@ -67,7 +75,7 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
 	@echo '#ifndef _h_tc_const' >> ${.TARGET}
 	@echo '#define _h_tc_const' >> ${.TARGET}
-	${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | egrep 'Char STR' | \
+	${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | grep 'Char STR' | \
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> ${.TARGET}
 	@echo '#endif /* _h_tc_const */' >> ${.TARGET}

bin/csh/nls/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR= finnish french ja german italian spanish
+SUBDIR= finnish french ja german italian spanish ukrainian
 
 # We are not ready for greek yet
 #SUBDIR+= greek

bin/csh/nls/ukrainian/Makefile

@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+NL=     ukrainian
+DL=     uk_UA.KOI8-U
+
+.PATH: ${BASESRC}/${NL}
+
+tcsh.msg: set[0-9]*
+	cat ${BASESRC}/${NL}/set[0-9] \
+	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
+
+install:
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
+
+.include <bsd.prog.mk>