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

17 files changed, 84 insertions, 205 deletions

diff --git a/japanese/font-ayu18/Makefile b/japanese/font-ayu18/Makefile
index 06a26a0a671a..3f948510f17d 100644
--- a/japanese/font-ayu18/Makefile
+++ b/japanese/font-ayu18/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ayu18
 PORTVERSION=	1.3.1.1
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	OSDN/x-tt/8535/:goth \
 		OSDN/x-tt/8494/:min
@@ -16,10 +17,9 @@ BUILD_DEPENDS=	mkitalic:x11-fonts/mkbold-mkitalic \
 		bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
-FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
-SUB_FILES=	Makefile
+SUB_FILES=	Makefile pkg-message
 MAKEFILE=	${WRKDIR}/Makefile
 PORTDOCS=	README.txt
 
@@ -27,11 +27,6 @@ OPTIONS_DEFINE=	DOCS
 
 pre-build: apply-slist
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-ayu18/files/Makefile.in b/japanese/font-ayu18/files/Makefile.in
index 6df6cdee4bae..e53adddc762b 100644
--- a/japanese/font-ayu18/files/Makefile.in
+++ b/japanese/font-ayu18/files/Makefile.in
@@ -28,8 +28,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-ayu18/files/pkg-message.in b/japanese/font-ayu18/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-ayu18/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-ayu18/pkg-plist b/japanese/font-ayu18/pkg-plist
index c85c1f504196..0f01f5d3adad 100644
--- a/japanese/font-ayu18/pkg-plist
+++ b/japanese/font-ayu18/pkg-plist
@@ -1,15 +1,3 @@
-%%DATADIR%%/9x18gm.pcf.gz
-%%DATADIR%%/9x18gmi.pcf.gz
-%%DATADIR%%/9x18grkm.pcf.gz
-%%DATADIR%%/9x18grkmi.pcf.gz
-%%DATADIR%%/9x18m.pcf.gz
-%%DATADIR%%/9x18mi.pcf.gz
-%%DATADIR%%/9x18rkm.pcf.gz
-%%DATADIR%%/9x18rkmi.pcf.gz
-%%DATADIR%%/k18gm.pcf.gz
-%%DATADIR%%/k18gmi.pcf.gz
-%%DATADIR%%/k18m.pcf.gz
-%%DATADIR%%/k18mi.pcf.gz
 %%FONTSDIR%%/9x18gm.pcf.gz
 %%FONTSDIR%%/9x18gmi.pcf.gz
 %%FONTSDIR%%/9x18grkm.pcf.gz
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
diff --git a/japanese/font-elisa10/Makefile b/japanese/font-elisa10/Makefile
index 3ac7a081070f..e8abdfd52f97 100644
--- a/japanese/font-elisa10/Makefile
+++ b/japanese/font-elisa10/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	elisa10
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.wheel.gr.jp/~dai/software/
 PKGNAMEPREFIX=	ja-font-
@@ -14,30 +14,22 @@ COMMENT=	Elisa 10-dot Kanji font
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts tar:tgz
-FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
-SUB_FILES=	Makefile pkg-install
+SUB_FILES=	Makefile pkg-message
 MAKEFILE=	${WRKDIR}/Makefile
 SUB_LIST=	BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \
-		GZIP_CMD="${GZIP_CMD}" \
-		FONTSALIAS="${DATADIR}/fonts.alias"
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
+		GZIP_CMD="${GZIP_CMD}"
 PORTDOCS=	elisau10.doc hosoku.txt
-PLIST_FILES=	%%DATADIR%%/elisau10.pcf.gz \
-		%%DATADIR%%/fonts.alias \
-		%%FONTSDIR%%/elisau10.pcf.gz
+PLIST_FILES=	%%FONTSDIR%%/elisau10.pcf.gz \
+		%%FONTSDIR%%/fonts.alias
 
 OPTIONS_DEFINE=	DOCS
 
 pre-build: apply-slist
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
-	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-elisa10/files/Makefile.in b/japanese/font-elisa10/files/Makefile.in
index 1fd383cfa1f9..9cde0a8fb5d0 100644
--- a/japanese/font-elisa10/files/Makefile.in
+++ b/japanese/font-elisa10/files/Makefile.in
@@ -13,11 +13,11 @@ all: ${F}.pcf.gz
 .endfor
 
 .for F in ${SRCS:R}
-${DESTDIR}%%DATADIR%%/${F}.pcf.gz: ${F}.pcf.gz
-	mkdir -p ${DESTDIR}%%DATADIR%%
+${DESTDIR}%%FONTSDIR%%/${F}.pcf.gz: ${F}.pcf.gz
+	mkdir -p ${DESTDIR}%%FONTSDIR%%
 	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
 
-install: ${DESTDIR}%%DATADIR%%/${F}.pcf.gz
+install: ${DESTDIR}%%FONTSDIR%%/${F}.pcf.gz
 .endfor
 
 all install:
diff --git a/japanese/font-elisa10/files/pkg-install.in b/japanese/font-elisa10/files/pkg-install.in
deleted file mode 100644
index 742953077013..000000000000
--- a/japanese/font-elisa10/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-elisa10/files/pkg-message.in b/japanese/font-elisa10/files/pkg-message.in
new file mode 100644
index 000000000000..059c75d35d44
--- /dev/null
+++ b/japanese/font-elisa10/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/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