From d1d3c3961d409041992af4c42178308938a9e0d9 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 30 Dec 2019 04:32:21 +0000
Subject: [PATCH] - Use FONTPATHSPEC and nuke pkg-message for adding FontPath
 manually. - Add LICENSE. - Update MASTER_SITES. - Use FONTSDIR consistently.

---
 japanese/font-ipa/Makefile  | 38 ++++++++++++++++++-------------------
 japanese/font-ipa/pkg-plist | 12 ++++--------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index b32cdbc23d57..c8d4f4caf768 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -2,27 +2,28 @@
 
 PORTNAME=	ipa
 PORTVERSION=	00303
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://dl.ipafont.ipa.go.jp/IPAfont/
+MASTER_SITES=	https://ipafont.ipa.go.jp/IPAfont/
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	IPAfont${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IPA Japanese fonts
 
-CONFLICTS=	ja-ipa-ttfonts-[0-9]*
+LICENSE=	IPAFONTLICv1.0
+LICENSE_NAME=	IPA Font License Agreement v1.0
+LICENSE_FILE=	${WRKSRC}/IPA_Font_License_Agreement_v1.0.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		fonts:fc zip
-FONTNAME=	OTF
+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_IPAfont${PORTVERSION}.txt
+PORTDOCS=	Readme_IPAfont${PORTVERSION}.txt
 
 OPTIONS_DEFINE=	DOCS
 
@@ -30,23 +31,20 @@ post-extract:
 	cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR}/ && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/ipa*.otf .
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.otf ${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 ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index 50d96f38d64e..81f9162a6464 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -1,12 +1,8 @@
-%%DATADIR%%/ipamp.otf
-%%DATADIR%%/ipam.otf
-%%DATADIR%%/ipagp.otf
-%%DATADIR%%/ipag.otf
-etc/fonts/conf.avail/20-unhint-ipa.conf
-etc/fonts/conf.avail/62-fonts-ipa.conf
-etc/fonts/conf.d/20-unhint-ipa.conf
-etc/fonts/conf.d/62-fonts-ipa.conf
 %%FONTSDIR%%/ipag.otf
 %%FONTSDIR%%/ipagp.otf
 %%FONTSDIR%%/ipam.otf
 %%FONTSDIR%%/ipamp.otf
+etc/fonts/conf.avail/20-unhint-ipa.conf
+etc/fonts/conf.avail/62-fonts-ipa.conf
+etc/fonts/conf.d/20-unhint-ipa.conf
+etc/fonts/conf.d/62-fonts-ipa.conf