diff --git a/x11-fonts/noto-serif-sinhala/Makefile b/x11-fonts/noto-serif-sinhala/Makefile
index 5fecc0e97a81..37d551db3a88 100644
--- a/x11-fonts/noto-serif-sinhala/Makefile
+++ b/x11-fonts/noto-serif-sinhala/Makefile
@@ -1,28 +1,71 @@
 PORTNAME=	noto
 PORTVERSION=	2.007
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://github.com/notofonts/sinhala/releases/download/NotoSerifSinhala-v${PORTVERSION}/
+#MASTER_SITES=	https://github.com/notofonts/notofonts.github.io/raw/NotoSerifSinhala-v${PORTVERSION}/fonts/ \
+#		https://github.com/notofonts/notofonts.github.io/raw/NotoSerifSinhala-v${PORTVERSION}/fonts/NotoSerifSinhala/hinted/ttf/:fonts
+MASTER_SITES=	https://github.com/notofonts/notofonts.github.io/raw/noto-monthly-release-23.4.1/fonts/ \
+		https://github.com/notofonts/notofonts.github.io/raw/noto-monthly-release-23.4.1/fonts/NotoSerifSinhala/hinted/ttf/:fonts
 PKGNAMESUFFIX=	-serif-sinhala
-DISTNAME=	NotoSerifSinhala-v${PORTVERSION}
-DIST_SUBDIR=	Noto
+DISTFILES=	LICENSE \
+		${FONTS:S|$|:fonts|}
+DIST_SUBDIR=	Noto/SerifSinhala/${PORTVERSION}
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Google Noto Serif Sinhala
 WWW=		https://fonts.google.com/noto \
 		https://notofonts.github.io/ \
-		https://github.com/notofonts/sinhala
+		https://github.com/notofonts/sinhala \
+		https://github.com/notofonts/notofonts.github.io/tree/main/fonts/NotoSerifSinhala
 
 LICENSE=	OFL11
-#LICENSE_FILE=	${WRKSRC}/OFL.txt
+LICENSE_FILE=	${DISTDIR}/${DIST_SUBDIR}/LICENSE
 
