7 files changed, 62 insertions, 73 deletions

diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index 7a46e8a1f8cb..66623347e91f 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	kappa20
-PORTVERSION=	0.3
+PORTVERSION=	0.394
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/misc/character/fonts/kappa/
+MASTER_SITES=	http://kappa.allnet.ne.jp/20dot.fonts/
 DISTNAME=	Kappa20-${PORTVERSION}
 
 MAINTAINER=	ginga@athena.club.ne.jp
 
 USE_X_PREFIX=	yes
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -21,7 +22,6 @@ USE_X_PREFIX=	yes
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
-ALL_TARGET=	default
 FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
 MAKE_ARGS=	TARGETDIR="${PREFIX}/${FONTSDIR}"
@@ -34,9 +34,10 @@ pre-install:
 post-install:
 	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/kappa20
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/kappa20/
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/pcf/fonts.alias.kappa ${PREFIX}/share/doc/kappa20/
+	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
+	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/ja/${PORTNAME}/README.euc-jp
+#	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/pcf/fonts.alias.kappa ${PREFIX}/share/doc/${PORTNAME}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/kappa20/distinfo b/japanese/kappa20/distinfo
index a4a013cb074d..05ebfca216b1 100644
--- a/japanese/kappa20/distinfo
+++ b/japanese/kappa20/distinfo
@@ -1 +1 @@
-MD5 (Kappa20-0.3.tar.gz) = 0fb4dec59deb0a01dd65e6d26d47126a
+MD5 (Kappa20-0.394.tar.bz2) = cfd3e479ab14489cb84dd2aff0a71c54
diff --git a/japanese/kappa20/files/patch-aa b/japanese/kappa20/files/patch-aa
deleted file mode 100644
index d0ccfb34df47..000000000000
--- a/japanese/kappa20/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	Sun Oct  4 05:46:39 1998
-+++ Makefile	Sat Oct 10 02:53:35 1998
-@@ -59,7 +59,7 @@
- 	rm vk20m.bdf.orig
- 
- fonts.alias.standard::
--	grep -v '^-kappa\*--20-\*' ${TARGETDIR}/fonts.alias > pcf/fonts.alias
-+#	egrep -iv '[ 	]-kappa.+--20-.+' ${TARGETDIR}/fonts.alias > pcf/fonts.alias
- 	echo -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias
- 	echo -kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias
- 	echo -kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias
-@@ -99,8 +99,9 @@
- 
- 
- install::
--	install -m 644 -c pcf/*.pcf* pcf/fonts.alias ${TARGETDIR}
--	cd ${TARGETDIR} ; mkfontdir
-+	install -m 644 -c pcf/*.pcf* ${TARGETDIR}
-+#	install -m 644 -c pcf/*.pcf* pcf/fonts.alias ${TARGETDIR}
-+#	cd ${TARGETDIR} ; mkfontdir
- 
- clean::
- 	rm -f *~ pcf/*.pcf* pcf/fonts.dir pcf/fonts.alias vk20?.bdf* 
diff --git a/japanese/kappa20/files/patch-ab b/japanese/kappa20/files/patch-ab
deleted file mode 100644
index 95d48aea8982..000000000000
--- a/japanese/kappa20/files/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
---- pcf/fonts.alias.kappa.old	Thu Oct  8 00:18:23 1998
-+++ pcf/fonts.alias.kappa	Wed Oct  7 15:26:19 1998
-@@ -0,0 +1,20 @@
-+-kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-+10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
-+a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
-+10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
-+a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
-+10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-+r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-+10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-+r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
diff --git a/japanese/kappa20/pkg-descr b/japanese/kappa20/pkg-descr
index 62e68113fb62..ad5432e3dc31 100644
--- a/japanese/kappa20/pkg-descr
+++ b/japanese/kappa20/pkg-descr
@@ -1,12 +1,16 @@
 Japanese 20 dot mincho font named `kappa font'.
 
 You can use 
-	"k20m"  	medium mincho
-	"k20b"  	bold mincho
-	"10x20m" 	ascii
-	"10x20b" 	bold ascii
-	"10x20rkm" 	kana
-	"10x20rkb" 	bold kana
+	k20[mb]		mincho	(JIS X 0208)
+			('m' for medium mincho, 'b' for bold mincho)
+	10x20[mb]	ascii		(ISO-8859-1(Latin 1))
+	10x20rk[mb]	kana		(JIS X 0201)
+	10x20L[239][mb]	ISO 8859-[239]	(Latin [239])
+	ipa-10x20[mb]	Mule IPA fonts
+	vk20[mb]	k20[mb] modified for vertical writings
 
-A simple usage:
-	% kterm -fn 10x20b -fr 10x20rkb -fk k20b
+An example usage:
+  % kterm -fn a20m -fb a20b -fr r10m -frb a20b -fk k20m -fkb k20b -lsp 3
+or in your Xresources file:
+  KTerm*VT100*fontList:		-kappa-fixed-medium-r-normal--20-*
+  KTerm*VT100*boldFontList:	-kappa-fixed-bold-r-normal--20-*
diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist
index 2d6ac7237574..b492a00274cb 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -1,11 +1,21 @@
+%%FONTSDIR%%/10x20L2b.pcf.gz
+%%FONTSDIR%%/10x20L2m.pcf.gz
+%%FONTSDIR%%/10x20L3b.pcf.gz
+%%FONTSDIR%%/10x20L3m.pcf.gz
+%%FONTSDIR%%/10x20L9b.pcf.gz
+%%FONTSDIR%%/10x20L9m.pcf.gz
 %%FONTSDIR%%/10x20b.pcf.gz
 %%FONTSDIR%%/10x20m.pcf.gz
 %%FONTSDIR%%/10x20rkb.pcf.gz
 %%FONTSDIR%%/10x20rkm.pcf.gz
+%%FONTSDIR%%/ipa-10x20b.pcf.gz
+%%FONTSDIR%%/ipa-10x20m.pcf.gz
 %%FONTSDIR%%/k20b.pcf.gz
 %%FONTSDIR%%/k20m.pcf.gz
-share/doc/kappa20/README
-share/doc/kappa20/fonts.alias.kappa
+%%FONTSDIR%%/nk20b-1.pcf.gz
+%%FONTSDIR%%/vk20b.pcf.gz
+%%FONTSDIR%%/vk20m.pcf.gz
+share/doc/ja/kappa20/README.euc-jp
 @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/japanese/kappa20/pkg-req b/japanese/kappa20/pkg-req
index d6f31cd01480..6d154393351e 100644
--- a/japanese/kappa20/pkg-req
+++ b/japanese/kappa20/pkg-req
@@ -22,26 +22,46 @@ fi
 # font alias entry here!
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
--kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+10x20L2b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-2
+10x20L2m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-2
+10x20L3b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-3
+10x20L3m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-3
+10x20L9b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-15
+10x20L9m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-15
 10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
-a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
 10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
-a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
 10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
 10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
+a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
+ipa-10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1
+ipa-10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1
+k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
 r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+vk20b -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+vk20m -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"