Fix font foundary in fontList.

Add jisx0213 patch.
Add 16-colors patch from ports/kterm16c.

PORTREVISION bump.

Submitted by:	KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp>

3 files changed, 43 insertions, 28 deletions

diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index b83fc12d19ec..b904633ce67c 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	kterm
 PORTVERSION=	6.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
-		${MASTER_SITE_PORTS_JP} \
+MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
+		${MASTER_SITE_XCONTRIB} \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	applications kterm shige/kterm
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -23,9 +23,14 @@ BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	kterm
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/ \
-		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/
+		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/ \
+		${MASTER_SITE_PORTS_JP} \
+		${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	shige/kterm
 PATCHFILES=	${DISTNAME}.NFS-xauth.patch \
-		${DISTNAME}-wpi.patch.gz
+		${DISTNAME}-wpi.patch.gz \
+		${DISTNAME}-jisx0213.patch.gz \
+		${DISTNAME}-color16.patch.gz
 PATCH_DIST_STRIP= -p1
 
 USE_IMAKE=	yes
diff --git a/japanese/kterm/distinfo b/japanese/kterm/distinfo
index 7d80b829aa68..16d47ffa481b 100644
--- a/japanese/kterm/distinfo
+++ b/japanese/kterm/distinfo
@@ -1,4 +1,6 @@
 MD5 (kterm/kterm-6.2.0.tar.gz) = 9cc72841b50dfba92bce01dbbebf3039
+MD5 (kterm/README.wallpaper.ja) = debae083ddb71e53a958c4ffb4c108e9
 MD5 (kterm/kterm-6.2.0.NFS-xauth.patch) = a2f11334e14929997e987e463f004dd0
 MD5 (kterm/kterm-6.2.0-wpi.patch.gz) = 9b7f06ce63fa06a656e45b752f8f6240
-MD5 (kterm/README.wallpaper.ja) = debae083ddb71e53a958c4ffb4c108e9
+MD5 (kterm/kterm-6.2.0-jisx0213.patch.gz) = c09953e2c8ea1bbb6dbd771ba969cd8b
+MD5 (kterm/kterm-6.2.0-color16.patch.gz) = ecf0d363f2d1a253678b77cf41b392ce
diff --git a/japanese/kterm/files/patch-ab b/japanese/kterm/files/patch-ab
index f214f20050ca..32a6d4b2beb6 100644
--- a/japanese/kterm/files/patch-ab
+++ b/japanese/kterm/files/patch-ab
@@ -1,6 +1,6 @@
---- KTerm.ad.orig	Sun Jun 23 17:00:22 1996
-+++ KTerm.ad	Sat Jun 23 00:08:11 2001
-@@ -51,37 +51,37 @@
+--- KTerm.ad.old	Tue Feb  5 02:02:39 2002
++++ KTerm.ad	Mon Feb  4 21:54:16 2002
+@@ -51,37 +51,43 @@
  
  *fontMenu.Label:  VT Fonts
  *fontMenu*fontdefault*Label:	Default
@@ -10,9 +10,10 @@
 -!*VT100*boldFontList:	-*-fixed-bold-r-normal--14-*,\
 -!			-*-gothic-bold-r-normal--14-*,\
 -!			-*-mincho-bold-r-normal--14-*
-+*VT100*fontList:	-*-fixed-medium-r-normal--14-*-c-*,\
-+			-*-gothic-medium-r-normal--14-*-c-*,\
-+			-*-mincho-medium-r-normal--14-*-c-*
++*VT100*fontList:	-alias-fixed-medium-r-normal--14-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--14-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--14-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--14-*-*-*-c-*-*-*
 +!*VT100*boldFontList:	-*-fixed-bold-r-normal--14-*-c-*,\
 +!			-*-gothic-bold-r-normal--14-*-c-*,\
 +!			-*-mincho-bold-r-normal--14-*-c-*
@@ -29,41 +30,46 @@
 -*VT100*fontList2:	-*-fixed-medium-r-normal--14-*,\
 -			-*-gothic-medium-r-normal--14-*,\
 -			-*-mincho-medium-r-normal--14-*
-+*VT100*fontList2:	-*-fixed-medium-r-normal--14-*-c-*,\
-+			-*-gothic-medium-r-normal--14-*-c-*,\
-+			-*-mincho-medium-r-normal--14-*-c-*
++*VT100*fontList2:	-alias-fixed-medium-r-normal--8-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--8-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--8-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--8-*-*-*-c-*-*-*
  *fontMenu*font3*Label:	Small
 -*VT100*fontList3:	-*-fixed-medium-r-normal--16-*,\
 -			-*-gothic-medium-r-normal--16-*,\
 -			-*-mincho-medium-r-normal--16-*
-+*VT100*fontList3:	-*-fixed-medium-r-normal--16-*-c-*,\
-+			-*-gothic-medium-r-normal--16-*-c-*,\
-+			-*-mincho-medium-r-normal--16-*-c-*
++*VT100*fontList3:	-alias-fixed-medium-r-normal--12-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--12-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--12-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--12-*-*-*-c-*-*-*
  *fontMenu*font4*Label:	Medium
 -*VT100*fontList4:	-*-fixed-medium-r-normal--18-*,\
 -			-*-gothic-medium-r-normal--18-*,\
 -			-*-mincho-medium-r-normal--18-*
-+*VT100*fontList4:	-*-fixed-medium-r-normal--18-*-c-*,\
-+			-*-gothic-medium-r-normal--18-*-c-*,\
-+			-*-mincho-medium-r-normal--18-*-c-*
++*VT100*fontList4:	-alias-fixed-medium-r-normal--16-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--16-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--16-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--16-*-*-*-c-*-*-*
  *fontMenu*font5*Label:	Large
 -*VT100*fontList5:	-*-fixed-medium-r-normal--24-*,\
 -			-*-gothic-medium-r-normal--24-*,\
 -			-*-mincho-medium-r-normal--24-*
-+*VT100*fontList5:	-*-fixed-medium-r-normal--24-*-c-*,\
-+			-*-gothic-medium-r-normal--24-*-c-*,\
-+			-*-mincho-medium-r-normal--24-*-c-*
++*VT100*fontList5:	-alias-fixed-medium-r-normal--20-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--20-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--20-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--20-*-*-*-c-*-*-*
  *fontMenu*font6*Label:	Huge
 -*VT100*fontList6:	-*-fixed-medium-r-normal--26-*,\
 -			-*-gothic-medium-r-normal--26-*,\
 -			-*-mincho-medium-r-normal--26-*
-+*VT100*fontList6:	-*-fixed-medium-r-normal--26-*-c-*,\
-+			-*-gothic-medium-r-normal--26-*-c-*,\
-+			-*-mincho-medium-r-normal--26-*-c-*
++*VT100*fontList6:	-alias-fixed-medium-r-normal--24-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--24-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--24-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--24-*-*-*-c-*-*-*
  *fontMenu*fontescape*Label:	Escape Sequence
  *fontMenu*fontsel*Label:		Selection
  !fontescape and fontsel overridden by application
-@@ -123,3 +123,18 @@
+@@ -123,5 +129,20 @@
  *tek4014*font3: 6x13
  *tek4014*fontSmall: 6x10
  
@@ -82,3 +88,5 @@
 +				<Btn5Down>:	scroll-forw(5,line)
 +*VT100.translations:	#override \
 +	Shift<Key>space: begin-conversion(_JAPANESE_CONVERSION)
+ *VT100*translations: #override  Shift<Key>space: \
+ 	begin-conversion(_JAPANESE_CONVERSION)