Upgrade to tcsh-6.08.00

10 files changed, 63 insertions, 186 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index f2654245399..0f12fa87dc5 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,32 +1,64 @@
-# $NetBSD: Makefile,v 1.13 1998/09/09 12:10:12 agc Exp $
-# FreeBSD Id: Makefile,v 1.17 1996/12/17 05:18:09 asami Exp
+# $NetBSD: Makefile,v 1.14 1998/10/03 07:06:23 kim Exp $
 #
 
-DISTNAME=       tcsh-6.07
-PKGNAME=        tcsh-6.07.02
+DISTNAME=	tcsh-6.08.00
+DISTFILES=	tcsh-6.08.tar.gz
 CATEGORIES=	shells
-MASTER_SITES=   ftp://ftp.astron.com/pub/tcsh/
+MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
+		ftp://ftp.gw.com/pub/unix/tcsh/ \
+		ftp://ftp.funet.fi/pub/unix/shells/tcsh/
 
-MAINTAINER=     packages@netbsd.org
+MAINTAINER=	kim@tac.nyc.ny.us
 
-GNU_CONFIGURE=  yes
-WRKSRC=         ${WRKDIR}/${PKGNAME}
-ALL_TARGET=     all catalogs
-INSTALL_TARGET= install install.man
+GNU_CONFIGURE=	yes
+ALL_TARGET=	all catalogs
+INSTALL_TARGET=	install install.man
 
