5 files changed, 27 insertions, 52 deletions
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index e6f8687aea6..10c0eb6db9a 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2010/03/26 14:09:50 hauke Exp $
+# $NetBSD: Makefile,v 1.69 2012/03/22 16:54:25 adam Exp $
 
-DISTNAME=	tcsh-6.17.00
-PKGREVISION=	1
+DISTNAME=	tcsh-6.18.01
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 		ftp://ftp.funet.fi/pub/unix/shells/tcsh/
@@ -9,6 +8,7 @@ MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.tcsh.org/Welcome
 COMMENT=	Extended C-shell with many useful features
+LICENSE=	original-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index aa72443c534..af9c62f4752 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.27 2010/05/04 00:14:00 agc Exp $
+$NetBSD: distinfo,v 1.28 2012/03/22 16:54:25 adam Exp $
 
-SHA1 (tcsh-6.17.00.tar.gz) = 9bf67d5ce1b406178e9ba535ecd34553fe0d4d36
-RMD160 (tcsh-6.17.00.tar.gz) = 2cc41a895799ade6d62640f877bb626f136dac35
-Size (tcsh-6.17.00.tar.gz) = 890084 bytes
-SHA1 (patch-aa) = bd2c3a5814b17675c56618feae9184548e40c0d0
+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) = f9d9d21482380002eaad51125310b6d36930baa7
 SHA1 (patch-ab) = ab71a3826bbcef0702a7d43446f13454176aa671
-SHA1 (patch-ac) = b08d073d947775c0bedaaf53c55bbd6c6c63c6d2
-SHA1 (patch-ad) = 7db4fbbcafb1d2ed1b0e68dd70373e6e5fac93e6
diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa
index c1693213d29..81157e48bcd 100644
--- a/shells/tcsh/patches/patch-aa
+++ b/shells/tcsh/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2010/03/14 14:06:09 adam Exp $
+$NetBSD: patch-aa,v 1.12 2012/03/22 16:54:25 adam Exp $
 
---- Makefile.in.orig	2009-06-24 22:09:05.000000000 +0000
+--- Makefile.in.orig	2011-02-05 17:35:31.000000000 +0000
 +++ Makefile.in
-@@ -278,7 +278,7 @@ P=
+@@ -357,7 +357,7 @@ P=
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  bindir=@bindir@
@@ -11,10 +11,19 @@ $NetBSD: patch-aa,v 1.11 2010/03/14 14:06:09 adam Exp $
  MANSECT=1
  DESTBIN=${DESTDIR}${bindir}
  DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
-@@ -512,17 +512,10 @@ vgrind:
+@@ -449,7 +449,7 @@ pure:$(P) ${OBJS} 
+ 
+ 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
+ 
+ tc.defs.c:	gethost host.defs
+ 	@rm -f $@.tmp
+@@ -596,20 +596,13 @@ vgrind:
  install-strip: install
  
- install: 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)
@@ -22,6 +31,9 @@ $NetBSD: patch-aa,v 1.11 2010/03/14 14:06:09 adam Exp $
 -	chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
 +	${BSD_INSTALL_PROGRAM} tcsh${EXEEXT} ${DESTBIN}/tcsh${EXEEXT}
  
+ install.catalogs:
+ 	@test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} install DESTDIR=${DESTDIR}) || exit 0
+ 
  install.man: tcsh.man
 -	-mkdir -p ${DESTMAN}
 -	-rm -f ${DESTMAN}/tcsh.${MANSECT}
@@ -29,5 +41,5 @@ $NetBSD: patch-aa,v 1.11 2010/03/14 14:06:09 adam Exp $
 -	chmod 444 ${DESTMAN}/tcsh.${MANSECT}
 +	${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT}
  
- install.cygwin: install install.man
- 	-mkdir -p ${DESTDIR}${prefix}/share/doc/tcsh
+ # Amiga Unix
+ #install.man: tcsh.man
diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac
deleted file mode 100644
index 1f0d4ef41bf..00000000000
--- a/shells/tcsh/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.13 2010/03/26 14:09:51 hauke Exp $
-
---- sh.char.c.orig	2007-03-07 17:31:37.000000000 +0100
-+++ sh.char.c
-@@ -233,8 +233,8 @@ unsigned short _cmap[256] = {
- 
- /*	252 udiaeresis	253 yacute	254 thorn	255 ydiaeresis	*/
- 	_LET|_DOW,	_LET|_DOW,	_LET|_DOW,	_LET|_DOW,
--};
- #endif /* SHORT_STRINGS */
-+};
- 
- #if defined(KANJI) && defined(SHORT_STRINGS) && defined(DSPMBYTE)
- /* original table */
diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad
deleted file mode 100644
index e2dfb75f667..00000000000
--- a/shells/tcsh/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2010/05/04 00:14:00 agc Exp $
-
-fix 'e' navigation in vi mode to classify '_' chars as part of words
-
---- ed.chared.c	2010/04/02 00:04:39	1.1
-+++ ed.chared.c	2010/04/02 00:04:59
-@@ -832,11 +832,11 @@
- 	while ((p < high) && Isspace(*p)) 
- 	    p++;
- 
--	if (Isalnum(*p))
--	    while ((p < high) && Isalnum(*p)) 
-+	if (isword(*p))
-+	    while ((p < high) && isword(*p)) 
- 		p++;
- 	else
--	    while ((p < high) && !(Isspace(*p) || Isalnum(*p)))
-+	    while ((p < high) && !(Isspace(*p) || isword(*p)))
- 		p++;
-     }
-