- 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], 226516 [2]
Submitted by:	WATANABE Kazuhiro <CQG00620@nifty.ne.jp> (maintainer) [2]
Reported by:	Shigeharu TAKENO <shige@iee.niit.ac.jp> [1]

5 files changed, 21 insertions, 51 deletions

diff --git a/japanese/font-naga10/Makefile b/japanese/font-naga10/Makefile
index 5d07909eb514..753350038794 100644
--- a/japanese/font-naga10/Makefile
+++ b/japanese/font-naga10/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	naga10
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA013391/fonts/
 PKGNAMEPREFIX=	ja-font-
@@ -16,13 +16,9 @@ BUILD_DEPENDS=	mkbold:x11-fonts/mkbold-mkitalic \
 		bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
-FONTNAME=	misc
 NO_ARCH=	yes
-SUB_FILES=	Makefile pkg-install
-SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+SUB_FILES=	Makefile pkg-message
 MAKEFILE=	${WRKDIR}/Makefile
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
@@ -30,10 +26,7 @@ OPTIONS_DEFINE=	DOCS
 pre-build: apply-slist
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR}
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-naga10/files/Makefile.in b/japanese/font-naga10/files/Makefile.in
index 1b388f4b15e8..2619862ac952 100644
--- a/japanese/font-naga10/files/Makefile.in
+++ b/japanese/font-naga10/files/Makefile.in
@@ -34,8 +34,8 @@ ${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
 	bdftopcf $> | ${GZIP_CMD} -c > $@
 
 install:
-	mkdir -p ${DESTDIR}%%DATADIR%%
-	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%DATADIR%%
+	mkdir -p ${DESTDIR}%%FONTSDIR%%
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%FONTSDIR%%
 
 clean::
 	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/font-naga10/files/pkg-install.in b/japanese/font-naga10/files/pkg-install.in
deleted file mode 100644
index 432ba23ea918..000000000000
--- a/japanese/font-naga10/files/pkg-install.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-case "$2" in
-POST-INSTALL)
-	cd %%FONTSDIR%%
-	touch fonts.alias
-	grep -v -- "^k10\|^a10\|^r10" fonts.alias > fonts.alias.tmp
-	cat fonts.alias.tmp %%FONTSALIAS%% > fonts.alias
-	rm -f fonts.alias.tmp
-;;
-DEINSTALL)
-	cd %%FONTSDIR%%
-	touch fonts.alias
-	grep -v -- "^k10\|^a10\|^r10" fonts.alias > fonts.alias.tmp
-	if [ -s fonts.alias.tmp ]; then
-		mv fonts.alias.tmp fonts.alias
-	else
-		rm -f fonts.alias.tmp fonts.alias
-	fi
-;;
-esac
diff --git a/japanese/font-naga10/files/pkg-message.in b/japanese/font-naga10/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-naga10/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-naga10/pkg-plist b/japanese/font-naga10/pkg-plist
index 02f887cd6ce7..2b3f1a2d6fa0 100644
--- a/japanese/font-naga10/pkg-plist
+++ b/japanese/font-naga10/pkg-plist
@@ -1,20 +1,4 @@
-%%DATADIR%%/fonts.alias
-%%DATADIR%%/5x10B.pcf.gz
-%%DATADIR%%/5x10a.pcf.gz
-%%DATADIR%%/5x10rk.pcf.gz
-%%DATADIR%%/knj10.pcf.gz
-%%DATADIR%%/knj10B.pcf.gz
-%%DATADIR%%/5x10rkb.pcf.gz
-%%DATADIR%%/5x10Bi.pcf.gz
-%%DATADIR%%/5x10ai.pcf.gz
-%%DATADIR%%/5x10rki.pcf.gz
-%%DATADIR%%/knj10i.pcf.gz
-%%DATADIR%%/knj10Bi.pcf.gz
-%%DATADIR%%/5x10rkbi.pcf.gz
-%%DATADIR%%/maru10.pcf.gz
-%%DATADIR%%/maru10i.pcf.gz
-%%DATADIR%%/min10.pcf.gz
-%%DATADIR%%/min10i.pcf.gz
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/5x10B.pcf.gz
 %%FONTSDIR%%/5x10a.pcf.gz
 %%FONTSDIR%%/5x10rk.pcf.gz