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

- Add LICENSE.
- Update MASTER_SITES.

2 files changed, 10 insertions, 22 deletions

diff --git a/japanese/font-elisa8/Makefile b/japanese/font-elisa8/Makefile
index 436db197d9da..35ebca6496de 100644
--- a/japanese/font-elisa8/Makefile
+++ b/japanese/font-elisa8/Makefile
@@ -3,21 +3,28 @@
 
 PORTNAME=	elisa8
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://www.bsdbbq.org/~toshi/distfiles/
+MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	elisat10
 
 MAINTAINER=	toshi@tea.forus.or.jp
 COMMENT=	8-dot Kanji font 'elisa'
 
+LICENSE=	NOTPARTIAL-NOTCOMMERCIAL
+LICENSE_NAME=	Whole, not partial, and not commercial
+LICENSE_TEXT=	Free redistribution of the whole package allowed, \
+		not partial, and not commercial
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
+FONTPATHSPEC=	${FONTNAME}:unscaled:pri=60
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
-SUB_FILES=	Makefile pkg-message
+SUB_FILES=	Makefile
 MAKEFILE=	${WRKDIR}/Makefile
 SUB_LIST=	BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \
 		GZIP_CMD="${GZIP_CMD}"
diff --git a/japanese/font-elisa8/files/pkg-message.in b/japanese/font-elisa8/files/pkg-message.in
deleted file mode 100644
index fd51f56edab9..000000000000
--- a/japanese/font-elisa8/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
-}
-]