From owner-ports-jp@jp.freebsd.org  Thu Nov 19 08:32:05 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id IAA11469;
	Thu, 19 Nov 1998 08:32:05 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from rr.iij4u.or.jp (h003.p060.iij4u.or.jp [210.130.60.3])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with SMTP id IAA11464
	for <ports-jp@jp.freebsd.org>; Thu, 19 Nov 1998 08:32:02 +0900 (JST)
	(envelope-from sada@rr.iij4u.or.jp)
Received: (qmail 3752 invoked by uid 1000); 19 Nov 1998 08:32:00 +0900
Date: 19 Nov 1998 08:32:00 +0900
Message-ID: <19981118233200.3751.qmail@sada.e-mail.ne.jp>
To: ports-jp@jp.freebsd.org, ishijima@tri.pref.osaka.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 5122
Subject: [ports-jp 5122] 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/elisa10x8 $B$r=$@5$7$^$7$?$N$G!"8!>Z$r$*4j$$$7$^$9!#(B

diff -urN elisa10x8.orig/Makefile elisa10x8/Makefile
--- elisa10x8.orig/Makefile	Thu Sep 24 23:42:58 1998
+++ elisa10x8/Makefile	Thu Nov 19 08:18:55 1998
@@ -23,6 +23,10 @@
 
 MAKE_ENV+=	DISTDIR=${DISTDIR}
 
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/elisa8
diff -urN elisa10x8.orig/patches/patch-aa elisa10x8/patches/patch-aa
--- elisa10x8.orig/patches/patch-aa	Sun Sep 28 23:20:20 1997
+++ elisa10x8/patches/patch-aa	Thu Nov 19 08:14:49 1998
@@ -10,10 +10,10 @@
 + 	bdftopcf clR5x8.bdf |  compress > clR5x8.pcf.Z
 + 
 + 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 ; \
++ 	mkdir -p ${PREFIX}/lib/X11/fonts/local
++ 	cp elisau10.pcf.Z ${PREFIX}/lib/X11/fonts/local/
++ 	cp clR5x8.pcf.Z ${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 ; \
 + 	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 ; \
diff -urN elisa10x8.orig/pkg/INSTALL elisa10x8/pkg/INSTALL
--- elisa10x8.orig/pkg/INSTALL	Thu Jan  1 09:00:00 1970
+++ elisa10x8/pkg/INSTALL	Thu Nov 19 08:17:54 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 elisa10x8.orig/pkg/PLIST elisa10x8/pkg/PLIST
--- elisa10x8.orig/pkg/PLIST	Sun Sep 28 23:20:19 1997
+++ elisa10x8/pkg/PLIST	Thu Nov 19 08:17:43 1998
@@ -1,11 +1,12 @@
-lib/X11/fonts/misc/elisau10.pcf.Z
-lib/X11/fonts/misc/clR5x8.pcf.Z
+lib/X11/fonts/local/elisau10.pcf.Z
+lib/X11/fonts/local/clR5x8.pcf.Z
 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 mkdir -p %D/lib/X11/fonts/local
+@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 "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/local ; mkfontdir
+@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/local; 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
 @dirrm share/doc/elisa8
