5 files changed, 22 insertions, 65 deletions
diff --git a/japanese/font-mplus-outline/Makefile b/japanese/font-mplus-outline/Makefile
index 0e6ab11f27e1..59b6e64cb750 100644
--- a/japanese/font-mplus-outline/Makefile
+++ b/japanese/font-mplus-outline/Makefile
@@ -2,49 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	mplus
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.6.3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	OSDN/${PORTNAME}-fonts/62344/
 PKGNAMEPREFIX=	ja-font-
 PKGNAMESUFFIX=	-outline
-DISTNAME=	${PORTNAME}-TESTFLIGHT-060
+DISTNAME=	${PORTNAME}-TESTFLIGHT-063a
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	M+ Outline Fonts
 
-BROKEN=		unfetchable
+LICENSE=	PD
+LICENSE_FILE=	${WRKSRC}/LICENSE_E
 
 RUN_DEPENDS=	mkfontscale>=0:x11-fonts/mkfontscale \
 		mkfontscale:x11-fonts/mkfontscale
 
 USES=		fonts:fc tar:xz
+FONTNAME=	${PORTNAME}${PKGNAMESUFFIX}
+FONTPATHSPEC=	${FONTNAME}:pri=60
 NO_BUILD=	yes
 NO_ARCH=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
-DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PLIST_SUB=	FONTSDIR="${FONTSDIR}"
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-PORTDOCS=	LICENSE_E README_E LICENSE_J README_J
+PORTDOCS=	README_E LICENSE_J README_J
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/*.ttf .
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
-	    ${FILESDIR}/62-fonts-${PORTNAME}.conf \
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \
+	    ${FILESDIR}/62-fonts-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
-	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
-	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
-	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+	${LN} -s -f ../conf.avail/20-unhint-${FONTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${FONTNAME}.conf
+	${LN} -s -f ../conf.avail/62-fonts-${FONTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${FONTNAME}.conf
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-mplus-outline/distinfo b/japanese/font-mplus-outline/distinfo
index b29c5ae5006e..9c3a0e7d808f 100644
--- a/japanese/font-mplus-outline/distinfo
+++ b/japanese/font-mplus-outline/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mplus-TESTFLIGHT-060.tar.xz) = b6914650caa86b9a8cfd682ae643bfb174690513a5aa01b3d75830a6761ae753
-SIZE (mplus-TESTFLIGHT-060.tar.xz) = 9795300
+TIMESTAMP = 1577670467
+SHA256 (mplus-TESTFLIGHT-063a.tar.xz) = 44eb973b4b6aff574de454db105ddc23e6749c2294734bd9cb1e0d734e4cdd79
+SIZE (mplus-TESTFLIGHT-063a.tar.xz) = 10371708
diff --git a/japanese/font-mplus-outline/files/20-unhint-mplus.conf b/japanese/font-mplus-outline/files/20-unhint-mplus-outline.conf
index 1e0bcaafdb63..1e0bcaafdb63 100644
--- a/japanese/font-mplus-outline/files/20-unhint-mplus.conf
+++ b/japanese/font-mplus-outline/files/20-unhint-mplus-outline.conf
diff --git a/japanese/font-mplus-outline/files/62-fonts-mplus.conf b/japanese/font-mplus-outline/files/62-fonts-mplus-outline.conf
index 29a6b0b14cdc..29a6b0b14cdc 100644
--- a/japanese/font-mplus-outline/files/62-fonts-mplus.conf
+++ b/japanese/font-mplus-outline/files/62-fonts-mplus-outline.conf
diff --git a/japanese/font-mplus-outline/pkg-plist b/japanese/font-mplus-outline/pkg-plist
index 77dd5d26a631..05981b93b794 100644
--- a/japanese/font-mplus-outline/pkg-plist
+++ b/japanese/font-mplus-outline/pkg-plist
@@ -1,46 +1,3 @@
-%%DATADIR%%/mplus-1c-black.ttf
-%%DATADIR%%/mplus-1c-bold.ttf
-%%DATADIR%%/mplus-1c-heavy.ttf
-%%DATADIR%%/mplus-1c-light.ttf
-%%DATADIR%%/mplus-1c-medium.ttf
-%%DATADIR%%/mplus-1c-regular.ttf
-%%DATADIR%%/mplus-1c-thin.ttf
-%%DATADIR%%/mplus-1m-bold.ttf
-%%DATADIR%%/mplus-1m-light.ttf
-%%DATADIR%%/mplus-1m-medium.ttf
-%%DATADIR%%/mplus-1m-regular.ttf
-%%DATADIR%%/mplus-1m-thin.ttf
-%%DATADIR%%/mplus-1mn-bold.ttf
-%%DATADIR%%/mplus-1mn-light.ttf
-%%DATADIR%%/mplus-1mn-medium.ttf
-%%DATADIR%%/mplus-1mn-regular.ttf
-%%DATADIR%%/mplus-1mn-thin.ttf
-%%DATADIR%%/mplus-1p-black.ttf
-%%DATADIR%%/mplus-1p-bold.ttf
-%%DATADIR%%/mplus-1p-heavy.ttf
-%%DATADIR%%/mplus-1p-light.ttf
-%%DATADIR%%/mplus-1p-medium.ttf
-%%DATADIR%%/mplus-1p-regular.ttf
-%%DATADIR%%/mplus-1p-thin.ttf
-%%DATADIR%%/mplus-2c-black.ttf
-%%DATADIR%%/mplus-2c-bold.ttf
-%%DATADIR%%/mplus-2c-heavy.ttf
-%%DATADIR%%/mplus-2c-light.ttf
-%%DATADIR%%/mplus-2c-medium.ttf
-%%DATADIR%%/mplus-2c-regular.ttf
-%%DATADIR%%/mplus-2c-thin.ttf
-%%DATADIR%%/mplus-2m-bold.ttf
-%%DATADIR%%/mplus-2m-light.ttf
-%%DATADIR%%/mplus-2m-medium.ttf
-%%DATADIR%%/mplus-2m-regular.ttf
-%%DATADIR%%/mplus-2m-thin.ttf
-%%DATADIR%%/mplus-2p-black.ttf
-%%DATADIR%%/mplus-2p-bold.ttf
-%%DATADIR%%/mplus-2p-heavy.ttf
-%%DATADIR%%/mplus-2p-light.ttf
-%%DATADIR%%/mplus-2p-medium.ttf
-%%DATADIR%%/mplus-2p-regular.ttf
-%%DATADIR%%/mplus-2p-thin.ttf
 %%FONTSDIR%%/mplus-1c-black.ttf
 %%FONTSDIR%%/mplus-1c-bold.ttf
 %%FONTSDIR%%/mplus-1c-heavy.ttf
@@ -84,7 +41,7 @@
 %%FONTSDIR%%/mplus-2p-medium.ttf
 %%FONTSDIR%%/mplus-2p-regular.ttf
 %%FONTSDIR%%/mplus-2p-thin.ttf
-etc/fonts/conf.avail/20-unhint-mplus.conf
-etc/fonts/conf.avail/62-fonts-mplus.conf
-etc/fonts/conf.d/20-unhint-mplus.conf
-etc/fonts/conf.d/62-fonts-mplus.conf
+etc/fonts/conf.avail/20-unhint-mplus-outline.conf
+etc/fonts/conf.avail/62-fonts-mplus-outline.conf
+etc/fonts/conf.d/20-unhint-mplus-outline.conf
+etc/fonts/conf.d/62-fonts-mplus-outline.conf