3 files changed, 69 insertions, 35 deletions

diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile
index daf71c15bea5..4e0115b79f37 100644
--- a/japanese/elisa8x8/Makefile
+++ b/japanese/elisa8x8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 Aug. 1998
 # Whom: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> & ELISA Font Project
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/09/18 22:49:25 kuriyama Exp $
 #
 
 DISTNAME=	elisat10
@@ -18,43 +18,38 @@ NO_WRKSUBDIR=	yes
 
 BDFTOPCF_CMD=	${PREFIX}/bin/bdftopcf
 MKFONTDIR_CMD=	${PREFIX}/bin/mkfontdir
-FONTSDIR=	${PREFIX}/lib/X11/fonts/misc
+FONTSDIR=	lib/X11/fonts/local
+INSTALLDIR=	${PREFIX}/${FONTSDIR}
 DOCDIR=		${PREFIX}/share/doc/elisa
 PORTDOCS=	elisa100.doc elisat10.doc elisat10.html
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 do-build:
 	@(cd ${WRKDIR}; \
-	${BDFTOPCF_CMD} elisat10.bdf | ${GZIP_CMD} -9 > elisat10.pcf.gz ;\
-	${BDFTOPCF_CMD} jpnhn4-jis.bdf | ${GZIP_CMD} -9 > jpnhn4-jis.pcf.gz ;\
-	${BDFTOPCF_CMD} jpnhn4-iso.bdf | ${GZIP_CMD} -9 > jpnhn4-iso.pcf.gz ;\
+	${BDFTOPCF_CMD} elisat10.bdf   | ${GZIP_CMD} -c > elisat10.pcf.gz ;\
+	${BDFTOPCF_CMD} jpnhn4-jis.bdf | ${GZIP_CMD} -c > jpnhn4-jis.pcf.gz ;\
+	${BDFTOPCF_CMD} jpnhn4-iso.bdf | ${GZIP_CMD} -c > jpnhn4-iso.pcf.gz ;\
 	)
 
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+
 do-install:
-	@${MKDIR} ${FONTSDIR} ${DOCDIR}
+	@${MKDIR} ${INSTALLDIR} ${DOCDIR}
 	@(cd ${WRKSRC} ;\
-	${INSTALL_DATA} elisat10.pcf.gz ${FONTSDIR} ;\
-	${INSTALL_DATA} jpnhn4-jis.pcf.gz ${FONTSDIR} ;\
-	${INSTALL_DATA} jpnhn4-iso.pcf.gz ${FONTSDIR} ;\
-	${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} ;\
-	${ECHO} "Updating fonts.dir" ;\
-	${MKFONTDIR_CMD} ${FONTSDIR} ;\
-	${ECHO} "Updating fonts.alias" ;\
-	${TOUCH} ${FONTSDIR}/fonts.alias ;\
-	${CAT} ${FONTSDIR}/fonts.alias fonts.alias > fonts.alias.tmp ;\
-	${INSTALL_DATA} fonts.alias.tmp ${FONTSDIR} ;\
-	${MV} -f ${FONTSDIR}/fonts.alias.tmp ${FONTSDIR}/fonts.alias ;\
+	${INSTALL_DATA} elisat10.pcf.gz ${INSTALLDIR} ;\
+	${INSTALL_DATA} jpnhn4-jis.pcf.gz ${INSTALLDIR} ;\
+	${INSTALL_DATA} jpnhn4-iso.pcf.gz ${INSTALLDIR} ;\
 	)
 
 post-install:
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
 	@(cd ${WRKSRC} ;\
 	${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} ;\
 	)
 .endif
-	@${ECHO} "**********************************************************"
-	@${ECHO} "You should restart X server or do 'xset fp rehash' command"
-	@${ECHO} "to use installed fonts."
-	@${ECHO} "**********************************************************"
 
 .include <bsd.port.mk>
diff --git a/japanese/elisa8x8/pkg-plist b/japanese/elisa8x8/pkg-plist
index cd4096aa5957..6ab9a5be9206 100644
--- a/japanese/elisa8x8/pkg-plist
+++ b/japanese/elisa8x8/pkg-plist
@@ -1,18 +1,9 @@
-lib/X11/fonts/misc/elisat10.pcf.gz
-lib/X11/fonts/misc/jpnhn4-jis.pcf.gz
-lib/X11/fonts/misc/jpnhn4-iso.pcf.gz
+%%FONTSDIR%%/elisat10.pcf.gz
+%%FONTSDIR%%/jpnhn4-jis.pcf.gz
+%%FONTSDIR%%/jpnhn4-iso.pcf.gz
 share/doc/elisa/elisa100.doc
 share/doc/elisa/elisat10.doc
 share/doc/elisa/elisat10.html
-@exec  echo "Updating fonts.dir"
-@exec mkfontdir %D/lib/X11/fonts/misc
-@exec  echo "Updating fonts.alias"
-@exec cd %D/lib/X11/fonts/misc ; touch fonts.alias ; cp fonts.alias fonts.alias.orig ; (cat fonts.alias.orig ; echo "k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0" ; echo "r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0"; echo "a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1"; echo "4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1" ) > fonts.alias ; rm fonts.alias.orig
-@unexec  echo "Updating fonts.dir"
-@unexec mkfontdir %D/lib/X11/fonts/misc
-@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc; cp fonts.alias fonts.alias.orig; grep -v 'elisa100\-fixed\-medium\-r\-normal' fonts.alias.orig | grep -v 'hiro\-fixed\-medium\-r\-normal' > fonts.alias; rm fonts.alias.orig
-@exec echo "**********************************************************"
-@exec echo "You should restart X server or do 'xset fp rehash' command"
-@exec echo "to use installed fonts."
-@exec echo "**********************************************************"
+@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @dirrm share/doc/elisa
diff --git a/japanese/elisa8x8/pkg-req b/japanese/elisa8x8/pkg-req
new file mode 100644
index 000000000000..9c2d05cb9f7b
--- /dev/null
+++ b/japanese/elisa8x8/pkg-req
@@ -0,0 +1,48 @@
+#!/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}
+k8  -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0
+r8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0
+a8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
+4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
+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;