Update Simgear & Flightgear ports to 2018.3.1

Changes:	http://wiki.flightgear.org/Changelog_2018.3
PR:		233811
Submitted by:	Michael Danilov <mike.d.ft402@gmail.com>

12 files changed, 14 insertions, 129 deletions

diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 2b607fe8756f..876d08948443 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	simgear
-PORTVERSION=	2018.2.2
-PORTREVISION=	3
+PORTVERSION=	2018.3.1
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index fb6afa0c213f..a96c3a1114c9 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535914817
-SHA256 (simgear-2018.2.2.tar.bz2) = f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5
-SIZE (simgear-2018.2.2.tar.bz2) = 1313890
+TIMESTAMP = 1544043372
+SHA256 (simgear-2018.3.1.tar.bz2) = 294580c8e98044f660d2a9d202856970a4ce9d81ff0107fffcbd701d36daa06a
+SIZE (simgear-2018.3.1.tar.bz2) = 1330322
diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist
index 1868c8481664..c8b3823a57d2 100644
--- a/devel/simgear/pkg-plist
+++ b/devel/simgear/pkg-plist
@@ -54,6 +54,7 @@ include/simgear/canvas/layout/SpacerItem.hxx
 include/simgear/compiler.h
 include/simgear/constants.h
 include/simgear/debug/BufferedLogCallback.hxx
+include/simgear/debug/OsgIoCapture.hxx
 include/simgear/debug/debug_types.h
 include/simgear/debug/logstream.hxx
 include/simgear/embedded_resources/EmbeddedResource.hxx
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 27b9aa74caf0..12ee83637276 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-data
-PORTVERSION=	2018.2.2
+PORTVERSION=	2018.3.1
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 DISTNAME=	FlightGear-${PORTVERSION}-data
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index 377b37715611..6b0ced99c341 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535914967
-SHA256 (FlightGear-2018.2.2-data.tar.bz2) = c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4
-SIZE (FlightGear-2018.2.2-data.tar.bz2) = 1624681801
+TIMESTAMP = 1544038436
+SHA256 (FlightGear-2018.3.1-data.tar.bz2) = b03a74a69cf02370e4ff3cf3dd09fff9ae217b2873f9938803935082a48bc9c0
+SIZE (FlightGear-2018.3.1-data.tar.bz2) = 1735407015
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index bb88ca3eb24f..02f07cb7670b 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	2018.2.2
-PORTREVISION=	3
+PORTVERSION=	2018.3.1
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
@@ -49,6 +48,6 @@ DBUS_CMAKE_OFF=	-DUSE_DBUS:BOOL=OFF
 QT5_CMAKE_ON=	-DENABLE_QT:BOOL=ON
 QT5_CMAKE_OFF=	-DENABLE_QT:BOOL=OFF
 QT5_USES=	qt:5
