Upgrade to tcsh 6.14.00

New Features:
    * UTF-8 handling for both singe and double width characters
    * termname builtin for testing whether a terminal type is
      available in termcap/terminfo

3 files changed, 57 insertions, 63 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index e74a2c9a753..090f0d5ce62 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.47 2004/12/03 15:15:09 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2005/03/25 19:13:24 kim Exp $
 #
 
-DISTNAME=	tcsh-6.13.00
+DISTNAME=	tcsh-6.14.00
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 		ftp://ftp.gw.com/pub/unix/tcsh/ \
-		ftp://ftp.funet.fi/pub/unix/shells/tcsh/
+		ftp://ftp.funet.fi/pub/unix/shells/tcsh/ \
+		\
+		ftp://ftp.astron.com/pub/tcsh/old/ \
+		ftp://ftp.gw.com/pub/unix/tcsh/old/ \
+		ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/
 
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.tcsh.org/
@@ -34,49 +38,53 @@ PKG_SHELL?=	${PREFIX}/bin/tcsh
 post-install:
 	@${ECHO} "Installing message catalogues"
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	@if [ -f ${WRKSRC}/tcsh.C.cat ]; then				\
-		[ -d ${PREFIX}/${NLSDIR}/C ] ||				\
-		    ${INSTALL_DATA_DIR} ${PREFIX}/${NLSDIR}/C;		\
-		${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat ${PREFIX}/${NLSDIR}/C/tcsh.cat; \
-		${ECHO} ${NLSDIR}/C/tcsh.cat >> ${PLIST_SRC};		\
-		for i in 						\
-			et:ISO_8859-15:et:EE				\
-			finnish:ISO_8859-1:fi:FI			\
-			french:ISO_8859-1:fr:BE:CA:CH:FR		\
-			german:ISO_8859-1:de:AT:CH:DE			\
-			greek:ISO_8859-7:el:GR				\
-			italian:ISO_8859-1:it:CH:IT			\
-			ja:eucJP:ja:JP					\
-			pl:ISO_8859-2:pl:PL				\
-			russian:KOI8-R:ru:RU:SU				\
-			spanish:ISO_8859-1:es:ES			\
-			ukrainian:KOI8-U:uk:UA				\
-			;						\
+	@if [ -f ${WRKSRC}/tcsh.C.cat ];				\
+	then								\
+	    [ -d ${PREFIX}/${NLSDIR}/C ] ||				\
+		${INSTALL_DATA_DIR} ${PREFIX}/${NLSDIR}/C;		\
+	    ${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat 			\
+		${PREFIX}/${NLSDIR}/C/tcsh.cat;				\
+	    ${ECHO} ${NLSDIR}/C/tcsh.cat >> ${PLIST_SRC};		\
+	    for i in 							\
+		et:ISO_8859-15:et:EE					\
+		finnish:ISO_8859-1:fi:FI				\
+		french:ISO_8859-1:fr:BE:CA:CH:FR			\
+		german:ISO_8859-1:de:AT:CH:DE				\
+		greek:ISO_8859-7:el:GR					\
+		italian:ISO_8859-1:it:CH:IT				\
+		ja:eucJP:ja:JP						\
+		pl:ISO_8859-2:pl:PL					\
+		russian:KOI8-R:ru:RU:SU					\
+		spanish:ISO_8859-1:es:ES				\
+		ukrainian:KOI8-U:uk:UA					\
+		;							\
+	    do								\
+		OIFS="${IFS}";						\
+		IFS=":${IFS}";						\
+		set -- $$i;						\
+		IFS="${OIFS}";						\
+		l=$$1; shift;						\
+		s=$$1; shift;						\
+		c=$$1; shift;						\
+		o=;							\
+		while [ $$# -gt 0 ];					\
 		do							\
-			OIFS="${IFS}";					\
-			IFS=":${IFS}";					\
-			set -- $$i;					\
-			IFS="${OIFS}";					\
-			l=$$1; shift;					\
-			s=$$1; shift;					\
-			c=$$1; shift;					\
-			o=;						\
-			while [ $$# -gt 0 ]; do				\
-				d=${NLSDIR}/$${c}_$$1.$${s};		\
-				[ -d ${PREFIX}/$$d ] ||			\
-					${INSTALL_DATA_DIR} ${PREFIX}/$$d; \
-				if [ -z "$$o" ]; then			\
-					o="$$d";			\
-					${INSTALL_DATA} ${WRKSRC}/tcsh.$${l}.cat \
-						${PREFIX}/$${d}/tcsh.cat; \
-				else					\
-					${LN} -f ${PREFIX}/$${o}/tcsh.cat \
-						${PREFIX}/$${d};	\
-				fi;					\
-				${ECHO} $${d}/tcsh.cat >> ${PLIST_SRC};	\
-				shift 1;				\
-			done;						\
-		done							\
+		    d=${NLSDIR}/$${c}_$$1.$${s};			\
+		    [ -d ${PREFIX}/$$d ] ||				\
+			${INSTALL_DATA_DIR} ${PREFIX}/$$d;		\
+		    if [ -z "$$o" ];					\
+		    then						\
+			o="$$d";					\
+			${INSTALL_DATA} ${WRKSRC}/tcsh.$${l}.cat	\
+			    ${PREFIX}/$${d}/tcsh.cat;			\
+		    else						\
+			${LN} -f ${PREFIX}/$${o}/tcsh.cat		\
+			    ${PREFIX}/$${d};				\
+		    fi;							\
+		    ${ECHO} $${d}/tcsh.cat >> ${PLIST_SRC};		\
+		    shift 1;						\
+		done;							\
+	    done;							\
 	fi
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index c2b2b79e870..d177e855281 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.14 2005/02/24 13:14:41 agc Exp $
+$NetBSD: distinfo,v 1.15 2005/03/25 19:13:24 kim Exp $
 
-SHA1 (tcsh-6.13.00.tar.gz) = 0980ac5765fffc48bd3abf7c685c848af88c4596
-RMD160 (tcsh-6.13.00.tar.gz) = eaba55464f42f43ee58c7e6ea6e56f96a39917b7
-Size (tcsh-6.13.00.tar.gz) = 844755 bytes
+SHA1 (tcsh-6.14.00.tar.gz) = 55a08b31a57cfd8631edd1fb7e42f18578d8198a
+RMD160 (tcsh-6.14.00.tar.gz) = fa7635225ceb0225aedcfad5dd9d8e17d8d70849
+Size (tcsh-6.14.00.tar.gz) = 859780 bytes
 SHA1 (patch-aa) = 98ab704908a6fe2f570d2688c2a9bdb600f630eb
 SHA1 (patch-ad) = 4eee34eb2f8ce3ddc3f6b4177510945a00f66f15
-SHA1 (patch-ao) = c1ea35a69f0f361b641af5dd7af0196c0642a26e
diff --git a/shells/tcsh/patches/patch-ao b/shells/tcsh/patches/patch-ao
deleted file mode 100644
index 2bebcc24fe7..00000000000
--- a/shells/tcsh/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/08/27 15:14:04 kim Exp $
-
---- configure.orig	2003-06-18 15:32:43.000000000 -0400
-+++ configure	2004-08-27 11:12:00.000000000 -0400
-@@ -2876,7 +2876,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_tgetent" = no; then
--  for ac_lib in termlib curses termcap; do
-+  for ac_lib in termlib curses ncurses termcap; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"