Update to version 6.07.06.

Submitted by:	maintainer

6 files changed, 90 insertions, 75 deletions

diff --git a/japanese/tcsh/Makefile b/japanese/tcsh/Makefile
index 0f2737c1d451..3a897f107629 100644
--- a/japanese/tcsh/Makefile
+++ b/japanese/tcsh/Makefile
@@ -1,44 +1,69 @@
 # New ports collection makefile for:	tcsh with color-ls and kanji patches
-# Version required:	6.07.02
+# Version required:	6.07.06
 # Date created:		29 November 1997
 # Whom:			issei <issei@t-cnet.or.jp>
 #
-# $Id: Makefile,v 1.2 1997/12/27 19:35:58 max Exp $
+# $Id: Makefile,v 1.3 1997/12/28 22:11:37 asami Exp $
 #
 
-DISTNAME=	tcsh-6.07
-PKGNAME=	ja-tcsh-6.07.02
+DISTNAME=	tcsh-6.07.06
+PKGNAME=	ja-tcsh-6.07.06b4
 CATEGORIES=	japanese shells
-MASTER_SITES=	ftp://ftp.jp.freebsd.org/pub/FreeBSD/distfiles/ \
-		ftp://ftp.iis.u-tokyo.ac.jp/pub7/FreeBSD/distfiles/ \
-		ftp://ftp.chem.sci.osaka-u.ac.jp/pub/unix/tools/tcsh/
-
-PATCH_SITES=	http://www2.wbs.or.jp/~znc/tcsh/ \
-		ftp://ftp.ccs.dendai.ac.jp/pub/misc/shell/tcsh/ \
+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/1996/dec/
-PATCHFILES=	tcsh-6.07.02.kanji.patch6a.gz tcsh-6.07.02-color-1.04.patch.gz
+		ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1998/jun/
+DISTFILES=	${DISTNAME}.tgz ${DISTNAME}-color-1.07.tgz
+
+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=	issei@t-cnet.or.jp
 
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/tcsh-6.07.02
 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
 
 post-install:
 	@(cd ${WRKSRC}; \
-	${INSTALL_DATA} tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat; \
-	${INSTALL_DATA} tcsh.C.m ${PREFIX}/share/nls/C/tcsh.m; \
-	${INSTALL_DATA} tcsh.ja.cat ${PREFIX}/share/nls/ja_JP.EUC/tcsh.cat; \
-	${INSTALL_DATA} tcsh.ja.m ${PREFIX}/share/nls/ja_JP.EUC/tcsh.m; \
+	${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
-	@${INSTALL_DATA} ${WRKSRC}/README-color.jp ${PREFIX}/share/doc/tcsh/
-	@${INSTALL_DATA} ${WRKSRC}/README.kanji.patch.euc ${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
diff --git a/japanese/tcsh/distinfo b/japanese/tcsh/distinfo
index 66541c11994d..f63927e6fe79 100644
--- a/japanese/tcsh/distinfo
+++ b/japanese/tcsh/distinfo
@@ -1,3 +1,3 @@
-MD5 (tcsh-6.07.tar.gz) = 18a9d8091c6da38ebdd63ab509324eb5
-MD5 (tcsh-6.07.02.kanji.patch6a.gz) = 6a78e3ebf631d3d78c7dc199bb6fe520
-MD5 (tcsh-6.07.02-color-1.04.patch.gz) = 5d2e0936f93d4616bd7bc497c9ee2929
+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
diff --git a/japanese/tcsh/files/patch-af b/japanese/tcsh/files/patch-af
index 249e9dc2f6d8..042be99dcd18 100644
--- a/japanese/tcsh/files/patch-af
+++ b/japanese/tcsh/files/patch-af
@@ -1,23 +1,15 @@
-*** config_f.h.bak	Fri Apr 26 23:17:30 1996
---- config_f.h	Mon Dec 16 03:53:59 1996
-***************
-*** 65,71 ****
-   *		if you don't have <nl_types.h>, you don't want
-   *		to define this.
-   */
-! #undef NLS_CATALOGS
-  
-  /*
-   * LOGINFIRST   Source ~/.login before ~/.cshrc
---- 65,75 ----
-   *		if you don't have <nl_types.h>, you don't want
-   *		to define this.
-   */
-! #if defined(__FreeBSD__) || defined(__OpenBSD__)
-! # define NLS_CATALOGS
-! #else
-! # undef NLS_CATALOGS
-! #endif
-  
-  /*
-   * LOGINFIRST   Source ~/.login before ~/.cshrc
+--- ../../tcsh-6.07.06/config_f.h	Sun Jun 21 10:45:27 1998
++++ config_f.h	Sun Jun 21 11:03:39 1998
+@@ -65,7 +65,11 @@
+  *		if you don't have <nl_types.h>, you don't want
+  *		to define this.
+  */
+-#undef NLS_CATALOGS
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
++# define NLS_CATALOGS
++#else
++# undef NLS_CATALOGS
++#endif
+ 
+ /*
+  * LOGINFIRST   Source ~/.login before ~/.cshrc
diff --git a/japanese/tcsh/files/patch-ag b/japanese/tcsh/files/patch-ag
index 62b4213868f7..cc8f26eff863 100644
--- a/japanese/tcsh/files/patch-ag
+++ b/japanese/tcsh/files/patch-ag
@@ -1,6 +1,6 @@
---- sh.func.c.orig	Sun Dec 28 03:14:21 1997
-+++ sh.func.c	Sun Dec 28 03:15:00 1997
-@@ -1273,6 +1273,9 @@
+--- ../../tcsh-6.07.06/sh.func.c	Sun Jun 21 10:45:27 1998
++++ sh.func.c	Sun Jun 21 11:27:31 1998
+@@ -1279,6 +1279,9 @@
      struct command *c;
  {
      Char   *vp, *lp;
@@ -10,36 +10,19 @@
  
      USE(c);
      if (*++v == 0) {
-@@ -1312,9 +1315,19 @@
- # ifdef LC_COLLATE
- 	(void) setlocale(LC_COLLATE, "");
- # endif
--# if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
-+# ifdef NLS_CATALOGS
-+# ifdef LC_MESSAGES
+@@ -1322,7 +1325,15 @@
+ #  ifdef LC_MESSAGES
  	(void) setlocale(LC_MESSAGES, "");
-+# endif
-+# ifdef __FreeBSD__
+ #  endif /* LC_MESSAGES */
++# ifdef __FreeBSD__  
 +	/* This code is to avoid bug. */
 +	if (catclosed)
- 	(void) catclose(catd);
++	    (void) catclose(catd);
 +	else
-+		catclosed = 1;
-+# else
-+		(void) catclose(catd);
++	    catclosed = 1;
++# else 
+ 	(void) catclose(catd);
 +# endif /* __FreeBSD__ */
  	nlsinit();
- # endif /* NLS_CATALOGS && LC_MESSAGES */
+ # endif /* NLS_CATALOGS */
  # ifdef LC_CTYPE
-@@ -1487,8 +1500,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/japanese/tcsh/files/patch-aj b/japanese/tcsh/files/patch-aj
new file mode 100644
index 000000000000..a6df6de96996
--- /dev/null
+++ b/japanese/tcsh/files/patch-aj
@@ -0,0 +1,9 @@
+--- ../../tcsh-6.07.06/nls/Makefile	Sun Jun 21 10:45:27 1998
++++ nls/Makefile	Sun Jun 21 11:38:16 1998
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS=	C german french greek spanish ja.roomi ja.koshiki ja
++SUBDIRS=	C ja ja_s ja.roomi ja.roomi_s ja.koshiki ja.koshiki_s
+ #GENCAT=	gencat -new
+ GENCAT=		gencat
+ 
diff --git a/japanese/tcsh/pkg-plist b/japanese/tcsh/pkg-plist
index 4f649c2e1621..f3a12b1d973a 100644
--- a/japanese/tcsh/pkg-plist
+++ b/japanese/tcsh/pkg-plist
@@ -2,10 +2,16 @@ 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/README-color.jp
+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