upgrade to tcsh 6.10.00

--
From: naddy@

shells/tcsh/Makefile

@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2000/11/15 16:10:41 brad Exp $
+# $OpenBSD: Makefile,v 1.26 2000/12/31 19:22:56 brad Exp $
 
-DISTNAME=	tcsh-6.09.03
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	${PKGNAME:R}
+PKGNAME=	tcsh-6.10.00
 CATEGORIES=	shells
 NEED_VERSION=	1.336
-MASTER_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
+MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
+		http://www2.wbs.ne.jp/~znc/tcsh/
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
@@ -19,13 +20,16 @@ FLAVORS=	static
 FLAVOR?=
 
 .if ${FLAVOR:L} == "static"
-CONFIGURE_ENV+=	LDFLAGS="-static"
+CONFIGURE_ENV=	LDFLAGS="-static"
 .endif
 
 ALL_TARGET=	all catalogs
 
+WRKDIST=	${WRKDIR}/${PKGNAME}
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/nls/el_GR.ISO_8859-7
+	${INSTALL_DATA_DIR} ${PREFIX}/share/nls/uk_UA.KOI8-U
 	${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh
 	${INSTALL_MAN} ${WRKSRC}/tcsh.man ${PREFIX}/man/man1/tcsh.1
 	${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat
@@ -42,5 +46,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/tcsh.italian.cat ${PREFIX}/share/nls/it_CH.ISO_8859-1/tcsh.cat
 	${INSTALL_DATA} ${WRKSRC}/tcsh.italian.cat ${PREFIX}/share/nls/it_IT.ISO_8859-1/tcsh.cat
 	${INSTALL_DATA} ${WRKSRC}/tcsh.ja.cat ${PREFIX}/share/nls/ja_JP.EUC/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.ukrainian.cat ${PREFIX}/share/nls/uk_UA.KOI8-U/tcsh.cat
 
 .include <bsd.port.mk>

shells/tcsh/files/md5

@@ -1,3 +1,3 @@
-MD5 (tcsh-6.09.03.tar.gz) = 8fffe820e2cba4666f9a228ffffd65e5
-RMD160 (tcsh-6.09.03.tar.gz) = 178cdee07edb40115a5addf0a8e4755944791bf9
-SHA1 (tcsh-6.09.03.tar.gz) = d7358329cc4fbc30afc5ddaeccec4d22e394cdd0
+MD5 (tcsh-6.10.tar.gz) = f459c423074d85dfaa55439eb908a053
+RMD160 (tcsh-6.10.tar.gz) = 9df0155f3c65ea6e782ead67d0d30a067963e02b
+SHA1 (tcsh-6.10.tar.gz) = 29074c586d432087b08d492f116726aad26fd426

shells/tcsh/patches/patch-nls_Makefile

@@ -0,0 +1,10 @@
+$OpenBSD: patch-nls_Makefile,v 1.1 2000/12/31 19:22:57 brad Exp $
+--- nls/Makefile.orig	Sun Dec 31 14:54:37 2000
++++ nls/Makefile	Sun Dec 31 14:54:41 2000
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS=	C finnish french german greek italian ja spanish
++SUBDIRS=	C finnish french german greek italian ja spanish ukrainian
+ #GENCAT=	gencat -new
+ GENCAT=		gencat
+ 

shells/tcsh/patches/patch-sh.dol.c

@@ -1,44 +0,0 @@
---- sh.dol.c.orig	Sun Nov 12 15:22:50 2000
-+++ sh.dol.c	Sun Nov 12 15:27:11 2000
-@@ -1017,7 +1017,7 @@
- heredoc(term)
-     Char   *term;
- {
--    register int c;
-+    int c;
-     Char   *Dv[2];
-     Char    obuf[BUFSIZE], lbuf[BUFSIZE], mbuf[BUFSIZE];
-     int     ocnt, lcnt, mcnt;
-@@ -1025,7 +1025,9 @@
-     Char  **vp;
-     bool    quoted;
-     char   *tmp;
-+    struct timeval tv;
- 
-+again:
-     tmp = short2str(shtemp);
- #ifndef O_CREAT
- # define O_CREAT 0
-@@ -1036,9 +1038,19 @@
- #ifndef O_TEMPORARY
- # define O_TEMPORARY 0
- #endif
--    if (open(tmp, O_RDWR|O_CREAT|O_TEMPORARY) < 0) {
--	int     oerrno = errno;
--
-+#ifndef O_EXCL
-+# define O_EXCL 0
-+#endif
-+    if (open(tmp, O_RDWR|O_CREAT|O_EXCL|O_TEMPORARY) == -1) {
-+	int oerrno = errno;
-+	if (errno == EEXIST) {
-+	    if (unlink(tmp) == -1) {
-+		(void) gettimeofday(&tv, NULL);
-+		shtemp = Strspl(STRtmpsh, putn((((int)tv.tv_sec) ^ 
-+		    ((int)tv.tv_usec) ^ ((int)doldol)) & 0x00ffffff));
-+	    }
-+	    goto again;
-+	}
- 	(void) unlink(tmp);
- 	errno = oerrno;
- 	stderror(ERR_SYSTEM, tmp, strerror(errno));

shells/tcsh/pkg/PLIST

@@ -1,17 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.7 2000/08/02 03:25:39 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.8 2000/12/31 19:22:58 brad Exp $
 bin/tcsh
 man/man1/tcsh.1
 share/nls/C/tcsh.cat
-share/nls/fi_FI.ISO_8859-1/tcsh.cat
-share/nls/fr_FR.ISO_8859-1/tcsh.cat
-share/nls/fr_BE.ISO_8859-1/tcsh.cat
-share/nls/fr_CA.ISO_8859-1/tcsh.cat
-share/nls/fr_CH.ISO_8859-1/tcsh.cat
 share/nls/de_AT.ISO_8859-1/tcsh.cat
 share/nls/de_CH.ISO_8859-1/tcsh.cat
 share/nls/de_DE.ISO_8859-1/tcsh.cat
 share/nls/el_GR.ISO_8859-7/tcsh.cat
+share/nls/es_ES.ISO_8859-1/tcsh.cat
+share/nls/fi_FI.ISO_8859-1/tcsh.cat
+share/nls/fr_BE.ISO_8859-1/tcsh.cat
+share/nls/fr_CA.ISO_8859-1/tcsh.cat
+share/nls/fr_CH.ISO_8859-1/tcsh.cat
+share/nls/fr_FR.ISO_8859-1/tcsh.cat
 share/nls/it_CH.ISO_8859-1/tcsh.cat
 share/nls/it_IT.ISO_8859-1/tcsh.cat
-share/nls/es_ES.ISO_8859-1/tcsh.cat
 share/nls/ja_JP.EUC/tcsh.cat
+share/nls/uk_UA.KOI8-U/tcsh.cat