Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Apr 2026 17:06:35 +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: 3478b7412a1e - main - japanese/font-takao: Update to 003.03.01 and take maintainership
Message-ID:  <69d92e1b.30b26.435b5580@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=3478b7412a1ead7af398802f3ad32102dfab2863

commit 3478b7412a1ead7af398802f3ad32102dfab2863
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-04-09 05:31:18 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-04-10 17:06:02 +0000

    japanese/font-takao: Update to 003.03.01 and take maintainership
    
    In this release, Takao and TakaoEx fonts are distributed separately.
    Update MASTER_SITES and DISTNAME.
    Lint with portclippy.
    Refactor do-install.
    
    Changelog: https://launchpad.net/takao-fonts/trunk/15.03
    
    PR:             277679
    Approved by:    hrs (maintainer timeout > 3 months)
    Approved by:    fluffy (mentor)
---
 japanese/font-takao/Makefile | 34 ++++++++++++++++++----------------
 japanese/font-takao/distinfo |  7 +++++--
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/japanese/font-takao/Makefile b/japanese/font-takao/Makefile
index 4fb2cd156f8b..2ff3afed6802 100644
--- a/japanese/font-takao/Makefile
+++ b/japanese/font-takao/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	takao
-PORTVERSION=	003.02.01
-PORTREVISION=	6
+DISTVERSION=	003.03.01
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://launchpadlibrarian.net/40218948/
+MASTER_SITES=	https://launchpad.net/takao-fonts/trunk/15.03/+download/
 PKGNAMEPREFIX=	ja-font-
-DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
+DISTNAME=	TakaoFonts_${DISTVERSION:S/.//}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${_EXNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	hrs@FreeBSD.org
+MAINTAINER=	mce@FreeBSD.org
 COMMENT=	Improved IPA Japanese fonts
 WWW=		https://launchpad.net/takao-fonts
 
@@ -15,34 +15,36 @@ 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
+USES=		fonts:fc tar:xz
 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 \
-		README.ja \
-		ChangeLog
+PORTDOCS=	ChangeLog README README.ja
 
 OPTIONS_DEFINE=	DOCS
 
+_EXNAME=	TakaoExFonts_00201.01
+_CONF=		20-unhint-${FONTNAME}.conf 62-fonts-${FONTNAME}.conf
+
 post-extract:
 	cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
+	cd ${WRKDIR}/${_EXNAME} && \
+		for F in *.ttf; do ${MV} $${F} ${WRKSRC}/$${F%.ttf}.otf; done
 
 do-install:
 	@${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-${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}
diff --git a/japanese/font-takao/distinfo b/japanese/font-takao/distinfo
index e6b62aded10b..616cdaaac4d9 100644
--- a/japanese/font-takao/distinfo
+++ b/japanese/font-takao/distinfo
@@ -1,2 +1,5 @@
-SHA256 (takao-fonts-ttf-003.02.01.tar.gz) = d8ef67e2bdad6c8f420b8e9ec7cdc5c47d9731cbb78164af43aec5d56d8f24f1
-SIZE (takao-fonts-ttf-003.02.01.tar.gz) = 29678930
+TIMESTAMP = 1765882024
+SHA256 (TakaoFonts_00303.01.tar.xz) = e9871f72ac69acb3e277aebbee7ca01fbebf54800733e29fafdc46133fc3552f
+SIZE (TakaoFonts_00303.01.tar.xz) = 11296836
+SHA256 (TakaoExFonts_00201.01.tar.xz) = 8a76073b11bc653da567be5d52fea7c7f1cf7ec92fae4f9a57c5476b7d05ac57
+SIZE (TakaoExFonts_00201.01.tar.xz) = 7822216


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d92e1b.30b26.435b5580>