From owner-ports-jp@jp.freebsd.org  Thu Nov 19 09:42:32 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id JAA14359;
	Thu, 19 Nov 1998 09:42:32 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from nejimaki2.pfu.co.jp (nejimaki2.pfu.co.jp [202.248.171.130])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with ESMTP id JAA14354
	for <ports-jp@jp.freebsd.org>; Thu, 19 Nov 1998 09:42:30 +0900 (JST)
	(envelope-from ematsu@Io.unoke.pfu.co.jp)
Received: from capella.pfu.co.jp ([202.248.171.195])
	by nejimaki2.pfu.co.jp (8.8.8+2.7Wbeta7/3.7W-98110412) with ESMTP id JAA03358
	for <ports-jp@jp.freebsd.org>; Thu, 19 Nov 1998 09:42:28 +0900 (JST)
Received: from Io.unoke.pfu.co.jp (Io.unoke.pfu.co.jp [133.163.18.180])
	by capella.pfu.co.jp (8.8.8+2.7Wbeta7/3.6W-MX981030-PFU Domain Mail Master) with ESMTP id JAA08106
	for <ports-jp@jp.freebsd.org>; Thu, 19 Nov 1998 09:42:23 +0900 (JST)
Received: (from ematsu@localhost)
	by Io.unoke.pfu.co.jp (8.8.8/8.8.8) id JAA10125;
	Thu, 19 Nov 1998 09:42:26 +0900 (JST)
	(envelope-from ematsu)
To: ports-jp@jp.freebsd.org
References: <19981118151224.1663.qmail@sada.e-mail.ne.jp>
From: Eiji-usagi-MATSUmoto <ematsu@pfu.co.jp>
In-Reply-To: <19981118151224.1663.qmail@sada.e-mail.ne.jp> (sada@e-mail.ne.jp's message of "19 Nov 1998 00:12:24 +0900")
MIME-Version: 1.0 (generated by SEMI 1.10.2 - "Higashi-Kanazawa")
Content-Type: text/plain; charset=ISO-2022-JP
Date: 19 Nov 1998 09:42:26 +0900
Message-ID: <pg6vhkccy31.fsf@Io.unoke.pfu.co.jp>
Lines: 182
User-Agent: Semi-gnus/6.8.19 SEMI/1.10.2 (Higashi-Kanazawa) FLIM/1.11.3 (Saidaiji) Emacs/20.3.90 (i386-unknown-freebsd2.2.6) MULE/4.0 (HANANOEN)
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+981115
X-Sequence: ports-jp 5125
Subject: [ports-jp 5125] Re: /usr/X11R6/lib/X11/fonts/local
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: ematsu@pfu.co.jp

$B$^$D$b$H$G$9(B

$B:4ED$5$s(B
> $B@n8}$5$s$N(B kappa20 $B$r;29M$K$7$F!"(B
> $BB>$N(B ports $B$r=$@5$7$h$&$H;W$$$^$9!#(B
> $B$9$G$K:n6H$r;O$a$F$$$?$j!"(B
> $B$3$l$+$i:n6H$9$kM=Dj$NJ}$O65$($F$/$@$5$$!#(B

$BJ!Eg(B@$B5~Bg>pJs$5$s$+$i$$$?$@$$$F$$$k%Q%C%A$H$"$o$;$F!"=$@5$7$?(B
$B$b$N$r:n@.$7$F$$$^$9!#%A%'%C%/$7$F$$$?$@$1$^$9$+!)(B


diff --exclude=CVS -ruN k10.orig/Makefile k10/Makefile
--- k10.orig/Makefile	Sat Aug  8 19:18:48 1998
+++ k10/Makefile	Thu Nov 19 09:38:05 1998
@@ -17,6 +17,7 @@
 WRKSRC=         ${WRKDIR}/knj10-1.00
 
 post-install:
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/naga10
 	@${CP} ${WRKSRC}/README ${PREFIX}/share/doc/naga10/
Binary files k10.orig/ja-naga10-1.0.tgz and k10/ja-naga10-1.0.tgz differ
diff --exclude=CVS -ruN 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 09:38:05 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
++	mkdir -p ${PREFIX}/lib/X11/fonts/local
++	cp 5x10B.pcf.gz  ${PREFIX}/lib/X11/fonts/local/
++	cp 5x10a.pcf.gz  ${PREFIX}/lib/X11/fonts/local/
++	cp 5x10rk.pcf.gz ${PREFIX}/lib/X11/fonts/local/
++	cp knj10.pcf.gz  ${PREFIX}/lib/X11/fonts/local/
++	cp knj10B.pcf.gz ${PREFIX}/lib/X11/fonts/local/
diff --exclude=CVS -ruN k10.orig/pkg/DESCR k10/pkg/DESCR
--- k10.orig/pkg/DESCR	Fri Mar 13 00:42:41 1998
+++ k10/pkg/DESCR	Thu Nov 19 09:38:05 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 --exclude=CVS -ruN k10.orig/pkg/PLIST k10/pkg/PLIST
--- k10.orig/pkg/PLIST	Fri Mar 13 00:42:42 1998
+++ k10/pkg/PLIST	Thu Nov 19 09:38:05 1998
@@ -1,12 +1,7 @@
-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.gz
+lib/X11/fonts/local/5x10a.pcf.gz
+lib/X11/fonts/local/5x10rk.pcf.gz
+lib/X11/fonts/local/knj10.pcf.gz
+lib/X11/fonts/local/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
 @dirrm share/doc/naga10
diff --exclude=CVS -ruN k10.orig/pkg/REQ k10/pkg/REQ
--- k10.orig/pkg/REQ	Thu Jan  1 09:00:00 1970
+++ k10/pkg/REQ	Thu Nov 19 09:38:05 1998
@@ -0,0 +1,40 @@
+#!/bin/sh -x
+
+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
+	(cat fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
+elif [ "$2" = "DEINSTALL" ] ; then
+	grep -v "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
+fi
+rm fonts.alias.orig
+echo "Making fonts.dir in ${FONTDIR}"
+mkfontdir
+
+echo "**********************************************************"
+echo "You should restart X server or do 'xset fp rehash' command"
+echo "to enable this update."
+echo "**********************************************************"
+
+exit 0;
diff --exclude=CVS -ruN k10.orig/pkg/REQ~ k10/pkg/REQ~
--- k10.orig/pkg/REQ~	Thu Jan  1 09:00:00 1970
+++ k10/pkg/REQ~	Thu Nov 19 09:38:05 1998
@@ -0,0 +1,40 @@
+#!/bin/sh -x
+
+if [ "x$1" = "x" ]; then
+	exit 1;
+if
+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
+	(cat fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
+elif [ "$2" = "DEINSTALL" ] ; then
+	grep -v "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
+fi
+rm fonts.alias.orig
+echo "Making fonts.dir in ${FONTDIR}"
+mkfontdir
+
+echo "**********************************************************"
+echo "You should restart X server or do 'xset fp rehash' command"
+echo "to enable this update."
+echo "**********************************************************"
+
+exit 0;
