Reallocate the font directory (misc->local),

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

4 files changed, 64 insertions, 20 deletions

diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile
index 151355ba2ffa..e0d55100917d 100644
--- a/japanese/elisa10x8/Makefile
+++ b/japanese/elisa10x8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 Sep 1997
 # Whom: Dai ISHIJIMA & ELISA Font Project <ishijima@tri.pref.osaka.jp>
 #
-# $Id: Makefile,v 1.3 1998/08/07 22:43:05 asami Exp $
+# $Id: Makefile,v 1.4 1998/09/24 14:42:58 kuriyama Exp $
 #
 
 DISTNAME=	ja-elisa8-1.0
@@ -21,9 +21,16 @@ USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_ONLY=	elisau10.tgz
 
-MAKE_ENV+=	DISTDIR=${DISTDIR}
+FONTSDIR=	lib/X11/fonts/local
+MAKE_ENV=	DISTDIR=${DISTDIR} 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/elisa8
 	@${CP} ${WRKSRC}/elisa100.doc ${PREFIX}/share/doc/elisa8/
diff --git a/japanese/elisa10x8/files/patch-aa b/japanese/elisa10x8/files/patch-aa
index 15fabb990758..f43b75e711e0 100644
--- a/japanese/elisa10x8/files/patch-aa
+++ b/japanese/elisa10x8/files/patch-aa
@@ -2,19 +2,14 @@
 --- Makefile	Fri Sep 26 15:43:17 1997
 ***************
 *** 0 ****
---- 1,15 ----
+--- 1,10 ----
 + all:
-+ 	bdftopcf elisau10.bdf | compress > elisau10.pcf.Z
++ 	bdftopcf elisau10.bdf | gzip -c > elisau10.pcf.gz
 + 	cp ${DISTDIR}/clR5x8.bdf .
 + 	patch --quiet < clR5x8-s5x8.diff
-+ 	bdftopcf clR5x8.bdf |  compress > clR5x8.pcf.Z
++ 	bdftopcf clR5x8.bdf   | gzip -c > clR5x8.pcf.gz
 + 
 + 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 ; \
-+ 	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
++ 	[ -d ${PREFIX}/${FONTSDIR} ] || mkdir -p ${PREFIX}/${FONTSDIR}
++ 	cp elisau10.pcf.gz ${PREFIX}/${FONTSDIR}
++ 	cp clR5x8.pcf.gz ${PREFIX}/${FONTSDIR}
diff --git a/japanese/elisa10x8/pkg-plist b/japanese/elisa10x8/pkg-plist
index bdf949bc8404..3ee9e0aa71a3 100644
--- a/japanese/elisa10x8/pkg-plist
+++ b/japanese/elisa10x8/pkg-plist
@@ -1,11 +1,8 @@
-lib/X11/fonts/misc/elisau10.pcf.Z
-lib/X11/fonts/misc/clR5x8.pcf.Z
+%%FONTSDIR%%/elisau10.pcf.gz
+%%FONTSDIR%%/clR5x8.pcf.gz
 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 cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @dirrm share/doc/elisa8
diff --git a/japanese/elisa10x8/pkg-req b/japanese/elisa10x8/pkg-req
new file mode 100644
index 000000000000..7d965af812dd
--- /dev/null
+++ b/japanese/elisa10x8/pkg-req
@@ -0,0 +1,45 @@
+#!/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}
+elisa -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0
+s5x8  -schumacher-descent2clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv
+EOF
+
+echo "Updating ${FONTDIR}/fonts.alias"
+cd ${FONTDIR}
+touch fonts.alias ${TMPFILE}
+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;