Welcome to tcsh-6.20.00

4 files changed, 13 insertions, 35 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index ba2a0c16849..4f2807e2afc 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2015/12/13 10:46:26 markd Exp $
+# $NetBSD: Makefile,v 1.82 2016/11/24 15:45:06 christos Exp $
 
-DISTNAME=	tcsh-6.19.00
-PKGREVISION=	1
+DISTNAME=	tcsh-6.20.00
+#PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index a413c6668e5..0f20265244b 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.36 2015/12/13 10:46:26 markd Exp $
+$NetBSD: distinfo,v 1.37 2016/11/24 15:45:06 christos Exp $
 
-SHA1 (tcsh-6.19.00.tar.gz) = cdb1abe319fab5d3caff101c393293e5b3607f0c
-RMD160 (tcsh-6.19.00.tar.gz) = 0f1e8c5fdee634baff6670290bd30074db965da3
-SHA512 (tcsh-6.19.00.tar.gz) = e34f267c05308d52db08576d6c67ec4b5f092b42494be4b432bd1ffe5705c3030a3bf1b6aba1fa4e7d8ff4151ef5a695503ab7e0d968e35620791959c27bcadf
-Size (tcsh-6.19.00.tar.gz) = 947135 bytes
-SHA1 (patch-aa) = cedcb5e0b209c50a945db6778fd86574ad16ad6b
+SHA1 (tcsh-6.20.00.tar.gz) = a77d68434cc4bed731a46a39b9e01523e3a1e98c
+RMD160 (tcsh-6.20.00.tar.gz) = 3f119421ef3500cea1bebe2edf35c6d81ca1c8f3
+SHA512 (tcsh-6.20.00.tar.gz) = c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
+Size (tcsh-6.20.00.tar.gz) = 1001696 bytes
+SHA1 (patch-aa) = 440849534fc49afdbd70b95d6cbc62ff5abee240
 SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2
 SHA1 (patch-configure) = 91c2019da8c074bd6f24b84bf798ccd497110727
 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e
-SHA1 (patch-tc.alloc.c) = 826edfd3c8d5bb4a9c5515b69ba28a4ad0eff99e
diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa
index d4c998da497..abd71905581 100644
--- a/shells/tcsh/patches/patch-aa
+++ b/shells/tcsh/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.14 2015/05/22 08:03:43 kim Exp $
+$NetBSD: patch-aa,v 1.15 2016/11/24 15:45:06 christos Exp $
 
 Use LDFLAGS and BSD_INSTALL_*.
 
---- Makefile.in.orig	2014-07-24 22:52:13.000000000 +0000
-+++ Makefile.in	2015-05-22 07:54:35.000000000 +0000
+--- Makefile.in.orig	2015-08-24 16:09:04.000000000 -0400
++++ Makefile.in	2016-11-24 10:43:07.000000000 -0500
 @@ -357,7 +357,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -17,7 +17,7 @@ Use LDFLAGS and BSD_INSTALL_*.
  
  gethost:  gethost.c sh.err.h tc.const.h sh.h
  	rm -f gethost
--	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c
+-	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c
 +	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} $(srcdir)/gethost.c
  
  tc.defs.c:	gethost host.defs
diff --git a/shells/tcsh/patches/patch-tc.alloc.c b/shells/tcsh/patches/patch-tc.alloc.c
deleted file mode 100644
index c3e54edfd79..00000000000
--- a/shells/tcsh/patches/patch-tc.alloc.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-tc.alloc.c,v 1.1 2015/12/13 10:46:26 markd Exp $
-
-Fix gcc5 optimization issue - from upstream.
-
---- tc.alloc.c.orig	2015-02-22 16:31:54.000000000 +0000
-+++ tc.alloc.c
-@@ -348,10 +348,13 @@ calloc(size_t i, size_t j)
- {
- #ifndef lint
-     char *cp;
-+    volatile size_t k;
- 
-     i *= j;
-     cp = xmalloc(i);
--    memset(cp, 0, i);
-+    /* Stop gcc 5.x from optimizing malloc+memset = calloc */
-+    k = i;
-+    memset(cp, 0, k);
- 
-     return ((memalign_t) cp);
- #else