git: 8cca5d4d2810 - main - graphics/linux-rl9-sdl_ttf: Merge into misc/linux-rl9-sdl12-extralibs

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sat, 03 May 2025 10:38:37 UTC
The branch main has been updated by arrowd:

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

commit 8cca5d4d28107a5a56702cbcf2f6bc2baa2628b6
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-05-01 19:20:24 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-05-03 10:38:26 +0000

    graphics/linux-rl9-sdl_ttf: Merge into misc/linux-rl9-sdl12-extralibs
---
 MOVED                                        |  1 +
 Mk/Uses/linux.mk                             |  1 -
 graphics/Makefile                            |  1 -
 graphics/linux-rl9-sdl_ttf/Makefile          | 26 --------------------------
 graphics/linux-rl9-sdl_ttf/distinfo          |  7 -------
 graphics/linux-rl9-sdl_ttf/pkg-plist.aarch64 |  6 ------
 graphics/linux-rl9-sdl_ttf/pkg-plist.amd64   |  6 ------
 7 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/MOVED b/MOVED
index d8db53ca7979..d3fdd2f818e3 100644
--- a/MOVED
+++ b/MOVED
@@ -4334,3 +4334,4 @@ x11-toolkits/SoXt||2025-04-28|Has expired: Broken for more than 6 months
 graphics/agg26|graphics/agg|2025-05-01|Merged into agg
 graphics/linux-c7-sdl_ttf|misc/linux-c7-sdl12-extralibs|2025-05-03|Merged into misc/linux-c7-sdl12-extralibs
 graphics/linux-rl9-sdl_image|misc/linux-rl9-sdl12-extralibs|2025-05-03|Merged into misc/linux-rl9-sdl12-extralibs
+graphics/linux-rl9-sdl_ttf|misc/linux-rl9-sdl12-extralibs|2025-05-03|Merged into misc/linux-rl9-sdl12-extralibs
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 1a37dda12a0f..575dd9748c60 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -197,7 +197,6 @@ _linux_${linux_ARGS}_sdl2ttf=		linux-${linux_ARGS}-sdl2_ttf>0:graphics/linux-${l
 _linux_${linux_ARGS}_sdl2sound=		linux-${linux_ARGS}-sdl2_sound>0:audio/linux-${linux_ARGS}-sdl2_sound
 _linux_${linux_ARGS}_sdlgfx=		linux-${linux_ARGS}-sdl_gfx>0:graphics/linux-${linux_ARGS}-sdl_gfx
 _linux_${linux_ARGS}_sdlmixer=		linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-sdl_mixer
-_linux_${linux_ARGS}_sdlttf=		linux-${linux_ARGS}-sdl_ttf>0:graphics/linux-${linux_ARGS}-sdl_ttf
 _linux_${linux_ARGS}_sdlsound=		linux-${linux_ARGS}-sdl_sound>0:audio/linux-${linux_ARGS}-sdl_sound
 _linux_rl9_shaderc=			linux-rl9-shaderc>0:graphics/linux-rl9-shaderc
 _linux_rl9_spirv-tools=			linux-rl9-spirv-tools>0:graphics/linux-rl9-spirv-tools
diff --git a/graphics/Makefile b/graphics/Makefile
index 3c659a056eac..a1a040d76f5c 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -558,7 +558,6 @@
     SUBDIR += linux-rl9-sdl2_image
     SUBDIR += linux-rl9-sdl2_ttf
     SUBDIR += linux-rl9-sdl_gfx
-    SUBDIR += linux-rl9-sdl_ttf
     SUBDIR += linux-rl9-shaderc
     SUBDIR += linux-rl9-spirv-tools
     SUBDIR += linux-rl9-vulkan
diff --git a/graphics/linux-rl9-sdl_ttf/Makefile b/graphics/linux-rl9-sdl_ttf/Makefile
deleted file mode 100644
index 32ff40e5fb05..000000000000
--- a/graphics/linux-rl9-sdl_ttf/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME=	sdl_ttf
-PORTVERSION=	2.0.11
-DISTVERSIONSUFFIX=	-29.el9
-PORTREVISION=	1
-CATEGORIES=	graphics linux
-MASTER_SITES=	EPEL9
-DISTNAME=	SDL_ttf-${DISTVERSIONFULL}
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Simple library to load True Type Fonts as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
-WWW=		https://github.com/libsdl-org/SDL_ttf/
-
-LICENSE=	ZLIB
-
-USES=		linux:rl9
-USE_LDCONFIG=	yes
-USE_LINUX=	imageformats-libs sdl12
-USE_LINUX_RPM=	yes
-
-CONFLICTS=	linux-c7-${PORTNAME}
-DESCR=		${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/SDL_image
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/graphics/linux-rl9-sdl_ttf/distinfo b/graphics/linux-rl9-sdl_ttf/distinfo
deleted file mode 100644
index 115e7f406d4e..000000000000
--- a/graphics/linux-rl9-sdl_ttf/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1739909301
-SHA256 (rocky/s/SDL_ttf-2.0.11-29.el9.aarch64.rpm) = 546e012f10f2eb528d295025a3af621279e26e5d43b782fa224b74d3d54c7420
-SIZE (rocky/s/SDL_ttf-2.0.11-29.el9.aarch64.rpm) = 25038
-SHA256 (rocky/s/SDL_ttf-2.0.11-29.el9.x86_64.rpm) = 5bb8f28b59b5e234c4e557dc3bd4e25294034673d8200356ce66e8d7a481baf9
-SIZE (rocky/s/SDL_ttf-2.0.11-29.el9.x86_64.rpm) = 25482
-SHA256 (rocky/s/SDL_ttf-2.0.11-29.el9.src.rpm) = cd8f36c70c4581d1bf3f62d767081c12b9aee685f17eacbebdbf346d2591f32c
-SIZE (rocky/s/SDL_ttf-2.0.11-29.el9.src.rpm) = 4060491
diff --git a/graphics/linux-rl9-sdl_ttf/pkg-plist.aarch64 b/graphics/linux-rl9-sdl_ttf/pkg-plist.aarch64
deleted file mode 100644
index b502e502e6e4..000000000000
--- a/graphics/linux-rl9-sdl_ttf/pkg-plist.aarch64
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/.build-id/2f/2e192c98f1b3cee08fd1d8668816114db38591
-usr/lib64/libSDL_ttf-2.0.so.0
-usr/lib64/libSDL_ttf-2.0.so.0.10.1
-usr/share/doc/SDL_ttf/CHANGES
-usr/share/doc/SDL_ttf/COPYING
-usr/share/doc/SDL_ttf/README
diff --git a/graphics/linux-rl9-sdl_ttf/pkg-plist.amd64 b/graphics/linux-rl9-sdl_ttf/pkg-plist.amd64
deleted file mode 100644
index 4d33c3160dd6..000000000000
--- a/graphics/linux-rl9-sdl_ttf/pkg-plist.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/.build-id/83/66f7543bb1e89f650ce954f7a79800bafac293
-usr/lib64/libSDL_ttf-2.0.so.0
-usr/lib64/libSDL_ttf-2.0.so.0.10.1
-usr/share/doc/SDL_ttf/CHANGES
-usr/share/doc/SDL_ttf/COPYING
-usr/share/doc/SDL_ttf/README