11 files changed, 115 insertions, 60 deletions
diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile
index 39217bef2638..42b562c71f42 100644
--- a/games/fs2open/Makefile
+++ b/games/fs2open/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	fs2open
 DISTVERSIONPREFIX=	release_
-DISTVERSION=	23_2_1
-PORTREVISION=	1
+DISTVERSION=	24_2_0
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
@@ -23,7 +22,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	scp-fs2open
 GH_PROJECT=	fs2open.github.com
 GH_TUPLE=	asarium:cmake-modules:7cef957:cmakemodules/cmake/external/rpavlik-cmake-modules \
-		asarium:libRocket:ecd648a:libRocket/lib/libRocket
+		asarium:libRocket:ae8a8d9:libRocket/lib/libRocket
 USE_SDL=	sdl2
 
 LDFLAGS_i386=	-Wl,-znotext
diff --git a/games/fs2open/distinfo b/games/fs2open/distinfo
index 27a285298db0..940989166a1a 100644
--- a/games/fs2open/distinfo
+++ b/games/fs2open/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1699052214
-SHA256 (scp-fs2open-fs2open.github.com-release_23_2_1_GH0.tar.gz) = 90e17499dc999370e6415fb56b46b755b03b187f03014cf8a983a39d3adde01b
-SIZE (scp-fs2open-fs2open.github.com-release_23_2_1_GH0.tar.gz) = 12091345
+TIMESTAMP = 1762251304
+SHA256 (scp-fs2open-fs2open.github.com-release_24_2_0_GH0.tar.gz) = 7b3756156c7faac9ac3013bc8c07415c1232bb340753ca457860231acc843f77
+SIZE (scp-fs2open-fs2open.github.com-release_24_2_0_GH0.tar.gz) = 10958574
 SHA256 (asarium-cmake-modules-7cef957_GH0.tar.gz) = 5d1e7954bb92c61c1509ad0bb0d2274af4863621dc864199aac85c2d43921c0e
 SIZE (asarium-cmake-modules-7cef957_GH0.tar.gz) = 267299
-SHA256 (asarium-libRocket-ecd648a_GH0.tar.gz) = 43864c375480c9eeac47643ae1c30947d9b236281e51e1d54d729c6d51cef6e4
-SIZE (asarium-libRocket-ecd648a_GH0.tar.gz) = 2417439
+SHA256 (asarium-libRocket-ae8a8d9_GH0.tar.gz) = e3cb4561dca373a9fc7bb2501820ff19ea2ef00bf1a1ad70cdca1ebbf7b2976f
+SIZE (asarium-libRocket-ae8a8d9_GH0.tar.gz) = 2417488
diff --git a/games/fs2open/files/patch-cmake_toolchain-clang.cmake b/games/fs2open/files/patch-cmake_toolchain-clang.cmake
index e643b93cb9c6..713ccdb2d82a 100644
--- a/games/fs2open/files/patch-cmake_toolchain-clang.cmake
+++ b/games/fs2open/files/patch-cmake_toolchain-clang.cmake
@@ -1,6 +1,6 @@
---- cmake/toolchain-clang.cmake.orig	2021-01-27 17:07:03 UTC
+--- cmake/toolchain-clang.cmake.orig	2024-10-28 01:17:49 UTC
 +++ cmake/toolchain-clang.cmake
-@@ -10,8 +10,8 @@ option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsaniti
+@@ -10,8 +10,8 @@ option(CLANG_USE_LIBCXX "Use libc++" OFF)
  option(CLANG_USE_LIBCXX "Use libc++" OFF)
  
  # These are the default values
@@ -11,13 +11,3 @@
  
  # For C and C++, the values can be overwritten independently
  if(DEFINED ENV{CXXFLAGS})
