From 28472e9722d808739a4d690f6d803a2b1b8f5f98 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Sat, 23 Mar 2024 14:01:07 +0000 Subject: [PATCH] Revert "x11-fonts/noto*: Restructure and update" This reverts commit 3b128ff9f74b28ada2f475f0b816480b1550e5b8. --- Mk/Uses/noto.mk | 71 --------- audio/fossmixer/Makefile | 6 +- benchmarks/ddosify/Makefile | 4 +- editors/cooledit/Makefile | 8 +- graphics/lux/Makefile | 3 +- multimedia/baka-mplayer/Makefile | 4 +- textproc/ibus-typing-booster/pkg-message | 2 +- www/chromium/Makefile | 6 +- www/iridium/Makefile | 5 +- www/ungoogled-chromium/Makefile | 5 +- x11-fonts/Makefile | 6 - x11-fonts/google-fonts/Makefile | 10 +- x11-fonts/noto-basic/Makefile | 38 ++++- x11-fonts/noto-basic/distinfo | 3 + x11-fonts/noto-basic/pkg-plist | 12 ++ x11-fonts/noto-color-emoji/Makefile | 20 --- x11-fonts/noto-color-emoji/distinfo | 3 - x11-fonts/noto-color-emoji/pkg-descr | 2 - x11-fonts/noto-emoji/Makefile | 40 ++--- x11-fonts/noto-emoji/distinfo | 6 +- x11-fonts/noto-emoji/pkg-descr | 15 +- x11-fonts/noto-extra/Makefile | 28 ++-- x11-fonts/noto-extra/pkg-plist | 178 +++++++++++++++++++++++ x11-fonts/noto-sans-mono/Makefile | 51 ------- x11-fonts/noto-sans-mono/distinfo | 3 - x11-fonts/noto-sans-mono/pkg-descr | 5 - x11-fonts/noto-sans-symbols-2/Makefile | 17 --- x11-fonts/noto-sans-symbols-2/distinfo | 3 - x11-fonts/noto-sans-symbols-2/pkg-descr | 3 - x11-fonts/noto-sans-symbols/Makefile | 25 ---- x11-fonts/noto-sans-symbols/distinfo | 3 - x11-fonts/noto-sans-symbols/pkg-descr | 3 - x11-fonts/noto-sans/Makefile | 87 ----------- x11-fonts/noto-sans/distinfo | 3 - x11-fonts/noto-sans/pkg-descr | 4 - x11-fonts/noto-serif/Makefile | 87 ----------- x11-fonts/noto-serif/distinfo | 3 - x11-fonts/noto-serif/pkg-descr | 4 - x11-fonts/noto/Makefile | 22 +-- x11/plasma5-plasma-integration/Makefile | 5 +- x11/plasma6-plasma-desktop/Makefile | 3 +- x11/plasma6-plasma-integration/Makefile | 7 +- 42 files changed, 309 insertions(+), 504 deletions(-) delete mode 100644 Mk/Uses/noto.mk create mode 100644 x11-fonts/noto-basic/distinfo create mode 100644 x11-fonts/noto-basic/pkg-plist delete mode 100644 x11-fonts/noto-color-emoji/Makefile delete mode 100644 x11-fonts/noto-color-emoji/distinfo delete mode 100644 x11-fonts/noto-color-emoji/pkg-descr delete mode 100644 x11-fonts/noto-sans-mono/Makefile delete mode 100644 x11-fonts/noto-sans-mono/distinfo delete mode 100644 x11-fonts/noto-sans-mono/pkg-descr delete mode 100644 x11-fonts/noto-sans-symbols-2/Makefile delete mode 100644 x11-fonts/noto-sans-symbols-2/distinfo delete mode 100644 x11-fonts/noto-sans-symbols-2/pkg-descr delete mode 100644 x11-fonts/noto-sans-symbols/Makefile delete mode 100644 x11-fonts/noto-sans-symbols/distinfo delete mode 100644 x11-fonts/noto-sans-symbols/pkg-descr delete mode 100644 x11-fonts/noto-sans/Makefile delete mode 100644 x11-fonts/noto-sans/distinfo delete mode 100644 x11-fonts/noto-sans/pkg-descr delete mode 100644 x11-fonts/noto-serif/Makefile delete mode 100644 x11-fonts/noto-serif/distinfo delete mode 100644 x11-fonts/noto-serif/pkg-descr diff --git a/Mk/Uses/noto.mk b/Mk/Uses/noto.mk deleted file mode 100644 index 909ae48cf6af..000000000000 --- a/Mk/Uses/noto.mk +++ /dev/null @@ -1,71 +0,0 @@ -# Infrastructure used by x11-fonts/noto-* ports. -# -# Feature: noto -# Usage: USES=noto -# -# The following variables can be defined in a port Makefile: -# -# NOTONAME Name of the font, e.g. NotoSans. -# NOTOTAG Git tag used in default NOTOLICSITES and NOTOSITES. -# Default: ${NOTONAME}-v${PORTVERSION}. -# NOTOLICSITES Location(s) of the license file. Optional. -# NOTOSITES Location(s) of the fonts. Optional. -# NOTOLICFILE Name of the license file. Default: LICENSE. -# NOTOSTYLES List of styles. You can define this if the upstream font -# files are named NOTONAME-STYLE.ttf. Define NOTOFILES -# directly if that's not the case. -# NOTOFILES List of upstream font files and their style. They will be -# installed as NOTONAME-STYLE.ttf. See x11-fonts/noto-emoji. -# Default: derived from NOTOSTYLES. -# -# MAINTAINER: tijl@FreeBSD.org - -.if !defined(_INCLUDE_USES_NOTO_MK) -_INCLUDE_USES_NOTO_MK= yes - -EXTRACT_SUFX= .tar.xz - -LICENSE= OFL11 -LICENSE_FILE= ${WRKSRC}/${NOTOLICFILE} - -FONTSDIR= ${PREFIX}/share/fonts/noto - -NOTOTAG?= ${NOTONAME}-v${PORTVERSION} -NOTOLICSITES?= https://github.com/notofonts/notofonts.github.io/raw/${NOTOTAG}/fonts/ -NOTOSITES?= https://github.com/notofonts/notofonts.github.io/raw/${NOTOTAG}/fonts/${NOTONAME}/hinted/ttf/ -NOTOLICFILE?= LICENSE -NOTOFILES?= ${NOTOSTYLES:C,.*,${NOTONAME}-&.ttf &,} -PLIST_FILES= ${NOTOFILES:N*.ttf:C,.*,${FONTSDIR:S,^${PREFIX}/,,}/${NOTONAME}-&.ttf,} - -NO_ARCH= yes -NO_BUILD= yes - -. ifdef NO_CHECKSUM && DISABLE_SIZE && !DIST_SUBDIR -# Assume make fetch called from make makesum. -_USES_fetch+= 250:noto-fetch -. endif - -noto-fetch: - @${MAKE} fetch NO_CHECKSUM=yes DISABLE_SIZE=yes \ - DISTFILES='${NOTOLICFILE}:lic ${NOTOFILES:M*.ttf}' \ - DIST_SUBDIR='${DISTNAME}' \ - MASTER_SITES='${NOTOLICSITES:S/$/:lic/} ${NOTOSITES}' - @${ECHO_MSG} '===> Creating distfile ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}' - @cd ${DISTDIR} && ${RM} ${DISTNAME}${EXTRACT_SUFX} && set -- \ - ${NOTOLICFILE:S,^,${DISTNAME}/,} \ - ${NOTOFILES:M*.ttf:S,^,${DISTNAME}/,} \ - && ${CHMOD} 0644 "$$@" && ${CHMOD} 0755 ${DISTNAME} \ - && ${TOUCH} -c -d 1970-01-01T00:00:00Z "$$@" ${DISTNAME} \ - && ${TAR} cJf ${DISTNAME}${EXTRACT_SUFX} \ - --uid 0 --gid 0 --numeric-owner "$$@" \ - && ${RM} "$$@" && { ${RMDIR} ${DISTNAME} 2>/dev/null || :; } - -do-install: - ${MKDIR} ${STAGEDIR}${FONTSDIR} -. for font style in ${NOTOFILES} - ${INSTALL_DATA} ${WRKSRC}/${font} \ - ${STAGEDIR}${FONTSDIR}/${NOTONAME}-${style}.ttf -. endfor - -.include "${USESDIR}/fonts.mk" -.endif diff --git a/audio/fossmixer/Makefile b/audio/fossmixer/Makefile index da4fcd88bdd9..cee9cd3f39e3 100644 --- a/audio/fossmixer/Makefile +++ b/audio/fossmixer/Makefile @@ -1,6 +1,6 @@ PORTNAME= fossmixer PORTVERSION= 0.0.3 -PORTREVISION= 5 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= SF/detroit DISTNAME= detroit-0.2.3 @@ -11,8 +11,8 @@ WWW= https://detroit.sourceforge.net/app_fossmixer.html LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${LOCALBASE}/share/fonts/noto/NotoSans-Italic.ttf:x11-fonts/noto-sans \ - ${LOCALBASE}/share/fonts/noto/NotoSans-Regular.ttf:x11-fonts/noto-sans +RUN_DEPENDS= ${LOCALBASE}/share/fonts/noto/NotoSans-Italic.ttf:x11-fonts/noto-basic \ + ${LOCALBASE}/share/fonts/noto/NotoSans-Regular.ttf:x11-fonts/noto-basic LIB_DEPENDS= libao.so:audio/libao \ libportaudio.so:audio/portaudio \ libpulse-simple.so:audio/pulseaudio \ diff --git a/benchmarks/ddosify/Makefile b/benchmarks/ddosify/Makefile index ef93cc69b40c..b7677e976eda 100644 --- a/benchmarks/ddosify/Makefile +++ b/benchmarks/ddosify/Makefile @@ -1,7 +1,7 @@ PORTNAME= ddosify DISTVERSIONPREFIX= v DISTVERSION= 1.0.6 -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= benchmarks MAINTAINER= dutra@FreeBSD.org @@ -48,7 +48,7 @@ OPTIONS_DEFINE= EMOJI ZSH OPTIONS_DEFAULT=EMOJI ZSH EMOJI_DESC= Enable emojis in console output -EMOJI_RUN_DEPENDS= noto-color-emoji>0:x11-fonts/noto-color-emoji +EMOJI_RUN_DEPENDS= noto-emoji>0:x11-fonts/noto-emoji ZSH_PLIST_FILES= share/zsh/site-functions/_${PORTNAME} diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index 4fb2ae94b9be..d499cafeb384 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -1,6 +1,6 @@ PORTNAME= cooledit DISTVERSION= 4.1.2 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= SUNSITE/apps/editors/X/cooledit @@ -15,9 +15,9 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYRIGHT.gpl LIB_DEPENDS= libfreetype.so:print/freetype2 RUN_DEPENDS= font-misc-misc>0:x11-fonts/font-misc-misc \ - noto-color-emoji>0:x11-fonts/noto-color-emoji \ - noto-sans>0:x11-fonts/noto-sans \ - noto-sans-mono>0:x11-fonts/noto-sans-mono + noto-basic>0:x11-fonts/noto-basic \ + noto-emoji>0:x11-fonts/noto-emoji \ + noto-extra>0:x11-fonts/noto-extra USES= gettext-runtime libtool:build pkgconfig python xorg USE_XORG= x11 xt diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index 4e0ee9c11f25..739e2acca7e2 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,6 +1,5 @@ PORTNAME= lux PORTVERSION= 1.1.8 -PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/kfj/pv/get/ PKGNAMESUFFIX= -pv # distinguish from www/lux @@ -19,7 +18,7 @@ LIB_DEPENDS= libhwy.so:devel/highway \ libsfml-window.so:devel/sfml \ libexiv2.so:graphics/exiv2 \ libvigraimpex.so:graphics/vigra -RUN_DEPENDS= ${GUIFONT}:x11-fonts/noto-sans +RUN_DEPENDS= ${GUIFONT}:x11-fonts/noto-basic GUIFONT= ${LOCALBASE}/share/fonts/noto/NotoSans-Regular.ttf USES= cmake desktop-file-utils dos2unix pkgconfig tar:bz2 diff --git a/multimedia/baka-mplayer/Makefile b/multimedia/baka-mplayer/Makefile index 74ffa690fa0b..944288577884 100644 --- a/multimedia/baka-mplayer/Makefile +++ b/multimedia/baka-mplayer/Makefile @@ -1,7 +1,7 @@ PORTNAME= baka-mplayer DISTVERSIONPREFIX= v DISTVERSION= 2.0.4 -PORTREVISION= 13 +PORTREVISION= 12 CATEGORIES= multimedia audio PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -33,7 +33,7 @@ NLS_USES= qt:5 NLS_USE= QT=linguisttools:build NLS_QMAKE_ON= CONFIG+="install_translations" NOTO_DESC= Original look with Noto Sans font -NOTO_RUN_DEPENDS= noto-sans>0:x11-fonts/noto-sans +NOTO_RUN_DEPENDS= noto>0:x11-fonts/noto post-patch: ${REINPLACE_CMD} '/^Comment/s,=.*,=${COMMENT},' \ diff --git a/textproc/ibus-typing-booster/pkg-message b/textproc/ibus-typing-booster/pkg-message index 3a600ef20140..ed32f094b232 100644 --- a/textproc/ibus-typing-booster/pkg-message +++ b/textproc/ibus-typing-booster/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: <0:x11-fonts/noto-sans \ - noto-sans-mono>0:x11-fonts/noto-sans-mono \ - noto-serif>0:x11-fonts/noto-serif + noto-basic>0:x11-fonts/noto-basic USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \ iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \ diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 143abef10080..db785288f289 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,6 +1,5 @@ PORTNAME= iridium PORTVERSION= 2024.01.120 -PORTREVISION= 1 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -70,9 +69,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libxshmfence.so:x11/libxshmfence RUN_DEPENDS= xdg-open:devel/xdg-utils \ - noto-sans>0:x11-fonts/noto-sans \ - noto-sans-mono>0:x11-fonts/noto-sans-mono \ - noto-serif>0:x11-fonts/noto-serif + noto-basic>0:x11-fonts/noto-basic USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \ iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \ diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 7607c7f6f397..9b59a5e6fa30 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= ungoogled-chromium PORTVERSION= 123.0.6312.58 -PORTREVISION= 1 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ @@ -72,9 +71,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libxshmfence.so:x11/libxshmfence RUN_DEPENDS= xdg-open:devel/xdg-utils \ - noto-sans>0:x11-fonts/noto-sans \ - noto-sans-mono>0:x11-fonts/noto-sans-mono \ - noto-serif>0:x11-fonts/noto-serif + noto-basic>0:x11-fonts/noto-basic USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \ iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \ diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile index 847ef091a96f..a3f390fda88d 100644 --- a/x11-fonts/Makefile +++ b/x11-fonts/Makefile @@ -188,23 +188,17 @@ SUBDIR += nexfontsel SUBDIR += noto SUBDIR += noto-basic - SUBDIR += noto-color-emoji SUBDIR += noto-emoji SUBDIR += noto-extra SUBDIR += noto-hk SUBDIR += noto-jp SUBDIR += noto-kr - SUBDIR += noto-sans SUBDIR += noto-sans-hk SUBDIR += noto-sans-jp SUBDIR += noto-sans-kr - SUBDIR += noto-sans-mono SUBDIR += noto-sans-sc - SUBDIR += noto-sans-symbols - SUBDIR += noto-sans-symbols-2 SUBDIR += noto-sans-tc SUBDIR += noto-sc - SUBDIR += noto-serif SUBDIR += noto-serif-hk SUBDIR += noto-serif-jp SUBDIR += noto-serif-kr diff --git a/x11-fonts/google-fonts/Makefile b/x11-fonts/google-fonts/Makefile index d21d6b663ec0..276d6e6266b6 100644 --- a/x11-fonts/google-fonts/Makefile +++ b/x11-fonts/google-fonts/Makefile @@ -1,6 +1,6 @@ PORTNAME= google-fonts DISTVERSION= 0.0.0.20210120 -PORTREVISION= 4 +PORTREVISION= 3 CATEGORIES= x11-fonts MAINTAINER= dmgk@FreeBSD.org @@ -18,17 +18,15 @@ RUN_DEPENDS= Andika>0:x11-fonts/andika \ b612>0:x11-fonts/b612 \ comfortaa-ttf>0:x11-fonts/comfortaa-ttf \ comic-neue>0:x11-fonts/comic-neue \ - courier-prime>0:x11-fonts/courier-prime \ + courier-prime>.:x11-fonts/courier-prime \ croscorefonts>0:x11-fonts/croscorefonts-fonts-ttf \ exo>0:x11-fonts/exo \ fira>0:x11-fonts/fira \ firacode>0:x11-fonts/firacode \ jetbrains-mono>0:x11-fonts/jetbrains-mono \ - lato>0:x11-fonts/lato \ + lato>.:x11-fonts/lato \ montserrat>0:x11-fonts/montserrat \ - noto-sans>0:x11-fonts/noto-sans \ - noto-sans-mono>0:x11-fonts/noto-sans-mono \ - noto-serif>0:x11-fonts/noto-serif \ + noto-basic>0:x11-fonts/noto-basic \ open-sans>0:x11-fonts/open-sans \ roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \ source-code-pro-ttf>0:x11-fonts/source-code-pro-ttf \ diff --git a/x11-fonts/noto-basic/Makefile b/x11-fonts/noto-basic/Makefile index 9c2c75b37c3c..e351a2d73543 100644 --- a/x11-fonts/noto-basic/Makefile +++ b/x11-fonts/noto-basic/Makefile @@ -1,17 +1,39 @@ -PORTNAME= noto-basic +PORTNAME= noto PORTVERSION= 2.0 -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= x11-fonts +MASTER_SITES= https://noto-website-2.storage.googleapis.com/pkgs/ +PKGNAMESUFFIX= -basic +DISTNAME= Noto-hinted MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Google Noto Fonts family (Basic metaport) +COMMENT= Google Noto Fonts family (Basic) WWW= https://fonts.google.com/noto -RUN_DEPENDS= noto-sans>=0:x11-fonts/noto-sans \ - noto-sans-mono>=0:x11-fonts/noto-sans-mono \ - noto-sans-symbols>=0:x11-fonts/noto-sans-symbols \ - noto-serif>=0:x11-fonts/noto-serif +LICENSE= OFL11 +LICENSE_FILE= ${WRKSRC}/LICENSE_OFL.txt -USES= metaport +USES= fonts zip + +NO_ARCH= yes +NO_BUILD= yes +NO_WRKSUBDIR= yes + +BASIC_FONTS= NotoSans-Bold.ttf \ + NotoSans-BoldItalic.ttf \ + NotoSans-Italic.ttf \ + NotoSans-Regular.ttf \ + NotoSansMono-Bold.ttf \ + NotoSansMono-Regular.ttf \ + NotoSansSymbols-Bold.ttf \ + NotoSansSymbols-Regular.ttf \ + NotoSerif-Bold.ttf \ + NotoSerif-BoldItalic.ttf \ + NotoSerif-Italic.ttf \ + NotoSerif-Regular.ttf + +do-install: + ${MKDIR} ${STAGEDIR}${FONTSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${BASIC_FONTS} ${STAGEDIR}${FONTSDIR} .include diff --git a/x11-fonts/noto-basic/distinfo b/x11-fonts/noto-basic/distinfo new file mode 100644 index 000000000000..ad7bf3b8c0ba --- /dev/null +++ b/x11-fonts/noto-basic/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1598970895 +SHA256 (Noto-hinted.zip) = 837b4a9352fce32ad7f298fbf155af1da5b6f3f8dbd995eb63fdd8e82117e4ae +SIZE (Noto-hinted.zip) = 1159948133 diff --git a/x11-fonts/noto-basic/pkg-plist b/x11-fonts/noto-basic/pkg-plist new file mode 100644 index 000000000000..f9278dc9d79e --- /dev/null +++ b/x11-fonts/noto-basic/pkg-plist @@ -0,0 +1,12 @@ +%%FONTSDIR%%/NotoSans-Bold.ttf +%%FONTSDIR%%/NotoSans-BoldItalic.ttf +%%FONTSDIR%%/NotoSans-Italic.ttf +%%FONTSDIR%%/NotoSans-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 +%%FONTSDIR%%/NotoSerif-Italic.ttf +%%FONTSDIR%%/NotoSerif-Regular.ttf diff --git a/x11-fonts/noto-color-emoji/Makefile b/x11-fonts/noto-color-emoji/Makefile deleted file mode 100644 index 2aacc4c85a48..000000000000 --- a/x11-fonts/noto-color-emoji/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME= noto-color-emoji -DISTVERSION= 2.042 -CATEGORIES= x11-fonts -MASTER_SITES= LOCAL/tijl - -MAINTAINER= tijl@FreeBSD.org -COMMENT= Noto Color Emoji font -WWW= https://fonts.google.com/noto/specimen/Noto+Color+Emoji \ - https://github.com/googlefonts/noto-emoji - -USES= noto - -NOTONAME= NotoColorEmoji -NOTOLICSITES= https://github.com/googlefonts/noto-emoji/raw/v${PORTVERSION}/fonts/ -NOTOSITES= https://github.com/googlefonts/noto-emoji/raw/v${PORTVERSION}/fonts/ -# Switch to COLRv1 with cairo-1.18? -#NOTOFILES= Noto-COLRv1.ttf Regular -NOTOFILES= NotoColorEmoji.ttf Regular - -.include diff --git a/x11-fonts/noto-color-emoji/distinfo b/x11-fonts/noto-color-emoji/distinfo deleted file mode 100644 index 6d470738acd4..000000000000 --- a/x11-fonts/noto-color-emoji/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1707762470 -SHA256 (noto-color-emoji-2.042.tar.xz) = c24f50a06749bc86233db6ab40b6d64da1914a55c95c3576dc7df422c47062b2 -SIZE (noto-color-emoji-2.042.tar.xz) = 9526112 diff --git a/x11-fonts/noto-color-emoji/pkg-descr b/x11-fonts/noto-color-emoji/pkg-descr deleted file mode 100644 index 86b0460f51d9..000000000000 --- a/x11-fonts/noto-color-emoji/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Noto Color Emoji is an open source font that has you covered for all -your emoji needs. diff --git a/x11-fonts/noto-emoji/Makefile b/x11-fonts/noto-emoji/Makefile index 784065f4c23c..eddbc93c8351 100644 --- a/x11-fonts/noto-emoji/Makefile +++ b/x11-fonts/noto-emoji/Makefile @@ -1,24 +1,28 @@ -PORTNAME= noto-emoji -DISTVERSION= 2.001 -PORTEPOCH= 1 +PORTNAME= noto +PORTVERSION= 2.038 CATEGORIES= x11-fonts -MASTER_SITES= LOCAL/tijl +MASTER_SITES= https://github.com/googlefonts/noto-emoji/raw/v${PORTVERSION}/fonts/ +PKGNAMESUFFIX= -emoji +DISTFILES= NotoColorEmoji.ttf +DIST_SUBDIR= Noto +EXTRACT_ONLY= # empty -MAINTAINER= tijl@FreeBSD.org -COMMENT= Noto Emoji font (monochrome) -WWW= https://fonts.google.com/noto/specimen/Noto+Emoji +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Google Noto Fonts family (Emoji) +WWW= https://fonts.google.com/noto \ + https://github.com/googlefonts/noto-emoji -USES= noto +LICENSE= APACHE20 -NOTONAME= NotoEmoji -NOTOTAG= 8857a069793e5db4a378c8a7316db684189e339a -NOTOLICSITES= https://github.com/google/fonts/raw/${NOTOTAG}/ofl/notoemoji/ -NOTOSITES= https://fonts.gstatic.com/s/notoemoji/v47/ -NOTOLICFILE= OFL.txt -NOTOFILES= bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf Light \ - bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf Regular \ - bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf Medium \ - bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf SemiBold \ - bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf Bold +USES= fonts + +NO_ARCH= yes +NO_BUILD= yes + +PLIST_FILES= ${FONTSDIR}/NotoColorEmoji.ttf + +do-install: + ${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/NotoColorEmoji.ttf ${STAGEDIR}${FONTSDIR} .include diff --git a/x11-fonts/noto-emoji/distinfo b/x11-fonts/noto-emoji/distinfo index 2e9b1820873d..14e8caa72c1e 100644 --- a/x11-fonts/noto-emoji/distinfo +++ b/x11-fonts/noto-emoji/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707762522 -SHA256 (noto-emoji-2.001.tar.xz) = c73180304723cb81a6a589c806923b4086ee16a40594c05ee2ca941066df8f9c -SIZE (noto-emoji-2.001.tar.xz) = 1878368 +TIMESTAMP = 1681052924 +SHA256 (Noto/NotoColorEmoji.ttf) = 5a953e4c2c3c650c37d9e996eae6fef08414854871e1f9a916daf4c59527f008 +SIZE (Noto/NotoColorEmoji.ttf) = 10352796 diff --git a/x11-fonts/noto-emoji/pkg-descr b/x11-fonts/noto-emoji/pkg-descr index 134eac1da711..4970a9d20d5d 100644 --- a/x11-fonts/noto-emoji/pkg-descr +++ b/x11-fonts/noto-emoji/pkg-descr @@ -1,3 +1,12 @@ -Noto Emoji (monochrome) is an open source font that has you covered for -all your emoji needs. It has multiple weights and features thousands of -emoji. +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 emoji fonts set. diff --git a/x11-fonts/noto-extra/Makefile b/x11-fonts/noto-extra/Makefile index dae368e4797c..8861620aa362 100644 --- a/x11-fonts/noto-extra/Makefile +++ b/x11-fonts/noto-extra/Makefile @@ -1,6 +1,6 @@ PORTNAME= noto PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= https://noto-website-2.storage.googleapis.com/pkgs/ DISTNAME= Noto-hinted @@ -20,15 +20,23 @@ NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes -post-patch: - @cd ${WRKSRC} && ${RM} \ - NotoColorEmoji* \ - NotoEmoji-* \ - NotoSans-* \ - NotoSansMono-* \ - NotoSansSymbols-* \ - NotoSansSymbols2-* \ - NotoSerif-* +BASIC_FONTS= NotoSans-Bold.ttf \ + NotoSans-BoldItalic.ttf \ + NotoSans-Italic.ttf \ + NotoSans-Regular.ttf \ + NotoSansMono-Bold.ttf \ + NotoSansMono-Regular.ttf \ + NotoSansSymbols-Bold.ttf \ + NotoSansSymbols-Regular.ttf \ + NotoSerif-Bold.ttf \ + NotoSerif-BoldItalic.ttf \ + NotoSerif-Italic.ttf \ + NotoSerif-Regular.ttf +EMOJI_FONTS= NotoColorEmoji.ttf \ + NotoEmoji-Regular.ttf + +post-extract: + @cd ${WRKSRC} && ${RM} ${BASIC_FONTS} ${EMOJI_FONTS} do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} diff --git a/x11-fonts/noto-extra/pkg-plist b/x11-fonts/noto-extra/pkg-plist index 4245d1917362..7370ec6cd008 100644 --- a/x11-fonts/noto-extra/pkg-plist +++ b/x11-fonts/noto-extra/pkg-plist @@ -6,6 +6,74 @@ %%FONTSDIR%%/NotoNaskhArabicUI-Bold.ttf %%FONTSDIR%%/NotoNaskhArabicUI-Regular.ttf %%FONTSDIR%%/NotoNastaliqUrdu-Regular.ttf +%%FONTSDIR%%/NotoSans-Black.ttf +%%FONTSDIR%%/NotoSans-BlackItalic.ttf +%%FONTSDIR%%/NotoSans-Condensed.ttf +%%FONTSDIR%%/NotoSans-CondensedBlack.ttf +%%FONTSDIR%%/NotoSans-CondensedBlackItalic.ttf +%%FONTSDIR%%/NotoSans-CondensedBold.ttf +%%FONTSDIR%%/NotoSans-CondensedBoldItalic.ttf +%%FONTSDIR%%/NotoSans-CondensedExtraBold.ttf +%%FONTSDIR%%/NotoSans-CondensedExtraBoldItalic.ttf +%%FONTSDIR%%/NotoSans-CondensedExtraLight.ttf +%%FONTSDIR%%/NotoSans-CondensedExtraLightItalic.ttf +%%FONTSDIR%%/NotoSans-CondensedItalic.ttf +%%FONTSDIR%%/NotoSans-CondensedLight.ttf +%%FONTSDIR%%/NotoSans-CondensedLightItalic.ttf +%%FONTSDIR%%/NotoSans-CondensedMedium.ttf +%%FONTSDIR%%/NotoSans-CondensedMediumItalic.ttf +%%FONTSDIR%%/NotoSans-CondensedSemiBold.ttf +%%FONTSDIR%%/NotoSans-CondensedSemiBoldItalic.ttf +%%FONTSDIR%%/NotoSans-CondensedThin.ttf +%%FONTSDIR%%/NotoSans-CondensedThinItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraBold.ttf +%%FONTSDIR%%/NotoSans-ExtraBoldItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensed.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedBlack.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedBlackItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedBold.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedBoldItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedExtraBold.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedExtraBoldItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedExtraLight.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedExtraLightItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedLight.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedLightItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedMedium.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedMediumItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedSemiBold.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedSemiBoldItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedThin.ttf +%%FONTSDIR%%/NotoSans-ExtraCondensedThinItalic.ttf +%%FONTSDIR%%/NotoSans-ExtraLight.ttf +%%FONTSDIR%%/NotoSans-ExtraLightItalic.ttf +%%FONTSDIR%%/NotoSans-Light.ttf +%%FONTSDIR%%/NotoSans-LightItalic.ttf +%%FONTSDIR%%/NotoSans-Medium.ttf +%%FONTSDIR%%/NotoSans-MediumItalic.ttf +%%FONTSDIR%%/NotoSans-SemiBold.ttf +%%FONTSDIR%%/NotoSans-SemiBoldItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensed.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedBlack.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedBlackItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedBold.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedBoldItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedExtraBold.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedExtraBoldItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedExtraLight.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedExtraLightItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedLight.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedLightItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedMedium.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedMediumItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedSemiBold.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedSemiBoldItalic.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedThin.ttf +%%FONTSDIR%%/NotoSans-SemiCondensedThinItalic.ttf +%%FONTSDIR%%/NotoSans-Thin.ttf +%%FONTSDIR%%/NotoSans-ThinItalic.ttf %%FONTSDIR%%/NotoSansAdlam-Regular.ttf %%FONTSDIR%%/NotoSansAdlamUnjoined-Regular.ttf %%FONTSDIR%%/NotoSansAnatolianHieroglyphs-Regular.ttf @@ -599,6 +667,40 @@ %%FONTSDIR%%/NotoSansMandaic-Regular.ttf %%FONTSDIR%%/NotoSansMeeteiMayek-Regular.ttf %%FONTSDIR%%/NotoSansMongolian-Regular.ttf +%%FONTSDIR%%/NotoSansMono-Black.ttf +%%FONTSDIR%%/NotoSansMono-Condensed.ttf +%%FONTSDIR%%/NotoSansMono-CondensedBlack.ttf +%%FONTSDIR%%/NotoSansMono-CondensedBold.ttf +%%FONTSDIR%%/NotoSansMono-CondensedExtraBold.ttf +%%FONTSDIR%%/NotoSansMono-CondensedExtraLight.ttf +%%FONTSDIR%%/NotoSansMono-CondensedLight.ttf +%%FONTSDIR%%/NotoSansMono-CondensedMedium.ttf +%%FONTSDIR%%/NotoSansMono-CondensedSemiBold.ttf +%%FONTSDIR%%/NotoSansMono-CondensedThin.ttf +%%FONTSDIR%%/NotoSansMono-ExtraBold.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensed.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensedBlack.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensedBold.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensedExtraBold.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensedExtraLight.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensedLight.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensedMedium.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensedSemiBold.ttf +%%FONTSDIR%%/NotoSansMono-ExtraCondensedThin.ttf +%%FONTSDIR%%/NotoSansMono-ExtraLight.ttf +%%FONTSDIR%%/NotoSansMono-Light.ttf +%%FONTSDIR%%/NotoSansMono-Medium.ttf +%%FONTSDIR%%/NotoSansMono-SemiBold.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensed.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensedBlack.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensedBold.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensedExtraBold.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensedExtraLight.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensedLight.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensedMedium.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensedSemiBold.ttf +%%FONTSDIR%%/NotoSansMono-SemiCondensedThin.ttf +%%FONTSDIR%%/NotoSansMono-Thin.ttf %%FONTSDIR%%/NotoSansMyanmar-Black.ttf %%FONTSDIR%%/NotoSansMyanmar-Bold.ttf %%FONTSDIR%%/NotoSansMyanmar-Condensed.ttf @@ -766,6 +868,14 @@ %%FONTSDIR%%/NotoSansSinhalaUI-Thin.ttf %%FONTSDIR%%/NotoSansSundanese-Regular.ttf %%FONTSDIR%%/NotoSansSylotiNagri-Regular.ttf +%%FONTSDIR%%/NotoSansSymbols-Black.ttf +%%FONTSDIR%%/NotoSansSymbols-ExtraBold.ttf +%%FONTSDIR%%/NotoSansSymbols-ExtraLight.ttf +%%FONTSDIR%%/NotoSansSymbols-Light.ttf +%%FONTSDIR%%/NotoSansSymbols-Medium.ttf +%%FONTSDIR%%/NotoSansSymbols-SemiBold.ttf +%%FONTSDIR%%/NotoSansSymbols-Thin.ttf +%%FONTSDIR%%/NotoSansSymbols2-Regular.ttf %%FONTSDIR%%/NotoSansSyriacEastern-Regular.ttf %%FONTSDIR%%/NotoSansSyriacEstrangela-Regular.ttf %%FONTSDIR%%/NotoSansSyriacWestern-Regular.ttf @@ -930,6 +1040,74 @@ %%FONTSDIR%%/NotoSansUgaritic-Regular.ttf %%FONTSDIR%%/NotoSansVai-Regular.ttf %%FONTSDIR%%/NotoSansYi-Regular.ttf +%%FONTSDIR%%/NotoSerif-Black.ttf +%%FONTSDIR%%/NotoSerif-BlackItalic.ttf +%%FONTSDIR%%/NotoSerif-Condensed.ttf +%%FONTSDIR%%/NotoSerif-CondensedBlack.ttf +%%FONTSDIR%%/NotoSerif-CondensedBlackItalic.ttf +%%FONTSDIR%%/NotoSerif-CondensedBold.ttf +%%FONTSDIR%%/NotoSerif-CondensedBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-CondensedExtraBold.ttf +%%FONTSDIR%%/NotoSerif-CondensedExtraBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-CondensedExtraLight.ttf +%%FONTSDIR%%/NotoSerif-CondensedExtraLightItalic.ttf +%%FONTSDIR%%/NotoSerif-CondensedItalic.ttf +%%FONTSDIR%%/NotoSerif-CondensedLight.ttf +%%FONTSDIR%%/NotoSerif-CondensedLightItalic.ttf +%%FONTSDIR%%/NotoSerif-CondensedMedium.ttf +%%FONTSDIR%%/NotoSerif-CondensedMediumItalic.ttf +%%FONTSDIR%%/NotoSerif-CondensedSemiBold.ttf +%%FONTSDIR%%/NotoSerif-CondensedSemiBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-CondensedThin.ttf +%%FONTSDIR%%/NotoSerif-CondensedThinItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraBold.ttf +%%FONTSDIR%%/NotoSerif-ExtraBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensed.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedBlack.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedBlackItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedBold.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedExtraBold.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedExtraBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedExtraLight.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedExtraLightItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedLight.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedLightItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedMedium.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedMediumItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedSemiBold.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedSemiBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedThin.ttf +%%FONTSDIR%%/NotoSerif-ExtraCondensedThinItalic.ttf +%%FONTSDIR%%/NotoSerif-ExtraLight.ttf +%%FONTSDIR%%/NotoSerif-ExtraLightItalic.ttf +%%FONTSDIR%%/NotoSerif-Light.ttf +%%FONTSDIR%%/NotoSerif-LightItalic.ttf +%%FONTSDIR%%/NotoSerif-Medium.ttf +%%FONTSDIR%%/NotoSerif-MediumItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiBold.ttf +%%FONTSDIR%%/NotoSerif-SemiBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensed.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedBlack.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedBlackItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedBold.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedExtraBold.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedExtraBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedExtraLight.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedExtraLightItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedLight.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedLightItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedMedium.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedMediumItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedSemiBold.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedSemiBoldItalic.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedThin.ttf +%%FONTSDIR%%/NotoSerif-SemiCondensedThinItalic.ttf +%%FONTSDIR%%/NotoSerif-Thin.ttf +%%FONTSDIR%%/NotoSerif-ThinItalic.ttf %%FONTSDIR%%/NotoSerifArmenian-Black.ttf %%FONTSDIR%%/NotoSerifArmenian-Bold.ttf %%FONTSDIR%%/NotoSerifArmenian-Condensed.ttf diff --git a/x11-fonts/noto-sans-mono/Makefile b/x11-fonts/noto-sans-mono/Makefile deleted file mode 100644 index 616240127286..000000000000 --- a/x11-fonts/noto-sans-mono/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -PORTNAME= noto-sans-mono -DISTVERSION= 2.014 -CATEGORIES= x11-fonts -MASTER_SITES= LOCAL/tijl - -MAINTAINER= tijl@FreeBSD.org -COMMENT= Noto Sans Mono font -WWW= https://fonts.google.com/noto/specimen/Noto+Sans+Mono \ - https://github.com/notofonts/latin-greek-cyrillic - -USES= noto - -NOTONAME= NotoSansMono -NOTOSTYLES= Black \ - Bold \ - Condensed \ - CondensedBlack \ - CondensedBold \ - CondensedExtraBold \ - CondensedExtraLight \ - CondensedLight \ - CondensedMedium \ - CondensedSemiBold \ - CondensedThin \ - ExtraBold \ - ExtraCondensed \ - ExtraCondensedBlack \ - ExtraCondensedBold \ - ExtraCondensedExtraBold \ - ExtraCondensedExtraLight \ - ExtraCondensedLight \ - ExtraCondensedMedium \ - ExtraCondensedSemiBold \ - ExtraCondensedThin \ - ExtraLight \ - Light \ - Medium \ - Regular \ - SemiBold \ - SemiCondensed \ - SemiCondensedBlack \ - SemiCondensedBold \ - SemiCondensedExtraBold \ - SemiCondensedExtraLight \ - SemiCondensedLight \ - SemiCondensedMedium \ - SemiCondensedSemiBold \ - SemiCondensedThin \ - Thin - -.include diff --git a/x11-fonts/noto-sans-mono/distinfo b/x11-fonts/noto-sans-mono/distinfo deleted file mode 100644 index 515f8586f242..000000000000 --- a/x11-fonts/noto-sans-mono/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1707762847 -SHA256 (noto-sans-mono-2.014.tar.xz) = 59f3e702d3a15004f15fa144f0d2169a628d40b259d778edf269abf35ee9fdae -SIZE (noto-sans-mono-2.014.tar.xz) = 4504304 diff --git a/x11-fonts/noto-sans-mono/pkg-descr b/x11-fonts/noto-sans-mono/pkg-descr deleted file mode 100644 index c05b7126e803..000000000000 --- a/x11-fonts/noto-sans-mono/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Noto is a global font collection for writing in all modern and ancient -languages. Noto Sans Mono is a monospaced, unmodulated ("sans serif") -design suitable for programming code and other uses where a fixed-width -font is needed. It supports the Latin, Cyrillic and Greek scripts, and -various symbols. diff --git a/x11-fonts/noto-sans-symbols-2/Makefile b/x11-fonts/noto-sans-symbols-2/Makefile deleted file mode 100644 index f9198ef71e76..000000000000 --- a/x11-fonts/noto-sans-symbols-2/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -PORTNAME= noto-sans-symbols-2 -DISTVERSION= 2.008 -CATEGORIES= x11-fonts -MASTER_SITES= LOCAL/tijl - -MAINTAINER= tijl@FreeBSD.org -COMMENT= Noto Sans Symbols 2 font -WWW= https://fonts.google.com/noto/specimen/Noto+Sans+Symbols+2 \ - https://github.com/notofonts/symbols - -USES= noto - -NOTONAME= NotoSansSymbols2 -NOTOTAG= c16b117609abbe4e60b3f2bd4433bdb3d0accb2e -NOTOSTYLES= Regular - -.include diff --git a/x11-fonts/noto-sans-symbols-2/distinfo b/x11-fonts/noto-sans-symbols-2/distinfo deleted file mode 100644 index 5c2cbc3c00b0..000000000000 --- a/x11-fonts/noto-sans-symbols-2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1707753252 -SHA256 (noto-sans-symbols-2-2.008.tar.xz) = e3e3367d7c5f60d8fbeaf31218ef48f65a204a654cea9276f7ed4d015cb97797 -SIZE (noto-sans-symbols-2-2.008.tar.xz) = 257096 diff --git a/x11-fonts/noto-sans-symbols-2/pkg-descr b/x11-fonts/noto-sans-symbols-2/pkg-descr deleted file mode 100644 index 83c171f4432d..000000000000 --- a/x11-fonts/noto-sans-symbols-2/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Noto is a global font collection for writing in all modern and ancient -languages. Noto Sans Symbols 2 is an unmodulated ("sans serif") design -for texts in Symbols and in Emoji symbols. diff --git a/x11-fonts/noto-sans-symbols/Makefile b/x11-fonts/noto-sans-symbols/Makefile deleted file mode 100644 index 3a7d79ea92b7..000000000000 --- a/x11-fonts/noto-sans-symbols/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -PORTNAME= noto-sans-symbols -DISTVERSION= 2.003 -CATEGORIES= x11-fonts -MASTER_SITES= LOCAL/tijl - -MAINTAINER= tijl@FreeBSD.org -COMMENT= Noto Sans Symbols font -WWW= https://fonts.google.com/noto/specimen/Noto+Sans+Symbols \ - https://github.com/notofonts/symbols - -USES= noto - -NOTONAME= NotoSansSymbols -NOTOTAG= 1b2fe62733b83bdb2018a77978be2d7aa424fd43 -NOTOSTYLES= Black \ - Bold \ - ExtraBold \ - ExtraLight \ - Light \ - Medium \ - Regular \ - SemiBold \ - Thin - -.include diff --git a/x11-fonts/noto-sans-symbols/distinfo b/x11-fonts/noto-sans-symbols/distinfo deleted file mode 100644 index 9ec97bd0a7c8..000000000000 --- a/x11-fonts/noto-sans-symbols/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1707762887 -SHA256 (noto-sans-symbols-2.003.tar.xz) = b1d50c0adb86f73b882f1d5db77593f6a8cbbc605b713c0c120fbac9f506ef2c -SIZE (noto-sans-symbols-2.003.tar.xz) = 529256 diff --git a/x11-fonts/noto-sans-symbols/pkg-descr b/x11-fonts/noto-sans-symbols/pkg-descr deleted file mode 100644 index 660dff506167..000000000000 --- a/x11-fonts/noto-sans-symbols/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Noto is a global font collection for writing in all modern and ancient -languages. Noto Sans Symbols is an unmodulated ("sans serif") design for -texts in Symbols. diff --git a/x11-fonts/noto-sans/Makefile b/x11-fonts/noto-sans/Makefile deleted file mode 100644 index 1cf0e8bb42d4..000000000000 --- a/x11-fonts/noto-sans/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -PORTNAME= noto-sans -DISTVERSION= 2.013 -CATEGORIES= x11-fonts -MASTER_SITES= LOCAL/tijl - -MAINTAINER= tijl@FreeBSD.org -COMMENT= Noto Sans font (Latin, Greek, Cyrillic) -WWW= https://fonts.google.com/noto/specimen/Noto+Sans \ - https://github.com/notofonts/latin-greek-cyrillic - -USES= noto - -NOTONAME= NotoSans -NOTOSTYLES= Black \ - BlackItalic \ - Bold \ - BoldItalic \ - Condensed \ - CondensedBlack \ - CondensedBlackItalic \ - CondensedBold \ - CondensedBoldItalic \ - CondensedExtraBold \ - CondensedExtraBoldItalic \ - CondensedExtraLight \ - CondensedExtraLightItalic \ - CondensedItalic \ - CondensedLight \ - CondensedLightItalic \ - CondensedMedium \ - CondensedMediumItalic \ - CondensedSemiBold \ - CondensedSemiBoldItalic \ - CondensedThin \ - CondensedThinItalic \ - ExtraBold \ - ExtraBoldItalic \ - ExtraCondensed \ - ExtraCondensedBlack \ - ExtraCondensedBlackItalic \ - ExtraCondensedBold \ - ExtraCondensedBoldItalic \ - ExtraCondensedExtraBold \ - ExtraCondensedExtraBoldItalic \ - ExtraCondensedExtraLight \ - ExtraCondensedExtraLightItalic \ - ExtraCondensedItalic \ - ExtraCondensedLight \ - ExtraCondensedLightItalic \ - ExtraCondensedMedium \ - ExtraCondensedMediumItalic \ - ExtraCondensedSemiBold \ - ExtraCondensedSemiBoldItalic \ - ExtraCondensedThin \ - ExtraCondensedThinItalic \ - ExtraLight \ - ExtraLightItalic \ - Italic \ - Light \ - LightItalic \ - Medium \ - MediumItalic \ - Regular \ - SemiBold \ - SemiBoldItalic \ - SemiCondensed \ - SemiCondensedBlack \ - SemiCondensedBlackItalic \ - SemiCondensedBold \ - SemiCondensedBoldItalic \ - SemiCondensedExtraBold \ - SemiCondensedExtraBoldItalic \ - SemiCondensedExtraLight \ - SemiCondensedExtraLightItalic \ - SemiCondensedItalic \ - SemiCondensedLight \ - SemiCondensedLightItalic \ - SemiCondensedMedium \ - SemiCondensedMediumItalic \ - SemiCondensedSemiBold \ - SemiCondensedSemiBoldItalic \ - SemiCondensedThin \ - SemiCondensedThinItalic \ - Thin \ - ThinItalic - -.include diff --git a/x11-fonts/noto-sans/distinfo b/x11-fonts/noto-sans/distinfo deleted file mode 100644 index f8f7e17a599c..000000000000 --- a/x11-fonts/noto-sans/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1707762623 -SHA256 (noto-sans-2.013.tar.xz) = 3f108d8245c2da642eb33b35dac8d1413483a9f8680192f9f8891835d5c833dc -SIZE (noto-sans-2.013.tar.xz) = 10451260 diff --git a/x11-fonts/noto-sans/pkg-descr b/x11-fonts/noto-sans/pkg-descr deleted file mode 100644 index 5b2b167a6e9e..000000000000 --- a/x11-fonts/noto-sans/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Noto is a global font collection for writing in all modern and ancient -languages. Noto Sans is an unmodulated ("sans serif") design for texts -in the Latin, Cyrillic and Greek scripts, which is also suitable as the -complementary choice for other script-specific Noto Sans fonts. diff --git a/x11-fonts/noto-serif/Makefile b/x11-fonts/noto-serif/Makefile deleted file mode 100644 index abd3ccd0b905..000000000000 --- a/x11-fonts/noto-serif/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -PORTNAME= noto-serif -DISTVERSION= 2.013 -CATEGORIES= x11-fonts -MASTER_SITES= LOCAL/tijl - -MAINTAINER= tijl@FreeBSD.org -COMMENT= Noto Serif font (Latin, Greek, Cyrillic) -WWW= https://fonts.google.com/noto/specimen/Noto+Serif \ - https://github.com/notofonts/latin-greek-cyrillic - -USES= noto - -NOTONAME= NotoSerif -NOTOSTYLES= Black \ - BlackItalic \ - Bold \ - BoldItalic \ - Condensed \ - CondensedBlack \ - CondensedBlackItalic \ - CondensedBold \ - CondensedBoldItalic \ - CondensedExtraBold \ - CondensedExtraBoldItalic \ - CondensedExtraLight \ - CondensedExtraLightItalic \ - CondensedItalic \ - CondensedLight \ - CondensedLightItalic \ - CondensedMedium \ - CondensedMediumItalic \ - CondensedSemiBold \ - CondensedSemiBoldItalic \ - CondensedThin \ - CondensedThinItalic \ - ExtraBold \ - ExtraBoldItalic \ - ExtraCondensed \ - ExtraCondensedBlack \ - ExtraCondensedBlackItalic \ - ExtraCondensedBold \ - ExtraCondensedBoldItalic \ - ExtraCondensedExtraBold \ - ExtraCondensedExtraBoldItalic \ - ExtraCondensedExtraLight \ - ExtraCondensedExtraLightItalic \ - ExtraCondensedItalic \ - ExtraCondensedLight \ - ExtraCondensedLightItalic \ - ExtraCondensedMedium \ - ExtraCondensedMediumItalic \ - ExtraCondensedSemiBold \ - ExtraCondensedSemiBoldItalic \ - ExtraCondensedThin \ - ExtraCondensedThinItalic \ - ExtraLight \ - ExtraLightItalic \ - Italic \ - Light \ - LightItalic \ - Medium \ - MediumItalic \ - Regular \ - SemiBold \ - SemiBoldItalic \ - SemiCondensed \ - SemiCondensedBlack \ - SemiCondensedBlackItalic \ - SemiCondensedBold \ - SemiCondensedBoldItalic \ - SemiCondensedExtraBold \ - SemiCondensedExtraBoldItalic \ - SemiCondensedExtraLight \ - SemiCondensedExtraLightItalic \ - SemiCondensedItalic \ - SemiCondensedLight \ - SemiCondensedLightItalic \ - SemiCondensedMedium \ - SemiCondensedMediumItalic \ - SemiCondensedSemiBold \ - SemiCondensedSemiBoldItalic \ - SemiCondensedThin \ - SemiCondensedThinItalic \ - Thin \ - ThinItalic - -.include diff --git a/x11-fonts/noto-serif/distinfo b/x11-fonts/noto-serif/distinfo deleted file mode 100644 index 8be08f6ab7af..000000000000 --- a/x11-fonts/noto-serif/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1707763003 -SHA256 (noto-serif-2.013.tar.xz) = b74fb72f4520d516f4b8235904e6cae355d3c240527e7c675886ff6d8554e677 -SIZE (noto-serif-2.013.tar.xz) = 12382536 diff --git a/x11-fonts/noto-serif/pkg-descr b/x11-fonts/noto-serif/pkg-descr deleted file mode 100644 index 2b77dfa9f067..000000000000 --- a/x11-fonts/noto-serif/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Noto is a global font collection for writing in all modern and ancient -languages. Noto Serif is a modulated ("serif") design for texts in the -Latin, Cyrillic and Greek scripts, also suitable as the complementary -font for other script-specific Noto Serif fonts. diff --git a/x11-fonts/noto/Makefile b/x11-fonts/noto/Makefile index feec455c581f..3eb4b96f056f 100644 --- a/x11-fonts/noto/Makefile +++ b/x11-fonts/noto/Makefile @@ -1,42 +1,32 @@ PORTNAME= noto PORTVERSION= 2.0 -PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= sunpoet@FreeBSD.org COMMENT= Google Noto Fonts family (meta port) WWW= https://fonts.google.com/noto -RUN_DEPENDS= noto-sans>=0:x11-fonts/noto-sans \ - noto-serif>=0:x11-fonts/noto-serif - USES= metaport -OPTIONS_DEFINE= COLOREMOJI EMOJI EXTRA HK JP KR MONO SC SYMBOLS SYMBOLS2 TC -OPTIONS_DEFAULT=COLOREMOJI EMOJI EXTRA HK JP KR MONO SC SYMBOLS SYMBOLS2 TC +OPTIONS_DEFINE= BASIC EMOJI EXTRA HK JP KR SC TC +OPTIONS_DEFAULT=BASIC EMOJI EXTRA HK JP KR SC TC -COLOREMOJI_DESC=Install color emoji font -EMOJI_DESC= Install monochrome emoji font -EXTRA_DESC= Install extra script-specific fonts +BASIC_DESC= Install basic fonts set +EXTRA_DESC= Install extra fonts set +EMOJI_DESC= Install emoji fonts set HK_DESC= Install Traditional Chinese Hong Kong fonts set JP_DESC= Install Japanese fonts set KR_DESC= Install Korean fonts set -MONO_DESC= Install monospace font SC_DESC= Install Simplified Chinese fonts set -SYMBOLS_DESC= Install symbols font -SYMBOLS2_DESC= Install symbols 2 font TC_DESC= Install Traditional Chinese fonts set -COLOREMOJI_RUN_DEPENDS= noto-color-emoji>=0:x11-fonts/noto-color-emoji +BASIC_RUN_DEPENDS= noto-basic>=0:x11-fonts/noto-basic EMOJI_RUN_DEPENDS= noto-emoji>=0:x11-fonts/noto-emoji EXTRA_RUN_DEPENDS= noto-extra>=0:x11-fonts/noto-extra HK_RUN_DEPENDS= noto-hk>=0:x11-fonts/noto-hk JP_RUN_DEPENDS= noto-jp>=0:x11-fonts/noto-jp KR_RUN_DEPENDS= noto-kr>=0:x11-fonts/noto-kr -MONO_RUN_DEPENDS= noto-sans-mono>=0:x11-fonts/noto-sans-mono SC_RUN_DEPENDS= noto-sc>=0:x11-fonts/noto-sc -SYMBOLS_RUN_DEPENDS= noto-sans-symbols>=0:x11-fonts/noto-sans-symbols -SYMBOLS2_RUN_DEPENDS= noto-sans-symbols-2>=0:x11-fonts/noto-sans-symbols-2 TC_RUN_DEPENDS= noto-tc>=0:x11-fonts/noto-tc .include diff --git a/x11/plasma5-plasma-integration/Makefile b/x11/plasma5-plasma-integration/Makefile index 97c7fc5e67fd..79da0677441f 100644 --- a/x11/plasma5-plasma-integration/Makefile +++ b/x11/plasma5-plasma-integration/Makefile @@ -1,6 +1,5 @@ PORTNAME= plasma-integration DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -35,9 +34,7 @@ NOTO_DESC= KDE default font LIGHT_DESC= Use noto-light BIG_DESC= Use complete noto -LIGHT_RUN_DEPENDS= noto-sans>=0:x11-fonts/noto-sans \ - noto-sans-mono>=0:x11-fonts/noto-sans-mono \ - noto-serif>=0:x11-fonts/noto-serif +LIGHT_RUN_DEPENDS= noto-basic>=0:x11-fonts/noto-basic BIG_RUN_DEPENDS= noto>=0:x11-fonts/noto .include diff --git a/x11/plasma6-plasma-desktop/Makefile b/x11/plasma6-plasma-desktop/Makefile index e02a6bc8a202..1d126bcd1f14 100644 --- a/x11/plasma6-plasma-desktop/Makefile +++ b/x11/plasma6-plasma-desktop/Makefile @@ -1,6 +1,5 @@ PORTNAME= plasma-desktop DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma COMMENT= KDE Plasma Desktop @@ -17,7 +16,7 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libxcb-util.so:x11/xcb-util \ libxkbcommon.so:x11/libxkbcommon \ libxkbfile.so:x11/libxkbfile -RUN_DEPENDS= noto-color-emoji>0:x11-fonts/noto-color-emoji \ +RUN_DEPENDS= noto-emoji>0:x11-fonts/noto-emoji \ xdg-user-dir:devel/xdg-user-dirs \ xf86-input-evdev>0:x11-drivers/xf86-input-evdev \ xf86-input-libinput>0:x11-drivers/xf86-input-libinput \ diff --git a/x11/plasma6-plasma-integration/Makefile b/x11/plasma6-plasma-integration/Makefile index 9d50015f54e2..5a895d1cdcaf 100644 --- a/x11/plasma6-plasma-integration/Makefile +++ b/x11/plasma6-plasma-integration/Makefile @@ -1,6 +1,5 @@ PORTNAME= plasma-integration DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma COMMENT= Qt Platform Theme integration plugins for the Plasma workspaces @@ -9,10 +8,8 @@ MAINTAINER= kde@FreeBSD.org LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hack-font>0:x11-fonts/hack-font \ - noto-color-emoji>0:x11-fonts/noto-color-emoji \ - noto-sans>0:x11-fonts/noto-sans \ - noto-sans-mono>0:x11-fonts/noto-sans-mono \ - noto-serif>0:x11-fonts/noto-serif + noto-basic>0:x11-fonts/noto-basic \ + noto-emoji>0:x11-fonts/noto-emoji USES= cmake gettext gl kde:6 qt:6 tar:xz xorg USE_KDE= bookmarks breeze colorscheme completion config configwidgets \