- Add LICENSE.

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

2 files changed, 4 insertions, 21 deletions

diff --git a/japanese/font-mplus-bitmap/Makefile b/japanese/font-mplus-bitmap/Makefile
index 1c48e41430b0..f1ad7a8f0294 100644
--- a/japanese/font-mplus-bitmap/Makefile
+++ b/japanese/font-mplus-bitmap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplus
 PORTVERSION=	2.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	OSDN/${PORTNAME}-fonts/5030/
 PKGNAMEPREFIX=	ja-font-
@@ -13,12 +13,14 @@ DISTNAME=	${PORTNAME}_bitmap_fonts-2.2.4
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	M+ Bitmap fonts
 
+LICENSE=	PD
+
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
+FONTPATHSPEC=	${PORTNAME}${PKGNAMESUFFIX}:unscaled:pri=60
 NO_BUILD=	yes
 NO_ARCH=	yes
-SUB_FILES=	pkg-message
 FONTSDIR=	${PREFIX}/share/fonts/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 PORTDOCS=	INSTALL_E LICENSE_E README_E \
diff --git a/japanese/font-mplus-bitmap/files/pkg-message.in b/japanese/font-mplus-bitmap/files/pkg-message.in
deleted file mode 100644
index fd51f56edab9..000000000000
--- a/japanese/font-mplus-bitmap/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
-}
-]