Index: head/japanese/font-elisa8/Makefile
===================================================================
--- head/japanese/font-elisa8/Makefile	(revision 466799)
+++ head/japanese/font-elisa8/Makefile	(revision 466800)
@@ -1,44 +1,37 @@
 # Created by: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> & ELISA Font Project
 # $FreeBSD$
 
 PORTNAME=	elisa8
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.bsdbbq.org/~toshi/distfiles/
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	elisat10
 
 MAINTAINER=	toshi@tea.forus.or.jp
 COMMENT=	8-dot Kanji font 'elisa'
 
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
-FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
-SUB_FILES=	Makefile pkg-install
+SUB_FILES=	Makefile pkg-message
 MAKEFILE=	${WRKDIR}/Makefile
 SUB_LIST=	BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \
-		GZIP_CMD="${GZIP_CMD}" \
-		FONTSALIAS="${DATADIR}/fonts.alias"
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
+		GZIP_CMD="${GZIP_CMD}"
 PORTDOCS=	elisa100.doc elisat10.doc elisat10.html
 
 OPTIONS_DEFINE=	DOCS
 
 pre-build: apply-slist
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/japanese/font-elisa8/files/pkg-install.in
===================================================================
--- head/japanese/font-elisa8/files/pkg-install.in	(revision 466799)
+++ head/japanese/font-elisa8/files/pkg-install.in	(nonexistent)
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-case $2 in
-POST-INSTALL)
-	cd %%FONTSDIR%%
-	touch fonts.alias
-	cp fonts.alias fonts.alias.orig
-	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
-	    > fonts.alias
-	rm -f fonts.alias.orig
-;;
-DEINSTALL)
-	cd %%FONTSDIR%%
-	touch fonts.alias
-	cp fonts.alias fonts.alias.orig
-	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
-	rm -f fonts.alias.orig
-;;
-esac

Property changes on: head/japanese/font-elisa8/files/pkg-install.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/japanese/font-elisa8/files/Makefile.in
===================================================================
--- head/japanese/font-elisa8/files/Makefile.in	(revision 466799)
+++ head/japanese/font-elisa8/files/Makefile.in	(revision 466800)
@@ -1,24 +1,24 @@
 # $FreeBSD$
 
 BDFTOPCF_CMD=	%%BDFTOPCF_CMD%%
 GZIP_CMD=	%%GZIP_CMD%%
 
 SRCS=	elisat10.bdf jpnhn4-jis.bdf jpnhn4-iso.bdf
 
 .for F in ${SRCS:R}
 ${F}.pcf.gz: ${F}.bdf
 	${BDFTOPCF_CMD} ${.ALLSRC} | ${GZIP_CMD} -c > ${.TARGET}
 
 all: ${F}.pcf.gz
 .endfor
 
 .for F in ${SRCS:R}
-${DESTDIR}%%DATADIR%%/${F}.pcf.gz: ${F}.pcf.gz
-	mkdir -p ${DESTDIR}%%DATADIR%%
+${DESTDIR}%%FONTSDIR%%/${F}.pcf.gz: ${F}.pcf.gz
+	mkdir -p ${DESTDIR}%%FONTSDIR%%
 	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
 
-install: ${DESTDIR}%%DATADIR%%/${F}.pcf.gz
+install: ${DESTDIR}%%FONTSDIR%%/${F}.pcf.gz
 .endfor
 
 all install:
 	@true
Index: head/japanese/font-elisa8/files/pkg-message.in
===================================================================
--- head/japanese/font-elisa8/files/pkg-message.in	(nonexistent)
+++ head/japanese/font-elisa8/files/pkg-message.in	(revision 466800)
@@ -0,0 +1,15 @@
+*******************************************************************
+You can start using the font(s) by following these instructions:
+
+Either type the following in an X terminal:
+
+        xset fp+ %%FONTSDIR%%
+        xset fp rehash
+
+Or, more permanently, add the following line to the "Files" section
+of your X.Org configuration file (typically /etc/X11/xorg.conf):
+
+        FontPath "%%FONTSDIR%%/"
+
+then restart X.
+*******************************************************************

Property changes on: head/japanese/font-elisa8/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/japanese/font-elisa8/pkg-plist
===================================================================
--- head/japanese/font-elisa8/pkg-plist	(revision 466799)
+++ head/japanese/font-elisa8/pkg-plist	(revision 466800)
@@ -1,7 +1,4 @@
-%%DATADIR%%/elisat10.pcf.gz
-%%DATADIR%%/jpnhn4-jis.pcf.gz
-%%DATADIR%%/jpnhn4-iso.pcf.gz
-%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/elisat10.pcf.gz
 %%FONTSDIR%%/jpnhn4-jis.pcf.gz
 %%FONTSDIR%%/jpnhn4-iso.pcf.gz