Update Simgear and Flightgear ports to 3.2.0

PR:		194571
Submitted by:	mike.d.ft402@gmail.com

13 files changed, 77 insertions, 101 deletions

diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 267c2a0db829..89a3740a8b2c 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	3.0.0
-PORTREVISION=	4
+PORTVERSION=	3.2.0
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Source/ \
@@ -21,7 +20,8 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libosg.so:${PORTSDIR}/graphics/osg
+		libosg.so:${PORTSDIR}/graphics/osg \
+		libspeex.so:${PORTSDIR}/audio/speex
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
@@ -32,10 +32,9 @@ USE_XORG=	ice sm x11 xext xft xi xinerama xt xmu
 USE_GL=		gl glu glut
 USE_SQLITE=	3
 
-USES=		tar:bzip2 dos2unix cmake compiler:features openal:al,alut
+USES=		tar:bzip2 dos2unix cmake compiler openal:al,alut
 DOS2UNIX_REGEX=	.*\.(c|h|cxx|cpp|hxx|hpp)
-CMAKE_ARGS+=	-DJPEG_FACTORY:BOOL=ON \
-		-DENABLE_JS_SERVER:BOOL=ON \
+CMAKE_ARGS+=	-DENABLE_JS_SERVER:BOOL=ON \
 		-DSYSTEM_SQLITE:BOOL=ON \
 		-DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \
 		-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
