update to tcsh-6.15

8 files changed, 6 insertions, 189 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 1a3db84b830..52d84768186 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,16 +1,11 @@
-# $NetBSD: Makefile,v 1.55 2007/02/22 19:01:25 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2007/04/10 00:49:32 christos Exp $
 #
 
-DISTNAME=	tcsh-6.14.00
-PKGREVISION=	1
+DISTNAME=	tcsh-6.15.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.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/Welcome
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 661a64f7415..b0fc8c944c2 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.20 2005/11/10 23:04:10 joerg Exp $
+$NetBSD: distinfo,v 1.21 2007/04/10 00:49:33 christos Exp $
 
-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-ab) = b368e3b5d82ed5eb1148ceeaef675bc9a33c7309
-SHA1 (patch-ac) = 3111462df95fe390695038c4208f22b6b57d8876
-SHA1 (patch-ad) = 0cb983da575050d7aa7ac41dc0c980302503768b
-SHA1 (patch-ae) = 14b36c07ab120c013d630c225aefbdc6322a1b3d
-SHA1 (patch-ap) = 332a71c54a3bba11b96e43b94b2d050a3a114540
+SHA1 (tcsh-6.15.00.tar.gz) = d24f7bf27e80222a6293b6629c14db547f0b7387
+RMD160 (tcsh-6.15.00.tar.gz) = 8065279e93bd3fddb2a95a3f74a680858d36508c
+Size (tcsh-6.15.00.tar.gz) = 870886 bytes
diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa
deleted file mode 100644
index bfb9d0aef75..00000000000
--- a/shells/tcsh/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2004/05/19 17:42:35 kim Exp $
-
---- Makefile.in.orig	2003-03-12 14:14:50.000000000 -0500
-+++ Makefile.in	2004-02-21 16:28:51.000000000 -0500
-@@ -476,17 +476,10 @@
- install-strip: install
- 
- install: tcsh$(EXEEXT) 
--	-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}
- 
- install.man: tcsh.man
--	-mkdir -p ${DESTMAN}
--	-rm -f ${DESTMAN}/tcsh.${MANSECT}
--	cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
--	chmod 444 ${DESTMAN}/tcsh.${MANSECT}
-+	${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT}
- 
- install.cygwin: install install.man
- 	-mkdir -p ${DESTDIR}${prefix}/doc/tcsh
diff --git a/shells/tcsh/patches/patch-ab b/shells/tcsh/patches/patch-ab
deleted file mode 100644
index ca1986c7fa2..00000000000
--- a/shells/tcsh/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2005/09/20 14:18:02 tron Exp $
-
---- tc.sig.h.orig	2005-01-18 20:24:51.000000000 +0000
-+++ tc.sig.h	2005-09-20 15:13:22.000000000 +0100
-@@ -58,7 +58,7 @@
- /*
-  * sigvec is not the same everywhere
-  */
--# if defined(_SEQUENT_) || (defined(_POSIX_SOURCE) && !defined(hpux))
-+# if defined(_SEQUENT_) || (defined(_POSIX_SOURCE) && !defined(hpux)) || defined(__NetBSD__)
- #  define HAVE_SIGVEC
- #  define mysigvec(a, b, c)	sigaction(a, b, c)
- typedef struct sigaction sigvec_t;
-@@ -67,7 +67,7 @@
- #  undef sv_flags
- #  define sv_handler sa_handler
- #  define sv_flags sa_flags
--# endif /* _SEQUENT || (_POSIX_SOURCE && !hpux) */
-+# endif /* _SEQUENT || (_POSIX_SOURCE && !hpux) || __NetBSD__ */
- 
- # ifdef hpux
- #  define HAVE_SIGVEC
diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac
deleted file mode 100644
index 3cc4d9376fa..00000000000
--- a/shells/tcsh/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2005/11/10 22:54:09 joerg Exp $
-
---- configure.orig	2005-11-10 22:51:12.000000000 +0000
-+++ configure
-@@ -1486,6 +1486,11 @@ case "${host}" in
-     tcsh_config_file=bsd4.4
-   ;;
- 
-+  ## DragonFly systems
-+  *-*-dragonfly*)
-+    tcsh_config_file=bsd4.4
-+  ;;
-+
-   ## Silicon Graphics machines
-   *-sgi-iri* )
-     tcsh_config_file=irix
diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad
deleted file mode 100644
index 644a7748a0f..00000000000
--- a/shells/tcsh/patches/patch-ad
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2005/07/14 23:58:37 grant Exp $
-
---- config_f.h.orig	2005-03-05 00:46:04.000000000 +1100
-+++ config_f.h
-@@ -44,7 +44,18 @@
-  *	         of nls...
-  *
-  */
--#define SHORT_STRINGS
-+#if defined(__NetBSD__)
-+# include <sys/param.h>
-+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 200000000)
-+#  define SHORT_STRINGS
-+# else
-+#  undef SHORT_STRINGS
-+# endif
-+#elif defined(__OpenBSD__)
-+# undef SHORT_STRINGS
-+#else
-+# define SHORT_STRINGS
-+#endif
- 
- /*
-  * WIDE_STRINGS	Represent strings using wide characters
-@@ -69,7 +80,11 @@
-  *		if you don't have <nl_types.h>, you don't want
-  *		to define this.
-  */
--#undef NLS_CATALOGS
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+# define NLS_CATALOGS
-+#else
-+# undef NLS_CATALOGS
-+#endif
- 
- /*
-  * LOGINFIRST   Source ~/.login before ~/.cshrc
diff --git a/shells/tcsh/patches/patch-ae b/shells/tcsh/patches/patch-ae
deleted file mode 100644
index 23f5d152452..00000000000
--- a/shells/tcsh/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2005/11/10 23:04:10 joerg Exp $
-
---- host.defs.orig	2005-11-10 23:01:08.000000000 +0000
-+++ host.defs
-@@ -522,6 +522,15 @@ machtype: defined(M_i386)				: "i386"
- enddef	:
- 
- 
-+newdef  : defined(__DragonFly__)
-+comment : DragonFly
-+vendor  : defined(M_intel)				: "intel"
-+hosttype:						: "DragonFly"
-+ostype  :						: "DragonFly"
-+machtype: defined(M_i386)				: "i386"
-+enddef	:
-+
-+
- newdef	: defined(__386BSD__)
- comment	: Bill Jolitz's 386BSD
- vendor	: defined(M_intel)				: "intel"
diff --git a/shells/tcsh/patches/patch-ap b/shells/tcsh/patches/patch-ap
deleted file mode 100644
index 1a56798c9b7..00000000000
--- a/shells/tcsh/patches/patch-ap
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2005/03/29 04:38:10 kim Exp $
-
---- glob.c.orig	2005-01-18 15:24:50.000000000 -0500
-+++ glob.c	2005-03-28 23:22:44.000000000 -0500
-@@ -63,7 +63,6 @@
- #undef QUOTE
- #undef TILDE
- #undef META
--#undef CHAR
- #undef ismeta
- #undef Strchr
- 
-@@ -120,7 +119,7 @@
- #define	M_MASK		0xffff
- #define	M_ASCII		0x00ff
- 
--#define	CHAR(c)		((c)&M_ASCII)
-+#define	LCHAR(c)	((c)&M_ASCII)
- #define	META(c)		((c)|M_META)
- #define	M_ALL		META('*')
- #define	M_END		META(']')
-@@ -427,11 +426,11 @@
- 		*bufnext++ = m_not;
- 	    c = *qpatnext++;
- 	    do {
--		*bufnext++ = CHAR(c);
-+		*bufnext++ = LCHAR(c);
- 		if (*qpatnext == RANGE &&
- 		    (c = qpatnext[1]) != RBRACKET) {
- 		    *bufnext++ = M_RNG;
--		    *bufnext++ = CHAR(c);
-+		    *bufnext++ = LCHAR(c);
- 		    qpatnext += 2;
- 		}
- 	    } while ((c = *qpatnext++) != RBRACKET);
-@@ -450,7 +449,7 @@
- 		*bufnext++ = M_ALL;
- 	    break;
- 	default:
--	    *bufnext++ = CHAR(c);
-+	    *bufnext++ = LCHAR(c);
- 	    break;
- 	}
-     }
-@@ -699,7 +698,7 @@
-     if (n > MB_LEN_MAX)
- 	n = MB_LEN_MAX;
-     p = buf;
--    while (p < buf + n && (*p++ = CHAR(*s++)) != 0)
-+    while (p < buf + n && (*p++ = LCHAR(*s++)) != 0)
- 	;
-     return one_mbtowc(pwc, buf, n);
- #else