summaryrefslogtreecommitdiff
path: root/games/flightgear
diff options
context:
space:
mode:
Diffstat (limited to 'games/flightgear')
-rw-r--r--games/flightgear/Makefile16
-rw-r--r--games/flightgear/distinfo8
-rw-r--r--games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp11
-rw-r--r--games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h11
-rw-r--r--games/flightgear/pkg-plist4
5 files changed, 33 insertions, 17 deletions
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index cdf052278f47..0347a14ef942 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -1,13 +1,6 @@
PORTNAME= flightgear
-PORTVERSION= 2020.3.19
-PORTREVISION= 7
+PORTVERSION= 2024.1.1
CATEGORIES= games
-MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
-
-# Fix for CVE-2025-0781
-# See: https://gitlab.com/frougon/flightgear-flightgear/-/commits/2020.3.6-minimal-fix-for-CVE-2025-0781
-PATCH_SITES= https://gitlab.com/frougon/flightgear-${PORTNAME}/-/commit/
-PATCHFILES+= cf99dc921aadab502ff90a1dd943d8bbb897de91.patch:-p1
MAINTAINER= martymac@FreeBSD.org
COMMENT= FlightGear flight simulator
@@ -34,8 +27,13 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
${LOCALBASE}/share/flightgear/version:games/flightgear-data
# Disable ninja, see https://sourceforge.net/p/flightgear/codetickets/2118/
-USES= alias cmake:noninja compiler:c++11-lang cpe dos2unix gl jpeg \
+USES= alias cmake:noninja compiler:c++17-lang cpe dos2unix gl jpeg \
openal:al,alut sqlite tar:bzip2 xorg
+
+USE_GITLAB= yes
+GL_ACCOUNT= flightgear
+GL_TAGNAME= v${PORTVERSION}
+
USE_XORG= ice sm x11 xext xft xi xinerama xmu xt
USE_GL= gl glew glu glut
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index c0feffc003ac..e63b85adfa79 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1738150411
-SHA256 (flightgear-2020.3.19.tar.bz2) = 167d08de9cc0f72218b379b23cd7e56c7f6ee18d7d559512da51a3bd67f38e6e
-SIZE (flightgear-2020.3.19.tar.bz2) = 8935152
-SHA256 (cf99dc921aadab502ff90a1dd943d8bbb897de91.patch) = c3cf18bec3510b870bcdb8cb3a833c58f63d33aa9d071d11ac893f90d6e2fe60
-SIZE (cf99dc921aadab502ff90a1dd943d8bbb897de91.patch) = 2178
+TIMESTAMP = 1751317021
+SHA256 (flightgear-v2024.1.1.tar.bz2) = a3b1fea7064caa18964828e79cc1ec663f6aabf0fb5eb4f7f7fb82635fc8a937
+SIZE (flightgear-v2024.1.1.tar.bz2) = 9463832
diff --git a/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp
new file mode 100644
index 000000000000..7eecac47aedb
--- /dev/null
+++ b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp
@@ -0,0 +1,11 @@
+--- src/FDM/JSBSim/input_output/FGfdmSocket.cpp.orig 2025-06-26 10:55:02 UTC
++++ src/FDM/JSBSim/input_output/FGfdmSocket.cpp
+@@ -40,7 +40,7 @@ INCLUDES
+
+ #if defined(_MSC_VER) || defined(__MINGW32__)
+ #include <ws2tcpip.h>
+-#elif defined(__OpenBSD__)
++#elif defined(__OpenBSD__) || defined(__FreeBSD__)
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
diff --git a/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h
new file mode 100644
index 000000000000..5374e4735279
--- /dev/null
+++ b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h
@@ -0,0 +1,11 @@
+--- src/FDM/JSBSim/input_output/FGfdmSocket.h.orig 2025-06-26 10:59:25 UTC
++++ src/FDM/JSBSim/input_output/FGfdmSocket.h
+@@ -44,6 +44,8 @@ INCLUDES
+ #if defined(_MSC_VER) || defined(__MINGW32__)
+ #include <winsock.h>
+ #include <io.h>
++#elif defined(__FreeBSD__)
++ #include <netinet/in.h>
+ #else
+ #include <netdb.h>
+ #endif
diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist
index 94cc162d5aab..9876f7bea073 100644
--- a/games/flightgear/pkg-plist
+++ b/games/flightgear/pkg-plist
@@ -6,11 +6,11 @@ bin/fgcom
bin/fgelev
bin/fgfs
bin/fgjs
-bin/fgpanel
bin/fgtraffic
bin/fgviewer
bin/js_demo
bin/metar
+bin/nasal
bin/yasim
bin/yasim-proptest
share/man/it/man1/GPSsmooth.1.gz
@@ -21,7 +21,6 @@ share/man/it/man1/fgcom.1.gz
share/man/it/man1/fgelev.1.gz
share/man/it/man1/fgfs.1.gz
share/man/it/man1/fgjs.1.gz
-share/man/it/man1/fgpanel.1.gz
share/man/it/man1/fgviewer.1.gz
share/man/it/man1/js_demo.1.gz
share/man/it/man1/metar.1.gz
@@ -34,7 +33,6 @@ share/man/man1/fgcom.1.gz
share/man/man1/fgelev.1.gz
share/man/man1/fgfs.1.gz
share/man/man1/fgjs.1.gz
-share/man/man1/fgpanel.1.gz
share/man/man1/fgviewer.1.gz
share/man/man1/js_demo.1.gz
share/man/man1/metar.1.gz