Use FONTPATHSPEC and nuke pkg-message for adding FontPath manually.

2 files changed, 4 insertions, 21 deletions

diff --git a/japanese/font-kanji18/Makefile b/japanese/font-kanji18/Makefile
index f1b31e202b78..82b7310a8d95 100644
--- a/japanese/font-kanji18/Makefile
+++ b/japanese/font-kanji18/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kanji
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	PORTS_JP/${DISTNAME}
 PKGNAMEPREFIX=	ja-font-
@@ -19,6 +19,8 @@ BUILD_DEPENDS=	mkbold:x11-fonts/mkbold-mkitalic \
 		bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
+FONTNAME=	${PORTNAME}${PKGNAMESUFFIX}
+FONTPATHSPEC=	${FONTNAME}:unscaled:pri=60
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=		${GZCAT}
@@ -28,7 +30,7 @@ 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 pkg-message
+SUB_FILES=	Makefile pkg-install
 SUB_LIST=	FONTSALIAS="${FONTSDIR}/fonts.alias.${PKGNAMESUFFIX}" \
 		SRCS="${SRCS}"
 PORTDOCS=	README.${PORTNAME}${PKGNAMESUFFIX}
diff --git a/japanese/font-kanji18/files/pkg-message.in b/japanese/font-kanji18/files/pkg-message.in
deleted file mode 100644
index fd51f56edab9..000000000000
--- a/japanese/font-kanji18/files/pkg-message.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-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.
-EOM
-}
-]