-QT5_USE=	QT=core,buildtools,gui,declarative,network,qmake,widgets
+QT5_USE=	QT=core,buildtools,gui,declarative,network,qmake,widgets,svg
 
 .include <bsd.port.mk>
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 4c05a22f2979..6372f5481e0a 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535914762
-SHA256 (flightgear-2018.2.2.tar.bz2) = 61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147
-SIZE (flightgear-2018.2.2.tar.bz2) = 8346698
+TIMESTAMP = 1544037940
+SHA256 (flightgear-2018.3.1.tar.bz2) = 3d4a1f37e4d5cb376c16f02c111aac9d3e6b05529015c7d068ce2c00ecb5a640
+SIZE (flightgear-2018.3.1.tar.bz2) = 8404294
diff --git a/games/flightgear/files/patch-3rdparty-joystick-js.h b/games/flightgear/files/patch-3rdparty-joystick-js.h
deleted file mode 100644
index e0a642435118..000000000000
--- a/games/flightgear/files/patch-3rdparty-joystick-js.h
+++ /dev/null
@@ -1,25 +0,0 @@
-Add missing defines and includes from removed ul.h
-
---- 3rdparty/joystick/js.h.orig	2018-05-30 23:24:08.180090000 +0200
-+++ 3rdparty/joystick/js.h	2018-05-30 23:32:04.841896000 +0200
-@@ -25,10 +25,20 @@
- #define __INCLUDED_JS_H__ 1
- #define JS_NEW
- 
-+#ifndef TRUE
-+#define TRUE  1
-+#define FALSE 0
-+#endif
-+
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
- #include <string>
- #include <cstring>
- #include <cstdlib>
- 
-+#include <simgear/props/props.hxx> /* for jsSetError and SG_WARN */
-+
- #define _JS_MAX_AXES 16
- #define _JS_MAX_BUTTONS 32
- #define _JS_MAX_HATS 4
diff --git a/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx b/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx
deleted file mode 100644
index 93a9a49ac788..000000000000
--- a/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-jsSetError() takes only two arguments (unlike ulSetError())
-
---- 3rdparty/joystick/jsBSD.cxx.orig	2018-05-28 23:22:56.449679000 +0200
-+++ 3rdparty/joystick/jsBSD.cxx	2018-05-28 23:50:32.852422000 +0200
-@@ -326,8 +289,8 @@
-     error = ( joyfile == NULL ) ;
-     if ( error )
-     {
--      jsSetError ( SG_WARN, "unable to open calibration file %s (%s), joystick %i disabled (you can generate the calibration file with the plib-jscal utility)",
--		   joyfname, strerror ( errno ), id + 1 );
-+      jsSetError ( SG_WARN, "unable to open calibration file, you can generate "
-+        "the calibration file with the plib-jscal utility" );
-       return ;
-     }
- 
diff --git a/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake b/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake
deleted file mode 100644
index 362ecf57aa19..000000000000
--- a/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-Use all linker flags from pkgconf, including library path
-
---- CMakeModules/SetupFGFSLibraries.cmake.orig	2018-05-29 23:46:55.859412000 +0200
-+++ CMakeModules/SetupFGFSLibraries.cmake	2018-05-29 23:47:59.869522000 +0200
-@@ -27,7 +27,7 @@
-     endif()
- 
-     if(USE_DBUS)
--        target_link_libraries(${target} ${DBUS_LIBRARIES})
-+        target_link_libraries(${target} ${DBUS_LDFLAGS})
-     endif()
- 
-     if(FG_HAVE_GPERFTOOLS)
diff --git a/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx b/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx
deleted file mode 100644
index 486577cf6a43..000000000000
--- a/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with clang 7:
-
-src/AIModel/AIFlightPlanCreatePushBack.cxx:96:48: error: ordered comparison between pointer and zero ('FGTaxiNode *' and 'int')
-
---- src/AIModel/AIFlightPlanCreatePushBack.cxx.orig	2018-08-17 19:14:25.768512000 +0200
-+++ src/AIModel/AIFlightPlanCreatePushBack.cxx	2018-08-17 19:14:44.343865000 +0200
-@@ -93,7 +93,7 @@
-   
-     FGGroundNetwork* groundNet = dep->groundNetwork();
-     FGParking *parking = gate.parking();
--    if (parking && parking->getPushBackPoint() > 0) {
-+    if (parking && parking->getPushBackPoint() != nullptr) {
-         FGTaxiRoute route = groundNet->findShortestRoute(parking, parking->getPushBackPoint(), false);
-       
-         int size = route.size();
diff --git a/games/flightgear/files/patch-clang7-stack_scope.diff b/games/flightgear/files/patch-clang7-stack_scope.diff
deleted file mode 100644
index 8bc74ebc2b2c..000000000000
--- a/games/flightgear/files/patch-clang7-stack_scope.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix scope of 'stack' when building with clang 7:
-
-error: reference to 'stack' is ambiguous
-
---- src/FDM/UIUCModel/uiuc_aircraft.h.orig	2018-08-31 19:26:14.641298000 +0200
-+++ src/FDM/UIUCModel/uiuc_aircraft.h	2018-08-31 19:50:35.444961000 +0200
-@@ -150,7 +150,7 @@
- #include "uiuc_parsefile.h"
- #include "uiuc_flapdata.h"
- 
--typedef stack :: iterator LIST;
-+typedef ::stack :: iterator LIST;
- 
- /* Add more keywords here if required*/
- enum {init_flag = 1000, geometry_flag, controlSurface_flag, controlsMixer_flag, 
---- src/FDM/UIUCModel/uiuc_parsefile.h.orig	2018-08-31 19:34:45.641135000 +0200
-+++ src/FDM/UIUCModel/uiuc_parsefile.h	2018-08-31 19:35:35.903930000 +0200
-@@ -23,7 +23,7 @@
- {
-         private:
-                 
--                stack commands;
-+                ::stack commands;
-                 ifstream file;
-                 void readFile();
- 
-@@ -37,7 +37,7 @@
-                 void removeComments(string& inputLine);
-                 string getToken(string inputLine, int tokenNo);
-                 void storeCommands(string inputLine);
--                stack getCommands();
-+                ::stack getCommands();
- };
- 
- #endif  // _PARSE_FILE_H_
---- src/FDM/UIUCModel/uiuc_recorder.cpp.orig	2018-08-31 19:16:32.680030000 +0200
-+++ src/FDM/UIUCModel/uiuc_recorder.cpp	2018-08-31 19:16:57.872109000 +0200
-@@ -102,7 +102,7 @@
- 
- void uiuc_recorder( double dt )
- {
--  stack command_list;
-+  ::stack command_list;
-   string linetoken;
-   // static int init = 0;
-   static int recordStep = 0;