Update Simgear & Flightgear to 3.4.0

7 files changed, 8 insertions, 71 deletions

diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index d80f625358ce..529ed073aad9 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	3.2.0
-PORTREVISION=	2
+PORTVERSION=	3.4.0
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Source/ \
@@ -32,6 +31,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 USE_XORG=	ice sm x11 xext xft xi xinerama xt xmu
 USE_GL=		gl glu glut
 USE_SQLITE=	3
+USE_QT5=	core buildtools qmake widgets
 
 USES=		tar:bzip2 dos2unix cmake compiler openal:al,alut
 DOS2UNIX_REGEX=	.*\.(c|h|cxx|cpp|hxx|hpp)
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index ff6415f4ab49..2b857063d788 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flightgear-3.2.0.tar.bz2) = addac512375b9f800a77e5733c7c0e4214442ed61a0b2712abedc0a506ac5f12
-SIZE (flightgear-3.2.0.tar.bz2) = 6950249
+SHA256 (flightgear-3.4.0.tar.bz2) = b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780
+SIZE (flightgear-3.4.0.tar.bz2) = 7522457
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
deleted file mode 100644
index ed10a8c0ddef..000000000000
--- a/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index ce8eb99d5526..000000000000
--- a/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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)
-     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-CMakeLists.txt b/games/flightgear/files/patch-CMakeLists.txt
deleted file mode 100644
index d22f0dc0ca78..000000000000
--- a/games/flightgear/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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})
- 
--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)
- 
-+    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
index 403578496087..1c78678724be 100644
--- a/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt
+++ b/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt
@@ -1,10 +1,7 @@
---- 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})
- 
+--- CMakeLists.txt.orig	2015-03-02 18:54:57.486432082 +0100
++++ CMakeLists.txt	2015-03-02 18:55:21.109548415 +0100
+@@ -293,7 +293,7 @@
+ endif (ENABLE_QT)
  ##############################################################################
  
 -find_package(PLIB REQUIRED puaux pu js fnt)
@@ -12,6 +9,3 @@
  
  # FlightGear and SimGear versions need to match
  find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
- 
- ##############################################################################
- 
diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist
index 8dad1cba7670..ef936fe89a66 100644
--- a/games/flightgear/pkg-plist
+++ b/games/flightgear/pkg-plist
@@ -19,5 +19,3 @@ man/man1/fgjs.1.gz
 man/man1/fgpanel.1.gz
 man/man1/js_demo.1.gz
 man/man1/terrasync.1.gz
-%%DATADIR%%/positions.txt
-%%DATADIR%%/special_frequencies.txt