-@@ -96,9 +96,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
- 
- set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
- set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
--
--
--set(CMAKE_EXE_LINKER_FLAGS "")
- 
- if (CLANG_USE_LIBCXX)
- 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
diff --git a/games/fs2open/files/patch-cmake_toolchain-gcc.cmake b/games/fs2open/files/patch-cmake_toolchain-gcc.cmake
deleted file mode 100644
index b5ceea9d4519..000000000000
--- a/games/fs2open/files/patch-cmake_toolchain-gcc.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/toolchain-gcc.cmake.orig	2021-01-28 12:41:41 UTC
-+++ cmake/toolchain-gcc.cmake
-@@ -12,8 +12,8 @@ option(GCC_USE_GOLD "Use the gold linker instead of th
- option(GCC_GENERATE_GDB_INDEX "Adds linker option to generate the gdb index for debug builds" OFF)
- 
- # These are the default values
--set(C_BASE_FLAGS "-march=native -pipe")
--set(CXX_BASE_FLAGS "-march=native -pipe")
-+set(C_BASE_FLAGS "${CMAKE_C_FLAGS_RELEASE}")
-+set(CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
- 
- # For C and C++, the values can be overwritten independently
- if(DEFINED ENV{CFLAGS})
diff --git a/games/fs2open/files/patch-code_CMakeLists.txt b/games/fs2open/files/patch-code_CMakeLists.txt
new file mode 100644
index 000000000000..9ada582f3bfa
--- /dev/null
+++ b/games/fs2open/files/patch-code_CMakeLists.txt
@@ -0,0 +1,18 @@
+--- code/CMakeLists.txt.orig	2025-11-04 12:53:34 UTC
++++ code/CMakeLists.txt
+@@ -79,7 +79,7 @@ target_link_libraries(code PUBLIC imgui)
+ 
+ target_link_libraries(code PUBLIC imgui)
+ 
+-IF(NOT APPLE)
++IF(NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ 	target_link_libraries(code PUBLIC OpenXR::openxr_loader)
+ 	target_include_directories(code PUBLIC OpenXR::Headers)
+ ENDIF()
+@@ -139,4 +139,4 @@ set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_
+ set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN[variant=Debug] "NO")
+ 
+ # Prevent GCC warnings in third-party BitOp... see GitHub #4366
+-suppress_file_warnings(scripting/lua/bitop/bit.c)
+\ No newline at end of file
++suppress_file_warnings(scripting/lua/bitop/bit.c)
diff --git a/games/fs2open/files/patch-code_graphics_opengl_gropengl.cpp b/games/fs2open/files/patch-code_graphics_opengl_gropengl.cpp
new file mode 100644
index 000000000000..506fa748214a
--- /dev/null
+++ b/games/fs2open/files/patch-code_graphics_opengl_gropengl.cpp
@@ -0,0 +1,20 @@
+--- code/graphics/opengl/gropengl.cpp.orig	2025-11-04 13:17:51 UTC
++++ code/graphics/opengl/gropengl.cpp
+@@ -6,7 +6,7 @@
+ #include <direct.h>
+ #endif
+ 
+-#if !defined __APPLE_CC__ && defined SCP_UNIX
++#if !defined __APPLE_CC__ && !defined __FreeBSD__ && defined SCP_UNIX
+ #include<glad/glad_glx.h>
+ //Required because X defines none and always, which is used later
+ #undef None
+@@ -1268,7 +1268,7 @@ bool gr_opengl_init(std::unique_ptr<os::GraphicsOperat
+ 		Error(LOCATION, "Failed to load OpenGL!");
+ 	}
+ 
+-#if !defined __APPLE_CC__ && defined SCP_UNIX
++#if !defined __APPLE_CC__ && !defined __FreeBSD__ && defined SCP_UNIX
+ 	if (!gladLoadGLXLoader(GL_context->getLoaderFunction(), nullptr, 0)) {
+ 		Error(LOCATION, "Failed to load GLX!");
+ 	}
diff --git a/games/fs2open/files/patch-code_graphics_opengl_gropenglopenxr.cpp b/games/fs2open/files/patch-code_graphics_opengl_gropenglopenxr.cpp
new file mode 100644
index 000000000000..0d633841388b
--- /dev/null
+++ b/games/fs2open/files/patch-code_graphics_opengl_gropenglopenxr.cpp
@@ -0,0 +1,20 @@
+--- code/graphics/opengl/gropenglopenxr.cpp.orig	2025-11-04 13:07:36 UTC
++++ code/graphics/opengl/gropenglopenxr.cpp
+@@ -21,7 +21,7 @@
+ #include "graphics/opengl/ShaderProgram.h"
+ #include "osapi/osapi.h"
+ 
+-#if defined __APPLE_CC__
++#if defined __APPLE_CC__ || defined __FreeBSD__
+ 
+ //Not supported
+ 
+@@ -38,7 +38,7 @@
+ 
+ #include <SDL_syswm.h>
+ 
+-#ifndef __APPLE_CC__
++#if !defined __APPLE_CC__ && !defined __FreeBSD__
+ 
+ //SETUP FUNCTIONS OGL
+ SCP_vector<const char*> gr_opengl_openxr_get_extensions() {
diff --git a/games/fs2open/files/patch-code_graphics_openxr.cpp b/games/fs2open/files/patch-code_graphics_openxr.cpp
new file mode 100644
index 000000000000..827388a667d7
--- /dev/null
+++ b/games/fs2open/files/patch-code_graphics_openxr.cpp
@@ -0,0 +1,18 @@
+--- code/graphics/openxr.cpp.orig	2025-11-04 13:12:38 UTC
++++ code/graphics/openxr.cpp
+@@ -9,7 +9,7 @@ std::unique_ptr<star[]> Stars_XRBuffer;
+ 
+ std::unique_ptr<star[]> Stars_XRBuffer;
+ 
+-#ifndef __APPLE_CC__
++#if !defined(__APPLE_CC__) && !defined(__FreeBSD__)
+ 
+ #define XR_MAKE_VERSION_SHORT(major, minor, patch) \
+     ((((major) & 0x3ffU) << 20) | (((minor) & 0x3ffU) << 10) | ((patch) & 0x3ffU))
+@@ -545,4 +545,4 @@ OpenXRTrackingInfo openxr_start_stereo_frame() { retur
+ 
+ OpenXRTrackingInfo openxr_start_stereo_frame() { return OpenXRTrackingInfo{}; }
+ 
+-#endif
+\ No newline at end of file
++#endif
diff --git a/games/fs2open/files/patch-code_graphics_openxr__internal.h b/games/fs2open/files/patch-code_graphics_openxr__internal.h
new file mode 100644
index 000000000000..32b81e952150
--- /dev/null
+++ b/games/fs2open/files/patch-code_graphics_openxr__internal.h
@@ -0,0 +1,18 @@
+--- code/graphics/openxr_internal.h.orig	2025-11-04 13:00:12 UTC
++++ code/graphics/openxr_internal.h
+@@ -7,7 +7,7 @@
+ #include <type_traits>
+ #include <tl/optional.hpp>
+ 
+-#ifndef __APPLE_CC__
++#if !defined(__APPLE_CC__) && !defined(__FreeBSD__)
+ 
+ #include <openxr/openxr.h>
+ #include <openxr/openxr_platform.h>
+@@ -51,4 +51,4 @@ tl::optional<typename std::result_of<openxr_fnc(arg_t.
+ 	return func(std::forward<arg_t>(args)...);
+ }
+ 
+-#endif
+\ No newline at end of file
++#endif
diff --git a/games/fs2open/files/patch-lib_CMakeLists.txt b/games/fs2open/files/patch-lib_CMakeLists.txt
new file mode 100644
index 000000000000..027db1ab3a36
--- /dev/null
+++ b/games/fs2open/files/patch-lib_CMakeLists.txt
@@ -0,0 +1,12 @@
+--- lib/CMakeLists.txt.orig	2025-11-04 12:49:44 UTC
++++ lib/CMakeLists.txt
+@@ -61,6 +61,6 @@ ADD_SUBDIRECTORY(imgui)
+ 
+ ADD_SUBDIRECTORY(imgui)
+ 
+-if(NOT APPLE)
++if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ 	add_subdirectory(openxr)
+-endif()
+\ No newline at end of file
++endif()
diff --git a/games/fs2open/files/patch-lib_freetype.cmake b/games/fs2open/files/patch-lib_freetype.cmake
deleted file mode 100644
index f68461c60d94..000000000000
--- a/games/fs2open/files/patch-lib_freetype.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix configure with CMake >= 3.28.0 where the FindFreetype module uses
-freetype-config.cmake if found, which already defines the freetype
-target.
- 
---- lib/freetype.cmake.orig	2023-11-03 16:14:29 UTC
-+++ lib/freetype.cmake
-@@ -1,7 +1,7 @@
- 
--add_library(freetype INTERFACE)
--
- if(PLATFORM_WINDOWS OR PLATFORM_MAC)
-+	add_library(freetype INTERFACE)
-+
- 	# We use prebuilt binaries for windows and mac
- 	get_prebuilt_path(PREBUILT_PATH)
- 	set(FREETYPE_ROOT_DIR "${PREBUILT_PATH}/freetype")
-@@ -21,6 +21,10 @@ else()
- 
- else()
- 	find_package(Freetype REQUIRED)
-+
-+	if(NOT TARGET freetype)
-+		add_library(freetype INTERFACE)
-+	endif()
- 
- 	target_include_directories(freetype INTERFACE ${FREETYPE_INCLUDE_DIRS})
- 	target_link_libraries(freetype INTERFACE ${FREETYPE_LIBRARIES})