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

- Add LICENSE.

2 files changed, 5 insertions, 21 deletions

diff --git a/japanese/font-kappa20/Makefile b/japanese/font-kappa20/Makefile
index f9bbcac3fffc..f79c6ef3842e 100644
--- a/japanese/font-kappa20/Makefile
+++ b/japanese/font-kappa20/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kappa20
 PORTVERSION=	0.396
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
@@ -12,14 +12,17 @@ DISTNAME=	Kappa20-${PORTVERSION}
 MAINTAINER=	ginga-freebsd@ginganet.org
 COMMENT=	20-dot Kanji font Kappa20
 
+LICENSE=	PD
+
 BUILD_DEPENDS=	mkitalic:x11-fonts/mkbold-mkitalic \
 		bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts tar:bzip2
+FONTPATHSPEC=	${FONTNAME}:unscaled:pri=60
 NO_ARCH=	yes
 MAKE_ARGS=	FONTSDIR="${FONTSDIR:S,${PREFIX},,}"
 MAKEFILE=	${WRKDIR}/Makefile
-SUB_FILES=	Makefile pkg-message
+SUB_FILES=	Makefile
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
diff --git a/japanese/font-kappa20/files/pkg-message.in b/japanese/font-kappa20/files/pkg-message.in
deleted file mode 100644
index fd51f56edab9..000000000000
--- a/japanese/font-kappa20/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
-}
-]