x11-fonts/source-code-pro-ttf: Move x11-fonts/sourcecodepro-ttf to x11-fonts/source-code-pro-ttf

- Update to 2.042
- Update MASTER_SITES
- Bump PORTREVISION of dependent ports for dependency change

Changes:        https://github.com/adobe-fonts/source-code-pro/releases

9 files changed, 12 insertions, 11 deletions

diff --git a/MOVED b/MOVED
index 17aafd86bad5..7b1032d3bd33 100644
--- a/MOVED
+++ b/MOVED
@@ -7860,3 +7860,4 @@ devel/rubygem-mustache0|devel/rubygem-mustache|2023-09-27|Has expired: Use devel
 sysutils/rsfetch||2023-09-27|Has expired: Upstream unmaintained
 sysutils/sysrc||2023-09-27|Has expired: Migrated into src
 deskutils/budgie-trash-applet||2023-09-29|Has expired: Merged into newer x11/budgie-desktop >= 10.8
+x11-fonts/sourcecodepro-ttf|x11-fonts/source-code-pro-ttf|2023-09-30|Move x11-fonts/sourcecodepro-ttf to x11-fonts/source-code-pro-ttf
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 8c9e5162ab70..d911354584d2 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -258,8 +258,8 @@
     SUBDIR += sgifonts
     SUBDIR += sharefonts
     SUBDIR += showfont
+    SUBDIR += source-code-pro-ttf
     SUBDIR += source-sans-ttf
-    SUBDIR += sourcecodepro-ttf
     SUBDIR += sourceserifpro-ttf
     SUBDIR += spleen
     SUBDIR += steps-mono
diff --git a/x11-fonts/google-fonts/Makefile b/x11-fonts/google-fonts/Makefile
index 4fe171fe0e70..b70d196d7250 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	dmgk@FreeBSD.org
@@ -29,7 +29,7 @@ RUN_DEPENDS=	Andika>0:x11-fonts/andika \
 		noto-basic>0:x11-fonts/noto-basic \
 		open-sans>0:x11-fonts/open-sans \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
-		sourcecodepro-ttf>0:x11-fonts/sourcecodepro-ttf \
+		source-code-pro-ttf>0:x11-fonts/source-code-pro-ttf \
 		source-sans-ttf>0:x11-fonts/source-sans-ttf \
 		sourceserifpro-ttf>0:x11-fonts/sourceserifpro-ttf \
 		ubuntu-font>0:x11-fonts/ubuntu-font \
diff --git a/x11-fonts/sourcecodepro-ttf/Makefile b/x11-fonts/source-code-pro-ttf/Makefile
index e9e422699ba2..21d6585cf498 100644
--- a/x11-fonts/sourcecodepro-ttf/Makefile
+++ b/x11-fonts/source-code-pro-ttf/Makefile
@@ -1,9 +1,9 @@
-PORTNAME=	sourcecodepro
-PORTVERSION=	2.038
+PORTNAME=	source-code-pro
+PORTVERSION=	2.042
 CATEGORIES=	x11-fonts
 PKGNAMESUFFIX=	-ttf
-MASTER_SITES=	https://github.com/adobe-fonts/source-code-pro/releases/download/2.038R-ro%2F1.058R-it%2F1.018R-VAR/
-DISTNAME=	TTF-source-code-pro-2.038R-ro-1.058R-it
+MASTER_SITES=	https://github.com/adobe-fonts/source-code-pro/releases/download/${PORTVERSION}R-u%2F1.062R-i%2F1.026R-vf/
+DISTNAME=	TTF-source-code-pro-${PORTVERSION}R-u_1.062R-i
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Set of fonts by Adobe designed for coders
@@ -24,6 +24,6 @@ PORTSCOUT=	skipv:variable-fonts
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/TTF/*.ttf ${STAGEDIR}${FONTSDIR}/
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/source-code-pro-ttf/distinfo b/x11-fonts/source-code-pro-ttf/distinfo
new file mode 100644
index 000000000000..68e53227ddd3
--- /dev/null
+++ b/x11-fonts/source-code-pro-ttf/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1696001256
+SHA256 (TTF-source-code-pro-2.042R-u_1.062R-i.zip) = 0c85bac90d15c040b82939aa92bc8404420fccc02e37bbcb9c93a7f21abb52c6
+SIZE (TTF-source-code-pro-2.042R-u_1.062R-i.zip) = 1294648
diff --git a/x11-fonts/sourcecodepro-ttf/files/pkg-message.in b/x11-fonts/source-code-pro-ttf/files/pkg-message.in
index 0e913d65fa5b..0e913d65fa5b 100644
--- a/x11-fonts/sourcecodepro-ttf/files/pkg-message.in
+++ b/x11-fonts/source-code-pro-ttf/files/pkg-message.in
diff --git a/x11-fonts/sourcecodepro-ttf/pkg-descr b/x11-fonts/source-code-pro-ttf/pkg-descr
index 8b8b4e104a44..8b8b4e104a44 100644
--- a/x11-fonts/sourcecodepro-ttf/pkg-descr
+++ b/x11-fonts/source-code-pro-ttf/pkg-descr
diff --git a/x11-fonts/sourcecodepro-ttf/pkg-plist b/x11-fonts/source-code-pro-ttf/pkg-plist
index c4c25204beb0..c4c25204beb0 100644
--- a/x11-fonts/sourcecodepro-ttf/pkg-plist
+++ b/x11-fonts/source-code-pro-ttf/pkg-plist
diff --git a/x11-fonts/sourcecodepro-ttf/distinfo b/x11-fonts/sourcecodepro-ttf/distinfo
deleted file mode 100644
index d08a8fdce7f9..000000000000
--- a/x11-fonts/sourcecodepro-ttf/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1611856518
-SHA256 (TTF-source-code-pro-2.038R-ro-1.058R-it.zip) = 5d53213eb7a4e1749daef33749fef8301bda4d302059054e2bbe88a9906d0a16
-SIZE (TTF-source-code-pro-2.038R-ro-1.058R-it.zip) = 940687