9 files changed, 85 insertions, 53 deletions

diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 97be2fc657cb..c37ec0f9c8c0 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -162,7 +162,7 @@
     SUBDIR += nerd-fonts
     SUBDIR += nexfontsel
     SUBDIR += noto
-    SUBDIR += noto-lite
+    SUBDIR += noto-basic
     SUBDIR += nucleus
     SUBDIR += ohsnap
     SUBDIR += oldschool-pc-fonts
diff --git a/x11-fonts/google-fonts/Makefile b/x11-fonts/google-fonts/Makefile
index deb2d4df34e6..ec03802ddd5f 100644
--- a/x11-fonts/google-fonts/Makefile
+++ b/x11-fonts/google-fonts/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	google-fonts
 DISTVERSION=	0.0.0.20190118
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	dg@syrec.org
@@ -13,7 +14,7 @@ LICENSE_COMB=	multi
 RUN_DEPENDS=	anonymous-pro>0:x11-fonts/anonymous-pro \
 		comfortaa-ttf>0:x11-fonts/comfortaa-ttf \
 		croscorefonts>0:x11-fonts/croscorefonts-fonts-ttf \
-		noto-lite>0:x11-fonts/noto-lite \
+		noto-basic>0:x11-fonts/noto-basic \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		sourcecodepro-ttf>0:x11-fonts/sourcecodepro-ttf \
 		sourcesanspro-ttf>0:x11-fonts/sourcesanspro-ttf \