-post-patch:
-	( cd ${WRKSRC}/nls/greek ; for i in * ; do ${ECHO} $$i ; ${MV} $$i $$i.BAK ; ${SED} -e 's/\\"/"/g' -e "s/\\\'/'/g" <$$i.BAK >$$i ; done )
+NLSDIR=		share/nls
+PLIST_SRC=	${PKGDIR}/PLIST ${WRKSRC}/PLIST.nls
 
 post-install:
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
-	ln -f ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat
-	ln -f ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat
-	ln -f ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat
-	ln -f ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat
-	ln -f ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
-	${ECHO} "updating /etc/shells"; ${CP} /etc/shells /etc/shells.bak; (grep -v ${PREFIX}/bin/tcsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/tcsh) >/etc/shells
+	@${ECHO} "Installing message catalogues"
+	@${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat ${PREFIX}/${NLSDIR}/C/tcsh.cat
+	@-${RM} -f ${WRKSRC}/PLIST.nls
+	@${ECHO} ${NLSDIR}/C/tcsh.cat > ${WRKSRC}/PLIST.nls
+	@for i in 						\
+	    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:EUC:ja:JP					\
+	    spanish:ISO_8859-1:es:ES				\
+	    ;							\
+	do							\
+	    OIFS="${IFS}";					\
+	    IFS=":${IFS}";					\
+	    set -- $$i;						\
+	    IFS="${OIFS}";					\
+	    l=$$1; shift;					\
+	    s=$$1; shift;					\
+	    c=$$1; shift;					\
+	    o=;							\
+	    for j;						\
+	    do							\
+		d=${NLSDIR}/$${c}_$${j}.$${s};			\
+		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 >> ${WRKSRC}/PLIST.nls;	\
+	    done;						\
+	done
+	@${ECHO} "updating /etc/shells";			\
+	${CP} /etc/shells /etc/shells.bak;			\
+	(							\
+		${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak;	\
+		${ECHO} ${PREFIX}/bin/tcsh			\
+	) >/etc/shells
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/files/md5 b/shells/tcsh/files/md5
index edf9e3ce2bb..ce2137a5d81 100644
--- a/shells/tcsh/files/md5
+++ b/shells/tcsh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:27:38 agc Exp $
+$NetBSD: md5,v 1.3 1998/10/03 07:06:24 kim Exp $
 
-MD5 (tcsh-6.07.tar.gz) = 18a9d8091c6da38ebdd63ab509324eb5
+MD5 (tcsh-6.08.tar.gz) = e16e0f08b324e67f654ecab554042967
diff --git a/shells/tcsh/patches/patch-ab b/shells/tcsh/patches/patch-ab
deleted file mode 100644
index 615e98be89b..00000000000
--- a/shells/tcsh/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:13:56 agc Exp $
-
---- nls/greek/set20.orig	Tue Aug  4 10:15:45 1998
-+++ nls/greek/set20	Tue Aug  4 10:15:45 1998
-@@ -13,7 +13,7 @@
- 10 %-15s->  δεν έχει οριστεί\n
- 11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n
- 12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n
--13     -a   εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\ν
-+13     -a   εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\n
- 14     -b   ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n
- 15     -s   ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n
- 16     -c   ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n
diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac
deleted file mode 100644
index f4bf963aab2..00000000000
--- a/shells/tcsh/patches/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 11:13:56 agc Exp $
-
---- glob.c.orig	Fri Nov 12 19:40:56 1993
-+++ glob.c	Tue Aug  4 10:15:40 1998
-@@ -139,6 +139,27 @@
- #define	M_SET		META('[')
- #define	ismeta(c)	(((c)&M_META) != 0)
- 
-+int collate_range_cmp (c1, c2)
-+	int c1, c2;
-+{
-+#if defined(NLS) && defined(LC_COLLATE)
-+	static char s1[2], s2[2];
-+	int ret;
-+#endif
-+
-+	c1 &= 0xFF;
-+	c2 &= 0xFF;
-+#if defined(NLS) && defined(LC_COLLATE)
-+	if (c1 == c2)
-+		return (0);
-+	s1[0] = c1;
-+	s2[0] = c2;
-+	if ((ret = strcoll(s1, s2)) != 0)
-+		return (ret);
-+#endif
-+	return (c1 - c2);
-+}
-+
- /*
-  * Need to dodge two kernel bugs:
-  * opendir("") != opendir(".")
-@@ -646,7 +667,9 @@
- 		++pat;
- 	    while (((c = *pat++) & M_MASK) != M_END) {
- 		if ((*pat & M_MASK) == M_RNG) {
--		    if (c <= k && k <= pat[1])
-+		    if (   collate_range_cmp(CHAR(c), CHAR(k)) <= 0
-+			&& collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0
-+		       )
- 			ok = 1;
- 		    pat += 2;
- 		}
diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad
deleted file mode 100644
index 2dbe777c6e2..00000000000
--- a/shells/tcsh/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1998/08/07 11:13:57 agc Exp $
-
---- sh.glob.c.orig	Fri Apr 26 15:19:30 1996
-+++ sh.glob.c	Tue Aug  4 10:15:41 1998
-@@ -85,6 +85,7 @@
- static	void	  pword		__P((int));
- static	void	  psave		__P((int));
- static	void	  backeval	__P((Char *, bool));
-+extern  int       collate_range_cmp __P((int, int));
- 
- static Char *
- globtilde(nv, s)
-@@ -1038,8 +1039,9 @@
- 		if (match)
- 		    continue;
- 		if (rangec == '-' && *(pattern-2) != '[' && *pattern  != ']') {
--		    match = (stringc <= (*pattern & TRIM) &&
--			      (*(pattern-2) & TRIM) <= stringc);
-+		    match = (   collate_range_cmp(stringc, *pattern & TRIM) <= 0
-+			     && collate_range_cmp(*(pattern-2) & TRIM, stringc) <= 0
-+			    );
- 		    pattern++;
- 		}
- 		else 
diff --git a/shells/tcsh/patches/patch-ae b/shells/tcsh/patches/patch-ae
deleted file mode 100644
index 4909900f02c..00000000000
--- a/shells/tcsh/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1998/08/07 11:13:57 agc Exp $
-
---- sh.func.c.orig	Sat Oct  5 13:39:10 1996
-+++ sh.func.c	Tue Aug  4 10:15:42 1998
-@@ -1312,8 +1312,10 @@
- # ifdef LC_COLLATE
- 	(void) setlocale(LC_COLLATE, "");
- # endif
--# if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
-+# ifdef NLS_CATALOGS
-+# ifdef LC_MESSAGES
- 	(void) setlocale(LC_MESSAGES, "");
-+# endif
- 	(void) catclose(catd);
- 	nlsinit();
- # endif /* NLS_CATALOGS && LC_MESSAGES */
-@@ -1475,8 +1477,10 @@
- # ifdef LC_COLLATE
- 		    (void) setlocale(LC_COLLATE, "");
- # endif
--# if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
-+# ifdef NLS_CATALOGS
-+# ifdef LC_MESSAGES
- 		    (void) setlocale(LC_MESSAGES, "");
-+# endif
- 		    (void) catclose(catd);
- 		    nlsinit();
- # endif /* NLS_CATALOGS && LC_MESSAGES */
diff --git a/shells/tcsh/patches/patch-ag b/shells/tcsh/patches/patch-ag
index dec552d86e6..d1d0ab445f7 100644
--- a/shells/tcsh/patches/patch-ag
+++ b/shells/tcsh/patches/patch-ag
@@ -1,17 +1,8 @@
-$NetBSD: patch-ag,v 1.4 1998/08/07 11:13:58 agc Exp $
+$NetBSD: patch-ag,v 1.5 1998/10/03 07:06:24 kim Exp $
 
---- Makefile.in.orig	Fri Oct 11 13:31:59 1996
-+++ Makefile.in	Tue Aug  4 10:19:30 1998
-@@ -261,7 +261,7 @@
- PARALLEL=12				# Make the multi-max run fast.
- #P=&					# Use Sequent's parallel make
- P=
--DESTDIR=/usr/local
-+DESTDIR=@prefix@
- MANSECT=1
- DESTBIN=${DESTDIR}/bin
- DESTMAN=${DESTDIR}/man/man${MANSECT}
-@@ -452,15 +452,10 @@
+--- Makefile.in.orig	Wed Sep  9 06:29:11 1998
++++ Makefile.in	Sun Sep 13 13:45:25 1998
+@@ -464,15 +464,10 @@
  	@vgrind -t -x -h Index index >/crp/bill/csh/index.t
  
  install: tcsh 
@@ -23,7 +14,7 @@ $NetBSD: patch-ag,v 1.4 1998/08/07 11:13:58 agc Exp $
  
  install.man: tcsh.man
 -	-rm -f ${DESTMAN}/tcsh.${MANSECT}
--	cp tcsh.man ${DESTMAN}/tcsh.${MANSECT}
+-	cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
 -	chmod 444 ${DESTMAN}/tcsh.${MANSECT}
 +	${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT}
  
diff --git a/shells/tcsh/patches/patch-ah b/shells/tcsh/patches/patch-ah
deleted file mode 100644
index f74b63045f4..00000000000
--- a/shells/tcsh/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1998/09/08 22:36:34 tron Exp $
-
---- pathnames.h.orig	Fri Apr 26 13:18:42 1996
-+++ pathnames.h	Tue Sep  8 09:36:37 1998
-@@ -37,6 +37,8 @@
- #ifndef _h_pathnames
- #define _h_pathnames
- 
-+#include <paths.h>
-+
- #if defined(CMUCS) && !defined(_PATH_LOCAL)
- # define _PATH_LOCAL		"/usr/cs/bin"
- #endif /* CMUCS && !_PATH_LOCAL */
diff --git a/shells/tcsh/patches/patch-ai b/shells/tcsh/patches/patch-ai
deleted file mode 100644
index f847cc66082..00000000000
--- a/shells/tcsh/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1998/09/08 22:36:34 tron Exp $
-
---- sh.c.orig	Sat Oct  5 11:39:07 1996
-+++ sh.c	Tue Sep  8 09:58:52 1998
-@@ -648,7 +648,11 @@
-      * Re-initialize path if set in environment
-      */
-     if ((tcp = getenv("PATH")) == NULL)
-+#ifdef _PATH_DEFPATH
-+	importpath(str2short(_PATH_DEFPATH));
-+#else /* !_PATH_DEFPATH */
- 	setq(STRpath, defaultpath(), &shvhed, VAR_READWRITE);
-+#endif /* _PATH_DEFPATH */
-     else
- 	/* Importpath() allocates memory for the path, and the
- 	 * returned pointer from SAVE() was discarded, so
diff --git a/shells/tcsh/pkg/PLIST b/shells/tcsh/pkg/PLIST
index f0275258e4e..fd7af53983a 100644
--- a/shells/tcsh/pkg/PLIST
+++ b/shells/tcsh/pkg/PLIST
@@ -1,14 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 1998/03/05 14:28:32 tv Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/10/03 07:06:25 kim Exp $
 bin/tcsh
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
-man/man1/tcsh.1.gz
-share/nls/C/tcsh.cat
-share/nls/fr_BE.ISO_8859-1/tcsh.cat
-share/nls/fr_CA.ISO_8859-1/tcsh.cat
-share/nls/fr_CH.ISO_8859-1/tcsh.cat
-share/nls/fr_FR.ISO_8859-1/tcsh.cat
-share/nls/de_AT.ISO_8859-1/tcsh.cat
-share/nls/de_CH.ISO_8859-1/tcsh.cat
-share/nls/de_DE.ISO_8859-1/tcsh.cat
-share/nls/el_GR.ISO_8859-7/tcsh.cat
+man/man1/tcsh.1