- 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)

4 files changed, 20 insertions, 100 deletions

diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index 5e970a78c606..2f62d515662c 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	shinonome
 PORTVERSION=	0.9.11.p1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
@@ -16,14 +16,9 @@ COMMENT=	Shinonome Japanese fonts, 12/14/16 dots
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts tar:bzip2
-FONTNAME=	misc
 NO_ARCH=	yes
+SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME:C/^font-//}-${PORTVERSION:C/.p.*$//}
-DATADIR=	${PREFIX}/share/font-${PORTNAME}
-SUB_FILES=	pkg-install
-SUB_LIST=	FONTSALIAS=${DATADIR}/fonts.alias
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
 
 PORTDOCS=	AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14	\
 		DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
@@ -60,12 +55,9 @@ do-build:
 	@${ECHO_CMD} "Done"
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias \
-	    ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/*.pcf.gz .
+	cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias \
+	    ${STAGEDIR}${FONTSDIR}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-shinonome/files/pkg-install.in b/japanese/font-shinonome/files/pkg-install.in
deleted file mode 100644
index d95521474469..000000000000
--- a/japanese/font-shinonome/files/pkg-install.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-case "$2" in
-POST-INSTALL)
-	cd %%FONTSDIR%%
-	touch fonts.alias
-	grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
-	(cat fonts.alias.tmp; grep -- "-shinonome-" %%FONTSALIAS%%) \
-	    > fonts.alias
-	rm -f fonts.alias.tmp
-	;;
-POST-DEINSTALL)
-	cd %%FONTSDIR%%
-	touch fonts.alias
-	grep -v -- "-shinonome-" 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-shinonome/files/pkg-message.in b/japanese/font-shinonome/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-shinonome/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-shinonome/pkg-plist b/japanese/font-shinonome/pkg-plist
index 5ffb23e6445e..90d21c398d38 100644
--- a/japanese/font-shinonome/pkg-plist
+++ b/japanese/font-shinonome/pkg-plist
@@ -1,68 +1,4 @@
-%%DATADIR%%/shnm6x12a.pcf.gz
-%%DATADIR%%/shnm6x12ab.pcf.gz
-%%DATADIR%%/shnm6x12abi.pcf.gz
-%%DATADIR%%/shnm6x12ai.pcf.gz
-%%DATADIR%%/shnm6x12r.pcf.gz
-%%DATADIR%%/shnm6x12rb.pcf.gz
-%%DATADIR%%/shnm6x12rbi.pcf.gz
-%%DATADIR%%/shnm6x12ri.pcf.gz
-%%DATADIR%%/shnm7x14a.pcf.gz
-%%DATADIR%%/shnm7x14ab.pcf.gz
-%%DATADIR%%/shnm7x14abi.pcf.gz
-%%DATADIR%%/shnm7x14ai.pcf.gz
-%%DATADIR%%/shnm7x14r.pcf.gz
-%%DATADIR%%/shnm7x14rb.pcf.gz
-%%DATADIR%%/shnm7x14rbi.pcf.gz
-%%DATADIR%%/shnm7x14ri.pcf.gz
-%%DATADIR%%/shnm8x16a.pcf.gz
-%%DATADIR%%/shnm8x16ab.pcf.gz
-%%DATADIR%%/shnm8x16abi.pcf.gz
-%%DATADIR%%/shnm8x16ai.pcf.gz
-%%DATADIR%%/shnm8x16r.pcf.gz
-%%DATADIR%%/shnm8x16rb.pcf.gz
-%%DATADIR%%/shnm8x16rbi.pcf.gz
-%%DATADIR%%/shnm8x16ri.pcf.gz
-%%DATADIR%%/shnm9x18a.pcf.gz
-%%DATADIR%%/shnm9x18ab.pcf.gz
-%%DATADIR%%/shnm9x18abi.pcf.gz
-%%DATADIR%%/shnm9x18ai.pcf.gz
-%%DATADIR%%/shnm9x18r.pcf.gz
-%%DATADIR%%/shnm9x18rb.pcf.gz
-%%DATADIR%%/shnm9x18rbi.pcf.gz
-%%DATADIR%%/shnm9x18ri.pcf.gz
-%%DATADIR%%/shnmk12.pcf.gz
-%%DATADIR%%/shnmk12b.pcf.gz
-%%DATADIR%%/shnmk12bi.pcf.gz
-%%DATADIR%%/shnmk12i.pcf.gz
-%%DATADIR%%/shnmk12maru.pcf.gz
-%%DATADIR%%/shnmk12marub.pcf.gz
-%%DATADIR%%/shnmk12marubi.pcf.gz
-%%DATADIR%%/shnmk12marui.pcf.gz
-%%DATADIR%%/shnmk12min.pcf.gz
-%%DATADIR%%/shnmk12minb.pcf.gz
-%%DATADIR%%/shnmk12minbi.pcf.gz
-%%DATADIR%%/shnmk12mini.pcf.gz
-%%DATADIR%%/shnmk12p.pcf.gz
-%%DATADIR%%/shnmk12pb.pcf.gz
-%%DATADIR%%/shnmk12pbi.pcf.gz
-%%DATADIR%%/shnmk12pi.pcf.gz
-%%DATADIR%%/shnmk14.pcf.gz
-%%DATADIR%%/shnmk14b.pcf.gz
-%%DATADIR%%/shnmk14bi.pcf.gz
-%%DATADIR%%/shnmk14i.pcf.gz
-%%DATADIR%%/shnmk14min.pcf.gz
-%%DATADIR%%/shnmk14minb.pcf.gz
-%%DATADIR%%/shnmk14minbi.pcf.gz
-%%DATADIR%%/shnmk14mini.pcf.gz
-%%DATADIR%%/shnmk16.pcf.gz
-%%DATADIR%%/shnmk16b.pcf.gz
-%%DATADIR%%/shnmk16bi.pcf.gz
-%%DATADIR%%/shnmk16i.pcf.gz
-%%DATADIR%%/shnmk16min.pcf.gz
-%%DATADIR%%/shnmk16minb.pcf.gz
-%%DATADIR%%/shnmk16minbi.pcf.gz
-%%DATADIR%%/shnmk16mini.pcf.gz
-%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/shnm6x12a.pcf.gz
 %%FONTSDIR%%/shnm6x12ab.pcf.gz
 %%FONTSDIR%%/shnm6x12abi.pcf.gz