Index: head/japanese/kterm/Makefile
===================================================================
--- head/japanese/kterm/Makefile	(revision 55376)
+++ head/japanese/kterm/Makefile	(revision 55377)
@@ -1,70 +1,75 @@
 # New ports collection makefile for:	kterm
 # Date created:		18 November 1994
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
 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} \
 		README.wallpaper.ja
 
 MAINTAINER=	shige@FreeBSD.org
 
 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
 USE_XPM=	yes
 MAN1=		kterm.1
 MANCOMPRESSED=	yes
 
 DOCDIR=		${PREFIX}/share/doc/kterm
 
 .if !defined(PACKAGE_BUILDING)
 
 .if defined(WITH_XAW3DLIB) && defined(WITH_NEXTAWLIB)
 .BEGIN:
 	@${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!"
 	@${FALSE}
 .elif defined(WITH_XAW3DLIB)
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 post-patch:
 	@${ECHO_MSG}  "===>  Applying Xaw3d scrollbar patch"
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-Xaw3d
 .elif defined(WITH_NEXTAWLIB)
 LIB_DEPENDS+=	neXtaw.${XAWVER}:${PORTSDIR}/x11-toolkits/neXtaw
 post-patch:
 	@${ECHO_MSG}  "===>  Applying neXtaw scrollbar patch"
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-neXtaw
 .endif
 
 .endif
 
 post-install:
 # install japanese manual
 	@${MV} ${WRKSRC}/kterm.jman ${WRKSRC}/kterm.jman.jis
 	@nkf -e -u ${WRKSRC}/kterm.jman.jis >${WRKSRC}/kterm.jman
 	@${INSTALL_MAN} ${WRKSRC}/kterm.jman ${PREFIX}/man/ja/man1/kterm.1
 	@${GZIP_CMD} ${PREFIX}/man/ja/man1/kterm.1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README.kt ${DOCDIR}
 	@${INSTALL_DATA} ${_DISTDIR}/README.wallpaper.ja ${DOCDIR}/README.wallpaper.ja
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/japanese/kterm/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.32
\ No newline at end of property
+1.33
\ No newline at end of property
Index: head/japanese/kterm/distinfo
===================================================================
--- head/japanese/kterm/distinfo	(revision 55376)
+++ head/japanese/kterm/distinfo	(revision 55377)
@@ -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

Property changes on: head/japanese/kterm/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/japanese/kterm/files/patch-ab
===================================================================
--- head/japanese/kterm/files/patch-ab	(revision 55376)
+++ head/japanese/kterm/files/patch-ab	(revision 55377)
@@ -1,84 +1,92 @@
---- 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
 -*VT100*fontList:	-*-fixed-medium-r-normal--14-*,\
 -			-*-gothic-medium-r-normal--14-*,\
 -			-*-mincho-medium-r-normal--14-*
 -!*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-*
  *fontMenu*font1*Label:	Unreadable
 -*VT100*fontList1:	-*-fixed-medium-r-normal--2-*,\
 -			-*-gothic-medium-r-normal--2-*,\
 -			-*-mincho-medium-r-normal--2-*
 -*VT100*font1:		-misc-nil-medium-r-normal--2-*-misc-fontspecific
 +*VT100*fontList1:	-*-fixed-medium-r-normal--2-*-c-*,\
 +			-*-gothic-medium-r-normal--2-*-c-*,\
 +			-*-mincho-medium-r-normal--2-*-c-*
 +*VT100*font1:		-misc-nil-medium-r-normal--2-*-c-*-misc-fontspecific
  *fontMenu*font2*Label:	Tiny
 -*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
  
 +!This can be useful if you have an IntelliMouse.  It maps the button
 +!events generated by the wheel
 +*VT100*Translations:	#override \
 +	!Ctrl			<Btn4Down>:	scroll-back(1,halfpage) \n\
 +	!Lock Ctrl		<Btn4Down>:	scroll-back(1,halfpage) \n\
 +	!Lock @Num_Lock Ctrl	<Btn4Down>:	scroll-back(1,halfpage) \n\
 +	! @Num_Lock Ctrl	<Btn4Down>:	scroll-back(1,halfpage) \n\
 +				<Btn4Down>:	scroll-back(5,line) \n\
 +	!Ctrl			<Btn5Down>:	scroll-forw(1,halfpage) \n\
 +	!Lock Ctrl		<Btn5Down>:	scroll-forw(1,halfpage) \n\
 +	!Lock @Num_Lock Ctrl	<Btn5Down>:	scroll-forw(1,halfpage) \n\
 +	! @Num_Lock Ctrl	<Btn5Down>:	scroll-forw(1,halfpage) \n\
 +				<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)

Property changes on: head/japanese/kterm/files/patch-ab
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property