Update to 2.001

Changes:	https://github.com/googlefonts/noto-cjk/blob/master/NEWS

4 files changed, 112 insertions, 12 deletions

diff --git a/x11-fonts/noto-jp/Makefile b/x11-fonts/noto-jp/Makefile
index 165fe47f8b83..042cad4b2e25 100644
--- a/x11-fonts/noto-jp/Makefile
+++ b/x11-fonts/noto-jp/Makefile
@@ -1,28 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	noto
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	2.001
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://noto-website-2.storage.googleapis.com/pkgs/
-DISTNAME=	Noto-hinted
+MASTER_SITES=	https://github.com/googlefonts/noto-cjk/raw/NotoSansV2.001/
 PKGNAMESUFFIX=	-jp
+DISTFILES=	NotoSansCJKjp-Black.otf \
+		NotoSansCJKjp-Bold.otf \
+		NotoSansCJKjp-DemiLight.otf \
+		NotoSansCJKjp-Light.otf \
+		NotoSansCJKjp-Medium.otf \
+		NotoSansCJKjp-Regular.otf \
+		NotoSansCJKjp-Thin.otf \
+		NotoSansJP-Black.otf \
+		NotoSansJP-Bold.otf \
+		NotoSansJP-DemiLight.otf \
+		NotoSansJP-Light.otf \
+		NotoSansJP-Medium.otf \
+		NotoSansJP-Regular.otf \
+		NotoSansJP-Thin.otf \
+		NotoSansMonoCJKjp-Bold.otf \
+		NotoSansMonoCJKjp-Regular.otf \
+		NotoSerifCJKjp-Black.otf \
+		NotoSerifCJKjp-Bold.otf \
+		NotoSerifCJKjp-ExtraLight.otf \
+		NotoSerifCJKjp-Light.otf \
+		NotoSerifCJKjp-Medium.otf \
+		NotoSerifCJKjp-Regular.otf \
+		NotoSerifCJKjp-SemiBold.otf \
+		NotoSerifJP-Black.otf \
+		NotoSerifJP-Bold.otf \
+		NotoSerifJP-ExtraLight.otf \
+		NotoSerifJP-Light.otf \
+		NotoSerifJP-Medium.otf \
+		NotoSerifJP-Regular.otf \
+		NotoSerifJP-SemiBold.otf
+DIST_SUBDIR=	Noto
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Google Noto Fonts family (Japanese)
 
 LICENSE=	OFL11
-LICENSE_FILE=	${WRKSRC}/LICENSE_OFL.txt
 
-USES=		fonts zip
+USES=		fonts
 
-EXTRACT_AFTER_ARGS=	-d ${EXTRACT_WRKDIR} '*CJKjp*.otf'
 NO_ARCH=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*CJKjp*.otf ${STAGEDIR}${FONTSDIR}
