3 files changed, 18 insertions, 26 deletions

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.
+*******************************************************************