6 files changed, 144 insertions, 85 deletions

diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index 79213ec67b78..6bc0def7bad9 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -1,26 +1,39 @@
 # New ports collection makefile for:	kappafont
-# Version required:	0.2
-# Date created:		30 Sep 1997
-# Whom: Kawaguti Ginga <ginga@amalthea.phys.s.u-tokyo.ac.jp>
+# Version required:	0.3
+# Date created:		12 Nov 1998
+# Whom: Kawaguti Ginga <ginga@athena.club.or.jp>
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:31:19 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/07 22:43:07 asami Exp $
 #
 
-DISTNAME=	Kappa20-0.2
-PKGNAME=	ja-kappa20-0.2
+DISTNAME=	Kappa20-0.3
+PKGNAME=	ja-kappa20-0.3
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	ftp://ftp.st.ryukoku.ac.jp/pub/X11/fonts/ \
-		ftp://ftp.win.or.jp/pub/doc-sources/fj.sources/1997/aug/
+MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/misc/character/fonts/kappa/
 
-MAINTAINER=	ginga@amalthea.phys.s.u-tokyo.ac.jp
+MAINTAINER=	ginga@athena.club.or.jp
 
+ALL_TARGET=	default
 USE_X_PREFIX=	yes
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
+PLIST_SUB=	PERL=${PERL}
+
+pre-install:
+	@if [ ! -d ${PREFIX}/lib/X11/fonts/local ]; then \
+	    ${ECHO} '**********************************************************************'; \
+	    ${ECHO} "****** ${PREFIX}/lib/X11/fonts/local/ doesn't exist."; \
+	    ${ECHO} "****** Creating ${PREFIX}/lib/X11/fonts/local/"; \
+	    ${MKDIR} ${PREFIX}/lib/X11/fonts/local/; \
+	    ${ECHO} '****** Please upgrade your XFree86 to 3.3.3 or upper,'; \
+	    ${ECHO} "****** or add this directory to your /etc/XF86Config's FontPath entry."; \
+	    ${ECHO} '**********************************************************************'; \
+	fi
 
 post-install:
 .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/
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/kappa20/distinfo b/japanese/kappa20/distinfo
index 492a89c495e2..a4a013cb074d 100644
--- a/japanese/kappa20/distinfo
+++ b/japanese/kappa20/distinfo
@@ -1 +1 @@
-MD5 (Kappa20-0.2.tar.gz) = 0a7df089ced7182241fa2105b4936c79
+MD5 (Kappa20-0.3.tar.gz) = 0fb4dec59deb0a01dd65e6d26d47126a
diff --git a/japanese/kappa20/files/patch-aa b/japanese/kappa20/files/patch-aa
index 1379e1f1199a..6bb283f32c03 100644
--- a/japanese/kappa20/files/patch-aa
+++ b/japanese/kappa20/files/patch-aa
@@ -1,37 +1,87 @@
---- Makefile.orig	Wed Aug  6 08:06:01 1997
-+++ Makefile	Tue Sep 30 22:53:23 1997
-@@ -1,6 +1,9 @@
+--- Makefile.dist	Sun Oct  4 05:46:39 1998
++++ Makefile	Wed Nov 11 23:55:53 1998
+@@ -1,4 +1,4 @@
 -TARGETDIR = /usr/X11R6/lib/X11/fonts/misc
-+TARGETDIR = ${PREFIX}/lib/X11/fonts/misc
++TARGETDIR = ${PREFIX}/lib/X11/fonts/local
  
--all:	k20b.pcf.Z k20m.pcf.Z 10x20b.pcf.Z 10x20m.pcf.Z 10x20rkb.pcf.Z 10x20rkm.pcf.Z
-+TARGETS = k20b.pcf.Z k20m.pcf.Z 10x20b.pcf.Z 10x20m.pcf.Z \
-+	10x20rkb.pcf.Z 10x20rkm.pcf.Z
-+
-+all: $(TARGETS)
+ COMPRESSCMD = gzip -9
+ COMPRESSEXT = .gz
+@@ -59,43 +59,43 @@
+ 	rm vk20m.bdf.orig
  
