Yikes! I missed a 'ja-' in my cvs co. Undo the previous

commit.

Pointed out by:	ache@FreeBSD.ORG

6 files changed, 120 insertions, 86 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 3a897f107629..40e836f1e2e0 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,72 +1,36 @@
-# New ports collection makefile for:	tcsh with color-ls and kanji patches
-# Version required:	6.07.06
-# Date created:		29 November 1997
-# Whom:			issei <issei@t-cnet.or.jp>
+# New ports collection makefile for:	tcsh
+# Version required:     6.07.02
+# Date created:		22 August 1994
+# Whom:			jkh
 #
-# $Id: Makefile,v 1.3 1997/12/28 22:11:37 asami Exp $
+# $Id: Makefile,v 1.18 1997/11/28 03:35:05 jseger Exp $
 #
 
-DISTNAME=	tcsh-6.07.06
-PKGNAME=	ja-tcsh-6.07.06b4
-CATEGORIES=	japanese shells
-MASTER_SITES=	ftp://ftp.gw.com/pub/unix/tcsh/ \
-		ftp://ftp.kobe-u.ac.jp/pub/shell/tcsh/ \
-		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/unix/shells/tcsh/ \
-		http://www.is.s.u-tokyo.ac.jp/~nayuta/pub/ \
-		ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1998/jun/
-DISTFILES=	${DISTNAME}.tgz ${DISTNAME}-color-1.07.tgz
+DISTNAME=       tcsh-6.07
+PKGNAME=        tcsh-6.07.02
+CATEGORIES=	shells
+MASTER_SITES=   ftp://ftp.astron.com/pub/tcsh/
 
-PATCH_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/ \
-		ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1998/jun/
-PATCHFILES=	${DISTNAME}.kanji.patch7b4.gz
-PATCH_DIST_STRIP=       -p1
+MAINTAINER=     ache@FreeBSD.ORG
 
-MAINTAINER=	issei@t-cnet.or.jp
-
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
-
-GNU_CONFIGURE=	yes
-ALL_TARGET=	all catalogs
-INSTALL_TARGET=	install install.man
-MAN1= 		tcsh.1
-NLSDIR=		${PREFIX}/share/nls
-PORTDOCS=	complete.tcsh FAQ HISTORY.kanji.patch.euc HowToMakeNLS.euc \
-		README-color.ja README.kanji.patch.euc
-ALL_CATALOGS=	ja ja.roomi ja.koshiki
-USE_CATALOG?=	ja
-
-post-patch:
-	@-(cd ${WRKSRC}; \
-	${PATCH} ${PATCH_DIST_ARGS} < ../color.patch ; \
-	${PATCH} ${PATCH_DIST_ARGS} < ../kanji.patch ; \
-	) > /dev/null 2>&1
-.for i in ${ALL_CATALOGS}
-	@(cd ${WRKSRC}/nls/$i; \
-	${MKDIR} ../$i_s; \
-	for j in * ; do \
-	nkf -Es $$j | \
-	${AWK} '{gsub(/[\x81-\x84\x88-\x9f\xe0-\xea]\\/,"&\\"); print; }' \
-	> ../$i_s/$$j ; done ; \
-	)
-.endfor
+GNU_CONFIGURE=  yes
+WRKSRC=         ${WRKDIR}/${PKGNAME}
+ALL_TARGET=     all catalogs
+INSTALL_TARGET= install install.man
+MAN1=		tcsh.1
 
 post-install:
