Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 08 Apr 2026 15:59:28 +0000
From:      Kousuke Kannagi <mce@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 224f94d5a77d - main - japanese/font-migmix: Refactor
Message-ID:  <69d67b60.46217.22de1ee9@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by mce:

URL: https://cgit.FreeBSD.org/ports/commit/?id=224f94d5a77dd660057dba63e046db13a93ae07b

commit 224f94d5a77dd660057dba63e046db13a93ae07b
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-04-07 01:09:31 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-04-08 15:58:30 +0000

    japanese/font-migmix: Refactor
    
    Lint with portclippy.
    Refactoring do-install*.
    Switch from LN to RLN.
    
    PR:             277645
    Approved by:    fluffy (mentor), osa (mentor)
---
 japanese/font-migmix/Makefile | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/japanese/font-migmix/Makefile b/japanese/font-migmix/Makefile
index 0e79b56a5407..4c2196472f09 100644
--- a/japanese/font-migmix/Makefile
+++ b/japanese/font-migmix/Makefile
@@ -20,42 +20,35 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		fonts:fc zip
 FONTPATHSPEC=	${FONTNAME}:pri=60
+
 NO_ARCH=	yes
 NO_BUILD=	yes
+SUB_FILES=	pkg-install
+
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
-SUB_FILES=	pkg-install
-PORTDOCS=	Readme_ipag00303.txt migmix-README.txt
+PORTDOCS=	${FONTNAME}-README.txt Readme_ipag00303.txt
 
 OPTIONS_DEFINE=	DOCS
 
 _1VER=		20200307
 _2VER=		${DISTVERSION:E}
+_CONF=		20-unhint-${FONTNAME}.conf 62-fonts-${FONTNAME}.conf
 
 do-install:
-	cd ${WRKDIR}/${PORTNAME}-2m-${_2VER}/ && \
-	    ${INSTALL_DATA} ipag00303/*.txt \
-		migmix-README.txt \
-		${WRKDIR}
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} \
-	    ${WRKDIR}/${PORTNAME}-1m-${_1VER}/*.ttf \
-	    ${WRKDIR}/${PORTNAME}-2m-${_2VER}/*.ttf \
-	    ${WRKDIR}/${PORTNAME}-1p-${_1VER}/*.ttf \
-	    ${WRKDIR}/${PORTNAME}-2p-${_2VER}/*.ttf \
-	    ${STAGEDIR}${FONTSDIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-*/*.ttf ${STAGEDIR}${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \
-	    ${FILESDIR}/62-fonts-${FONTNAME}.conf \
+	${INSTALL_DATA} ${_CONF:S,^,${FILESDIR}/,} \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
-	${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
+	${RLN} ${_CONF:S,^,../conf.avail/,} \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKDIR}/${PORTNAME}-2m-${_2VER}/ && \
+	    ${INSTALL_DATA} ${PORTDOCS:S,^Readme,ipag00303/Readme,} \
+	    ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d67b60.46217.22de1ee9>