git: f08ea94267df - main - x11-fonts/noto-{basic,extra}: Reorganize

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 11 Sep 2023 03:15:40 UTC
The branch main has been updated by sunpoet:

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

commit f08ea94267df705f452758616f84ec4d8dfb2ca6
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-09-11 03:10:36 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-09-11 03:12:39 +0000

    x11-fonts/noto-{basic,extra}: Reorganize
    
    - Move from noto-basic to noto-extra:
      - NotoMono-Regular.ttf: Obsoleted
      - NotoSansLinearB-Regular.ttf: Ancient script
    - Move from noto-extra to noto-basic:
      - NotoSansMono-Bold.ttf, NotoSansMono-Regular.ttf: Replace NotoMono-Regular.ttf
      - NotoSansSymbols-Bold.ttf: Along with NotoSansSymbols-Regular.ttf
    - Bump PORTREVISION for package change
    
    PR:             273179
    Submitted by:   tijl
---
 x11-fonts/noto-basic/Makefile  | 9 +++++----
 x11-fonts/noto-basic/pkg-plist | 5 +++--
 x11-fonts/noto-extra/Makefile  | 8 +++++---
 x11-fonts/noto-extra/pkg-plist | 5 ++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/x11-fonts/noto-basic/Makefile b/x11-fonts/noto-basic/Makefile
index eff9bec9008e..e351a2d73543 100644
--- a/x11-fonts/noto-basic/Makefile
+++ b/x11-fonts/noto-basic/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	noto
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://noto-website-2.storage.googleapis.com/pkgs/
 PKGNAMESUFFIX=	-basic
@@ -19,12 +19,13 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-BASIC_FONTS=	NotoMono-Regular.ttf \
-		NotoSans-Bold.ttf \
+BASIC_FONTS=	NotoSans-Bold.ttf \
 		NotoSans-BoldItalic.ttf \
 		NotoSans-Italic.ttf \
 		NotoSans-Regular.ttf \
-		NotoSansLinearB-Regular.ttf \
+		NotoSansMono-Bold.ttf \
+		NotoSansMono-Regular.ttf \
+		NotoSansSymbols-Bold.ttf \
 		NotoSansSymbols-Regular.ttf \
 		NotoSerif-Bold.ttf \
 		NotoSerif-BoldItalic.ttf \
diff --git a/x11-fonts/noto-basic/pkg-plist b/x11-fonts/noto-basic/pkg-plist
index 8df688e94b72..f9278dc9d79e 100644
--- a/x11-fonts/noto-basic/pkg-plist
+++ b/x11-fonts/noto-basic/pkg-plist
@@ -1,9 +1,10 @@
-%%FONTSDIR%%/NotoMono-Regular.ttf
 %%FONTSDIR%%/NotoSans-Bold.ttf
 %%FONTSDIR%%/NotoSans-BoldItalic.ttf
 %%FONTSDIR%%/NotoSans-Italic.ttf
 %%FONTSDIR%%/NotoSans-Regular.ttf
-%%FONTSDIR%%/NotoSansLinearB-Regular.ttf
+%%FONTSDIR%%/NotoSansMono-Bold.ttf
+%%FONTSDIR%%/NotoSansMono-Regular.ttf
+%%FONTSDIR%%/NotoSansSymbols-Bold.ttf
 %%FONTSDIR%%/NotoSansSymbols-Regular.ttf
 %%FONTSDIR%%/NotoSerif-Bold.ttf
 %%FONTSDIR%%/NotoSerif-BoldItalic.ttf
diff --git a/x11-fonts/noto-extra/Makefile b/x11-fonts/noto-extra/Makefile
index 676899e40308..8861620aa362 100644
--- a/x11-fonts/noto-extra/Makefile
+++ b/x11-fonts/noto-extra/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	noto
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://noto-website-2.storage.googleapis.com/pkgs/
 DISTNAME=	Noto-hinted