-	@(cd ${WRKSRC}; \
-	${INSTALL_DATA} tcsh.C.cat ${NLSDIR}/C/tcsh.cat; \
-	${INSTALL_DATA} tcsh.C.m ${NLSDIR}/C/tcsh.m; \
-	${INSTALL_DATA} tcsh.${USE_CATALOG}.cat ${NLSDIR}/ja_JP.EUC/tcsh.cat; \
-	${INSTALL_DATA} tcsh.${USE_CATALOG}.m ${NLSDIR}/ja_JP.EUC/tcsh.m; \
-	${INSTALL_DATA} tcsh.${USE_CATALOG}_s.cat ${NLSDIR}/ja_JP.SJIS/tcsh.cat; \
-	${INSTALL_DATA} tcsh.${USE_CATALOG}_s.m ${NLSDIR}/ja_JP.SJIS/tcsh.m; \
-	)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/tcsh
-.for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/tcsh/
-.endfor
-.endif
-	@${ECHO} "updating /etc/shells"
-	@${CP} /etc/shells /etc/shells.bak
-	@(grep -v ${PREFIX}/bin/tcsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/tcsh) >/etc/shells
+	chown bin.bin ${PREFIX}/bin/tcsh
+	chown bin.bin ${PREFIX}/man/man1/tcsh.1
+	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 -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat
+	ln -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat
+	ln -sf ${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 -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat
+	ln -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
+	install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${PREFIX}/share/nls/el_GR.ISO_8859-7
+	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
 
 .include <bsd.port.mk>
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index f63927e6fe79..87e4635683bf 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,3 +1 @@
-MD5 (tcsh-6.07.06.tgz) = 8255a55e72b6008202b35d2432e0173b
-MD5 (tcsh-6.07.06-color-1.07.tgz) = 3e99a572d900666efdc51688996964fb
-MD5 (tcsh-6.07.06.kanji.patch7b4.gz) = 67e01f647dfa618405d0acaa72c912d4
+MD5 (tcsh-6.07.tar.gz) = 18a9d8091c6da38ebdd63ab509324eb5
diff --git a/shells/tcsh/files/patch-ad b/shells/tcsh/files/patch-ad
new file mode 100644
index 000000000000..490b9f6b044b
--- /dev/null
+++ b/shells/tcsh/files/patch-ad
@@ -0,0 +1,83 @@
+*** glob.c.orig	Sat Nov 13 03:40:56 1993
+--- glob.c	Mon Dec 16 03:09:07 1996
+***************
+*** 139,144 ****
+--- 139,165 ----
+  #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,652 ****
+  		++pat;
+  	    while (((c = *pat++) & M_MASK) != M_END) {
+  		if ((*pat & M_MASK) == M_RNG) {
+! 		    if (c <= k && k <= pat[1])
+  			ok = 1;
+  		    pat += 2;
+  		}
+--- 667,675 ----
+  		++pat;
+  	    while (((c = *pat++) & M_MASK) != M_END) {
+  		if ((*pat & M_MASK) == M_RNG) {
+! 		    if (   collate_range_cmp(CHAR(c), CHAR(k)) <= 0
+! 			&& collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0
+! 		       )
+  			ok = 1;
+  		    pat += 2;
+  		}
+*** sh.glob.c.orig	Sun May 14 00:49:17 1995
+--- sh.glob.c	Thu Oct 31 18:04:28 1996
+***************
+*** 85,90 ****
+--- 85,91 ----
+  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,1045 ****
+  		if (match)
+  		    continue;
+  		if (rangec == '-' && *(pattern-2) != '[' && *pattern  != ']') {
+! 		    match = (stringc <= (*pattern & TRIM) &&
+! 			      (*(pattern-2) & TRIM) <= stringc);
+  		    pattern++;
+  		}
+  		else 
+--- 1039,1047 ----
+  		if (match)
+  		    continue;
+  		if (rangec == '-' && *(pattern-2) != '[' && *pattern  != ']') {
+! 		    match = (   collate_range_cmp(stringc, *pattern & TRIM) <= 0
+! 			     && collate_range_cmp(*(pattern-2) & TRIM, stringc) <= 0
+! 			    );
+  		    pattern++;
+  		}
+  		else 
diff --git a/shells/tcsh/pkg-comment b/shells/tcsh/pkg-comment
index b48705ad7908..11c830c0b809 100644
--- a/shells/tcsh/pkg-comment
+++ b/shells/tcsh/pkg-comment
@@ -1 +1 @@
-An extended C-shell with many useful features with Japanese and color support.
+An extended C-shell with many useful features.
diff --git a/shells/tcsh/pkg-descr b/shells/tcsh/pkg-descr
index 4a6937ae5813..7c3c806b9845 100644
--- a/shells/tcsh/pkg-descr
+++ b/shells/tcsh/pkg-descr
@@ -1,9 +1,2 @@
 TCSH is an extended C-shell with many useful features like
 filename completion, history editing, etc.
-
-This also supports
-   1. Japanese command-line editing
-   2. Japanese NLS catalogs
-   3. colorlized ls-F command
-
-See also ${PREFIX}/share/doc/tcsh.
diff --git a/shells/tcsh/pkg-plist b/shells/tcsh/pkg-plist
index f3a12b1d973a..d060882a38ac 100644
--- a/shells/tcsh/pkg-plist
+++ b/shells/tcsh/pkg-plist
@@ -2,16 +2,12 @@ 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/doc/tcsh/complete.tcsh
-share/doc/tcsh/FAQ
-share/doc/tcsh/HISTORY.kanji.patch.euc
-share/doc/tcsh/HowToMakeNLS.euc
-share/doc/tcsh/README-color.ja
-share/doc/tcsh/README.kanji.patch.euc
-@dirrm share/doc/tcsh
 share/nls/C/tcsh.cat
-share/nls/C/tcsh.m
-share/nls/ja_JP.EUC/tcsh.cat
-share/nls/ja_JP.EUC/tcsh.m
-share/nls/ja_JP.SJIS/tcsh.cat
-share/nls/ja_JP.SJIS/tcsh.m
+share/nls/fr_FR.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/fr_BE.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/fr_CA.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/fr_CH.ISO_8859-1/tcsh.cat
+share/nls/de_DE.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
+share/nls/el_GR.ISO_8859-7/tcsh.cat