- 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, 22 insertions, 43 deletions

diff --git a/japanese/font-kaname12/Makefile b/japanese/font-kaname12/Makefile
index 86816b1ec29c..76a9727d1ed4 100644
--- a/japanese/font-kaname12/Makefile
+++ b/japanese/font-kaname12/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kaname12
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
@@ -16,27 +17,19 @@ COMMENT=	12-dot Kanji font
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
-FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
-SUB_FILES=	Makefile pkg-install
-SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+SUB_FILES=	Makefile pkg-message
 MAKEFILE=	${WRKDIR}/Makefile
 PORTDOCS=	readme readme.kaname_bdf kaname.doc \
 		readme.knm gijutsu-siryou.doc
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
 
 OPTIONS_DEFINE=	DOCS
 
 pre-build: apply-slist
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${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:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-doc
diff --git a/japanese/font-kaname12/files/Makefile.in b/japanese/font-kaname12/files/Makefile.in
index 80ff06f2da55..85390f616e94 100644
--- a/japanese/font-kaname12/files/Makefile.in
+++ b/japanese/font-kaname12/files/Makefile.in
@@ -10,11 +10,11 @@ knmhn12x.pcf.gz: knmhn12x.bdf
 	bdftopcf ${.ALLSRC} | gzip -9 > ${.TARGET}
 
 .for F in ${PCF}
-${DESTDIR}%%DATADIR%%/$F: $F
-	mkdir -p ${DESTDIR}%%DATADIR%%
+${DESTDIR}%%FONTSDIR%%/$F: $F
+	mkdir -p ${DESTDIR}%%FONTSDIR%%
 	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
 
-install: ${DESTDIR}%%DATADIR%%/$F
+install: ${DESTDIR}%%FONTSDIR%%/$F
 all: ${F}
 .endfor
 
diff --git a/japanese/font-kaname12/files/pkg-install.in b/japanese/font-kaname12/files/pkg-install.in
deleted file mode 100644
index 742953077013..000000000000
--- a/japanese/font-kaname12/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-kaname12/files/pkg-message.in b/japanese/font-kaname12/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-kaname12/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-kaname12/pkg-plist b/japanese/font-kaname12/pkg-plist
index 1bb40b897fce..d6b0f46c1f70 100644
--- a/japanese/font-kaname12/pkg-plist
+++ b/japanese/font-kaname12/pkg-plist
@@ -1,13 +1,7 @@
-%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/kaname-latin1.pcf.gz
 %%FONTSDIR%%/knm12p.pcf.gz
 %%FONTSDIR%%/knm12pb.pcf.gz
 %%FONTSDIR%%/knmhn12x.pcf.gz
 %%FONTSDIR%%/knmzn12x.pcf.gz
 %%FONTSDIR%%/knmzn12xb.pcf.gz
-%%DATADIR%%/kaname-latin1.pcf.gz
-%%DATADIR%%/knm12p.pcf.gz
-%%DATADIR%%/knm12pb.pcf.gz
-%%DATADIR%%/knmhn12x.pcf.gz
-%%DATADIR%%/knmzn12x.pcf.gz
-%%DATADIR%%/knmzn12xb.pcf.gz