- 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.
- Bump PORTREVISION.
- Set submitter as maintainer.

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

5 files changed, 25 insertions, 29 deletions

diff --git a/japanese/font-kanji18/Makefile b/japanese/font-kanji18/Makefile
index 9851a3aa119c..a86ab7893d6a 100644
--- a/japanese/font-kanji18/Makefile
+++ b/japanese/font-kanji18/Makefile
@@ -3,22 +3,22 @@
 
 PORTNAME=	kanji
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=   PORTS_JP/${DISTNAME}
+MASTER_SITES=	PORTS_JP/${DISTNAME}
 PKGNAMEPREFIX=	ja-font-
 PKGNAMESUFFIX?=	18
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}
 DISTFILES?=	573.z 574.z 575.z 576.z 577.z 578.z 579.z 580.z 581.z
 DIST_SUBDIR=	${DISTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	${PKGNAMESUFFIX}-dot Kanji font
 
 BUILD_DEPENDS=	mkbold:x11-fonts/mkbold-mkitalic \
 		bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
-FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=		${GZCAT}
@@ -28,8 +28,8 @@ EXTRACT_AFTER_ARGS=	| ${SED} '/bin\/sh/,/exit 0/!d' \
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 MAKEFILE=	${WRKDIR}/Makefile
-SUB_FILES=	Makefile pkg-install
-SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias.${PKGNAMESUFFIX}" \
+SUB_FILES=	Makefile pkg-install pkg-message
+SUB_LIST=	FONTSALIAS="${FONTSDIR}/fonts.alias.${PKGNAMESUFFIX}" \
 		SRCS="${SRCS}"
 PORTDOCS=	README.${PORTNAME}${PKGNAMESUFFIX}
 
@@ -53,10 +53,7 @@ pre-build: apply-slist
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/fonts.alias.${PKGNAMESUFFIX} \
-	    ${STAGEDIR}${DATADIR}/fonts.alias.${PKGNAMESUFFIX}
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+	    ${STAGEDIR}${FONTSDIR}/fonts.alias.${PKGNAMESUFFIX}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-kanji18/files/Makefile.in b/japanese/font-kanji18/files/Makefile.in
index fff83d9fadde..ec4842e203c4 100644
--- a/japanese/font-kanji18/files/Makefile.in
+++ b/japanese/font-kanji18/files/Makefile.in
@@ -27,8 +27,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-kanji18/files/pkg-message.in b/japanese/font-kanji18/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-kanji18/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-kanji18/pkg-plist b/japanese/font-kanji18/pkg-plist
index b7208f0108b1..899df09a1ac0 100644
--- a/japanese/font-kanji18/pkg-plist
+++ b/japanese/font-kanji18/pkg-plist
@@ -1,12 +1,4 @@
-%%DATADIR%%/fonts.alias.18
-%%DATADIR%%/kanji18.pcf.gz
-%%DATADIR%%/kanji18b.pcf.gz
-%%DATADIR%%/kanji18bi.pcf.gz
-%%DATADIR%%/kanji18i.pcf.gz
-%%DATADIR%%/kanji16.pcf.gz
-%%DATADIR%%/kanji16b.pcf.gz
-%%DATADIR%%/kanji16bi.pcf.gz
-%%DATADIR%%/kanji16i.pcf.gz
+%%FONTSDIR%%/fonts.alias.18
 %%FONTSDIR%%/kanji18.pcf.gz
 %%FONTSDIR%%/kanji18b.pcf.gz
 %%FONTSDIR%%/kanji18bi.pcf.gz
diff --git a/japanese/font-kanji26/pkg-plist b/japanese/font-kanji26/pkg-plist
index 724ce5730e4c..7d52626dccb8 100644
--- a/japanese/font-kanji26/pkg-plist
+++ b/japanese/font-kanji26/pkg-plist
@@ -1,12 +1,4 @@
-%%DATADIR%%/fonts.alias.26
-%%DATADIR%%/kanji26.pcf.gz
-%%DATADIR%%/kanji26b.pcf.gz
-%%DATADIR%%/kanji26bi.pcf.gz
-%%DATADIR%%/kanji26i.pcf.gz
-%%DATADIR%%/kanji24.pcf.gz
-%%DATADIR%%/kanji24b.pcf.gz
-%%DATADIR%%/kanji24bi.pcf.gz
-%%DATADIR%%/kanji24i.pcf.gz
+%%FONTSDIR%%/fonts.alias.26
 %%FONTSDIR%%/kanji26.pcf.gz
 %%FONTSDIR%%/kanji26b.pcf.gz
 %%FONTSDIR%%/kanji26bi.pcf.gz