+	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${DISTFILES} ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/noto-jp/distinfo b/x11-fonts/noto-jp/distinfo
index 8dd6afe030c9..5812eab0b4ec 100644
--- a/x11-fonts/noto-jp/distinfo
+++ b/x11-fonts/noto-jp/distinfo
@@ -1,3 +1,61 @@
-TIMESTAMP = 1567192405
-SHA256 (Noto-hinted.zip) = 837b4a9352fce32ad7f298fbf155af1da5b6f3f8dbd995eb63fdd8e82117e4ae
-SIZE (Noto-hinted.zip) = 1159948133
+TIMESTAMP = 1598970897
+SHA256 (Noto/NotoSansCJKjp-Black.otf) = 2a13a24d7be11cf4d6a654051127dac73e0cd46b231ea7fcf83ce79d8a7a709f
+SIZE (Noto/NotoSansCJKjp-Black.otf) = 18482548
+SHA256 (Noto/NotoSansCJKjp-Bold.otf) = a5d6c6479ddc7742925473b1f680b05c77b934025592d9cb25620559283a7a7e
+SIZE (Noto/NotoSansCJKjp-Bold.otf) = 17908952
+SHA256 (Noto/NotoSansCJKjp-DemiLight.otf) = 5781fbd7edeb92f18d50515165827d19cdaf82407c0d572658dd9b3a8c81f0e8
+SIZE (Noto/NotoSansCJKjp-DemiLight.otf) = 17260680
+SHA256 (Noto/NotoSansCJKjp-Light.otf) = b125dfc25819ae584c234333ed8a0d95798f1f4e64b66a07c88183e59f079a0b
+SIZE (Noto/NotoSansCJKjp-Light.otf) = 17171328
+SHA256 (Noto/NotoSansCJKjp-Medium.otf) = 6fb729c205020908e61af84c198720306694c2b7d3debf804ca6ebcacbc0db06
+SIZE (Noto/NotoSansCJKjp-Medium.otf) = 17411676
+SHA256 (Noto/NotoSansCJKjp-Regular.otf) = f28f7fe4e2a7a350f959d9534c4bd6ad682967ce5fee1cbb9ef3ae71ee711c3b
+SIZE (Noto/NotoSansCJKjp-Regular.otf) = 17311712
+SHA256 (Noto/NotoSansCJKjp-Thin.otf) = 82207de564fd3becc6be71598241b43028f0f9dc8aeed1e11b788b76fa56a794
+SIZE (Noto/NotoSansCJKjp-Thin.otf) = 16000192
+SHA256 (Noto/NotoSansMonoCJKjp-Bold.otf) = 9eeadb2d8733e6ed9cba374ad210d0414b5e803a7f859c816af248b5f1f6b86d
+SIZE (Noto/NotoSansMonoCJKjp-Bold.otf) = 17865196
+SHA256 (Noto/NotoSansMonoCJKjp-Regular.otf) = 6abbcc290e198fb2a92621ec1fac5a1f70895c2ec5ee00fe73e63dca94e19972
+SIZE (Noto/NotoSansMonoCJKjp-Regular.otf) = 17268148
+SHA256 (Noto/NotoSansJP-Black.otf) = 258a1f5a93d423910e99731e67f3df7414eca2d0159c711e97ab2df1cc89aed7
+SIZE (Noto/NotoSansJP-Black.otf) = 5046420
+SHA256 (Noto/NotoSansJP-Bold.otf) = 048616656372c0b74e9f03705d15d8ccd9ce68998c633fdc890626595874224f
+SIZE (Noto/NotoSansJP-Bold.otf) = 4820292
+SHA256 (Noto/NotoSansJP-DemiLight.otf) = c052f2171281765a670f14ca074a68c81dc81dd076c706531a36ef7349a76c8e
+SIZE (Noto/NotoSansJP-DemiLight.otf) = 4662336
+SHA256 (Noto/NotoSansJP-Light.otf) = 8e4d17c4798e3c8a5b91f196cd0e32955ae8d44fea3f0b2488e628732ac14a11
+SIZE (Noto/NotoSansJP-Light.otf) = 4635672
+SHA256 (Noto/NotoSansJP-Medium.otf) = a65b85329ab5e96075347ef8c4111d6f4f732b1c7f614e996246fc70ff179ede
+SIZE (Noto/NotoSansJP-Medium.otf) = 4692420
+SHA256 (Noto/NotoSansJP-Regular.otf) = 9bb39c9781e6bc6ae53304ffeda53eb52ca398d67847d0e79f7fde584bb261a6
+SIZE (Noto/NotoSansJP-Regular.otf) = 4672792
+SHA256 (Noto/NotoSansJP-Thin.otf) = 5cb4d03bfda4371444cc24635052be1e80685938eb7a1f8c7e587a16dcb2b9d9
+SIZE (Noto/NotoSansJP-Thin.otf) = 4374736
+SHA256 (Noto/NotoSerifCJKjp-Black.otf) = 0db4bdcfe6e0a7cf0fd4fa532d1dd7c33cb2de90197f5c1fcaa33d5ffa1bd1f7
+SIZE (Noto/NotoSerifCJKjp-Black.otf) = 22926508
+SHA256 (Noto/NotoSerifCJKjp-Bold.otf) = 58934baab3edc7196d7e2b79a07c8e0377699fa61708b87be8711315dbc2ccf3
+SIZE (Noto/NotoSerifCJKjp-Bold.otf) = 24694400
+SHA256 (Noto/NotoSerifCJKjp-ExtraLight.otf) = c1e56e2ad421217782e6cb18ef88533efb0d99523249b6ebd987c3f958bd8e92
+SIZE (Noto/NotoSerifCJKjp-ExtraLight.otf) = 21313820
+SHA256 (Noto/NotoSerifCJKjp-Light.otf) = 485ec27ad7c2ae6eb44af1a6b5f0a603577a886b04f8cc4c0e5db219e2978715
+SIZE (Noto/NotoSerifCJKjp-Light.otf) = 23468788
+SHA256 (Noto/NotoSerifCJKjp-Medium.otf) = 481cec1d1c2b12c8c2504134393e480b6c0a34af0120c130603c55dc0ba938f0
+SIZE (Noto/NotoSerifCJKjp-Medium.otf) = 23900156
+SHA256 (Noto/NotoSerifCJKjp-Regular.otf) = 79c0247b9bd2bcb68d011b0b32d00f575743cb69b308c57625371c1b457cdf88
+SIZE (Noto/NotoSerifCJKjp-Regular.otf) = 23624340
+SHA256 (Noto/NotoSerifCJKjp-SemiBold.otf) = 5a60025b47c0583ba4f0977c8c8da66a586b547365af6ef9776b720a027821da
+SIZE (Noto/NotoSerifCJKjp-SemiBold.otf) = 23888120
+SHA256 (Noto/NotoSerifJP-Black.otf) = 82493ab8e52bbbdc196ea619e3a4175397b66c1f3e546a37f572b142c44c9a40
+SIZE (Noto/NotoSerifJP-Black.otf) = 6339268
+SHA256 (Noto/NotoSerifJP-Bold.otf) = 36fb67448496053160fb393a5839742bcb88dfad1810c9081d16275061422483
+SIZE (Noto/NotoSerifJP-Bold.otf) = 6436060
+SHA256 (Noto/NotoSerifJP-ExtraLight.otf) = d7f1ff319dfad5716767c2426161c7ec0de32f0188a26e42f9725d58595fdb59
+SIZE (Noto/NotoSerifJP-ExtraLight.otf) = 5675496
+SHA256 (Noto/NotoSerifJP-Light.otf) = 230c9cf1e5e74273c174640333cb352323f3d6114e3e41a3c972d1ae065e885e
+SIZE (Noto/NotoSerifJP-Light.otf) = 6093028
+SHA256 (Noto/NotoSerifJP-Medium.otf) = ead14d3d2b05d4f22360940fd3a14a28da9e0a67ac7df261ab17121807ad7db1
+SIZE (Noto/NotoSerifJP-Medium.otf) = 6248168
+SHA256 (Noto/NotoSerifJP-Regular.otf) = a12875dcde3979f7901cd52c6f750f763e5ad2824cf3c27019a61dd5de5a8d9d
+SIZE (Noto/NotoSerifJP-Regular.otf) = 6174156
+SHA256 (Noto/NotoSerifJP-SemiBold.otf) = 4d8a38b1c13717513aa93d5efb22c801b5b6494ecd7135bc3ebabce45e703fd0
+SIZE (Noto/NotoSerifJP-SemiBold.otf) = 6283516
diff --git a/x11-fonts/noto-jp/pkg-descr b/x11-fonts/noto-jp/pkg-descr
index 608de4f7281d..b549192c5d06 100644
--- a/x11-fonts/noto-jp/pkg-descr
+++ b/x11-fonts/noto-jp/pkg-descr
@@ -10,3 +10,4 @@ This port is the set of Japanese fonts which supports all of the kanji in JIS X
 0208, JIS X 0213, and JIS X 0212 to include all kanji in Adobe-Japan1-6.
 
 WWW: https://www.google.com/get/noto/
