From owner-ports-jp@jp.freebsd.org  Thu Nov 19 07:52:40 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id HAA10511;
	Thu, 19 Nov 1998 07:52:40 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from rr.iij4u.or.jp (h079.p060.iij4u.or.jp [210.130.60.79])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with SMTP id HAA10501
	for <ports-jp@jp.freebsd.org>; Thu, 19 Nov 1998 07:52:36 +0900 (JST)
	(envelope-from sada@rr.iij4u.or.jp)
Received: (qmail 3400 invoked by uid 1000); 19 Nov 1998 07:52:35 +0900
Date: 19 Nov 1998 07:52:35 +0900
Message-ID: <19981118225235.3399.qmail@sada.e-mail.ne.jp>
To: ports-jp@jp.freebsd.org, usagi@clave.gr.jp
In-Reply-To: Your message of "Wed, 11 Nov 1998 12:38:52 JST".
	<199811110338.TAA13384@silvia.hip.berkeley.edu>
From: sada@e-mail.ne.jp (SADA Kenji)
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
X-Mailer: mnews [version 1.21] 1997-12/23(Tue)
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+981115
X-Sequence: ports-jp 5119
Subject: [ports-jp 5119] Re: /usr/X11R6/lib/X11/fonts/local
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: sada@e-mail.ne.jp

$B:4ED$G$9!#(B

japanese/k10 $B$r=$@5$7$^$7$?$N$G!"8!>Z$r$*4j$$$7$^$9!#(B

diff -urN k10.orig/Makefile k10/Makefile
--- k10.orig/Makefile	Sat Aug  8 07:43:07 1998
+++ k10/Makefile	Thu Nov 19 07:14:16 1998
@@ -16,6 +16,10 @@
 USE_X_PREFIX=	yes
 WRKSRC=         ${WRKDIR}/knj10-1.00
 
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/naga10
diff -urN k10.orig/patches/patch-aa k10/patches/patch-aa
--- k10.orig/patches/patch-aa	Fri Mar 13 00:42:43 1998
+++ k10/patches/patch-aa	Thu Nov 19 07:16:06 1998
@@ -9,14 +9,14 @@
 +	bdftopcf knj10B.bdf | compress > knj10B.pcf.Z
 +
 +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 ; \
++	mkdir -p ${PREFIX}/lib/X11/fonts/local
++	cp 5x10B.pcf.Z ${PREFIX}/lib/X11/fonts/local/
++	cp 5x10a.pcf.Z ${PREFIX}/lib/X11/fonts/local/
++	cp 5x10rk.pcf.Z ${PREFIX}/lib/X11/fonts/local/
++	cp knj10.pcf.Z ${PREFIX}/lib/X11/fonts/local/
++	cp knj10B.pcf.Z ${PREFIX}/lib/X11/fonts/local/
++	cp fonts.alias.naga10 ${PREFIX}/lib/X11/fonts/local/
++	cd ${PREFIX}/lib/X11/fonts/local/ ; ${PREFIX}/bin/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
diff -urN k10.orig/pkg/INSTALL k10/pkg/INSTALL
--- k10.orig/pkg/INSTALL	Thu Jan  1 09:00:00 1970
+++ k10/pkg/INSTALL	Thu Nov 19 07:11:38 1998
@@ -0,0 +1,9 @@
+#!/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 '**********************************************************************'
+fi
diff -urN k10.orig/pkg/PLIST k10/pkg/PLIST
--- k10.orig/pkg/PLIST	Fri Mar 13 00:42:42 1998
+++ k10/pkg/PLIST	Thu Nov 19 07:13:42 1998
@@ -1,12 +1,12 @@
-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
+lib/X11/fonts/local/5x10B.pcf.Z
+lib/X11/fonts/local/5x10a.pcf.Z
+lib/X11/fonts/local/5x10rk.pcf.Z
+lib/X11/fonts/local/knj10.pcf.Z
+lib/X11/fonts/local/knj10B.pcf.Z
 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/lib/X11/fonts/local ; %D/bin/mkfontdir
+@exec  echo "Updating local/fonts.alias"
+@exec cd %D/lib/X11/fonts/local ; 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/local ; %D/bin/mkfontdir
+@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/local; 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
 @dirrm share/doc/naga10
