From 05ca4b9427b8713c32f96bfce5c75449ac0cb5e7 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 30 Dec 2019 04:46:06 +0000
Subject: [PATCH] - Add LICENSE. - Use FONTPATHSPEC. - Use FONTSDIR
 consistently.

---
 japanese/font-migmix/Makefile  | 34 +++++++++++++++++-----------------
 japanese/font-migmix/pkg-plist | 16 ++++------------
 2 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/japanese/font-migmix/Makefile b/japanese/font-migmix/Makefile
index 4549ed095011..fa7c3875d999 100644
--- a/japanese/font-migmix/Makefile
+++ b/japanese/font-migmix/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	migmix
 PORTVERSION=	1.0.20130617
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	OSDN/mix-mplus-ipa/59021
 PKGNAMEPREFIX=	ja-font-
@@ -14,16 +14,19 @@ DISTFILES=	${PORTNAME}-1m-${PORTVERSION:E}${EXTRACT_SUFX} \
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mixed Japanese font with IPA Gothic and M-plus outline
 
+LICENSE=	IPAFONTLICv1.0
+LICENSE_NAME=	IPA Font License Agreement v1.0
+LICENSE_FILE=	${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/ipag00303/IPA_Font_License_Agreement_v1.0.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 USES=		fonts:fc zip
-FONTNAME=	TTF
+FONTPATHSPEC=	${FONTNAME}:pri=60
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
-DATADIR=	${PREFIX}/share/font-${PORTNAME}
-PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
-		migmix-README.txt
+PORTDOCS=	Readme_ipag00303.txt migmix-README.txt
 
 OPTIONS_DEFINE=	DOCS
 
@@ -32,28 +35,25 @@ do-install:
 	    ${INSTALL_DATA} ipag00303/*.txt \
 		migmix-README.txt \
 		${WRKDIR}
-	${MKDIR} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} \
 	    ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \
 	    ${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \
 	    ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \
 	    ${WRKDIR}/${PORTNAME}-2p-${PORTVERSION:E}/*.ttf \
-	    ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/migmix*.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}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/font-migmix/pkg-plist b/japanese/font-migmix/pkg-plist
index 9a61542edd0d..c8d16061fb3c 100644
--- a/japanese/font-migmix/pkg-plist
+++ b/japanese/font-migmix/pkg-plist
@@ -1,15 +1,3 @@
-%%DATADIR%%/migmix-1m-bold.ttf
-%%DATADIR%%/migmix-1m-regular.ttf
-%%DATADIR%%/migmix-1p-bold.ttf
-%%DATADIR%%/migmix-1p-regular.ttf
-%%DATADIR%%/migmix-2m-bold.ttf
-%%DATADIR%%/migmix-2m-regular.ttf
-%%DATADIR%%/migmix-2p-bold.ttf
-%%DATADIR%%/migmix-2p-regular.ttf
-etc/fonts/conf.avail/20-unhint-migmix.conf
-etc/fonts/conf.avail/62-fonts-migmix.conf
-etc/fonts/conf.d/20-unhint-migmix.conf
-etc/fonts/conf.d/62-fonts-migmix.conf
 %%FONTSDIR%%/migmix-1m-bold.ttf
 %%FONTSDIR%%/migmix-1m-regular.ttf
 %%FONTSDIR%%/migmix-1p-bold.ttf
@@ -18,3 +6,7 @@ etc/fonts/conf.d/62-fonts-migmix.conf
 %%FONTSDIR%%/migmix-2m-regular.ttf
 %%FONTSDIR%%/migmix-2p-bold.ttf
 %%FONTSDIR%%/migmix-2p-regular.ttf
+etc/fonts/conf.avail/20-unhint-migmix.conf
+etc/fonts/conf.avail/62-fonts-migmix.conf
+etc/fonts/conf.d/20-unhint-migmix.conf
+etc/fonts/conf.d/62-fonts-migmix.conf