+WWW: https://github.com/googlefonts/noto-cjk
diff --git a/x11-fonts/noto-jp/pkg-plist b/x11-fonts/noto-jp/pkg-plist
index a0e04f57a46a..1af7f1f4eef3 100644
--- a/x11-fonts/noto-jp/pkg-plist
+++ b/x11-fonts/noto-jp/pkg-plist
@@ -7,6 +7,13 @@
 %%FONTSDIR%%/NotoSansCJKjp-Thin.otf
 %%FONTSDIR%%/NotoSansMonoCJKjp-Bold.otf
 %%FONTSDIR%%/NotoSansMonoCJKjp-Regular.otf
+%%FONTSDIR%%/NotoSansJP-Black.otf
+%%FONTSDIR%%/NotoSansJP-Bold.otf
+%%FONTSDIR%%/NotoSansJP-DemiLight.otf
+%%FONTSDIR%%/NotoSansJP-Light.otf
+%%FONTSDIR%%/NotoSansJP-Medium.otf
+%%FONTSDIR%%/NotoSansJP-Regular.otf
+%%FONTSDIR%%/NotoSansJP-Thin.otf
 %%FONTSDIR%%/NotoSerifCJKjp-Black.otf
 %%FONTSDIR%%/NotoSerifCJKjp-Bold.otf
 %%FONTSDIR%%/NotoSerifCJKjp-ExtraLight.otf
@@ -14,3 +21,10 @@
 %%FONTSDIR%%/NotoSerifCJKjp-Medium.otf
 %%FONTSDIR%%/NotoSerifCJKjp-Regular.otf
 %%FONTSDIR%%/NotoSerifCJKjp-SemiBold.otf
+%%FONTSDIR%%/NotoSerifJP-Black.otf
+%%FONTSDIR%%/NotoSerifJP-Bold.otf
+%%FONTSDIR%%/NotoSerifJP-ExtraLight.otf
+%%FONTSDIR%%/NotoSerifJP-Light.otf
+%%FONTSDIR%%/NotoSerifJP-Medium.otf
+%%FONTSDIR%%/NotoSerifJP-Regular.otf
+%%FONTSDIR%%/NotoSerifJP-SemiBold.otf