aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--x11-fonts/Makefile2
-rw-r--r--x11-fonts/google-fonts/Makefile3
-rw-r--r--x11-fonts/source-sans-ttf/Makefile (renamed from x11-fonts/sourcesanspro-ttf/Makefile)11
-rw-r--r--x11-fonts/source-sans-ttf/distinfo3
-rw-r--r--x11-fonts/source-sans-ttf/files/pkg-message.in (renamed from x11-fonts/sourcesanspro-ttf/files/pkg-message.in)0
-rw-r--r--x11-fonts/source-sans-ttf/pkg-descr (renamed from x11-fonts/sourcesanspro-ttf/pkg-descr)2
-rw-r--r--x11-fonts/source-sans-ttf/pkg-plist (renamed from x11-fonts/sourcesanspro-ttf/pkg-plist)0
-rw-r--r--x11-fonts/sourcesanspro-ttf/distinfo3
9 files changed, 13 insertions, 12 deletions
diff --git a/MOVED b/MOVED
index 4206ba832418..4f630f48a3d3 100644
--- a/MOVED
+++ b/MOVED
@@ -16878,3 +16878,4 @@ x11-toolkits/py-qt5-quickwidgets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/
x11-toolkits/py-qt5-widgets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
x11/py-qt5-opengl|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
net-mgmt/zabbix54-frontend|net-mgmt/zabbix54-frontend@php74|2022-01-27|Build as php 7.4-flavored only
+x11-fonts/sourcesanspro-ttf|x11-fonts/source-sans-ttf|2022-01-28|Rename to match upstream naming
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index d115b6985765..b923d9718dca 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -231,8 +231,8 @@
SUBDIR += sgifonts
SUBDIR += sharefonts
SUBDIR += showfont
+ SUBDIR += source-sans-ttf
SUBDIR += sourcecodepro-ttf
- SUBDIR += sourcesanspro-ttf
SUBDIR += sourceserifpro-ttf
SUBDIR += spleen
SUBDIR += steps-mono
diff --git a/x11-fonts/google-fonts/Makefile b/x11-fonts/google-fonts/Makefile
index 4f8d80f06a4d..4173f1b03542 100644
--- a/x11-fonts/google-fonts/Makefile
+++ b/x11-fonts/google-fonts/Makefile
@@ -1,5 +1,6 @@
PORTNAME= google-fonts
DISTVERSION= 0.0.0.20210120
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= dmgk@FreeBSD.org
@@ -28,7 +29,7 @@ RUN_DEPENDS= Andika>0:x11-fonts/andika \
open-sans>0:x11-fonts/open-sans \
roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
sourcecodepro-ttf>0:x11-fonts/sourcecodepro-ttf \
- sourcesanspro-ttf>0:x11-fonts/sourcesanspro-ttf \
+ source-sans-ttf>0:x11-fonts/sourcesanspro-ttf \
sourceserifpro-ttf>0:x11-fonts/sourceserifpro-ttf \
ubuntu-font>0:x11-fonts/ubuntu-font \
vollkorn-ttf>0:x11-fonts/vollkorn-ttf
diff --git a/x11-fonts/sourcesanspro-ttf/Makefile b/x11-fonts/source-sans-ttf/Makefile
index 973007562046..d9f3ff27c2f7 100644
--- a/x11-fonts/sourcesanspro-ttf/Makefile
+++ b/x11-fonts/source-sans-ttf/Makefile
@@ -1,17 +1,16 @@
# Created by: Pedro Giffuni
-PORTNAME= sourcesanspro
-PORTVERSION= 3.028
-MASTER_SITES= https://github.com/adobe-fonts/source-sans-pro/releases/download/${PORTVERSION}R/
+PORTNAME= source-sans
+PORTVERSION= 3.046
+MASTER_SITES= https://github.com/adobe-fonts/source-sans/releases/download/${PORTVERSION}R/
CATEGORIES= x11-fonts
PKGNAMESUFFIX= -ttf
-DISTNAME= source-sans-${PORTVERSION:R}v${PORTVERSION:E}R
+DISTNAME= TTF-source-sans-${PORTVERSION}R
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Set of fonts by Adobe designed for user interfaces
LICENSE= OFL11
-LICENSE_FILE= ${WRKSRC}/LICENSE.md
USES= fonts zip
@@ -19,7 +18,7 @@ NO_ARCH= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
-FONTNAME= SourceSansPro
+FONTNAME= SourceSans
SUB_FILES= pkg-message
PORTSCOUT= skipv:variable-fonts
diff --git a/x11-fonts/source-sans-ttf/distinfo b/x11-fonts/source-sans-ttf/distinfo
new file mode 100644
index 000000000000..d1316d850ed4
--- /dev/null
+++ b/x11-fonts/source-sans-ttf/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1643382490
+SHA256 (TTF-source-sans-3.046R.zip) = dc899c8ba784b33aede8cd46aabb4dc9992bd71a4b19cd9f9401cbb008bbb574
+SIZE (TTF-source-sans-3.046R.zip) = 1648335
diff --git a/x11-fonts/sourcesanspro-ttf/files/pkg-message.in b/x11-fonts/source-sans-ttf/files/pkg-message.in
index 0e913d65fa5b..0e913d65fa5b 100644
--- a/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
+++ b/x11-fonts/source-sans-ttf/files/pkg-message.in
diff --git a/x11-fonts/sourcesanspro-ttf/pkg-descr b/x11-fonts/source-sans-ttf/pkg-descr
index 668dbacbc365..bbb93515719e 100644
--- a/x11-fonts/sourcesanspro-ttf/pkg-descr
+++ b/x11-fonts/source-sans-ttf/pkg-descr
@@ -10,4 +10,4 @@ script, and includes all the characters in the Adobe Latin 4 glyph set. As
an open source project, it is expected that incremental updates will be
made over time to extend glyph set coverage and functionality.
-WWW: https://github.com/adobe-fonts/source-sans-pro
+WWW: https://github.com/adobe-fonts/source-sans
diff --git a/x11-fonts/sourcesanspro-ttf/pkg-plist b/x11-fonts/source-sans-ttf/pkg-plist
index ce3870baa599..ce3870baa599 100644
--- a/x11-fonts/sourcesanspro-ttf/pkg-plist
+++ b/x11-fonts/source-sans-ttf/pkg-plist
diff --git a/x11-fonts/sourcesanspro-ttf/distinfo b/x11-fonts/sourcesanspro-ttf/distinfo
deleted file mode 100644
index 55824396ddf6..000000000000
--- a/x11-fonts/sourcesanspro-ttf/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1611856520
-SHA256 (source-sans-3v028R.zip) = 1186d594ecb1336679a1d102bb6ddbe6041f0fd029482e53f02e46aa3ab011cf
-SIZE (source-sans-3v028R.zip) = 10333042