- k20b.pcf.Z:	k20b.bdf
- 	bdftopcf k20b.bdf | compress > k20b.pcf.Z
-@@ -20,13 +23,14 @@
- 10x20rkm.pcf.Z:	10x20rkm.bdf
- 	bdftopcf 10x20rkm.bdf | compress > 10x20rkm.pcf.Z
+ fonts.alias.standard::
+-	grep -v '^-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
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias
+-	echo 10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 >> pcf/fonts.alias
+-	echo a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 >> pcf/fonts.alias
+-	echo 10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 >> pcf/fonts.alias
+-	echo a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 >> pcf/fonts.alias
+-	echo 10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 >> pcf/fonts.alias
+-	echo r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 >> pcf/fonts.alias
+-	echo 10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 >> pcf/fonts.alias
+-	echo r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 >> pcf/fonts.alias
++	perl -ne 'if ( /^!/ || ( !/[ \t]-kappa-.+--20-/i ) ){ print; }' ${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
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo 'k20b	-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo 'k20m	-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias
++	echo '10x20b	-kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1' >> pcf/fonts.alias
++	echo 'a20b	-kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1' >> pcf/fonts.alias
++	echo '10x20m	-kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1' >> pcf/fonts.alias
++	echo 'a20m	-kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1' >> pcf/fonts.alias
++	echo '10x20rkb	-kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0' >> pcf/fonts.alias
++	echo 'r20b	-kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0' >> pcf/fonts.alias
++	echo '10x20rkm	-kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0' >> pcf/fonts.alias
++	echo 'r20m	-kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0' >> pcf/fonts.alias
  
--install:	k20b.pcf.Z k20m.pcf.Z 10x20b.pcf.Z 10x20m.pcf.Z 10x20rkb.pcf.Z 10x20rkm.pcf.Z
--	install -c -m 0644 k20b.pcf.Z k20m.pcf.Z 10x20b.pcf.Z 10x20m.pcf.Z 10x20rkb.pcf.Z 10x20rkm.pcf.Z ${TARGETDIR}
--	grep -h '[^0-9]' fonts.dir ${TARGETDIR}/fonts.dir | sort -u > fonts.dir.tmp
--	wc -l fonts.dir.tmp | awk '{print $$1}' | cat - fonts.dir.tmp > ${TARGETDIR}/fonts.dir
--	sort -u fonts.alias ${TARGETDIR}/fonts.alias > fonts.alias.tmp
--	install -m 0644 fonts.alias.tmp ${TARGETDIR}/fonts.alias
-+install: $(TARGETS)
-+	${INSTALL_DATA} $(TARGETS) $(TARGETDIR)
-+	@echo "updating fonts.dir and fonts.alias"
-+	@(cd $(TARGETDIR) ; mkfontdir . ; touch fonts.alias ; \
-+	cp fonts.alias fonts.alias.orig)
-+	@(cd $(TARGETDIR) ; cat fonts.alias.orig ; grep -i -- '-kappa-' fonts.dir | \
-+	sed 's/\.pcf\.Z//;s/x20rkm/x20rk/') >$(TARGETDIR)/fonts.alias
-+	@rm $(TARGETDIR)/fonts.alias.orig
+ fonts.alias.all:: fonts.alias.standard
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo vk20b -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo -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 >> pcf/fonts.alias
+-	echo vk20m -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias
+-	echo ipa-10x20m  -kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1
+-	echo ipa-10x20b  -kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo 'vk20b	-kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo '-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' >> pcf/fonts.alias
++	echo 'vk20m	-kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias
++	echo 'ipa-10x20m	-kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1' >> pcf/fonts.alias
++	echo 'ipa-10x20b	-kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1' >> pcf/fonts.alias
  
- clean:
--	rm -f fonts.dir.tmp
--	rm -f k20b.pcf.Z k20m.pcf.Z 10x20b.pcf.Z 10x20m.pcf.Z 10x20rkb.pcf.Z 10x20rkm.pcf.Z
-+	rm -f $(TARGETS)
+ 
+ install::
diff --git a/japanese/kappa20/files/patch-ab b/japanese/kappa20/files/patch-ab
index 3d5e6ed8d7ae..d8ddc303f045 100644
--- a/japanese/kappa20/files/patch-ab
+++ b/japanese/kappa20/files/patch-ab
@@ -1,31 +1,23 @@
-diff -u -r1.1 10x20b.bdf
---- 10x20b.bdf	1997/08/12 08:55:57	1.1
-+++ 10x20b.bdf	1997/08/12 08:56:08
-@@ -10,7 +10,7 @@
- FONTNAME_REGISTRY ""
- FOUNDRY "Kappa"
- FAMILY_NAME "Fixed"
--WEIGHT_NAME "Medium"
-+WEIGHT_NAME "Bold"
- SLANT "R"
- SETWIDTH_NAME "Normal"
- ADD_STYLE_NAME ""
-diff -u -r1.1 10x20rkb.bdf
---- 10x20rkb.bdf	1997/08/12 08:54:24	1.1
-+++ 10x20rkb.bdf	1997/08/12 08:54:46
-@@ -1,13 +1,13 @@
- STARTFONT 2.1
- COMMENT 10x20rkb.bdf ver.0.20(1997.8.6) by KANOU Hiroki(g92k0323@mn.waseda.ac.jp).
--FONT -Kappa-Fixed-Medium-R-Normal--20-190-75-75-C-100-JISX0201.1976-0
-+FONT -Kappa-Fixed-Bold-R-Normal--20-190-75-75-C-100-JISX0201.1976-0
- SIZE 20 75 75
- FONTBOUNDINGBOX 10 20 0 -3
- STARTPROPERTIES 19
- FONTNAME_REGISTRY ""
- FOUNDRY "Kappa"
- FAMILY_NAME "Fixed"
--WEIGHT_NAME "Medium"
-+WEIGHT_NAME "Bold"
- SLANT "R"
- SETWIDTH_NAME "Normal"
- ADD_STYLE_NAME ""
+--- 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-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-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-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-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
++k20m	-kappa-fixed-medium-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
++a20m	-kappa-fixed-medium-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
++10x20b	-kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
++r20m	-kappa-fixed-medium-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
++10x20rkb	-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
diff --git a/japanese/kappa20/pkg-descr b/japanese/kappa20/pkg-descr
index bf799a00163c..62e68113fb62 100644
--- a/japanese/kappa20/pkg-descr
+++ b/japanese/kappa20/pkg-descr
@@ -5,7 +5,7 @@ You can use
 	"k20b"  	bold mincho
 	"10x20m" 	ascii
 	"10x20b" 	bold ascii
-	"10x20rk" 	kana
+	"10x20rkm" 	kana
 	"10x20rkb" 	bold kana
 
 A simple usage:
diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist
index 3937e97e4989..1ac593359f90 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -1,13 +1,17 @@
-lib/X11/fonts/misc/10x20b.pcf.Z
-lib/X11/fonts/misc/10x20m.pcf.Z
-lib/X11/fonts/misc/10x20rkb.pcf.Z
-lib/X11/fonts/misc/10x20rkm.pcf.Z
-lib/X11/fonts/misc/k20b.pcf.Z
-lib/X11/fonts/misc/k20m.pcf.Z
+lib/X11/fonts/local/10x20b.pcf.gz
+lib/X11/fonts/local/10x20m.pcf.gz
+lib/X11/fonts/local/10x20rkb.pcf.gz
+lib/X11/fonts/local/10x20rkm.pcf.gz
+lib/X11/fonts/local/k20b.pcf.gz
+lib/X11/fonts/local/k20m.pcf.gz
 share/doc/kappa20/README
-@exec cd %D/lib/X11/fonts/misc ; mkfontdir
-@exec  echo "Updating misc/fonts.alias"
-@exec cd %D/lib/X11/fonts/misc ; touch fonts.alias ; cp fonts.alias fonts.alias.orig ; (cat fonts.alias.orig ; grep -i -- -kappa- fonts.dir | sed 's/\.pcf\.Z//;s/x20rkm/x20rk/') >fonts.alias ; rm fonts.alias.orig
-@unexec cd %D/lib/X11/fonts/misc ; mkfontdir
-@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc ; cp fonts.alias fonts.alias.orig ; grep -v 'kappa' fonts.alias.orig > fonts.alias ; rm fonts.alias.orig
+share/doc/kappa20/fonts.alias.kappa
+@exec if [ ! -d %D/lib/X11/fonts/local ]; then echo '**********************************************************************'; echo '****** '%D"/lib/X11/fonts/local/ doesn't exist."; echo '****** ''Creating '%D'/lib/X11/fonts/local/'; mkdir -p %D/lib/X11/fonts/local/; echo '****** ''Please upgrade your XFree86 to 3.3.3 or upper,'; echo '****** '"or add this directory to your /etc/XF86Config's FontPath entry."; echo '**********************************************************************'; fi
+@exec cd %D/lib/X11/fonts/local ; mkfontdir
+@exec echo "Updating local/fonts.alias"
+@exec touch %D/lib/X11/fonts/local/fonts.alias
+@exec cd %D/lib/X11/fonts/local ; cp fonts.alias fonts.alias.orig ; cat fonts.alias.orig | %%PERL%% -ne 'if ( /^!/ || ( !/[ \t]-kappa-.+--20-/i ) ){ print; }' > fonts.alias ; cat %D/share/doc/kappa20/fonts.alias.kappa >> fonts.alias ; rm fonts.alias.orig
+@unexec cd %D/lib/X11/fonts/local ; mkfontdir
+@unexec echo "updating fonts.alias"
+@unexec cd %D/lib/X11/fonts/local ; cp fonts.alias fonts.alias.orig ; cat fonts.alias.orig | %%PERL%% -ne 'if ( /^!/ || ( !/[ \t]-kappa-.+--20-/i ) ){ print; }' > fonts.alias ; rm fonts.alias.orig
 @dirrm share/doc/kappa20