Pullup ticket #6091 - requested by leot

shells/tcsh: bugfix

Revisions pulled up:
- shells/tcsh/Makefile                                          1.93
- shells/tcsh/distinfo                                          1.43
- shells/tcsh/patches/patch-tests_subst.at                      deleted
- shells/tcsh/patches/patch-tests_variables.at                  deleted

---
   Module Name:    pkgsrc
   Committed By:   leot
   Date:           Thu Nov 28 20:46:40 UTC 2019

   Modified Files:
           pkgsrc/shells/tcsh: Makefile distinfo
   Removed Files:
           pkgsrc/shells/tcsh/patches: patch-tests_subst.at
               patch-tests_variables.at

   Log Message:
   {standalone-,static-,}tcsh: Update to 6.22.00

   pkgsrc changes:
    - Remove no longer needed patches (both backport from upstream to 6.21.00)

   Changes:
   V6.22.00 - 20191128
   -------------------
    - PR/113: Sobomax: avoid infinite loops for -c commands when stdout is
      not a tty.
    - Avoid infinite loops during history loads when merging, print a better
      error for errors during history load.
    - PR/88: Preserve empty arguments in :q
    - PR/94: Small apple issues (SAVESIGVEC, HOSTTYPE)
    - PR/81: Fix range matching issue where we were comparing with the
      range character instead of the start of range. [l-z]* would match foo

4 files changed, 7 insertions, 58 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 3be616d4153..818f9067b67 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.92 2019/08/11 13:23:02 wiz Exp $
+# $NetBSD: Makefile,v 1.92.2.1 2019/12/07 10:58:32 bsiegert Exp $
 #
 # used by shells/standalone-tcsh/Makefile
 # used by shells/static-tcsh/Makefile
 
-DISTNAME=	tcsh-6.21.00
+DISTNAME=	tcsh-6.22.00
 PKGREVISION?=	0			# use ?= to allow for overrides.
-PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/
 MASTER_SITES+=	ftp://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index c7fbe854cfd..6e89f767076 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.42 2019/05/15 09:18:01 leot Exp $
+$NetBSD: distinfo,v 1.42.4.1 2019/12/07 10:58:32 bsiegert Exp $
 
-SHA1 (tcsh-6.21.00.tar.gz) = aeb43ee952d47bdf33cc29fdecd170cfedbe8481
-RMD160 (tcsh-6.21.00.tar.gz) = 665d522ded31e3fa23b71a5726d2d52e1c60e085
-SHA512 (tcsh-6.21.00.tar.gz) = d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
-Size (tcsh-6.21.00.tar.gz) = 1001909 bytes
+SHA1 (tcsh-6.22.00.tar.gz) = e219409934060af8aa278db20d712b5b7777b531
+RMD160 (tcsh-6.22.00.tar.gz) = 18e13da1601ffee536a11ef22391cad978380fbc
+SHA512 (tcsh-6.22.00.tar.gz) = 533d61a4870fcbf759a07347578a20557865a2bc363c971210bd86f17439c3188352a502cfd09f0b134d41ec9df5c174d017f15fe3a54c63ab35034b9cf2ccaf
+Size (tcsh-6.22.00.tar.gz) = 1002785 bytes
 SHA1 (patch-aa) = 6ec2bcee6029e733743a73d267aa51bfcc898843
 SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2
 SHA1 (patch-configure) = 6970c041a66910325d1fb53ebf8ab3627d764778
 SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7
 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e
-SHA1 (patch-tests_subst.at) = 3be0ec07237e12653805644f1d545122842e97c9
-SHA1 (patch-tests_variables.at) = 809c7c006f59581bdae8280eabc7a43ce93a697d
diff --git a/shells/tcsh/patches/patch-tests_subst.at b/shells/tcsh/patches/patch-tests_subst.at
deleted file mode 100644
index 60d5ee8f25b..00000000000
--- a/shells/tcsh/patches/patch-tests_subst.at
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-tests_subst.at,v 1.1 2019/05/15 09:18:01 leot Exp $
-
-Reset $HOME before tests that need $HOME.
-
-From upstream commit cb71f67782b2829ca66b341daba70e501d028eee.
-
---- tests/subst.at.orig	2019-05-08 18:39:28.000000000 +0000
-+++ tests/subst.at
-@@ -50,11 +50,11 @@ nothing*
- foo* ab{c,d} ^fo*
- ])
- 
--AT_CHECK([echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'],
-+AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }'); echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'],
- , [1
- ])
- 
--AT_CHECK([echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq dnl
-+AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }'); echo "echo ~$(id -un)/foo; echo \"\$HOME/foo\"" | tcsh -f | uniq dnl
- 	  | wc -l | tr -d ' \t'], , [1
- ])
- 
diff --git a/shells/tcsh/patches/patch-tests_variables.at b/shells/tcsh/patches/patch-tests_variables.at
deleted file mode 100644
index 2ac08a8dd2e..00000000000
--- a/shells/tcsh/patches/patch-tests_variables.at
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-tests_variables.at,v 1.1 2019/05/15 09:18:01 leot Exp $
-
-Reset $HOME before tests that need $HOME.
-
-From upstream commit cb71f67782b2829ca66b341daba70e501d028eee.
-
---- tests/variables.at.orig	2019-05-08 18:39:28.000000000 +0000
-+++ tests/variables.at
-@@ -588,7 +588,7 @@ printenv HOME
- setenv HOME /bar
- echo $home
- ]])
--AT_CHECK([tcsh -f home.csh], ,
-+AT_CHECK([export HOME=$(getent passwd $(id -nu) | awk -F: '{ print $(NF - 1) }'); tcsh -f home.csh], ,
- [1
- 1
- /foo
-@@ -705,7 +705,7 @@ AT_CLEANUP
- 
- 
- AT_SETUP([$ cdtohome])
--AT_CHECK([tcsh -f -c 'cd'], 0)
-+AT_CHECK([export HOME=$(getent passwd $(id -nu) | awk -F: '{ print $(NF - 1) }'); tcsh -f -c 'cd'], 0)
- AT_CLEANUP
- AT_SETUP([$ noimplicithome])
- AT_CHECK([tcsh -f -c 'unset cdtohome; cd'], 1, , [cd: Too few arguments.