-USES=		fonts zip
+USES=		fonts
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
+FONTS=		NotoSerifSinhala-Black.ttf \
+		NotoSerifSinhala-Bold.ttf \
+		NotoSerifSinhala-Condensed.ttf \
+		NotoSerifSinhala-CondensedBlack.ttf \
+		NotoSerifSinhala-CondensedBold.ttf \
+		NotoSerifSinhala-CondensedExtraBold.ttf \
+		NotoSerifSinhala-CondensedExtraLight.ttf \
+		NotoSerifSinhala-CondensedLight.ttf \
+		NotoSerifSinhala-CondensedMedium.ttf \
+		NotoSerifSinhala-CondensedSemiBold.ttf \
+		NotoSerifSinhala-CondensedThin.ttf \
+		NotoSerifSinhala-ExtraBold.ttf \
+		NotoSerifSinhala-ExtraCondensed.ttf \
+		NotoSerifSinhala-ExtraCondensedBlack.ttf \
+		NotoSerifSinhala-ExtraCondensedBold.ttf \
+		NotoSerifSinhala-ExtraCondensedExtraBold.ttf \
+		NotoSerifSinhala-ExtraCondensedExtraLight.ttf \
+		NotoSerifSinhala-ExtraCondensedLight.ttf \
+		NotoSerifSinhala-ExtraCondensedMedium.ttf \
+		NotoSerifSinhala-ExtraCondensedSemiBold.ttf \
+		NotoSerifSinhala-ExtraCondensedThin.ttf \
+		NotoSerifSinhala-ExtraLight.ttf \
+		NotoSerifSinhala-Light.ttf \
+		NotoSerifSinhala-Medium.ttf \
+		NotoSerifSinhala-Regular.ttf \
+		NotoSerifSinhala-SemiBold.ttf \
+		NotoSerifSinhala-SemiCondensed.ttf \
+		NotoSerifSinhala-SemiCondensedBlack.ttf \
+		NotoSerifSinhala-SemiCondensedBold.ttf \
+		NotoSerifSinhala-SemiCondensedExtraBold.ttf \
+		NotoSerifSinhala-SemiCondensedExtraLight.ttf \
+		NotoSerifSinhala-SemiCondensedLight.ttf \
+		NotoSerifSinhala-SemiCondensedMedium.ttf \
+		NotoSerifSinhala-SemiCondensedSemiBold.ttf \
+		NotoSerifSinhala-SemiCondensedThin.ttf \
+		NotoSerifSinhala-Thin.ttf
+
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/NotoSerifSinhala/hinted/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
+	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${FONTS} ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/noto-serif-sinhala/distinfo b/x11-fonts/noto-serif-sinhala/distinfo
index 93255621ae5a..07adbf2c1af3 100644
--- a/x11-fonts/noto-serif-sinhala/distinfo
+++ b/x11-fonts/noto-serif-sinhala/distinfo
@@ -1,3 +1,75 @@
-TIMESTAMP = 1710676121
-SHA256 (Noto/NotoSerifSinhala-v2.007.zip) = 654f7e394fc80f61667529582b16c5036b762e786741c398f1c359e332dd66a7
-SIZE (Noto/NotoSerifSinhala-v2.007.zip) = 20462657
+TIMESTAMP = 1715677710
+SHA256 (Noto/SerifSinhala/2.007/LICENSE) = f2095b08bed08b23a6fe26112fcd679a2bee3f002eef077eb05d215ed1051bd8
+SIZE (Noto/SerifSinhala/2.007/LICENSE) = 4374
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-Black.ttf) = 2b27691abe354761d2cabbe46c063db471fe1dd0131d2d7177437b70703f0d63
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-Black.ttf) = 343268
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-Bold.ttf) = f556f505f7189c013797750e17ac97645af07672e6971bdd8452f0eec202e259
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-Bold.ttf) = 337684
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-Condensed.ttf) = 7aea9c0612f4140ecf5a8a6e9bf9d2113958c581a3b2cd474ebba7bc09d30551
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-Condensed.ttf) = 314472
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedBlack.ttf) = b61ce76346880300c46c7870c2f2a56965de5c1926d8494571a83de3d60f776e
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedBlack.ttf) = 341236
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedBold.ttf) = 26448753b388d5e95b7f679981efa80fd11bfc53ef778e79d35787c43113cc1d
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedBold.ttf) = 348856
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedExtraBold.ttf) = 4308f91165ccc510c1d917e2f22f7c466637b629e9f808790caae9685ee8ba54
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedExtraBold.ttf) = 341144
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedExtraLight.ttf) = 854c3406407302b55106a2f58353a8352af7b50eadf7c3978b50ba98154dcce7
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedExtraLight.ttf) = 314148
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedLight.ttf) = f6a53e5e861658ad604cfa8ef8fc66602d323351872b5427dec5d8ae53e3c3d3
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedLight.ttf) = 326628
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedMedium.ttf) = 8b00c48a0709a7fdf8c08ef21e4de28c6fe1331103104367ea01e9ebba7d975c
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedMedium.ttf) = 318564
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedSemiBold.ttf) = 71302892c186b41623eda9a52e495b39afe110f15ef90ef91b7223d0fbe900e9
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedSemiBold.ttf) = 320076
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedThin.ttf) = 1caf91fc4412919e87a46b33b2d7718f1d1e2fcb35c0269efe05939a478dcf95
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-CondensedThin.ttf) = 323108
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraBold.ttf) = af5d2db05c5e05b4a98a74181da846e746b7e87d49e176f8b2a29d1fe8fab034
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraBold.ttf) = 347780
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensed.ttf) = 5b64d222ca603b76d1b4121a32950046d63b4531c28e09aaf1bbb618ea1f4853
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensed.ttf) = 315344
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedBlack.ttf) = 53f971748ac89483588bede3f1c17af03d0b228836afdd72efee88ea03823ef7
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedBlack.ttf) = 336308
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedBold.ttf) = c012f8b8d46be018ca71029205dd4f6d9099cb00be4cf07180fb5ebc0cd7ef23
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedBold.ttf) = 333128
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedExtraBold.ttf) = fc2316146a8a67c09b3e45c16d30aaf54a38f7b20ddf6e923dad37eadac0a375
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedExtraBold.ttf) = 328876
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedExtraLight.ttf) = c306d1a40d46dfb771fe8a778e14f7c9fcd70105478ba1f0b3bf02f60b2a321c
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedExtraLight.ttf) = 310760
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedLight.ttf) = 79e812ca2d8b0438eba53665254b2793c5a74b5cf2704599b2a9ad626fc6ac93
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedLight.ttf) = 327876
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedMedium.ttf) = d0d8569371de0691d0bbc59f54c5df458cf19ce89fb9650970346bf5fc29872f
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedMedium.ttf) = 319312
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedSemiBold.ttf) = 9a273585a85454d716204100000267a73e9234b14bdc3b8b8e0fd336eb462c98
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedSemiBold.ttf) = 310152
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedThin.ttf) = 3b6330c49cb528bcc444066fd032bf56c9d0386f3a8a2be0d5d8847073a9b2bc
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraCondensedThin.ttf) = 318256
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraLight.ttf) = c2f8615592af2a3c96aaf11d489fca8c83a323063370f06c62f6f7f7f9fe4cbd
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-ExtraLight.ttf) = 327512
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-Light.ttf) = 92493b1ce897ac8200ed69313d97e54c6a736561ab8f27231a4a4417e091eff0
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-Light.ttf) = 338692
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-Medium.ttf) = eb5fdfb34c1d8023bc11d465e6cf61f906682045e45cad2bea32141f05461a8d
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-Medium.ttf) = 325508
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-Regular.ttf) = 0d5a63d34ed378e345ec96021d72385c8e288ecd0ea36511a329aed448ede375
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-Regular.ttf) = 325860
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiBold.ttf) = eb7bb3ca9c771cbfb3e81f69440887aafc8fb7c29e7e8191774a45541711c353
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiBold.ttf) = 334900
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensed.ttf) = 628d316180e427c6725f1953e9bf992ded0cc9f777df8ba3a6ea1dfa64c54fc0
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensed.ttf) = 331788
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedBlack.ttf) = 67ed55cd9726e69ee07f50346a752102f26b515df0c65f11e09b4e2b534d0ed4
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedBlack.ttf) = 342240
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedBold.ttf) = 3d6c62c307ee45c84f2b5ecd057f17f810f888b714ebeeec304af79f81d904bf
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedBold.ttf) = 344456
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedExtraBold.ttf) = 08636d40ed4fbdc046d939824a8087e428fb2317a09d49c9988d1778f205a7a8
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedExtraBold.ttf) = 348428
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedExtraLight.ttf) = babfe516416d79e069a855a0ac865b811bfe1ae1a1ef8517862faa63fc3d84d5
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedExtraLight.ttf) = 323388
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedLight.ttf) = 16cd9b6aa1642e96eb4e55db8747ba93e29bcc481b90497cfa01b41cb44be4bf
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedLight.ttf) = 341008
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedMedium.ttf) = 43d1be57edad83e1d128acfab2965e7eda1d04896abd6ad05451a1ee24b4cb8a
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedMedium.ttf) = 317072
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedSemiBold.ttf) = c0fe78fa65379cbd4d856cc652e1bf29f07da5dc60f27a0a6effcfc815a3f462
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedSemiBold.ttf) = 327692
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedThin.ttf) = 9c86e9619c2ca0c187fb40fafd389c07596adc6f056492a82f2f03ee418c5702
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-SemiCondensedThin.ttf) = 337152
+SHA256 (Noto/SerifSinhala/2.007/NotoSerifSinhala-Thin.ttf) = b31e143f56873a9c63f6fae085f7f72d8acc6934df70ed1b18d1205301f49f8e
+SIZE (Noto/SerifSinhala/2.007/NotoSerifSinhala-Thin.ttf) = 323040