From 771b7a95da186d6b3a0758fe5b110f336a101f80 Mon Sep 17 00:00:00 2001
From: ume <ume@FreeBSD.org>
Date: Mon, 30 Dec 2019 18:06:29 +0000
Subject: Use FONTPATHSPEC

---
 japanese/font-rounded-mgenplus/Makefile  | 14 +++++++-------
 japanese/font-rounded-mgenplus/pkg-plist |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'japanese')

diff --git a/japanese/font-rounded-mgenplus/Makefile b/japanese/font-rounded-mgenplus/Makefile
index 269816b90ab4..ae3a0c216a01 100644
--- a/japanese/font-rounded-mgenplus/Makefile
+++ b/japanese/font-rounded-mgenplus/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Rounded Mgen+ Japanese TrueType fonts
 LICENSE=	OFL11
 
 USES=		7z fonts:fc
-FONTNAME=	${PORTNAME}
+FONTPATHSPEC=	${FONTNAME}:pri=60
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -93,13 +93,13 @@ do-install:
 .endfor
 	${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-rounded-mgenplus/pkg-plist b/japanese/font-rounded-mgenplus/pkg-plist
index 72d9644b1556..5bbf873dd326 100644
--- a/japanese/font-rounded-mgenplus/pkg-plist
+++ b/japanese/font-rounded-mgenplus/pkg-plist
@@ -1,5 +1,7 @@
 etc/fonts/conf.avail/20-unhint-rounded-mgenplus.conf
 etc/fonts/conf.avail/62-fonts-rounded-mgenplus.conf
+etc/fonts/conf.d/20-unhint-rounded-mgenplus.conf
+etc/fonts/conf.d/62-fonts-rounded-mgenplus.conf
 %%ROUNDED_MGENPLUS_1C%%%%FONTSDIR%%/rounded-mgenplus-1c-black.ttf
 %%ROUNDED_MGENPLUS_1C%%%%FONTSDIR%%/rounded-mgenplus-1c-bold.ttf
 %%ROUNDED_MGENPLUS_1C%%%%FONTSDIR%%/rounded-mgenplus-1c-heavy.ttf
-- 
cgit