@@ -19,12 +20,13 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-BASIC_FONTS=	NotoMono-Regular.ttf \
-		NotoSans-Bold.ttf \
+BASIC_FONTS=	NotoSans-Bold.ttf \
 		NotoSans-BoldItalic.ttf \
 		NotoSans-Italic.ttf \
 		NotoSans-Regular.ttf \
-		NotoSansLinearB-Regular.ttf \
+		NotoSansMono-Bold.ttf \
+		NotoSansMono-Regular.ttf \
+		NotoSansSymbols-Bold.ttf \
 		NotoSansSymbols-Regular.ttf \
 		NotoSerif-Bold.ttf \
 		NotoSerif-BoldItalic.ttf \
diff --git a/x11-fonts/noto-extra/pkg-plist b/x11-fonts/noto-extra/pkg-plist
index 7bcc7644a703..7370ec6cd008 100644
--- a/x11-fonts/noto-extra/pkg-plist
+++ b/x11-fonts/noto-extra/pkg-plist
@@ -1,5 +1,6 @@
 %%FONTSDIR%%/NotoKufiArabic-Bold.ttf
 %%FONTSDIR%%/NotoKufiArabic-Regular.ttf
+%%FONTSDIR%%/NotoMono-Regular.ttf
 %%FONTSDIR%%/NotoNaskhArabic-Bold.ttf
 %%FONTSDIR%%/NotoNaskhArabic-Regular.ttf
 %%FONTSDIR%%/NotoNaskhArabicUI-Bold.ttf
@@ -655,6 +656,7 @@
 %%FONTSDIR%%/NotoSansLaoUI-Thin.ttf
 %%FONTSDIR%%/NotoSansLepcha-Regular.ttf
 %%FONTSDIR%%/NotoSansLimbu-Regular.ttf
+%%FONTSDIR%%/NotoSansLinearB-Regular.ttf
 %%FONTSDIR%%/NotoSansLisu-Regular.ttf
 %%FONTSDIR%%/NotoSansLycian-Regular.ttf
 %%FONTSDIR%%/NotoSansLydian-Regular.ttf
@@ -666,7 +668,6 @@
 %%FONTSDIR%%/NotoSansMeeteiMayek-Regular.ttf
 %%FONTSDIR%%/NotoSansMongolian-Regular.ttf
 %%FONTSDIR%%/NotoSansMono-Black.ttf
-%%FONTSDIR%%/NotoSansMono-Bold.ttf
 %%FONTSDIR%%/NotoSansMono-Condensed.ttf
 %%FONTSDIR%%/NotoSansMono-CondensedBlack.ttf
 %%FONTSDIR%%/NotoSansMono-CondensedBold.ttf
@@ -689,7 +690,6 @@
 %%FONTSDIR%%/NotoSansMono-ExtraLight.ttf
 %%FONTSDIR%%/NotoSansMono-Light.ttf
 %%FONTSDIR%%/NotoSansMono-Medium.ttf
-%%FONTSDIR%%/NotoSansMono-Regular.ttf
 %%FONTSDIR%%/NotoSansMono-SemiBold.ttf
 %%FONTSDIR%%/NotoSansMono-SemiCondensed.ttf
 %%FONTSDIR%%/NotoSansMono-SemiCondensedBlack.ttf
@@ -869,7 +869,6 @@
 %%FONTSDIR%%/NotoSansSundanese-Regular.ttf
 %%FONTSDIR%%/NotoSansSylotiNagri-Regular.ttf
 %%FONTSDIR%%/NotoSansSymbols-Black.ttf
-%%FONTSDIR%%/NotoSansSymbols-Bold.ttf
 %%FONTSDIR%%/NotoSansSymbols-ExtraBold.ttf
 %%FONTSDIR%%/NotoSansSymbols-ExtraLight.ttf
 %%FONTSDIR%%/NotoSansSymbols-Light.ttf