From owner-ports-jp@jp.freebsd.org  Thu Nov 19 07:57:48 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id HAA10581;
	Thu, 19 Nov 1998 07:57:48 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from rr.iij4u.or.jp (h134.p060.iij4u.or.jp [210.130.60.134])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with SMTP id HAA10574
	for <ports-jp@jp.freebsd.org>; Thu, 19 Nov 1998 07:57:46 +0900 (JST)
	(envelope-from sada@rr.iij4u.or.jp)
Received: (qmail 3649 invoked by uid 1000); 19 Nov 1998 07:57:44 +0900
Date: 19 Nov 1998 07:57:44 +0900
Message-ID: <19981118225744.3648.qmail@sada.e-mail.ne.jp>
To: ports-jp@jp.freebsd.org, mita@jp.FreeBSD.org
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 5120
Subject: [ports-jp 5120] 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/k12 $B$r=$@5$7$^$7$?$N$G!"8!>Z$r$*4j$$$7$^$9!#(B

* XFree86 3.3.3 $BBP1~$N$?$a$N(B fonts/local $B%G%#%l%/%H%j$X$N0\9T(B
* mkfontdir $B$r%U%k%Q%9$G;XDj(B (TODO: $PREFIX $B$rH?1G$7$?$$$G$9(B)
* REQ $B$rGQ;_$7$F(B INSTALL $B$KE}9g(B (fonts/local $B%G%#%l%/%H%j:n@.$NET9g(B)

diff -urN k12.orig/Makefile k12/Makefile
--- k12.orig/Makefile	Sat Aug  8 07:43:07 1998
+++ k12/Makefile	Thu Nov 19 07:52:04 1998
@@ -16,7 +16,12 @@
 USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+
 post-install:
-	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff -urN k12.orig/patches/patch-aa k12/patches/patch-aa
--- k12.orig/patches/patch-aa	Tue Apr  1 20:38:33 1997
+++ k12/patches/patch-aa	Thu Nov 19 07:26:54 1998
@@ -10,8 +10,8 @@
 + 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/
++ 	if [ ! -d /usr/X11R6/lib/X11/fonts/local ] ; then \
++ 	mkdir -p /usr/X11R6/lib/X11/fonts/local ; fi
++ 	cp knmhn12x.pcf.Z knmzn12x.pcf.Z /usr/X11R6/lib/X11/fonts/local/
 + 	cp readme.kaname_bdf doc.orig/* /usr/X11R6/lib/X11/k12 
-+ 	cd /usr/X11R6/lib/X11/fonts/misc ; mkfontdir
++ 	cd /usr/X11R6/lib/X11/fonts/local ; /usr/X11R6/bin/mkfontdir
diff -urN k12.orig/pkg/INSTALL k12/pkg/INSTALL
--- k12.orig/pkg/INSTALL	Thu Jan  1 09:00:00 1970
+++ k12/pkg/INSTALL	Thu Nov 19 07:51:29 1998
@@ -0,0 +1,18 @@
+#!/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
+if [ $2x = POST-INSTALLx ]; then
+	mkdir -p /usr/X11R6/lib/X11/fonts/local
+	echo "Updating local/fonts.alias"
+	cd /usr/X11R6/lib/X11/fonts/local
+	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
+fi
diff -urN k12.orig/pkg/PLIST k12/pkg/PLIST
--- k12.orig/pkg/PLIST	Fri Oct  9 12:48:25 1998
+++ k12/pkg/PLIST	Thu Nov 19 07:30:37 1998
@@ -1,10 +1,11 @@
-lib/X11/fonts/misc/knmhn12x.pcf.Z
-lib/X11/fonts/misc/knmzn12x.pcf.Z
+lib/X11/fonts/local/knmhn12x.pcf.Z
+lib/X11/fonts/local/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
+@exec mkdir -p %D/lib/X11/fonts/local
+@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
+@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 '\-mnkaname\-fixed\-medium\-r\-normal' fonts.alias.orig > fonts.alias; rm fonts.alias.orig
 @dirrm lib/X11/k12
diff -urN k12.orig/pkg/REQ k12/pkg/REQ
--- k12.orig/pkg/REQ	Tue Apr  1 20:38:33 1997
+++ k12/pkg/REQ	Thu Jan  1 09:00:00 1970
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ "$2" != "INSTALL" ] ; then
-	exit 0
-fi
-echo "Updating misc/fonts.alias"
-cd /usr/X11R6/lib/X11/fonts/misc
-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
