From ba71b65a4e085a9d5a1c4723c5f04c0ff1d2514e Mon Sep 17 00:00:00 2001
From: bentley <bentley@openbsd.org>
Date: Mon, 28 Mar 2022 09:35:28 +0000
Subject: [PATCH] Update to noto-cjk-20220127.

---
 fonts/noto/cjk/Makefile  | 15 ++++++++-------
 fonts/noto/cjk/distinfo  |  6 ++++--
 fonts/noto/cjk/pkg/PLIST | 10 ++--------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/fonts/noto/cjk/Makefile b/fonts/noto/cjk/Makefile
index 801c4c6ac00..3f223613d29 100644
--- a/fonts/noto/cjk/Makefile
+++ b/fonts/noto/cjk/Makefile
@@ -2,16 +2,17 @@ COMMENT =		east asian fonts for the noto font family
 
 NOTO_PROJECT =		cjk
 
-V =			2.001
-GH_TAGNAME =		NotoSansV$V
-REVISION =		0
+V =			20220127
 
-BUILD_DEPENDS =		archivers/unzip
+MASTER_SITES0 =		https://github.com/googlefonts/noto-cjk/releases/download/Sans2.004/
+MASTER_SITES1 =		https://github.com/googlefonts/noto-cjk/releases/download/Serif2.001/
+DISTFILES =		01_NotoSansCJK-OTF-VF.zip:0 \
+			02_NotoSerifCJK-OTF-VF.zip:1
+DIST_SUBDIR =		noto-cjk-$V
+WRKDIST =		${WRKDIR}
 
 do-install:
 	${INSTALL_DATA_DIR} ${NOTO_INSTALLDIR}
-	${INSTALL_DATA} ${WRKDIST}/NotoSerifCJK-*.ttc ${NOTO_INSTALLDIR}
-	cd ${NOTO_INSTALLDIR} && unzip ${WRKDIST}/NotoSansCJK.ttc.zip
-	rm -rf ${NOTO_INSTALLDIR}/__MACOSX
+	${INSTALL_DATA} ${WRKDIST}/Variable/OTC/*.ttc ${NOTO_INSTALLDIR}
 
 .include <bsd.port.mk>
diff --git a/fonts/noto/cjk/distinfo b/fonts/noto/cjk/distinfo
index 604f70d448a..a440a8f8d97 100644
--- a/fonts/noto/cjk/distinfo
+++ b/fonts/noto/cjk/distinfo
@@ -1,2 +1,4 @@
-SHA256 (noto-cjk-2.001.tar.gz) = OxiFmz7+OsNtjVJz6TzAe2GpSArAnFtS7fTdiqq3QYc=
-SIZE (noto-cjk-2.001.tar.gz) = 1882149917
+SHA256 (noto-cjk-20220127/01_NotoSansCJK-OTF-VF.zip) = 0eFDJzzHrTe3EM2w0YijJVPO6c/WASnc7p1Z+R48a0g=
+SHA256 (noto-cjk-20220127/02_NotoSerifCJK-OTF-VF.zip) = vt64Yib+/V/Wm1TtRmBBWGGGT4ecC32gix/XHKNaeLA=
+SIZE (noto-cjk-20220127/01_NotoSansCJK-OTF-VF.zip) = 239547497
+SIZE (noto-cjk-20220127/02_NotoSerifCJK-OTF-VF.zip) = 222678895
diff --git a/fonts/noto/cjk/pkg/PLIST b/fonts/noto/cjk/pkg/PLIST
index 31cf97d0062..cadb50e56c4 100644
--- a/fonts/noto/cjk/pkg/PLIST
+++ b/fonts/noto/cjk/pkg/PLIST
@@ -1,10 +1,4 @@
 share/fonts/
 @fontdir share/fonts/noto/
-share/fonts/noto/NotoSansCJK.ttc
-share/fonts/noto/NotoSerifCJK-Black.ttc
-share/fonts/noto/NotoSerifCJK-Bold.ttc
-share/fonts/noto/NotoSerifCJK-ExtraLight.ttc
-share/fonts/noto/NotoSerifCJK-Light.ttc
-share/fonts/noto/NotoSerifCJK-Medium.ttc
-share/fonts/noto/NotoSerifCJK-Regular.ttc
-share/fonts/noto/NotoSerifCJK-SemiBold.ttc
+share/fonts/noto/NotoSansCJK-VF.otf.ttc
+share/fonts/noto/NotoSerifCJK-VF.otf.ttc