Reallocate the font directory (misc->local),

following the change in XFree86 3.3.3.
Submitted by:	Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>

5 files changed, 78 insertions, 28 deletions

diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 76ab81e..4def787 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 Feb 1998
 # Whom: Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:31:17 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/07 22:43:07 asami Exp $
 #
 
 DISTNAME=	knj10-1.00
@@ -16,7 +16,16 @@ MAINTAINER=	usagi@clave.gr.jp
 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}/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 --git a/japanese/k10/files/patch-aa b/japanese/k10/files/patch-aa
index d40eabc..18a1604 100644
--- a/japanese/k10/files/patch-aa
+++ b/japanese/k10/files/patch-aa
@@ -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 --git a/japanese/k10/pkg-descr b/japanese/k10/pkg-descr
index df89b16..0170360 100644
--- a/japanese/k10/pkg-descr
+++ b/japanese/k10/pkg-descr
@@ -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 --git a/japanese/k10/pkg-plist b/japanese/k10/pkg-plist
index 90be55f..c6eeff8 100644
--- a/japanese/k10/pkg-plist
+++ b/japanese/k10/pkg-plist
@@ -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%% ; %D/bin/mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @dirrm share/doc/naga10
diff --git a/japanese/k10/pkg-req b/japanese/k10/pkg-req
new file mode 100644
index 0000000..74130b3
--- /dev/null
+++ b/japanese/k10/pkg-req
@@ -0,0 +1,49 @@
+#!/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
+
+if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
+	echo '**********************************************************************'
+	echo "****** ${FONTDIR}/ doesn't exist."
+	echo "****** Creating ${FONTDIR}/"
+	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 ${FONTDIR}
+fi
+
+# 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;