From owner-ports-jp@jp.freebsd.org  Thu Nov 19 11:06:49 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id LAA19290;
	Thu, 19 Nov 1998 11:06:49 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from spa.kuis.kyoto-u.ac.jp (root@lab4imgw.kuis.kyoto-u.ac.jp [130.54.23.230])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with ESMTP id LAA19281
	for <ports-jp@jp.freebsd.org>; Thu, 19 Nov 1998 11:06:47 +0900 (JST)
	(envelope-from shige@kuis.kyoto-u.ac.jp)
Received: from localhost (sirahama.kuis.kyoto-u.ac.jp [130.54.22.177])
	by spa.kuis.kyoto-u.ac.jp (8.8.8/3.6Wspa) with ESMTP id LAA24792;
	Thu, 19 Nov 1998 11:04:30 +0900 (JST)
To: ports-jp@jp.freebsd.org
Cc: shige@kuis.kyoto-u.ac.jp
In-Reply-To: Your message of "Thu, 19 Nov 1998 10:18:08 +0900 (JST)"
	<19981119101808Q.shige@kuis.kyoto-u.ac.jp>
References: <19981119101808Q.shige@kuis.kyoto-u.ac.jp>
X-Mailer: Mew version 1.93 on Emacs 20.3 / Mule 4.0
 =?iso-2022-jp?B?KBskQjJWMWMbKEIp?=
X-Prom-Mew: Prom-Mew 1.93 (procmail reader for Mew)
X-URL: http://www.yuasa.kuis.kyoto-u.ac.jp/~shige/
X-fingerprint: C8 BD 6A A7 CF FF 74 88  A4 B2 CC 5F C7 61 5C 9A
X-Pgp-Public-Key-URL: http://pgp5.ai.mit.edu:11371/pks/lookup?op=get&search=0x56B99BF9
X-Face-Version: X-Face utility v1.3.2 - "The Fool On The Hill"
                with Select X-Face v0.09 - "Figure Of Eight"
