Update to 6.22.02.

6.21 and 6.22 are bug fix releases with no new features.

Stop installing the message catalogs, which were already broken.
tcsh uses the obscure POSIX catopen() interface, which requires the
environment variable NLSPATH to be set to access the translations.
NLSPATH is not set by default on OpenBSD and users are unlikely to
figure out the necessary magic.  Discussed with schwarze@

shells/tcsh/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.60 2019/07/12 20:49:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.61 2019/12/06 20:19:34 naddy Exp $
 
 COMMENT=	extended C-shell with many useful features
 
-DISTNAME=	tcsh-6.20.00
-REVISION=	1
+DISTNAME=	tcsh-6.22.02
 CATEGORIES=	shells
 HOMEPAGE=	http://www.tcsh.org/
 
@@ -20,37 +19,19 @@ FLAVOR?=
 
 .if ${FLAVOR} == "static"
 CONFIGURE_ENV=	LDFLAGS="${STATIC}"
+WANTLIB=
 .endif
 
 CONFIGURE_STYLE=gnu
+# obsolete catopen(3) message catalogs
+CONFIGURE_ARGS+=--disable-nls-catalogs
 
-AUTOCONF_VERSION=2.59
+AUTOCONF_VERSION=2.69
 TEST_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS}
 TEST_FLAGS=	AUTOCONF_VERSION=${AUTOCONF_VERSION}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh
 	${INSTALL_MAN} ${WRKSRC}/tcsh.man ${PREFIX}/man/man1/tcsh.1
-.for S D in \
-	C	C		 \
-	et	et_EE.ISO-8859-1 \
-	finnish	fi_FI.ISO_8859-1 \
-	french	fr_BE.ISO_8859-1 \
-	french	fr_CA.ISO_8859-1 \
-	french	fr_CH.ISO_8859-1 \
-	french	fr_FR.ISO_8859-1 \
-	german	de_AT.ISO_8859-1 \
-	german	de_CH.ISO_8859-1 \
-	german	de_DE.ISO_8859-1 \
-	greek	el_GR.ISO_8859-7 \
-	italian	it_CH.ISO_8859-1 \
-	italian it_IT.ISO_8859-1 \
-	ja	ja_JP.EUC	 \
-	pl	pl_PL.ISO_8859-2 \
-	russian	ru_RU.KOI8-R	 \
-	spanish	es_ES.ISO_8859-1 \
-	ukrainian uk_UA.KOI8-U
-	${INSTALL_DATA} ${WRKSRC}/nls/$S.cat ${PREFIX}/share/nls/$D/tcsh.cat
-.endfor
 
 .include <bsd.port.mk>

shells/tcsh/distinfo

@@ -1,2 +1,2 @@
-SHA256 (tcsh-6.20.00.tar.gz) = uJ3nBkq1TaxFSiZs/l2L9mlAy17QSNDDBnTqYufs750=
-SIZE (tcsh-6.20.00.tar.gz) = 1001696
+SHA256 (tcsh-6.22.02.tar.gz) = 7ShxWMobALpHfo6le6xTYJg468/QX8sFypUCG36+iFs=
+SIZE (tcsh-6.22.02.tar.gz) = 1006405

shells/tcsh/patches/patch-sh_func_c

@@ -1,33 +0,0 @@
-$OpenBSD: patch-sh_func_c,v 1.3 2018/09/10 16:23:27 sthen Exp $
-
-From d8b47bd1934d1d9cb603e562b149bba2816d90ca Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 28 Nov 2016 17:14:20 +0000
-Subject: [PATCH] Fix type of read in prompt confirmation (eg. rmstar) (David
- Kaspar)
-
-Index: sh.func.c
---- sh.func.c.orig
-+++ sh.func.c
-@@ -2734,16 +2734,18 @@ nlsclose(void)
- int
- getYN(const char *prompt)
- {
--    int doit, c;
-+    int doit;
-+    char c;
-+
-     xprintf("%s", prompt);
-     flush();
--    (void) force_read(SHIN, &c, 1);
-+    (void) force_read(SHIN, &c, sizeof(c));
-     /* 
-      * Perhaps we should use the yesexpr from the
-      * actual locale
-      */
-     doit = (strchr(CGETS(22, 14, "Yy"), c) != NULL);
--    while (c != '\n' && force_read(SHIN, &c, 1) == 1)
-+    while (c != '\n' && force_read(SHIN, &c, sizeof(c)) == sizeof(c))
- 	continue;
-     return doit;
- }

shells/tcsh/pkg/PLIST

@@ -1,21 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.13 2016/05/31 12:11:34 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.14 2019/12/06 20:19:34 naddy Exp $
 @shell bin/tcsh
 @man man/man1/tcsh.1
-share/nls/C/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/et_EE.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/ja_JP.EUC/tcsh.cat
-share/nls/pl_PL.ISO_8859-2/tcsh.cat
-share/nls/ru_RU.KOI8-R/tcsh.cat
-share/nls/uk_UA.KOI8-U/tcsh.cat