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

5 files changed, 21 insertions, 44 deletions

diff --git a/japanese/font-ayu20/Makefile b/japanese/font-ayu20/Makefile
index 4fc28774f15b..11a2128ab2ad 100644
--- a/japanese/font-ayu20/Makefile
+++ b/japanese/font-ayu20/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ayu20
 PORTVERSION=	1.7.a
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	OSDN/x-tt/8536/
 PKGNAMEPREFIX=	ja-font-
@@ -16,13 +17,9 @@ BUILD_DEPENDS=	mkitalic:x11-fonts/mkbold-mkitalic \
 CONFLICS=	ja-kappa20-[0-9]*
 
 USES=		fonts
-FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
-SUB_FILES=	Makefile pkg-install
-SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	Makefile pkg-message
 PORTDOCS=	README.txt
 MAKEFILE=	${WRKDIR}/Makefile
 
@@ -31,11 +28,8 @@ OPTIONS_DEFINE=	DOCS
 pre-build: apply-slist
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
 	${INSTALL_DATA} ${FILESDIR}/fonts.alias \
-	    ${STAGEDIR}${DATADIR}
+	    ${STAGEDIR}${FONTSDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-ayu20/files/Makefile.in b/japanese/font-ayu20/files/Makefile.in
index 4fc2b446c91f..8e82b51b1cc5 100644
--- a/japanese/font-ayu20/files/Makefile.in
+++ b/japanese/font-ayu20/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-ayu20/files/pkg-install.in b/japanese/font-ayu20/files/pkg-install.in
deleted file mode 100644
index 7c1d22761134..000000000000
--- a/japanese/font-ayu20/files/pkg-install.in
+++ /dev/null
@@ -1,26 +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
-	if [ ! -s fonts.alias ]; then
-		rm -f fonts.alias
-	fi
-;;
-esac
diff --git a/japanese/font-ayu20/files/pkg-message.in b/japanese/font-ayu20/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-ayu20/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-ayu20/pkg-plist b/japanese/font-ayu20/pkg-plist
index 8944f2b94507..6cefa7681b00 100644
--- a/japanese/font-ayu20/pkg-plist
+++ b/japanese/font-ayu20/pkg-plist
@@ -1,10 +1,4 @@
-%%DATADIR%%/10x20gm.pcf.gz
-%%DATADIR%%/10x20gmi.pcf.gz
-%%DATADIR%%/10x20grkm.pcf.gz
-%%DATADIR%%/10x20grkmi.pcf.gz
-%%DATADIR%%/k20gm.pcf.gz
-%%DATADIR%%/k20gmi.pcf.gz
-%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/10x20gm.pcf.gz
 %%FONTSDIR%%/10x20gmi.pcf.gz
 %%FONTSDIR%%/10x20grkm.pcf.gz