Upgrade to 6.19.00

This is a mainly a bug fix release with few new features:

1. new cdtohome variable
2. locking in history files
3. history speedups.

7 files changed, 20 insertions, 179 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 418ed6d77ce..fae38b3cde0 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.78 2015/01/20 11:00:32 hauke Exp $
+# $NetBSD: Makefile,v 1.79 2015/05/22 08:03:43 kim Exp $
 
-DISTNAME=	tcsh-6.18.01
-PKGREVISION=	6
+DISTNAME=	tcsh-6.19.00
+#PKGREVISION=	0
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
-		ftp://ftp.funet.fi/pub/unix/shells/tcsh/
+		ftp://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
 
 MAINTAINER=	kim@NetBSD.org
 HOMEPAGE=	http://www.tcsh.org/
diff --git a/shells/tcsh/PLIST b/shells/tcsh/PLIST
index b0d3bdcf09e..be14c5137f9 100644
--- a/shells/tcsh/PLIST
+++ b/shells/tcsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/01/20 11:00:32 hauke Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/05/22 08:03:43 kim Exp $
 bin/tcsh
 man/man1/tcsh.1
 share/examples/tcsh/complete.tcsh
@@ -14,4 +14,4 @@ share/locale/it/LC_MESSAGES/tcsh.cat
 share/locale/ja/LC_MESSAGES/tcsh.cat
 share/locale/pl/LC_MESSAGES/tcsh.cat
 share/locale/ru/LC_MESSAGES/tcsh.cat
-share/locale/ru_UA.koi8u/LC_MESSAGES/tcsh.cat
+share/locale/ru_UA/LC_MESSAGES/tcsh.cat
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index ad0f6d79d37..0350e03762c 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.33 2014/05/25 03:59:17 rodent Exp $
+$NetBSD: distinfo,v 1.34 2015/05/22 08:03:43 kim Exp $
 
-SHA1 (tcsh-6.18.01.tar.gz) = eee2035645737197ff8059c84933a75d23cd76f9
-RMD160 (tcsh-6.18.01.tar.gz) = ea18bb6d4d6dca2700d74daa2940f67d45a18cb9
-Size (tcsh-6.18.01.tar.gz) = 926872 bytes
-SHA1 (patch-aa) = eadb2c1f4ad8bab7826c8e07c8edfc68569c74d4
+SHA1 (tcsh-6.19.00.tar.gz) = cdb1abe319fab5d3caff101c393293e5b3607f0c
+RMD160 (tcsh-6.19.00.tar.gz) = 0f1e8c5fdee634baff6670290bd30074db965da3
+Size (tcsh-6.19.00.tar.gz) = 947135 bytes
+SHA1 (patch-aa) = cedcb5e0b209c50a945db6778fd86574ad16ad6b
 SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2
-SHA1 (patch-ac) = c2a944f9c6857cdd8ba9753e3ce7c496749f8f87
 SHA1 (patch-configure) = 91c2019da8c074bd6f24b84bf798ccd497110727
-SHA1 (patch-nls_Makefile.in) = 50c6d7a038799db60393a4daf3a491961a40fdc7
-SHA1 (patch-sh.c) = 9f7a1449a0ff0da5a3af886fcf86bdc551e10732
 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e
diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa
index a95c7f07331..d4c998da497 100644
--- a/shells/tcsh/patches/patch-aa
+++ b/shells/tcsh/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.13 2012/05/25 20:01:31 he Exp $
+$NetBSD: patch-aa,v 1.14 2015/05/22 08:03:43 kim Exp $
 
 Use LDFLAGS and BSD_INSTALL_*.
 
---- Makefile.in.orig	2011-02-05 17:35:31.000000000 +0000
-+++ Makefile.in
-@@ -357,7 +357,7 @@ P=
+--- Makefile.in.orig	2014-07-24 22:52:13.000000000 +0000
++++ Makefile.in	2015-05-22 07:54:35.000000000 +0000
+@@ -357,7 +357,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  bindir=@bindir@
@@ -13,23 +13,22 @@ Use LDFLAGS and BSD_INSTALL_*.
  MANSECT=1
  DESTBIN=${DESTDIR}${bindir}
  DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
-@@ -449,7 +449,7 @@ pure:$(P) ${OBJS} 
+@@ -449,7 +449,7 @@
  
  gethost:  gethost.c sh.err.h tc.const.h sh.h
  	rm -f gethost
--	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c
-+	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${LDFLAGS} $(srcdir)/gethost.c
+-	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c
++	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} $(srcdir)/gethost.c
  
  tc.defs.c:	gethost host.defs
  	@rm -f $@.tmp
-@@ -596,20 +596,13 @@ vgrind:
- install-strip: install
+@@ -597,19 +597,13 @@
+ 	-strip ${DESTBIN}/tcsh$(EXEEXT)
  
  install: tcsh$(EXEEXT) install.catalogs install.man
 -	-mkdir -p ${DESTBIN}
 -	-mv -f ${DESTBIN}/tcsh$(EXEEXT)  ${DESTBIN}/tcsh.old
 -	cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
--	-strip ${DESTBIN}/tcsh$(EXEEXT)
 -	chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
 +	${BSD_INSTALL_PROGRAM} tcsh${EXEEXT} ${DESTBIN}/tcsh${EXEEXT}
  
diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac
deleted file mode 100644
index d68868ef70e..00000000000
--- a/shells/tcsh/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.15 2012/05/26 08:34:14 he Exp $
-
-Fix problem with Meta-<key> no longer being recognized,
-patch from christos@.
-
---- ed.inputl.c.orig	2010-12-22 17:26:04.000000000 +0000
-+++ ed.inputl.c
-@@ -683,7 +683,7 @@ GetNextCommand(KEYCMD *cmdnum, Char *ch)
- #ifdef DSPMBYTE
- 	     _enable_mbdisp &&
- #else
--	     MB_CUR_MAX == 1 &&
-+	     MB_LEN_MAX == 1 &&
- #endif
- 	     !adrof(STRnokanji) && (*ch & META)) {
- 	    MetaNext = 0;
diff --git a/shells/tcsh/patches/patch-nls_Makefile.in b/shells/tcsh/patches/patch-nls_Makefile.in
deleted file mode 100644
index e1f72a5fd40..00000000000
--- a/shells/tcsh/patches/patch-nls_Makefile.in
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-nls_Makefile.in,v 1.1 2014/04/04 12:00:37 kim Exp $
-
-Use allsrc as impsrc is not set for non-suffix rules.
-This is fine because there is only one source per rule.
-
---- nls/Makefile.in.orig	2012-01-05 11:54:25.000000000 -0500
-+++ nls/Makefile.in	2014-04-04 07:47:28.000000000 -0400
-@@ -19,7 +19,7 @@
- INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh.cat
- ${localedir}/C/LC_MESSAGES/tcsh.cat:	C.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- C.cat: ${srcdir}/C/charset ${srcdir}/C/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -27,7 +27,7 @@
- INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh.cat
- ${localedir}/et/LC_MESSAGES/tcsh.cat:	et.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- et.cat: ${srcdir}/et/charset ${srcdir}/et/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -35,7 +35,7 @@
- INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh.cat
- ${localedir}/fi/LC_MESSAGES/tcsh.cat:	finnish.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- finnish.cat: ${srcdir}/finnish/charset ${srcdir}/finnish/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -43,7 +43,7 @@
- INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh.cat
- ${localedir}/fr/LC_MESSAGES/tcsh.cat:	french.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- french.cat: ${srcdir}/french/charset ${srcdir}/french/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -51,7 +51,7 @@
- INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh.cat
- ${localedir}/de/LC_MESSAGES/tcsh.cat:	german.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -59,7 +59,7 @@
- INSTALLED+=${localedir}/gr/LC_MESSAGES/tcsh.cat
- ${localedir}/gr/LC_MESSAGES/tcsh.cat:	greek.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- greek.cat: ${srcdir}/greek/charset ${srcdir}/greek/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -67,7 +67,7 @@
- INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh.cat
- ${localedir}/it/LC_MESSAGES/tcsh.cat:	italian.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- italian.cat: ${srcdir}/italian/charset ${srcdir}/italian/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -75,7 +75,7 @@
- INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh.cat
- ${localedir}/ja/LC_MESSAGES/tcsh.cat:	ja.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- ja.cat: ${srcdir}/ja/charset ${srcdir}/ja/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -83,7 +83,7 @@
- INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh.cat
- ${localedir}/pl/LC_MESSAGES/tcsh.cat:	pl.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- pl.cat: ${srcdir}/pl/charset ${srcdir}/pl/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -91,7 +91,7 @@
- INSTALLED+=${localedir}/ru/LC_MESSAGES/tcsh.cat
- ${localedir}/ru/LC_MESSAGES/tcsh.cat:	russian.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- russian.cat: ${srcdir}/russian/charset ${srcdir}/russian/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -99,7 +99,7 @@
- INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh.cat
- ${localedir}/es/LC_MESSAGES/tcsh.cat:	spanish.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- spanish.cat: ${srcdir}/spanish/charset ${srcdir}/spanish/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
-@@ -107,7 +107,7 @@
- INSTALLED+=${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat
- ${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat:	ukrainian.cat
- 	mkdir -p $(@D)
--	$(INSTALL) $< $@
-+	$(INSTALL) $> $@
- 
- ukrainian.cat: ${srcdir}/ukrainian/charset ${srcdir}/ukrainian/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
diff --git a/shells/tcsh/patches/patch-sh.c b/shells/tcsh/patches/patch-sh.c
deleted file mode 100644
index 13ab25bc35b..00000000000
--- a/shells/tcsh/patches/patch-sh.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-sh.c,v 1.1 2012/10/10 19:19:58 dholland Exp $
-
-Avoid calling tcsetpgrp on fd -1; prevents libc diagnostic assertion
-in NetBSD. From christos.
-
---- sh.c~	2011-11-29 18:38:54.000000000 +0000
-+++ sh.c
-@@ -1215,14 +1215,14 @@ main(int argc, char **argv)
- 
- #ifdef NeXT
- 	    /* NeXT 2.0 /usr/etc/rlogind, does not set our process group! */
--	    if (shpgrp == 0) {
-+	    if (f != -1 && shpgrp == 0) {
- 	        shpgrp = getpid();
- 		(void) setpgid(0, shpgrp);
- 	        (void) tcsetpgrp(f, shpgrp);
- 	    }
- #endif /* NeXT */
- #ifdef BSDJOBS			/* if we have tty job control */
--	    if (grabpgrp(f, shpgrp) != -1) {
-+	    if (f != -1 && grabpgrp(f, shpgrp) != -1) {
- 		/*
- 		 * Thanks to Matt Day for the POSIX references, and to
- 		 * Paul Close for the SGI clarification.