Upgrade, 6.07.6b4 -> 6.07.9b5.

Provide the Japanese catalog files as separate ports.
Update maintainer's e-mail address.

PR:		7692
Submitted by:	maintainer

7 files changed, 34 insertions, 63 deletions

diff --git a/japanese/tcsh/Makefile b/japanese/tcsh/Makefile
index 3a897f107629..3b644ba796d4 100644
--- a/japanese/tcsh/Makefile
+++ b/japanese/tcsh/Makefile
@@ -1,63 +1,36 @@
-# New ports collection makefile for:	tcsh with color-ls and kanji patches
-# Version required:	6.07.06
+# New ports collection makefile for:	tcsh with kanji patch
+# Version required:	6.07.09
 # Date created:		29 November 1997
-# Whom:			issei <issei@t-cnet.or.jp>
+# Whom:			issei <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1997/12/28 22:11:37 asami Exp $
+# $Id: Makefile,v 1.4 1998/07/04 03:20:11 steve Exp $
 #
 
-DISTNAME=	tcsh-6.07.06
-PKGNAME=	ja-tcsh-6.07.06b4
+DISTNAME=	tcsh-6.07.09
+PKGNAME=	ja-tcsh-6.07.09b5
 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
+MASTER_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
+EXTRACT_SUFX=	.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
+PATCH_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
+PATCHFILES=	${DISTNAME}.kanji.patch7b5.gz
 
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+MAINTAINER=	issei@jp.FreeBSD.ORG
 
+PATCH_DIST_STRIP=       -p1
 GNU_CONFIGURE=	yes
+# Ugly hack
+CONFIGURE_ARGS=	--bindir=${PREFIX}/bin
 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
+		README.kanji.patch.euc
 
 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; \
+	${INSTALL_DATA} tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat; \
+	${INSTALL_DATA} tcsh.C.m ${PREFIX}/share/nls/C/tcsh.m; \
 	)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/tcsh
@@ -67,6 +40,7 @@ post-install:
 .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
+	@(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/tcsh) >/etc/shells
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/japanese/tcsh/distinfo b/japanese/tcsh/distinfo
index f63927e6fe79..ae7fca635980 100644
--- a/japanese/tcsh/distinfo
+++ b/japanese/tcsh/distinfo
@@ -1,3 +1,2 @@
-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.09.tgz) = f285baaebbb3c5f9c32425558415a798
+MD5 (tcsh-6.07.09.kanji.patch7b5.gz) = fe918113362ba0446b12269356a6e2de
diff --git a/japanese/tcsh/files/patch-af b/japanese/tcsh/files/patch-af
index 042be99dcd18..8f14ba436c2a 100644
--- a/japanese/tcsh/files/patch-af
+++ b/japanese/tcsh/files/patch-af
@@ -1,5 +1,5 @@
---- ../../tcsh-6.07.06/config_f.h	Sun Jun 21 10:45:27 1998
-+++ config_f.h	Sun Jun 21 11:03:39 1998
+--- ../../tcsh-6.07.09/config_f.h	Wed Jul 22 01:03:32 1998
++++ config_f.h	Wed Jul 22 01:04:17 1998
 @@ -65,7 +65,11 @@
   *		if you don't have <nl_types.h>, you don't want
   *		to define this.
diff --git a/japanese/tcsh/files/patch-ag b/japanese/tcsh/files/patch-ag
index cc8f26eff863..706fb022625f 100644
--- a/japanese/tcsh/files/patch-ag
+++ b/japanese/tcsh/files/patch-ag
@@ -1,6 +1,6 @@
---- ../../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 @@
+--- ../../tcsh-6.07.09/sh.func.c	Wed Jul 22 01:03:33 1998
++++ sh.func.c	Wed Jul 22 01:04:47 1998
+@@ -1286,6 +1286,9 @@
      struct command *c;
  {
      Char   *vp, *lp;
@@ -10,7 +10,7 @@
  
      USE(c);
      if (*++v == 0) {
-@@ -1322,7 +1325,15 @@
+@@ -1338,7 +1341,15 @@
  #  ifdef LC_MESSAGES
  	(void) setlocale(LC_MESSAGES, "");
  #  endif /* LC_MESSAGES */
diff --git a/japanese/tcsh/files/patch-aj b/japanese/tcsh/files/patch-aj
index a6df6de96996..572623c7ffec 100644
--- a/japanese/tcsh/files/patch-aj
+++ b/japanese/tcsh/files/patch-aj
@@ -1,9 +1,9 @@
---- ../../tcsh-6.07.06/nls/Makefile	Sun Jun 21 10:45:27 1998
-+++ nls/Makefile	Sun Jun 21 11:38:16 1998
+--- nls/Makefile.orig	Wed Aug 19 14:21:20 1998
++++ nls/Makefile	Wed Aug 19 14:23:51 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
++SUBDIRS=	C
  #GENCAT=	gencat -new
  GENCAT=		gencat
  
diff --git a/japanese/tcsh/pkg-message b/japanese/tcsh/pkg-message
new file mode 100644
index 000000000000..d762f7e0acbf
--- /dev/null
+++ b/japanese/tcsh/pkg-message
@@ -0,0 +1,4 @@
+############################################################
+You must install one of packages ja-tcsh-nls-* to enable
+Japanese NLS catalog feature.
+############################################################
diff --git a/japanese/tcsh/pkg-plist b/japanese/tcsh/pkg-plist
index f3a12b1d973a..8e43d8cb9568 100644
--- a/japanese/tcsh/pkg-plist
+++ b/japanese/tcsh/pkg-plist
@@ -1,17 +1,11 @@
 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