4 files changed, 24 insertions, 40 deletions

diff --git a/japanese/font-elisa10/Makefile b/japanese/font-elisa10/Makefile
index 3ac7a081070f..e8abdfd52f97 100644
--- a/japanese/font-elisa10/Makefile
+++ b/japanese/font-elisa10/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	elisa10
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.wheel.gr.jp/~dai/software/
 PKGNAMEPREFIX=	ja-font-
@@ -14,30 +14,22 @@ COMMENT=	Elisa 10-dot Kanji font
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts tar:tgz
-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=	elisau10.doc hosoku.txt
-PLIST_FILES=	%%DATADIR%%/elisau10.pcf.gz \
-		%%DATADIR%%/fonts.alias \
-		%%FONTSDIR%%/elisau10.pcf.gz
+PLIST_FILES=	%%FONTSDIR%%/elisau10.pcf.gz \
+		%%FONTSDIR%%/fonts.alias
 
 OPTIONS_DEFINE=	DOCS
 
 pre-build: apply-slist
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
-	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-elisa10/files/Makefile.in b/japanese/font-elisa10/files/Makefile.in
index 1fd383cfa1f9..9cde0a8fb5d0 100644
--- a/japanese/font-elisa10/files/Makefile.in
+++ b/japanese/font-elisa10/files/Makefile.in
@@ -13,11 +13,11 @@ 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:
diff --git a/japanese/font-elisa10/files/pkg-install.in b/japanese/font-elisa10/files/pkg-install.in
deleted file mode 100644
index 742953077013..000000000000
--- a/japanese/font-elisa10/files/pkg-install.in
+++ /dev/null
@@ -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
diff --git a/japanese/font-elisa10/files/pkg-message.in b/japanese/font-elisa10/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-elisa10/files/pkg-message.in
@@ -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.
+*******************************************************************