X-Face: 34/1@t8]M!wP}sAw$~XQMzl5'O=lCIM]8=_8CE,|S)Vs4Wy@tU~A'wRi\lgWh-o&'|:zg<S
 g%%4BRt%M~>>Gc?0?{^jo8(|5'Tg`yBH81.:!N9tSq*Sp6>C0q@{|&+FaM;R;KkoW1jA?QIWQ3:gNq
 {O%`:ww
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Thu_Nov_19_11:05:10_1998_924)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19981119110645T.shige@kuis.kyoto-u.ac.jp>
Date: Thu, 19 Nov 1998 11:06:45 +0900 (JST)
From: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 910
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+981115
X-Sequence: ports-jp 5130
Subject: [ports-jp 5130] Re: /usr/X11R6/lib/X11/fonts/local
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: shige@kuis.kyoto-u.ac.jp

----Next_Part(Thu_Nov_19_11:05:10_1998_924)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

 From: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 Date: Thu, 19 Nov 1998 10:18:08 +0900 (JST)
 Title: [ports-jp 5128] Re: /usr/X11R6/lib/X11/fonts/local
 Message-ID: <19981119101808Q.shige@kuis.kyoto-u.ac.jp>

$BJ!Eg!w5~Bg>pJs(B $B$G$9!#(B

$B$H$$$&$o$1$G!"$3$s$J$b$s$G$I$J$$$G$7$g$&!)(B
 > elisa10x8, elisa8x8, k10, k12, kappa20

$B<g$JJQ99$O!"(B

 . k12font -> kaname12 $B$KJQ99$7$^$7$?!#(B
 . FONTSDIR $B$r(B PLIST_SUB $B$K(B
 . sada $B$5$s$N(B pkg/INSTALL $B$rDI2C(B
   $B$5$i$K!"$=$NCf$G!"(Bmkdir $B$7$F$d$k$h$&$K$7$?!#(B

$B$J$I$G$9!#(B
---------
$BJ!Eg(B $BLPG7(B (Shigeyuki FUKUSHIMA) <shige@kuis.kyoto-u.ac.jp>
  $B5~ETBg3XBg3X1!9)3X8&5f2J>pJs9)3X@l96(B $BEr^I8&5f<<(B
PGP Public Key:
http://pgp5.ai.mit.edu:11371/pks/lookup?op=get&search=0x56B99BF9


----Next_Part(Thu_Nov_19_11:05:10_1998_924)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=elisa10x8.diff

diff -urN /usr/ports/japanese/elisa10x8/Makefile elisa10x8/Makefile
--- /usr/ports/japanese/elisa10x8/Makefile	Fri Sep 25 13:55:54 1998
+++ elisa10x8/Makefile	Thu Nov 19 10:54:53 1998
@@ -21,9 +21,18 @@
 NO_WRKSUBDIR=	yes
 EXTRACT_ONLY=	elisau10.tgz
 
-MAKE_ENV+=	DISTDIR=${DISTDIR}
+FONTSDIR=	lib/X11/fonts/local
+MAKE_ENV=	DISTDIR=${DISTDIR} FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
+
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 post-install:
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/elisa8
 	@${CP} ${WRKSRC}/elisa100.doc ${PREFIX}/share/doc/elisa8/
diff -urN /usr/ports/japanese/elisa10x8/patches/patch-aa elisa10x8/patches/patch-aa
--- /usr/ports/japanese/elisa10x8/patches/patch-aa	Sun Sep 28 23:20:20 1997
+++ elisa10x8/patches/patch-aa	Thu Nov 19 08:39:36 1998
@@ -2,19 +2,14 @@
 --- Makefile	Fri Sep 26 15:43:17 1997
 ***************
 *** 0 ****
---- 1,15 ----
+--- 1,10 ----
 + all:
-+ 	bdftopcf elisau10.bdf | compress > elisau10.pcf.Z
++ 	bdftopcf elisau10.bdf | gzip -c > elisau10.pcf.gz
 + 	cp ${DISTDIR}/clR5x8.bdf .
 + 	patch --quiet < clR5x8-s5x8.diff
-+ 	bdftopcf clR5x8.bdf |  compress > clR5x8.pcf.Z
++ 	bdftopcf clR5x8.bdf   | gzip -c > clR5x8.pcf.gz
 + 
 + install:
-+ 	mkdir -p ${PREFIX}/lib/X11/fonts/misc
-+ 	cp elisau10.pcf.Z ${PREFIX}/lib/X11/fonts/misc/
-+ 	cp clR5x8.pcf.Z ${PREFIX}/lib/X11/fonts/misc/
-+ 	cd ${PREFIX}/lib/X11/fonts/misc/ ; mkfontdir ; \
-+ 	touch fonts.alias ; cp fonts.alias fonts.alias.orig ; \
-+ 	(cat fonts.alias.orig ; \
-+ 	echo "elisa -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0" ; echo "s5x8 -schumacher-descent2clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv") > fonts.alias ; \
-+ 	rm fonts.alias.orig
++ 	[ -d ${PREFIX}/${FONTSDIR} ] || mkdir -p ${PREFIX}/${FONTSDIR}
++ 	cp elisau10.pcf.gz ${PREFIX}/${FONTSDIR}
++ 	cp clR5x8.pcf.gz ${PREFIX}/${FONTSDIR}
diff -urN /usr/ports/japanese/elisa10x8/pkg/INSTALL elisa10x8/pkg/INSTALL
--- /usr/ports/japanese/elisa10x8/pkg/INSTALL	Thu Jan  1 09:00:00 1970
+++ elisa10x8/pkg/INSTALL	Thu Nov 19 10:48:46 1998
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ $2x = PRE-INSTALLx -a ! -d ${PKG_PREFIX}/lib/X11/fonts/local ]; then
+	echo '**********************************************************************'
+	echo "****** ${PKG_PREFIX}/lib/X11/fonts/local/ doesn't exist."
+	echo "****** Creating ${PKG_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 '**********************************************************************'
+	mkdir ${PKG_PREFIX}/lib/X11/fonts/local
+fi
diff -urN /usr/ports/japanese/elisa10x8/pkg/PLIST elisa10x8/pkg/PLIST
--- /usr/ports/japanese/elisa10x8/pkg/PLIST	Sun Sep 28 23:20:19 1997
+++ elisa10x8/pkg/PLIST	Thu Nov 19 09:33:37 1998
@@ -1,11 +1,8 @@
-lib/X11/fonts/misc/elisau10.pcf.Z
-lib/X11/fonts/misc/clR5x8.pcf.Z
+%%FONTSDIR%%/elisau10.pcf.gz
+%%FONTSDIR%%/clR5x8.pcf.gz
 share/doc/elisa8/elisa100.doc
 share/doc/elisa8/elisau10.doc
 share/doc/elisa8/hosoku.txt
-@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 ; echo "elisa -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0" ; echo "s5x8 -schumacher-descent2clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv") > 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 'elisa\-fixed\-medium\-r\-normal' fonts.alias.orig | grep -v 'schumacher\-descent2clean\-medium\-r\-normal' > fonts.alias; rm fonts.alias.orig
+@exec cd %D/%%FONTSDIR%% ; mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; mkfontdir
 @dirrm share/doc/elisa8
diff -urN /usr/ports/japanese/elisa10x8/pkg/REQ elisa10x8/pkg/REQ
--- /usr/ports/japanese/elisa10x8/pkg/REQ	Thu Jan  1 09:00:00 1970
+++ elisa10x8/pkg/REQ	Thu Nov 19 10:34:31 1998
@@ -0,0 +1,37 @@
+#!/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
+
+# font alias entry here!
+TMPFILE=/tmp/install-fonts-alias-$$
+cat << EOF > ${TMPFILE}
+elisa -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0
+s5x8  -schumacher-descent2clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv
+EOF
+
+ls -l ${FONTDIR}
+echo "Updating ${FONTDIR}/fonts.alias"
+cd ${FONTDIR}
+touch fonts.alias ${TMPFILE}
+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 -e "`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;

----Next_Part(Thu_Nov_19_11:05:10_1998_924)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=elisa8x8.diff

diff -urN /usr/ports/japanese/elisa8x8/Makefile elisa8x8/Makefile
--- /usr/ports/japanese/elisa8x8/Makefile	Sat Sep 19 07:49:25 1998
+++ elisa8x8/Makefile	Thu Nov 19 10:54:59 1998
@@ -18,43 +18,40 @@
 
 BDFTOPCF_CMD=	${PREFIX}/bin/bdftopcf
 MKFONTDIR_CMD=	${PREFIX}/bin/mkfontdir
-FONTSDIR=	${PREFIX}/lib/X11/fonts/misc
+FONTSDIR=	lib/X11/fonts/local
+INSTALLDIR=	${PREFIX}/${FONTSDIR}
 DOCDIR=		${PREFIX}/share/doc/elisa
 PORTDOCS=	elisa100.doc elisat10.doc elisat10.html
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 do-build:
 	@(cd ${WRKDIR}; \
-	${BDFTOPCF_CMD} elisat10.bdf | ${GZIP_CMD} -9 > elisat10.pcf.gz ;\
-	${BDFTOPCF_CMD} jpnhn4-jis.bdf | ${GZIP_CMD} -9 > jpnhn4-jis.pcf.gz ;\
-	${BDFTOPCF_CMD} jpnhn4-iso.bdf | ${GZIP_CMD} -9 > jpnhn4-iso.pcf.gz ;\
+	${BDFTOPCF_CMD} elisat10.bdf   | ${GZIP_CMD} -c > elisat10.pcf.gz ;\
+	${BDFTOPCF_CMD} jpnhn4-jis.bdf | ${GZIP_CMD} -c > jpnhn4-jis.pcf.gz ;\
+	${BDFTOPCF_CMD} jpnhn4-iso.bdf | ${GZIP_CMD} -c > jpnhn4-iso.pcf.gz ;\
 	)
 
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+
 do-install:
-	@${MKDIR} ${FONTSDIR} ${DOCDIR}
+	@${MKDIR} ${INSTALLDIR} ${DOCDIR}
 	@(cd ${WRKSRC} ;\
-	${INSTALL_DATA} elisat10.pcf.gz ${FONTSDIR} ;\
-	${INSTALL_DATA} jpnhn4-jis.pcf.gz ${FONTSDIR} ;\
-	${INSTALL_DATA} jpnhn4-iso.pcf.gz ${FONTSDIR} ;\
-	${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} ;\
-	${ECHO} "Updating fonts.dir" ;\
-	${MKFONTDIR_CMD} ${FONTSDIR} ;\
-	${ECHO} "Updating fonts.alias" ;\
-	${TOUCH} ${FONTSDIR}/fonts.alias ;\
-	${CAT} ${FONTSDIR}/fonts.alias fonts.alias > fonts.alias.tmp ;\
-	${INSTALL_DATA} fonts.alias.tmp ${FONTSDIR} ;\
-	${MV} -f ${FONTSDIR}/fonts.alias.tmp ${FONTSDIR}/fonts.alias ;\
+	${INSTALL_DATA} elisat10.pcf.gz ${INSTALLDIR} ;\
+	${INSTALL_DATA} jpnhn4-jis.pcf.gz ${INSTALLDIR} ;\
+	${INSTALL_DATA} jpnhn4-iso.pcf.gz ${INSTALLDIR} ;\
 	)
 
 post-install:
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
 	@(cd ${WRKSRC} ;\
 	${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} ;\
 	)
 .endif
-	@${ECHO} "**********************************************************"
-	@${ECHO} "You should restart X server or do 'xset fp rehash' command"
-	@${ECHO} "to use installed fonts."
-	@${ECHO} "**********************************************************"
 
 .include <bsd.port.mk>
diff -urN /usr/ports/japanese/elisa8x8/pkg/INSTALL elisa8x8/pkg/INSTALL
--- /usr/ports/japanese/elisa8x8/pkg/INSTALL	Thu Jan  1 09:00:00 1970
+++ elisa8x8/pkg/INSTALL	Thu Nov 19 10:48:46 1998
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ $2x = PRE-INSTALLx -a ! -d ${PKG_PREFIX}/lib/X11/fonts/local ]; then
+	echo '**********************************************************************'
+	echo "****** ${PKG_PREFIX}/lib/X11/fonts/local/ doesn't exist."
+	echo "****** Creating ${PKG_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 '**********************************************************************'
+	mkdir ${PKG_PREFIX}/lib/X11/fonts/local
+fi
diff -urN /usr/ports/japanese/elisa8x8/pkg/PLIST elisa8x8/pkg/PLIST
--- /usr/ports/japanese/elisa8x8/pkg/PLIST	Sat Sep 19 07:49:25 1998
+++ elisa8x8/pkg/PLIST	Thu Nov 19 09:31:16 1998
@@ -1,18 +1,9 @@
-lib/X11/fonts/misc/elisat10.pcf.gz
-lib/X11/fonts/misc/jpnhn4-jis.pcf.gz
-lib/X11/fonts/misc/jpnhn4-iso.pcf.gz
+%%FONTSDIR%%/elisat10.pcf.gz
+%%FONTSDIR%%/jpnhn4-jis.pcf.gz
+%%FONTSDIR%%/jpnhn4-iso.pcf.gz
 share/doc/elisa/elisa100.doc
 share/doc/elisa/elisat10.doc
 share/doc/elisa/elisat10.html
-@exec  echo "Updating fonts.dir"
-@exec mkfontdir %D/lib/X11/fonts/misc
-@exec  echo "Updating fonts.alias"
-@exec cd %D/lib/X11/fonts/misc ; touch fonts.alias ; cp fonts.alias fonts.alias.orig ; (cat fonts.alias.orig ; echo "k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0" ; echo "r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0"; echo "a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1"; echo "4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1" ) > fonts.alias ; rm fonts.alias.orig
-@unexec  echo "Updating fonts.dir"
-@unexec mkfontdir %D/lib/X11/fonts/misc
-@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc; cp fonts.alias fonts.alias.orig; grep -v 'elisa100\-fixed\-medium\-r\-normal' fonts.alias.orig | grep -v 'hiro\-fixed\-medium\-r\-normal' > fonts.alias; rm fonts.alias.orig
-@exec echo "**********************************************************"
-@exec echo "You should restart X server or do 'xset fp rehash' command"
-@exec echo "to use installed fonts."
-@exec echo "**********************************************************"
+@exec %D/%%FONTSDIR%% ; mkfontdir
+@unexec %D/%%FONTSDIR%% ; mkfontdir
 @dirrm share/doc/elisa
diff -urN /usr/ports/japanese/elisa8x8/pkg/REQ elisa8x8/pkg/REQ
--- /usr/ports/japanese/elisa8x8/pkg/REQ	Thu Jan  1 09:00:00 1970
+++ elisa8x8/pkg/REQ	Thu Nov 19 10:34:43 1998
@@ -0,0 +1,38 @@
+#!/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
+
+# font alias entry here!
+TMPFILE=/tmp/install-fonts-alias-$$
+cat << EOF > ${TMPFILE}
+k8  -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0
+r8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0
+a8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
+4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
+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 -e "`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;

----Next_Part(Thu_Nov_19_11:05:10_1998_924)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=k10.diff

diff -urN /usr/ports/japanese/k10/Makefile k10/Makefile
--- /usr/ports/japanese/k10/Makefile	Sun Aug  9 23:09:50 1998
+++ k10/Makefile	Thu Nov 19 10:55:04 1998
@@ -16,7 +16,18 @@
 USE_X_PREFIX=	yes
 WRKSRC=         ${WRKDIR}/knj10-1.00
 
+FONTSDIR=	lib/X11/fonts/local
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
+
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+
 post-install:
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/naga10
 	@${CP} ${WRKSRC}/README ${PREFIX}/share/doc/naga10/
diff -urN /usr/ports/japanese/k10/patches/patch-aa k10/patches/patch-aa
--- /usr/ports/japanese/k10/patches/patch-aa	Fri Mar 13 00:42:43 1998
+++ k10/patches/patch-aa	Thu Nov 19 08:30:16 1998
@@ -1,22 +1,17 @@
 --- /dev/null	Wed Feb 25 11:48:19 1998
 +++ Makefile	Wed Feb 25 11:46:18 1998
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,14 @@
 +all:
-+	bdftopcf 5x10B.bdf | compress > 5x10B.pcf.Z
-+	bdftopcf 5x10a.bdf | compress > 5x10a.pcf.Z
-+	bdftopcf 5x10rk.bdf | compress > 5x10rk.pcf.Z
-+	bdftopcf knj10.bdf | compress > knj10.pcf.Z
-+	bdftopcf knj10B.bdf | compress > knj10B.pcf.Z
++	bdftopcf 5x10B.bdf  | gzip -c > 5x10B.pcf.gz
++	bdftopcf 5x10a.bdf  | gzip -c > 5x10a.pcf.gz
++	bdftopcf 5x10rk.bdf | gzip -c > 5x10rk.pcf.gz
++	bdftopcf knj10.bdf  | gzip -c > knj10.pcf.gz
++	bdftopcf knj10B.bdf | gzip -c > knj10B.pcf.gz
 +
 +install:
 +	mkdir -p ${PREFIX}/lib/X11/fonts/misc
-+	cp 5x10B.pcf.Z ${PREFIX}/lib/X11/fonts/misc/
-+	cp 5x10a.pcf.Z ${PREFIX}/lib/X11/fonts/misc/
-+	cp 5x10rk.pcf.Z ${PREFIX}/lib/X11/fonts/misc/
-+	cp knj10.pcf.Z ${PREFIX}/lib/X11/fonts/misc/
-+	cp knj10B.pcf.Z ${PREFIX}/lib/X11/fonts/misc/
-+	cp fonts.alias.naga10 ${PREFIX}/lib/X11/fonts/misc/
-+	cd ${PREFIX}/lib/X11/fonts/misc/ ; mkfontdir ; \
-+	touch fonts.alias ; cp fonts.alias fonts.alias.orig ; \
-+	cat fonts.alias.orig fonts.alias.naga10 > fonts.alias; \
-+	rm fonts.alias.orig fonts.alias.naga10
++	cp 5x10B.pcf.gz  ${PREFIX}/${FONTSDIR}
++	cp 5x10a.pcf.gz  ${PREFIX}/${FONTSDIR}
++	cp 5x10rk.pcf.gz ${PREFIX}/${FONTSDIR}
++	cp knj10.pcf.gz  ${PREFIX}/${FONTSDIR}
++	cp knj10B.pcf.gz ${PREFIX}/${FONTSDIR}
diff -urN /usr/ports/japanese/k10/pkg/DESCR k10/pkg/DESCR
--- /usr/ports/japanese/k10/pkg/DESCR	Fri Mar 13 00:42:41 1998
+++ k10/pkg/DESCR	Mon Nov  9 07:58:04 1998
@@ -1,6 +1,6 @@
 Japanese 10 dot font named `naga10'.
 
-You can use 'k10' as an alias for knj10.pcf.Z, and 'a10' for 5x10a.pcf.Z.
+You can use 'k10' as an alias for knj10.pcf.gz, and 'a10' for 5x10a.pcf.gz.
 For detail description, please read the 'README'
 
 A simple usage:
diff -urN /usr/ports/japanese/k10/pkg/INSTALL k10/pkg/INSTALL
--- /usr/ports/japanese/k10/pkg/INSTALL	Thu Jan  1 09:00:00 1970
+++ k10/pkg/INSTALL	Thu Nov 19 10:48:46 1998
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ $2x = PRE-INSTALLx -a ! -d ${PKG_PREFIX}/lib/X11/fonts/local ]; then
+	echo '**********************************************************************'
+	echo "****** ${PKG_PREFIX}/lib/X11/fonts/local/ doesn't exist."
+	echo "****** Creating ${PKG_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 '**********************************************************************'
+	mkdir ${PKG_PREFIX}/lib/X11/fonts/local
+fi
diff -urN /usr/ports/japanese/k10/pkg/PLIST k10/pkg/PLIST
--- /usr/ports/japanese/k10/pkg/PLIST	Fri Mar 13 00:42:42 1998
+++ k10/pkg/PLIST	Thu Nov 19 10:28:06 1998
@@ -1,12 +1,9 @@
-lib/X11/fonts/misc/5x10B.pcf.Z
-lib/X11/fonts/misc/5x10a.pcf.Z
-lib/X11/fonts/misc/5x10rk.pcf.Z
-lib/X11/fonts/misc/knj10.pcf.Z
-lib/X11/fonts/misc/knj10B.pcf.Z
+%%FONTSDIR%%/5x10B.pcf.gz
+%%FONTSDIR%%/5x10a.pcf.gz
+%%FONTSDIR%%/5x10rk.pcf.gz
+%%FONTSDIR%%/knj10.pcf.gz
+%%FONTSDIR%%/knj10B.pcf.gz
 share/doc/naga10/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 ; echo "k10 -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0" ; echo "k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0" ; echo "a10 -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1" ; echo "a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1" ; echo "r10 -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0") > 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 'misc\-fixed\-medium\-r\-normal\-\-10' fonts.alias.orig | grep -v 'misc\-fixed\-bold\-r\-normal\-\-10' > fonts.alias; rm fonts.alias.orig
+@exec cd %D/%%FONTSDIR%% ; mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; mkfontdir
 @dirrm share/doc/naga10
diff -urN /usr/ports/japanese/k10/pkg/REQ k10/pkg/REQ
--- /usr/ports/japanese/k10/pkg/REQ	Thu Jan  1 09:00:00 1970
+++ k10/pkg/REQ	Thu Nov 19 10:34:58 1998
@@ -0,0 +1,39 @@
+#!/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
+
+# font alias entry here!
+TMPFILE=/tmp/install-fonts-alias-$$
+cat << EOF > ${TMPFILE}
+k10  -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+a10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1
+a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1
+r10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-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 -e "`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;

----Next_Part(Thu_Nov_19_11:05:10_1998_924)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=k12.diff

diff -urN /usr/ports/japanese/k12/Makefile k12/Makefile
--- /usr/ports/japanese/k12/Makefile	Sun Aug  9 23:09:50 1998
+++ k12/Makefile	Thu Nov 19 10:59:56 1998
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	kaname_k12_bdf
-PKGNAME=	ja-k12font-1.0
+PKGNAME=	ja-kaname12-1.0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/FreeBSD/etc/
 
@@ -16,7 +16,22 @@
 USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
+FONTSDIR=	lib/X11/fonts/local
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
+
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+
 post-install:
-	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/k12
+	@${CP} ${WRKSRC}/readme.kaname_bdf ${PREFIX}/share/doc/k12
+	@${CP} ${WRKSRC}/doc.orig/*        ${PREFIX}/share/doc/k12
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/japanese/k12/patches/patch-aa k12/patches/patch-aa
--- /usr/ports/japanese/k12/patches/patch-aa	Tue Apr  1 20:38:33 1997
+++ k12/patches/patch-aa	Thu Nov 19 08:32:50 1998
@@ -2,16 +2,12 @@
 --- Makefile	Sat Jul  6 12:25:35 1996
 ***************
 *** 0 ****
---- 1,12 ----
+--- 1,8 ----
 + all:
 + 	bdftopcf knmhn12x.bdf > knmhn12x.pcf
 + 	bdftopcf knmzn12x.bdf > knmzn12x.pcf
-+ 	compress *.pcf
++ 	gzip *.pcf
 + install:
-+ 	if [ ! -d /usr/X11R6/lib/X11/k12 ] ; then \
-+ 	mkdir -p /usr/X11R6/lib/X11/k12 ; fi
-+ 	if [ ! -d /usr/X11R6/lib/X11/fonts/misc ] ; then \
-+ 	mkdir -p /usr/X11R6/lib/X11/fonts/misc ; fi
-+ 	cp knmhn12x.pcf.Z knmzn12x.pcf.Z /usr/X11R6/lib/X11/fonts/misc/
-+ 	cp readme.kaname_bdf doc.orig/* /usr/X11R6/lib/X11/k12 
-+ 	cd /usr/X11R6/lib/X11/fonts/misc ; mkfontdir
++ 	if [ ! -d ${PREFIX}/${FONTSDIR} ] ; then \
++ 	mkdir -p ${PREFIX}/X11R6/${FONTSDIR} ; fi
++ 	cp knmhn12x.pcf.gz knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR}
diff -urN /usr/ports/japanese/k12/pkg/INSTALL k12/pkg/INSTALL
--- /usr/ports/japanese/k12/pkg/INSTALL	Thu Jan  1 09:00:00 1970
+++ k12/pkg/INSTALL	Thu Nov 19 10:48:46 1998
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ $2x = PRE-INSTALLx -a ! -d ${PKG_PREFIX}/lib/X11/fonts/local ]; then
+	echo '**********************************************************************'
+	echo "****** ${PKG_PREFIX}/lib/X11/fonts/local/ doesn't exist."
+	echo "****** Creating ${PKG_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 '**********************************************************************'
+	mkdir ${PKG_PREFIX}/lib/X11/fonts/local
+fi
diff -urN /usr/ports/japanese/k12/pkg/PLIST k12/pkg/PLIST
--- /usr/ports/japanese/k12/pkg/PLIST	Sat Oct 10 00:50:42 1998
+++ k12/pkg/PLIST	Thu Nov 19 10:29:20 1998
@@ -1,10 +1,9 @@
-lib/X11/fonts/misc/knmhn12x.pcf.Z
-lib/X11/fonts/misc/knmzn12x.pcf.Z
-lib/X11/k12/gijutsu-siryou.doc
-lib/X11/k12/kaname.doc
-lib/X11/k12/readme.kaname_bdf
-lib/X11/k12/readme.knm
-@exec cd %D/lib/X11/fonts/misc ; mkfontdir
-@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 '\-mnkaname\-fixed\-medium\-r\-normal' fonts.alias.orig > fonts.alias; rm fonts.alias.orig
-@dirrm lib/X11/k12
+%%FONTSDIR%%/knmhn12x.pcf.gz
+%%FONTSDIR%%/knmzn12x.pcf.gz
+share/doc/k12/gijutsu-siryou.doc
+share/doc/k12/kaname.doc
+share/doc/k12/readme.kaname_bdf
+share/doc/k12/readme.knm
+@exec cd %D/%%FONTSDIR%% ; mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; mkfontdir
+@dirrm share/doc/k12
diff -urN /usr/ports/japanese/k12/pkg/REQ k12/pkg/REQ
--- /usr/ports/japanese/k12/pkg/REQ	Tue Apr  1 20:38:33 1997
+++ k12/pkg/REQ	Thu Nov 19 10:35:11 1998
@@ -1,10 +1,36 @@
 #!/bin/sh
-if [ "$2" != "INSTALL" ] ; then
-	exit 0
+
+if [ "x$1" = "x" ]; then
+	exit 1;
 fi
-echo "Updating misc/fonts.alias"
-cd /usr/X11R6/lib/X11/fonts/misc
+if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
+	exit 1;
+fi
+
+export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+
+# font alias entry here!
+TMPFILE=/tmp/install-fonts-alias-$$
+cat << EOF > ${TMPFILE}
+k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
+r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
+EOF
+
+echo "Updating ${FONTDIR}/fonts.alias"
+cd ${FONTDIR}
 touch fonts.alias
 cp fonts.alias fonts.alias.orig
-(cat fonts.alias.orig ; echo "k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0" ; echo "r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0") > fonts.alias
-rm 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 -e "`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;

----Next_Part(Thu_Nov_19_11:05:10_1998_924)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=kappa20.diff

diff -urN /usr/ports/japanese/kappa20/Makefile kappa20/Makefile
--- /usr/ports/japanese/kappa20/Makefile	Sun Aug  9 23:09:51 1998
+++ kappa20/Makefile	Thu Nov 19 10:56:00 1998
@@ -1,26 +1,37 @@
 # 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:		8 Oct 1998
+# Whom: Kawaguti Ginga <ginga@athena.club.or.jp>
 #
 # $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
+FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ARGS=	TARGETDIR="${PREFIX}/${FONTSDIR}"
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
+
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@${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/
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/pcf/fonts.alias.kappa ${PREFIX}/share/doc/kappa20/
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/japanese/kappa20/files/md5 kappa20/files/md5
--- /usr/ports/japanese/kappa20/files/md5	Wed Apr 22 23:19:08 1998
+++ kappa20/files/md5	Mon Nov  9 07:58:01 1998
@@ -1 +1 @@
-MD5 (Kappa20-0.2.tar.gz) = 0a7df089ced7182241fa2105b4936c79
+MD5 (Kappa20-0.3.tar.gz) = 0fb4dec59deb0a01dd65e6d26d47126a
diff -urN /usr/ports/japanese/kappa20/patches/patch-aa kappa20/patches/patch-aa
--- /usr/ports/japanese/kappa20/patches/patch-aa	Wed Apr 22 23:19:09 1998
+++ kappa20/patches/patch-aa	Thu Nov 19 10:39:45 1998
@@ -1,37 +1,23 @@
---- Makefile.orig	Wed Aug  6 08:06:01 1997
-+++ Makefile	Tue Sep 30 22:53:23 1997
-@@ -1,6 +1,9 @@
--TARGETDIR = /usr/X11R6/lib/X11/fonts/misc
-+TARGETDIR = ${PREFIX}/lib/X11/fonts/misc
+--- 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
  
--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)
+ 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 @@
  
- 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
  
--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
+ 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 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)
+ clean::
+ 	rm -f *~ pcf/*.pcf* pcf/fonts.dir pcf/fonts.alias vk20?.bdf* 
diff -urN /usr/ports/japanese/kappa20/patches/patch-ab kappa20/patches/patch-ab
--- /usr/ports/japanese/kappa20/patches/patch-ab	Wed Apr 22 23:19:09 1998
+++ kappa20/patches/patch-ab	Mon Nov  9 07:58:01 1998
@@ -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-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 -urN /usr/ports/japanese/kappa20/pkg/DESCR kappa20/pkg/DESCR
--- /usr/ports/japanese/kappa20/pkg/DESCR	Wed Apr 22 23:19:08 1998
+++ kappa20/pkg/DESCR	Mon Nov  9 07:58:01 1998
@@ -5,7 +5,7 @@
 	"k20b"  	bold mincho
 	"10x20m" 	ascii
 	"10x20b" 	bold ascii
-	"10x20rk" 	kana
+	"10x20rkm" 	kana
 	"10x20rkb" 	bold kana
 
 A simple usage:
diff -urN /usr/ports/japanese/kappa20/pkg/INSTALL kappa20/pkg/INSTALL
--- /usr/ports/japanese/kappa20/pkg/INSTALL	Thu Jan  1 09:00:00 1970
+++ kappa20/pkg/INSTALL	Thu Nov 19 10:48:46 1998
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ $2x = PRE-INSTALLx -a ! -d ${PKG_PREFIX}/lib/X11/fonts/local ]; then
+	echo '**********************************************************************'
+	echo "****** ${PKG_PREFIX}/lib/X11/fonts/local/ doesn't exist."
+	echo "****** Creating ${PKG_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 '**********************************************************************'
+	mkdir ${PKG_PREFIX}/lib/X11/fonts/local
+fi
diff -urN /usr/ports/japanese/kappa20/pkg/PLIST kappa20/pkg/PLIST
--- /usr/ports/japanese/kappa20/pkg/PLIST	Wed Apr 22 23:19:08 1998
+++ kappa20/pkg/PLIST	Thu Nov 19 10:32:15 1998
@@ -1,13 +1,11 @@
-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
+%%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
-@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 cd %D/%%FONTSDIR%% ; mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; mkfontdir
 @dirrm share/doc/kappa20
diff -urN /usr/ports/japanese/kappa20/pkg/REQ kappa20/pkg/REQ
--- /usr/ports/japanese/kappa20/pkg/REQ	Thu Jan  1 09:00:00 1970
+++ kappa20/pkg/REQ	Thu Nov 19 10:31:35 1998
@@ -0,0 +1,54 @@
+#!/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
+
+# 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;

----Next_Part(Thu_Nov_19_11:05:10_1998_924)----
