Reallocate the font directory (misc->local),

following the change in XFree86 3.3.3.
Submitted by:	Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>

5 files changed, 116 insertions, 126 deletions

diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index 6bc0def7bad9..3aea6923d58d 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	kappafont
 # Version required:	0.3
-# Date created:		12 Nov 1998
+# Date created:		8 Oct 1998
 # Whom: Kawaguti Ginga <ginga@athena.club.or.jp>
 #
-# $Id: Makefile,v 1.4 1998/08/07 22:43:07 asami Exp $
+# $Id$
 #
 
 DISTNAME=	Kappa20-0.3
@@ -15,21 +15,17 @@ MAINTAINER=	ginga@athena.club.or.jp
 
 ALL_TARGET=	default
 USE_X_PREFIX=	yes
+FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
-PLIST_SUB=	PERL=${PERL}
+MAKE_ARGS=	TARGETDIR="${PREFIX}/${FONTSDIR}"
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 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
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 post-install:
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/kappa20
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/kappa20/
diff --git a/japanese/kappa20/files/patch-aa b/japanese/kappa20/files/patch-aa
index 6bb283f32c03..d0ccfb34df47 100644
--- a/japanese/kappa20/files/patch-aa
+++ b/japanese/kappa20/files/patch-aa
@@ -1,87 +1,23 @@
---- 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/local
- 
- COMPRESSCMD = gzip -9
- COMPRESSEXT = .gz
-@@ -59,43 +59,43 @@
+--- 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
--	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
- 
- 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
++#	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
index d8ddc303f045..95d48aea8982 100644
--- a/japanese/kappa20/files/patch-ab
+++ b/japanese/kappa20/files/patch-ab
@@ -1,23 +1,23 @@
 --- 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
++-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-plist b/japanese/kappa20/pkg-plist
index 1ac593359f90..b5f7efc4e8b8 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -1,17 +1,11 @@
-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
+%%FONTSDIR%%/10x20b.pcf.gz
+%%FONTSDIR%%/10x20m.pcf.gz
+%%FONTSDIR%%/10x20rkb.pcf.gz
+%%FONTSDIR%%/10x20rkm.pcf.gz
+%%FONTSDIR%%/k20b.pcf.gz
+%%FONTSDIR%%/k20m.pcf.gz
 share/doc/kappa20/README
 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
+@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @dirrm share/doc/kappa20
diff --git a/japanese/kappa20/pkg-req b/japanese/kappa20/pkg-req
new file mode 100644
index 000000000000..d6f31cd01480
--- /dev/null
+++ b/japanese/kappa20/pkg-req
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+if [ "x$1" = "x" ]; then
+	exit 1;
+fi
+if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
+	exit 1;
+fi
+
+export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+
+if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
+	echo '**********************************************************************'
+	echo "****** ${FONTDIR}/ doesn't exist."
+	echo "****** Creating ${FONTDIR}/"
+	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
+	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
+	echo '**********************************************************************'
+	mkdir ${FONTDIR}
+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-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
+EOF
+
+echo "Updating ${FONTDIR}/fonts.alias"
+cd ${FONTDIR}
+touch fonts.alias
+cp fonts.alias fonts.alias.orig
+if [ "$2" = "INSTALL" ] ; then
+	(grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \
+	 cat ${TMPFILE}) > fonts.alias
+elif [ "$2" = "DEINSTALL" ] ; then
+	grep -v -- "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
+fi
+rm -f fonts.alias.orig ${TMPFILE}
+
+echo "**********************************************************"
+echo "You should restart X server or do 'xset fp rehash' command"
+echo "to enable this update."
+echo "**********************************************************"
+
+exit 0;