- Install font files to ${FONTSDIR} instead of ${DATADIR}.

- Stop to make symbolic links from the font files to
  ${PREFIX}/share/fonts/misc/, which is found in the default
  font path, because recent libXfont does not follow symbolic
  links.
- Add pkg-message.in to show additional font path settings.
- Remove unnecessary pkg-install.in.
- Bump PORTREVISION.

PR:		225125 [1], 226519 [2]
Submitted by:	WATANABE Kazuhiro <CQG00620@nifty.ne.jp> [2]
Reported by:	Shigeharu TAKENO <shige@iee.niit.ac.jp> [1]

5 files changed, 21 insertions, 83 deletions

diff --git a/japanese/font-mona/Makefile b/japanese/font-mona/Makefile
index 73db460ca9a9..e9430db17861 100644
--- a/japanese/font-mona/Makefile
+++ b/japanese/font-mona/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mona
 PORTVERSION=	2.90
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
 PKGNAMEPREFIX=	ja-font-
@@ -15,20 +16,13 @@ BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
 		mkfontdir:x11-fonts/mkfontdir
 
 USES=		fonts perl5 tar:bzip2
-FONTNAME=	misc
 USE_PERL5=	build
 NO_ARCH=	yes
-MAKE_ENV=	DATADIR="${DATADIR}"
-SUB_FILES=	pkg-install
-SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
+MAKE_ENV=	FONTSDIR="${FONTSDIR}"
+SUB_FILES=	pkg-message
 ALL_TARGET=	bdf
 
 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}
 
 .include <bsd.port.mk>
diff --git a/japanese/font-mona/files/patch-Makefile b/japanese/font-mona/files/patch-Makefile
index 088cb2ee229e..1206404eb9e0 100644
--- a/japanese/font-mona/files/patch-Makefile
+++ b/japanese/font-mona/files/patch-Makefile
@@ -9,7 +9,7 @@
 -BDFTOPCF	= $(X11BINDIR)/bdftopcf
 -MKDIRHIER	= $(X11BINDIR)/mkdirhier	# 'mkdir -p' may also work.
 -MKFONTDIR	= $(X11BINDIR)/mkfontdir
-+X11FONTDIR	= $(DESTDIR)$(DATADIR)
++X11FONTDIR	= $(DESTDIR)$(FONTSDIR)
 +BDFTOPCF	= bdftopcf
 +MKDIRHIER	= mkdir -p	# 'mkdir -p' may also work.
 +MKFONTDIR	= mkfontdir
diff --git a/japanese/font-mona/files/pkg-install.in b/japanese/font-mona/files/pkg-install.in
deleted file mode 100644
index 742953077013..000000000000
--- a/japanese/font-mona/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-mona/files/pkg-message.in b/japanese/font-mona/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-mona/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.
+*******************************************************************
diff --git a/japanese/font-mona/pkg-plist b/japanese/font-mona/pkg-plist
index ba14e6b76647..1ce9eb046ffd 100644
--- a/japanese/font-mona/pkg-plist
+++ b/japanese/font-mona/pkg-plist
@@ -1,52 +1,4 @@
-%%DATADIR%%/fonts.alias
-%%DATADIR%%/mona6x12a.pcf.gz
-%%DATADIR%%/mona6x12aB.pcf.gz
-%%DATADIR%%/mona6x12aBI.pcf.gz
-%%DATADIR%%/mona6x12aI.pcf.gz
-%%DATADIR%%/mona6x12r.pcf.gz
-%%DATADIR%%/mona6x12rB.pcf.gz
-%%DATADIR%%/mona6x12rBI.pcf.gz
-%%DATADIR%%/mona6x12rI.pcf.gz
-%%DATADIR%%/mona7x14a.pcf.gz
-%%DATADIR%%/mona7x14aB.pcf.gz
-%%DATADIR%%/mona7x14aBI.pcf.gz
-%%DATADIR%%/mona7x14aI.pcf.gz
-%%DATADIR%%/mona7x14r.pcf.gz
-%%DATADIR%%/mona7x14rB.pcf.gz
-%%DATADIR%%/mona7x14rBI.pcf.gz
-%%DATADIR%%/mona7x14rI.pcf.gz
-%%DATADIR%%/mona8x16a.pcf.gz
-%%DATADIR%%/mona8x16aB.pcf.gz
-%%DATADIR%%/mona8x16aBI.pcf.gz
-%%DATADIR%%/mona8x16aI.pcf.gz
-%%DATADIR%%/mona8x16r.pcf.gz
-%%DATADIR%%/mona8x16rB.pcf.gz
-%%DATADIR%%/mona8x16rBI.pcf.gz
-%%DATADIR%%/mona8x16rI.pcf.gz
-%%DATADIR%%/monak12.pcf.gz
-%%DATADIR%%/monak12B.pcf.gz
-%%DATADIR%%/monak12BI.pcf.gz
-%%DATADIR%%/monak12I.pcf.gz
-%%DATADIR%%/monak14.pcf.gz
-%%DATADIR%%/monak14B.pcf.gz
-%%DATADIR%%/monak14BI.pcf.gz
-%%DATADIR%%/monak14I.pcf.gz
-%%DATADIR%%/monak16.pcf.gz
-%%DATADIR%%/monak16B.pcf.gz
-%%DATADIR%%/monak16BI.pcf.gz
-%%DATADIR%%/monak16I.pcf.gz
-%%DATADIR%%/monau12.pcf.gz
-%%DATADIR%%/monau12B.pcf.gz
-%%DATADIR%%/monau12BI.pcf.gz
-%%DATADIR%%/monau12I.pcf.gz
-%%DATADIR%%/monau14.pcf.gz
-%%DATADIR%%/monau14B.pcf.gz
-%%DATADIR%%/monau14BI.pcf.gz
-%%DATADIR%%/monau14I.pcf.gz
-%%DATADIR%%/monau16.pcf.gz
-%%DATADIR%%/monau16B.pcf.gz
-%%DATADIR%%/monau16BI.pcf.gz
-%%DATADIR%%/monau16I.pcf.gz
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/mona6x12a.pcf.gz
 %%FONTSDIR%%/mona6x12aB.pcf.gz
 %%FONTSDIR%%/mona6x12aBI.pcf.gz