@@ -49,8 +48,9 @@ DBUS_CMAKE_OFF=	-DUSE_DBUS:BOOL=OFF
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_FEATURES:Mlibc++}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h
+# Chase devel/simgear compiler version
+.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46
+USE_GCC=	4.6+
 .endif
 
 post-install:
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 127fb71b001c..ff6415f4ab49 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flightgear-3.0.0.tar.bz2) = e4bf1922825920a404539e6611c36eb5567b85d46a726fd8c6f9b19c138ba6e9
-SIZE (flightgear-3.0.0.tar.bz2) = 5874662
+SHA256 (flightgear-3.2.0.tar.bz2) = addac512375b9f800a77e5733c7c0e4214442ed61a0b2712abedc0a506ac5f12
+SIZE (flightgear-3.2.0.tar.bz2) = 6950249
diff --git a/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h b/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h
deleted file mode 100644
index c6e096b3f437..000000000000
--- a/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/FDM/JSBSim/input_output/string_utilities.h.orig	2014-03-12 18:30:00.000000000 +0100
-+++ src/FDM/JSBSim/input_output/string_utilities.h	2014-03-12 18:31:18.000000000 +0100
-@@ -73,9 +73,11 @@
-   extern bool is_number(const std::string& str);
-   std::vector <std::string> split(std::string str, char d);
- /* Comment out to_string functions when they are defined already - C++ 11 defines these */
-+/*
-   extern std::string to_string(int);
-   extern std::string to_string(double);
-   extern std::string to_string(float);
-+*/
-   extern std::string replace(std::string str, const std::string& old, const std::string& newstr);
- #else
-   #include <cctype>
-@@ -159,6 +161,7 @@
-     return str_array;
-   }
- /* Comment out to_string functions when they are defined already - C++ 11 defines these */
-+/*
-   string to_string(int i)
-   {
-     char buffer[32];
-@@ -179,6 +182,7 @@
-     if (!(o << x)) cerr << "Bad double to string conversion" << endl;
-     return o.str();
-   }
-+*/
- 
-   string replace(string str, const string& oldstr, const string& newstr)
-   {
diff --git a/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c b/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c
new file mode 100644
index 000000000000..ed10a8c0ddef
--- /dev/null
+++ b/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c
@@ -0,0 +1,11 @@
+--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig	2014-10-21 18:20:10.716009721 +0200
++++ 3rdparty/hts_engine_API/lib/HTS_misc.c	2014-10-21 18:21:32.200933884 +0200
+@@ -245,7 +245,7 @@
+    } else if (fp->type == HTS_FILE) {
+       fpos_t pos;
+       fgetpos((FILE *) fp->pointer, &pos);
+-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__)
+       return (size_t) pos;
+ #else
+       return (size_t) pos.__pos;
diff --git a/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt b/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt
index 4bd4f929261d..ce8eb99d5526 100644
--- a/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt
+++ b/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt
@@ -1,11 +1,28 @@
---- 3rdparty/iaxclient/lib/CMakeLists.txt.orig	2014-03-12 18:13:58.000000000 +0100
-+++ 3rdparty/iaxclient/lib/CMakeLists.txt	2014-03-12 18:14:39.000000000 +0100
-@@ -88,7 +88,7 @@
-         libspeex/vq.c
-         )
+--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig	2014-10-21 18:27:37.041376820 +0200
++++ 3rdparty/iaxclient/lib/CMakeLists.txt	2014-10-21 18:27:53.883368567 +0200
+@@ -1,6 +1,6 @@
+ # CMakeLists.txt, for utils/iaxclient/lib - 20130925
+ # even if we don't select the codec, speex is used for pre-processing audio
+-set(ENABLE_SPEXX 1)
++set(ENABLE_SPEEX 1)
+ 
+ set(IAXCLIENT_BASE_SOURCES
+     audio_encode.c
+@@ -57,7 +57,7 @@
+     list(APPEND IAXCLIENT_BASE_SOURCES unixfuncs.c)
+ endif(WIN32)
+ 
+-if (ENABLE_SPEXX)
++if (ENABLE_SPEEX)
+     list(APPEND IAXCLIENT_BASE_SOURCES codec_speex.c)
+ 
+     if (SYSTEM_SPEEX)
+@@ -115,7 +115,7 @@
      
--    include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
-+    include_directories(BEFORE ${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
- endif(ENABLE_SPEXX)
+         include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
+     endif(SPEEX_FOUND AND SPEEXDSP_FOUND)
+-endif(ENABLE_SPEXX)
++endif(ENABLE_SPEEX)
  
  if (ENABLE_ALSA)
+     list(APPEND IAXCLIENT_BASE_SOURCES audio_alsa.c)
diff --git a/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h b/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h
deleted file mode 100644
index 189ee3d44479..000000000000
--- a/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 3rdparty/iaxclient/lib/iaxclient.h.orig	2014-03-17 07:06:55.000000000 +0100
-+++ 3rdparty/iaxclient/lib/iaxclient.h	2014-03-17 07:09:42.000000000 +0100
-@@ -45,6 +45,8 @@
- #include <sys/socket.h>
- #endif
- 
-+#include <sys/time.h>
-+
- #ifdef BUILDING_DLL
- # if defined(WIN32) ||  defined(_WIN32_WCE)
- #  ifdef _MSC_VER
diff --git a/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c b/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c
deleted file mode 100644
index 571ffef44e5f..000000000000
--- a/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig	2014-03-12 18:16:21.000000000 +0100
-+++ 3rdparty/iaxclient/lib/libiax2/src/iax.c	2014-03-12 18:18:38.000000000 +0100
-@@ -72,7 +72,7 @@
- #include <arpa/inet.h>
- #include <time.h>
- 
--#if !defined(MACOSX) && !defined(__OpenBSD__)
-+#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #include <malloc.h>
- #if !defined(SOLARIS)
- #include <error.h>
diff --git a/games/flightgear/files/patch-CMakeLists.txt b/games/flightgear/files/patch-CMakeLists.txt
index 4d92c0ec8292..d22f0dc0ca78 100644
--- a/games/flightgear/files/patch-CMakeLists.txt
+++ b/games/flightgear/files/patch-CMakeLists.txt
@@ -1,11 +1,16 @@
---- CMakeLists.txt.orig	2012-08-27 18:14:13.000000000 +0200
-+++ CMakeLists.txt	2012-08-27 18:14:52.000000000 +0200
-@@ -225,7 +225,7 @@
-     endif(LIBSVN_FOUND)
- endif(ENABLE_LIBSVN)
+--- CMakeLists.txt.orig	2014-10-21 18:32:02.620104085 +0200
++++ CMakeLists.txt	2014-10-22 06:52:20.912083280 +0200
+@@ -96,10 +96,11 @@
+     find_library(COCOA_LIBRARY Cocoa)
+     list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY})
  
--find_package(PLIB REQUIRED puaux pu js fnt)
-+find_package(PLIB REQUIRED puaux pu js fnt net)
+-elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
++elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
++	${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+     set(USE_DBUS_DEFAULT 1)
+-    find_package(UDev)
  
- # FlightGear and SimGear versions need to match
- find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
++    find_package(UDev)
+     if(UDEV_FOUND)
+         set(EVENT_INPUT_DEFAULT 1)
+     endif(UDEV_FOUND)
diff --git a/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt b/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt
new file mode 100644
index 000000000000..403578496087
--- /dev/null
+++ b/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt
@@ -0,0 +1,17 @@
+--- CMakeLists.txt.orig	2014-10-22 07:01:17.414717967 +0200
++++ CMakeLists.txt	2014-10-22 07:01:34.267267822 +0200
+@@ -266,13 +266,13 @@
+ 
+ # Sqlite always depends on the threading lib
+ list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
+ 
+ ##############################################################################
+ 
+-find_package(PLIB REQUIRED puaux pu js fnt)
++find_package(PLIB REQUIRED puaux pu js fnt net)
+ 
+ # FlightGear and SimGear versions need to match
+ find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
+ 
+ ##############################################################################
+ 
diff --git a/games/flightgear/files/patch-utils-CMakeLists.txt b/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt
index d1241f36ff97..d1241f36ff97 100644
--- a/games/flightgear/files/patch-utils-CMakeLists.txt
+++ b/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt
diff --git a/games/flightgear/files/patch-utils-js_server-CMakeLists.txt b/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt
index 33d832907e15..33d832907e15 100644
--- a/games/flightgear/files/patch-utils-js_server-CMakeLists.txt
+++ b/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt
diff --git a/games/flightgear/files/patch-src-Airports-airports_fwd.hxx b/games/flightgear/files/patch-src-Airports-airports_fwd.hxx
deleted file mode 100644
index 8b55e284f19c..000000000000
--- a/games/flightgear/files/patch-src-Airports-airports_fwd.hxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Airports/airports_fwd.hxx.orig	2013-10-09 15:45:38.000000000 +0200
-+++ src/Airports/airports_fwd.hxx	2013-10-09 10:56:51.000000000 +0200
-@@ -25,6 +25,7 @@
- #include <map>
- #include <vector>
- #include <string>
-+#include <ctime>
- 
- // forward decls
- class FGAirport;
diff --git a/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx b/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx
deleted file mode 100644
index 0b2ec5c09515..000000000000
--- a/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/FDM/JSBSim/JSBSim.cxx.orig	2012-04-30 11:31:18.119554386 +0300
-+++ src/FDM/JSBSim/JSBSim.cxx	2012-04-30 11:31:38.251553602 +0300
-@@ -28,7 +28,7 @@
- #include <simgear/compiler.h>
- #include <simgear/sg_inlines.h>
- 
--#include <stdio.h>    //    size_t
-+#include <cstdlib>    //    size_t
- #include <string>
- 
- #include <simgear/constants.h>
-