diff --git a/x11-fonts/noto-basic/Makefile b/x11-fonts/noto-basic/Makefile
new file mode 100644
index 000000000000..ce97fb6aba27
--- /dev/null
+++ b/x11-fonts/noto-basic/Makefile
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+PORTNAME=	noto
+PORTVERSION=	1.0.5
+CATEGORIES=	x11-fonts
+MASTER_SITES=	https://noto-website.storage.googleapis.com/pkgs/ \
+		https://github.com/googlei18n/noto-emoji/raw/master/fonts/:emoji
+PKGNAMESUFFIX=	-basic
+DISTFILES=	Noto-hinted${EXTRACT_SUFX} \
+		NotoColorEmoji.ttf:emoji \
+		NotoEmoji-Regular.ttf:emoji
+EXTRACT_ONLY=	Noto-hinted${EXTRACT_SUFX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Google Noto Fonts family (Basic and Emoji)
+
+LICENSE=	APACHE20 OFL11
+LICENSE_COMB=	multi
+LICENSE_FILE_OFL11=	${WRKSRC}/LICENSE_OFL.txt
+
+USES=		fonts zip
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
+BASIC_FONTS=	NotoColorEmoji.ttf \
+		NotoEmoji-Regular.ttf \
+		NotoMono-Regular.ttf \
+		NotoSans-Bold.ttf \
+		NotoSans-BoldItalic.ttf \
+		NotoSans-Italic.ttf \
+		NotoSans-Regular.ttf \
+		NotoSansLinearB-Regular.ttf \
+		NotoSansSymbols-Regular.ttf \
+		NotoSerif-Bold.ttf \
+		NotoSerif-BoldItalic.ttf \
+		NotoSerif-Italic.ttf \
+		NotoSerif-Regular.ttf
+
+post-extract:
+	@${CP} ${DISTDIR}/NotoColorEmoji.ttf ${DISTDIR}/NotoEmoji-Regular.ttf ${WRKSRC}
+
+do-install:
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${BASIC_FONTS} ${STAGEDIR}${FONTSDIR}
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/noto-basic/distinfo b/x11-fonts/noto-basic/distinfo
new file mode 100644
index 000000000000..818f19a32066
--- /dev/null
+++ b/x11-fonts/noto-basic/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1551635358
+SHA256 (Noto-hinted.zip) = d5e5bace69570f348228e864444155657c1e7eca50857b9de4981fbd9b5122dd
+SIZE (Noto-hinted.zip) = 499786749
+SHA256 (NotoColorEmoji.ttf) = f17dc14a99c39883d29f573d890fdeba65cafd5a25f338a5045890ea815b8d32
+SIZE (NotoColorEmoji.ttf) = 7792004
+SHA256 (NotoEmoji-Regular.ttf) = 415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5
+SIZE (NotoEmoji-Regular.ttf) = 418804
diff --git a/x11-fonts/noto-basic/pkg-descr b/x11-fonts/noto-basic/pkg-descr
new file mode 100644
index 000000000000..7be062443441
--- /dev/null
+++ b/x11-fonts/noto-basic/pkg-descr
@@ -0,0 +1,14 @@
+When text is rendered by a computer, sometimes characters are displayed as
+"tofu". They are little boxes to indicate your device doesn't have a font to
+display the text.
+
+Google has been developing a font family called Noto, which aims to support all
+languages with a harmonious look and feel. Noto is Google's answer to tofu. The
+name noto is to convey the idea that Google's goal is to see no more "tofu".
+Noto has multiple styles and weights, and is freely available to all. The
+comprehensive set of fonts and tools used in our development is available in our
+GitHub repositories.
+
+This port provides the basic fonts set.
+
+WWW: https://www.google.com/get/noto/
diff --git a/x11-fonts/noto-basic/pkg-plist b/x11-fonts/noto-basic/pkg-plist
new file mode 100644
index 000000000000..4e6cc48196f7
--- /dev/null
+++ b/x11-fonts/noto-basic/pkg-plist
@@ -0,0 +1,13 @@
+%%FONTSDIR%%/NotoColorEmoji.ttf
+%%FONTSDIR%%/NotoEmoji-Regular.ttf
+%%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%%/NotoSansSymbols-Regular.ttf
+%%FONTSDIR%%/NotoSerif-Bold.ttf
+%%FONTSDIR%%/NotoSerif-BoldItalic.ttf
+%%FONTSDIR%%/NotoSerif-Italic.ttf
+%%FONTSDIR%%/NotoSerif-Regular.ttf
diff --git a/x11-fonts/noto-lite/Makefile b/x11-fonts/noto-lite/Makefile
deleted file mode 100644
index 09e0b2ec137e..000000000000
--- a/x11-fonts/noto-lite/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	noto
-PORTVERSION=	1.0.5
-PORTREVISION=	2
-CATEGORIES=	x11-fonts
-MASTER_SITES=	https://noto-website.storage.googleapis.com/pkgs/ \
-		https://github.com/googlei18n/noto-emoji/raw/master/:emoji
-PKGNAMESUFFIX=	-lite
-DISTNAME=	${PORTNAME:S|n|N|}-hinted
-DISTFILES=	${DISTNAME}.zip NotoEmoji-Regular.ttf:emoji
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Google font family - lite version
-
-LICENSE=	APACHE20 OFL11
-LICENSE_COMB=	multi
-
-USES=		fonts zip
-FONTNAME=	noto-lite
-NO_ARCH=	yes
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-
-LIST=		NotoEmoji-Regular.ttf NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-BoldItalic.ttf NotoSans-Italic.ttf NotoSans-Regular.ttf NotoSansLinearB-Regular.ttf NotoSansSymbols-Regular.ttf NotoSerif-Bold.ttf NotoSerif-BoldItalic.ttf NotoSerif-Italic.ttf NotoSerif-Regular.ttf
-
-.for f in ${LIST}
-PLIST_FILES+=	${FONTSDIR}/${f}
-.endfor
-
-post-extract:
-	${CP} ${DISTDIR}/NotoEmoji-Regular.ttf ${WRKSRC}
-
-do-install:
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-.for f in ${LIST}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${FONTSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/x11-fonts/noto-lite/distinfo b/x11-fonts/noto-lite/distinfo
deleted file mode 100644
index 6174d0b4e3f8..000000000000
--- a/x11-fonts/noto-lite/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1493788410
-SHA256 (Noto-hinted.zip) = d5e5bace69570f348228e864444155657c1e7eca50857b9de4981fbd9b5122dd
-SIZE (Noto-hinted.zip) = 499786749
-SHA256 (NotoEmoji-Regular.ttf) = a24fc856d48a3a1054ec0ed4511a4026f0381e8727fc4caa59fb8d3938a46637
-SIZE (NotoEmoji-Regular.ttf) = 441468
diff --git a/x11-fonts/noto-lite/pkg-descr b/x11-fonts/noto-lite/pkg-descr
deleted file mode 100644
index fed3c8b79ec2..000000000000
--- a/x11-fonts/noto-lite/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Noto is Google's font family that aims to support all the world's languages.
-Its design goal is to achieve visual harmonization across languages.
-This is the light version.
-
-WWW: http://www.google.com/get/noto/