Update Simgear & Flightgear ports to 2017.1.1

5 files changed, 19 insertions, 47 deletions

diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index f924f93d6e61..6cc1667fb122 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	2016.4.4
-PORTREVISION=	1
+PORTVERSION=	2017.1.1
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 129751467563..2d27b6a294b2 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483648311
-SHA256 (flightgear-2016.4.4.tar.bz2) = d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc
-SIZE (flightgear-2016.4.4.tar.bz2) = 7560911
+TIMESTAMP = 1487853265
+SHA256 (flightgear-2017.1.1.tar.bz2) = 8f98bbdc027164564cddf660856e0b2f4924c5c9b6a32735b14cd57b4338a028
+SIZE (flightgear-2017.1.1.tar.bz2) = 8057285
diff --git a/games/flightgear/files/patch-CLANG_4.txt b/games/flightgear/files/patch-CLANG_4.txt
deleted file mode 100644
index b5ae88a2b57d..000000000000
--- a/games/flightgear/files/patch-CLANG_4.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Fix build with Clang 4.0
-
---- src/FDM/JSBSim/FGFDMExec.cpp	2017-01-20 21:38:08.784722000 +0000
-+++ src/FDM/JSBSim/FGFDMExec.cpp	2017-01-20 22:55:24.501656000 +0000
-@@ -211,7 +211,7 @@ 
-   
-   SetGroundCallback(0);
- 
--  if (FDMctr > 0) (*FDMctr)--;
-+  if (FDMctr != 0) (*FDMctr)--;
- 
-   Debug(1);
- }
---- src/FDM/JSBSim/input_output/FGInputSocket.cpp.orig	2017-01-21 20:58:27.676020000 +0100
-+++ src/FDM/JSBSim/input_output/FGInputSocket.cpp	2017-01-21 21:02:08.818597000 +0100
-@@ -192,7 +192,7 @@
-           } else {
-             socket->Reply("Must be in HOLD to search properties\n");
-           }
--        } else if (node > 0) {
-+        } else {
-           ostringstream buf;
-           buf << argument << " = " << setw(12) << setprecision(6) << node->getDoubleValue() << endl;
-           socket->Reply(buf.str());
---- src/Network/native_ctrls.cxx.orig	2017-01-21 21:06:09.165609000 +0100
-+++ src/Network/native_ctrls.cxx	2017-01-21 21:10:14.120123000 +0100
-@@ -428,10 +428,10 @@
- //    node->setDoubleValue( net->brake_right );
- 
-     node = fgGetNode( "/controls/switches", true );
--    node->setBoolValue( "master-bat", net->master_bat > 0 );
--    node->setBoolValue( "master-alt", net->master_alt > 0);
--    node->setBoolValue( "master-avionics", net->master_avionics > 0);
--    
-+    node->setBoolValue( "master-bat", net->master_bat != 0 );
-+    node->setBoolValue( "master-alt", net->master_alt != 0 );
-+    node->setBoolValue( "master-avionics", net->master_avionics > 0 );
-+
-     node = fgGetNode( "/environment", true );
-     node->setDoubleValue( "wind-speed-kt", net->wind_speed_kt );
-     node->setDoubleValue( "wind-from-heading-deg", net->wind_dir_deg );
diff --git a/games/flightgear/files/patch-src-Main-CMakeLists.txt b/games/flightgear/files/patch-src-Main-CMakeLists.txt
new file mode 100644
index 000000000000..8f3478a644a9
--- /dev/null
+++ b/games/flightgear/files/patch-src-Main-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- src/Main/CMakeLists.txt.orig	2017-02-22 17:29:45.000000000 +0000
++++ src/Main/CMakeLists.txt	2017-02-28 12:42:12.797102000 +0000
+@@ -157,6 +157,10 @@
+     target_link_libraries(fgfs Qt5::Widgets fglauncher)
+ endif()
+ 
++if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++    target_link_libraries(fgfs execinfo)
++endif()
++
+ if (APPLE)
+     install(TARGETS fgfs BUNDLE DESTINATION .)
+ else()
diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist
index 0c83a46feb50..a96e3be058d0 100644
--- a/games/flightgear/pkg-plist
+++ b/games/flightgear/pkg-plist
@@ -1,11 +1,12 @@
 bin/GPSsmooth
+bin/JSBSim
 bin/MIDGsmooth
 bin/UGsmooth
 bin/fgcom
 bin/fgelev
 bin/fgfs
 bin/fgjs
-bin/fgpanel
+bin/fgtraffic
 bin/fgviewer
 bin/js_demo
 bin/js_server