diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 4f8c1bcaf885..7ade49f13cb5 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	simgear
-PORTVERSION=	3.2.0
-PORTREVISION=	1
+PORTVERSION=	3.4.0
 CATEGORIES=	devel games
 MASTER_SITES=	http://mirrors.ibiblio.org/simgear/ftp/Source/ \
 		ftp://ftp.de.flightgear.org/pub/simgear/Source/ \
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index 20c9f5c9f01b..0bf4607f3293 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (simgear-3.2.0.tar.bz2) = b456cdc63b37d609bc24b347d43dc275eb7d06f5d92b18aeb0e66eedd3819c86
-SIZE (simgear-3.2.0.tar.bz2) = 1020432
+SHA256 (simgear-3.4.0.tar.bz2) = 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894
+SIZE (simgear-3.4.0.tar.bz2) = 1057455
diff --git a/devel/simgear/files/patch-CMakeLists.txt b/devel/simgear/files/patch-CMakeLists.txt
deleted file mode 100644
index b07596c161eb..000000000000
--- a/devel/simgear/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- CMakeLists.txt.orig	2014-10-21 07:26:42.608036396 +0200
-+++ CMakeLists.txt	2014-10-21 07:27:18.571673862 +0200
-@@ -276,12 +276,12 @@
- # isnan might not be real symbol, so can't check using function_exists
- check_cxx_source_compiles(
-     "#include <cmath> 
--    void f() { isnan(0.0);} "
-+    int main() { return isnan(0.0);} "
-     HAVE_ISNAN)
- 
- check_cxx_source_compiles(
-     "#include <cmath> 
--    void f() { std::isnan(0.0);} "
-+    int main() { return std::isnan(0.0);} "
-     HAVE_STD_ISNAN)
- 
- if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h b/devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h
deleted file mode 100644
index 71b638290e75..000000000000
--- a/devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- simgear/canvas/ShivaVG/src/shDefs.h.orig	2014-10-28 09:45:41.492715364 +0100
-+++ simgear/canvas/ShivaVG/src/shDefs.h	2014-10-28 09:54:06.791735417 +0100
-@@ -156,7 +156,7 @@
- 
- /* OpenGL headers */
- 
--#if defined(VG_API_LINUX)
-+#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD)
-     #include <GL/gl.h>
-     #include <GL/glx.h>
- #elif defined(VG_API_MACOSX)
diff --git a/devel/simgear/files/patch-simgear-debug-BufferedLogCallback.cxx b/devel/simgear/files/patch-simgear-debug-BufferedLogCallback.cxx
deleted file mode 100644
index 90badfd7c093..000000000000
--- a/devel/simgear/files/patch-simgear-debug-BufferedLogCallback.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- simgear/debug/BufferedLogCallback.cxx.orig	2014-10-27 09:26:46.499707738 +0100
-+++ simgear/debug/BufferedLogCallback.cxx	2014-10-27 09:27:54.034557089 +0100
-@@ -26,6 +26,8 @@
- #include <simgear/sg_inlines.h>
- #include <simgear/threads/SGThread.hxx>
- #include <simgear/threads/SGGuard.hxx>
-+
-+#include <cstdlib> // for malloc
-      
- namespace simgear
- {
diff --git a/devel/simgear/files/patch-simgear-nasal-naref.h b/devel/simgear/files/patch-simgear-nasal-naref.h
new file mode 100644
index 000000000000..1dfb569a6a44
--- /dev/null
+++ b/devel/simgear/files/patch-simgear-nasal-naref.h
@@ -0,0 +1,13 @@
+Clang 3.4.1 on FreeBSD 10.1/i386 with -std=c++11 does not define i386
+
+--- simgear/nasal/naref.h.orig	2015-03-09 07:33:09.127727983 +0100
++++ simgear/nasal/naref.h	2015-03-09 07:34:06.947658185 +0100
+@@ -10,7 +10,7 @@
+ /* Win64 and Irix should work with this too, but have not been
+  * tested */
+ # define NASAL_NAN64
+-#elif defined(_M_IX86) || defined(i386) || defined(__x86_64) || \
++#elif defined(_M_IX86) || defined(__i386) || defined(__x86_64) || \
+       defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \
+       defined(_M_X64) || defined(__alpha__) || \
+       (defined(__sh__) && defined(__LITTLE_ENDIAN__))
diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist
index 608d0e3df43f..f866ae51c051 100644
--- a/devel/simgear/pkg-plist
+++ b/devel/simgear/pkg-plist
@@ -1,3 +1,7 @@
+include/simgear/3rdparty/utf8/utf8.h
+include/simgear/3rdparty/utf8/utf8/checked.h
+include/simgear/3rdparty/utf8/utf8/core.h
+include/simgear/3rdparty/utf8/utf8/unchecked.h
 include/simgear/bucket/newbucket.hxx
 include/simgear/bvh/BVHBoundingBoxVisitor.hxx
 include/simgear/bvh/BVHGroup.hxx
@@ -43,7 +47,10 @@ include/simgear/canvas/elements/CanvasPath.hxx
 include/simgear/canvas/elements/CanvasText.hxx
 include/simgear/canvas/elements/detail/add_segment_variadic.hxx
 include/simgear/canvas/events/CustomEvent.hxx
+include/simgear/canvas/events/DeviceEvent.hxx
+include/simgear/canvas/events/KeyboardEvent.hxx
 include/simgear/canvas/events/MouseEvent.hxx
+include/simgear/canvas/layout/AlignFlag_values.hxx
 include/simgear/canvas/layout/BoxLayout.hxx
 include/simgear/canvas/layout/Layout.hxx
 include/simgear/canvas/layout/LayoutItem.hxx
@@ -145,6 +152,7 @@ include/simgear/nasal/cppbind/NasalHash.hxx
 include/simgear/nasal/cppbind/NasalObject.hxx
 include/simgear/nasal/cppbind/NasalObjectHolder.hxx
 include/simgear/nasal/cppbind/NasalString.hxx
+include/simgear/nasal/cppbind/detail/NasalObject_callMethod_templates.hxx
 include/simgear/nasal/cppbind/detail/from_nasal_function_templates.hxx
 include/simgear/nasal/cppbind/detail/from_nasal_helper.hxx
 include/simgear/nasal/cppbind/detail/functor_templates.hxx
@@ -226,9 +234,12 @@ include/simgear/scene/tgdb/SGBuildingBin.hxx
 include/simgear/scene/tgdb/SGDirectionalLightBin.hxx
 include/simgear/scene/tgdb/SGLightBin.hxx
 include/simgear/scene/tgdb/SGModelBin.hxx
+include/simgear/scene/tgdb/SGNodeTriangles.hxx
 include/simgear/scene/tgdb/SGOceanTile.hxx
 include/simgear/scene/tgdb/SGReaderWriterBTG.hxx
 include/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
+include/simgear/scene/tgdb/SGTileDetailsCallback.hxx
+include/simgear/scene/tgdb/SGTileGeometryBin.hxx
 include/simgear/scene/tgdb/SGTriangleBin.hxx
 include/simgear/scene/tgdb/SGVasiDrawable.hxx
 include/simgear/scene/tgdb/SGVertexArrayBin.hxx
diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index c88fad94b453..3f784f410637 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -2,52 +2,52 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-aircraft
-PORTVERSION=	20141022
+PORTVERSION=	20150303
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.2/ \
-		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.2/ \
-		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.2/ \
-		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.2/ \
-		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.2/
+MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.4/ \
+		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.4/ \
+		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.4/ \
+		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.4/ \
+		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.4/
 # Selection of production-ready/well-known planes
 # (planes already included in flightgear-data are excluded)
 # Please contact the MAINTAINER if a plane is missing
-DISTFILES=	737-200_20120506.zip \
-		A-10_20140116.zip \
-		A300_20120717.zip \
-		Alouette-II_20120506.zip \
-		Alphajet_20130225.zip \
-		B-17_20130706.zip \
-		Breguet-XIX_20100829.zip \
-		C130_20130810.zip \
-		Caravelle_20120506.zip \
-		Caudron-G3_20120506.zip \
-		F80C_20120717.zip \
-		Hurricane_20130823.zip \
-		IL-2_20140508.zip \
-		Lightning_20140613.zip \
+DISTFILES=	737-200_20140909.zip \
+		A-10_20140909.zip \
+		A300_20140909.zip \
+		Alouette-II_20140909.zip \
+		Alphajet_20140909.zip \
+		B-17_0.1.zip \
+		Breguet-XIX_20140909.zip \
+		C130_20140909.zip \
+		Caravelle_20140909.zip \
+		Caudron-G3_20140909.zip \
+		F80C_20140909.zip \
+		Hurricane_20140909.zip \
+		IL-2_20140909.zip \
+		Lightning_20140909.zip \
 		Lockheed1049h_1.0.zip \
-		Messerschmitt-P1101_20130315.zip \
-		MirageIII_20131008.zip \
-		PaperAirplane_20101229.zip \
-		Pond-Racer_20120506.zip \
-		R44_20130426.zip \
-		Spitfire_20130310.zip \
-		Stieglitz_20091025.zip \
-		Super-Etendard_20131008.zip \
-		Supermarine-S.6B_20130312.zip \
-		Superwal_20100330.zip \
-		airwaveXtreme150_June-2014.zip \
+		Messerschmitt-P1101_20140909.zip \
+		MirageIII_20140909.zip \
+		PaperAirplane_20140909.zip \
+		Pond-Racer_20140909.zip \
+		R44_20140909.zip \
+		Spitfire_20140909.zip \
+		Stieglitz_20140909.zip \
+		Super-Etendard_20140909.zip \
+		Supermarine-S.6B_20140909.zip \
+		Superwal_20140909.zip \
+		airwaveXtreme150_January-2015.zip \
 		asw20_June-2014.zip \
-		bf109_20130615.zip \
-		c310_20130209.zip \
-		dhc3_20120506.zip \
-		f16_20140612.zip \
-		harrier_20130823.zip \
-		pa24-250_20121128.zip \
-		tu154_20081221.zip \
-		wrightFlyer1903_20070710.zip
+		bf109_20140909.zip \
+		c310_20150114.zip \
+		dhc3_0.1.zip \
+		f16_20140909.zip \
+		harrier_20140909.zip \
+		pa24-250_20140909.zip \
+		tu154_20140909.zip \
+		wrightFlyer1903_20140909.zip
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	martymac@FreeBSD.org
diff --git a/games/flightgear-aircraft/distinfo b/games/flightgear-aircraft/distinfo
index 8db939573248..a29d3b1f186a 100644
--- a/games/flightgear-aircraft/distinfo
+++ b/games/flightgear-aircraft/distinfo
@@ -1,70 +1,70 @@
-SHA256 (flightgear-aircraft/737-200_20120506.zip) = 8aadefbd4cd6fec5297176fe08bbc15206388da5d4d55c4b277909c92f335f5c
-SIZE (flightgear-aircraft/737-200_20120506.zip) = 12401593
-SHA256 (flightgear-aircraft/A-10_20140116.zip) = 85b48a7185595dfafdec47967b9f55ece704007f47b27efc20e1fdad56df546a
-SIZE (flightgear-aircraft/A-10_20140116.zip) = 9328047
-SHA256 (flightgear-aircraft/A300_20120717.zip) = 913236da87fd3abe1177b7e59d2dff69d8ee9803a3f60192f071f507eb23107d
-SIZE (flightgear-aircraft/A300_20120717.zip) = 386184
-SHA256 (flightgear-aircraft/Alouette-II_20120506.zip) = 755bc4bc620d1cceb208def0d979f4c4535667df42abcd0adb30dbf317d1b42c
-SIZE (flightgear-aircraft/Alouette-II_20120506.zip) = 5381104
-SHA256 (flightgear-aircraft/Alphajet_20130225.zip) = 2f6460be7c9948d53681830b05f55c6add7b2d4b12a9d56564698a9ac7ba9b10
-SIZE (flightgear-aircraft/Alphajet_20130225.zip) = 19410469
-SHA256 (flightgear-aircraft/B-17_20130706.zip) = bb01931aad4bf50cfc74ab98dd69cb64307fd4d68d1cb34272363b1f60fc0060
-SIZE (flightgear-aircraft/B-17_20130706.zip) = 12486789
-SHA256 (flightgear-aircraft/Breguet-XIX_20100829.zip) = 9405ec3e475e8b3ef63ed3357273dfc5f83e88074fb1ced90764a23eb3d5a1af
-SIZE (flightgear-aircraft/Breguet-XIX_20100829.zip) = 4323944
-SHA256 (flightgear-aircraft/C130_20130810.zip) = 38e9a897cd14a785a0848314484ff75c1698d50c2789e52e3f29a196fdee3b84
-SIZE (flightgear-aircraft/C130_20130810.zip) = 25474281
-SHA256 (flightgear-aircraft/Caravelle_20120506.zip) = b936271471312502cf3b755f9b1c8ca6a68c1d1172508c0274ea4b3cebb68412
-SIZE (flightgear-aircraft/Caravelle_20120506.zip) = 14686948
-SHA256 (flightgear-aircraft/Caudron-G3_20120506.zip) = 191a68c00fa75a034ee0d6f75e0cc456e152fd1cc735dac401da48ad8b283902
-SIZE (flightgear-aircraft/Caudron-G3_20120506.zip) = 4531626
-SHA256 (flightgear-aircraft/F80C_20120717.zip) = 633016a2ea70f9be59927d5201c48af985ef7d2414888ddff3488f25261526d5
-SIZE (flightgear-aircraft/F80C_20120717.zip) = 1528349
-SHA256 (flightgear-aircraft/Hurricane_20130823.zip) = 10dfe10c5365c7232fdd324a0c3af6c1b2c90cd5373af263ac35eb031b3b4fb5
-SIZE (flightgear-aircraft/Hurricane_20130823.zip) = 12062976
-SHA256 (flightgear-aircraft/IL-2_20140508.zip) = 8e6ecb37fa5b5d0c6c8a6aac8a7aad55071582183d16851323e99c68aa451d97
-SIZE (flightgear-aircraft/IL-2_20140508.zip) = 4801474
-SHA256 (flightgear-aircraft/Lightning_20140613.zip) = 4c72b9cda1b901cd95c89361cbad3bb730e59cf1084658ce1fb6f619e050ec87
-SIZE (flightgear-aircraft/Lightning_20140613.zip) = 4785070
-SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 624d85fe96380870387bb35c0c43601cbe0fb19506f6915e69bb49853c836371
-SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529095
-SHA256 (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 6a1a53902ffd6ff33c412a1d605e2a43615b3dcdaa7efebdff1f647ebe4b40ec
-SIZE (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 4359275
-SHA256 (flightgear-aircraft/MirageIII_20131008.zip) = 04e387b578c0ca10119605d775012f152aae44e003ad8227ccf2ea91ab45e240
-SIZE (flightgear-aircraft/MirageIII_20131008.zip) = 11112464
-SHA256 (flightgear-aircraft/PaperAirplane_20101229.zip) = b458c06510d1687b2be5769db5823fa0bb9165a3e5aef6094e4a23803efb3bb4
-SIZE (flightgear-aircraft/PaperAirplane_20101229.zip) = 867872
-SHA256 (flightgear-aircraft/Pond-Racer_20120506.zip) = 707d8401d394095475e0f3442cd01a66b9c3e7f8c08512dd685824e8d782ef94
-SIZE (flightgear-aircraft/Pond-Racer_20120506.zip) = 3063526
-SHA256 (flightgear-aircraft/R44_20130426.zip) = fef35003f5d8c10df1deaeab1f70d00825ba376bb837d1f58ffbd5bf35b10a89
-SIZE (flightgear-aircraft/R44_20130426.zip) = 8909152
-SHA256 (flightgear-aircraft/Spitfire_20130310.zip) = cb886772228c4cea6a301b037dad4f9c6ee5afee593c04822369bff422c88ed8
-SIZE (flightgear-aircraft/Spitfire_20130310.zip) = 21052226
-SHA256 (flightgear-aircraft/Stieglitz_20091025.zip) = 05393d31f11bc718bbbe43d539f18020b2ab9ed34b68c6bf7dff8c543b6fb3bd
-SIZE (flightgear-aircraft/Stieglitz_20091025.zip) = 4499810
-SHA256 (flightgear-aircraft/Super-Etendard_20131008.zip) = 118b2b6ca1da9d56fe2f5dc85d03b1c8ebf3b84163b3cde9443d08d9660ca14a
-SIZE (flightgear-aircraft/Super-Etendard_20131008.zip) = 10418381
-SHA256 (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 4222889bf64693630d1a0c9abcaefcc1a61af2529c3a00730f1f6a36bdaba5d4
-SIZE (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 3275253
-SHA256 (flightgear-aircraft/Superwal_20100330.zip) = cd013f6c6ab073cea4c5eef59acb3b51c8a40d47652a3dfcbebfc79c30504384
-SIZE (flightgear-aircraft/Superwal_20100330.zip) = 2654839
-SHA256 (flightgear-aircraft/airwaveXtreme150_June-2014.zip) = 67d58564d244f1aeb3fae20b3a996cf9a8eeb7ff3136039d4e05f8bbfcd9050e
-SIZE (flightgear-aircraft/airwaveXtreme150_June-2014.zip) = 1219396
+SHA256 (flightgear-aircraft/737-200_20140909.zip) = 74be9c9f5de3ab752324bc5470a9554aea691e6937a1275a36efebc7036bb751
+SIZE (flightgear-aircraft/737-200_20140909.zip) = 12401593
+SHA256 (flightgear-aircraft/A-10_20140909.zip) = 172f116ec5f092fbfb05b3de960e5040b9c43b995634332f373c4af010b08043
+SIZE (flightgear-aircraft/A-10_20140909.zip) = 9328047
+SHA256 (flightgear-aircraft/A300_20140909.zip) = b1427fb29d2cbe3e489bcc8e48487411e46cbdf0dac51c35eb05d6ad3516ba74
+SIZE (flightgear-aircraft/A300_20140909.zip) = 386184
+SHA256 (flightgear-aircraft/Alouette-II_20140909.zip) = aef45f15e08fd56c6a7ccfc6d837c40b47ef7beb285292f8fc856317eeb724f5
+SIZE (flightgear-aircraft/Alouette-II_20140909.zip) = 5381104
+SHA256 (flightgear-aircraft/Alphajet_20140909.zip) = c2a57b9c1315ee07c7d55af518fc5cbb2fb65928c429e32ee878518c68b99850
+SIZE (flightgear-aircraft/Alphajet_20140909.zip) = 19410469
+SHA256 (flightgear-aircraft/B-17_0.1.zip) = 58c604f8cb38b082e0de606e276bd948560a1c3322d2de169e41640bd71b1d19
+SIZE (flightgear-aircraft/B-17_0.1.zip) = 17434364
+SHA256 (flightgear-aircraft/Breguet-XIX_20140909.zip) = 473951870ec8beaaaf8daf290326f4440038361d33a25eab9f8d0775bbc32129
+SIZE (flightgear-aircraft/Breguet-XIX_20140909.zip) = 4323944
+SHA256 (flightgear-aircraft/C130_20140909.zip) = caf25eda65e5778a4224d14b50c0313b6f9ea2984760e3b076d74d6b12f4ec3b
+SIZE (flightgear-aircraft/C130_20140909.zip) = 23131488
+SHA256 (flightgear-aircraft/Caravelle_20140909.zip) = a666c0ad00b0818acf96f704711605e7e77d9c923cc114271038ac790db3f61b
+SIZE (flightgear-aircraft/Caravelle_20140909.zip) = 14686948
+SHA256 (flightgear-aircraft/Caudron-G3_20140909.zip) = 3781487c4d993d37d4713b20c9ca863c44e86c3c3a9cf66deda3b982ca130332
+SIZE (flightgear-aircraft/Caudron-G3_20140909.zip) = 4531626
+SHA256 (flightgear-aircraft/F80C_20140909.zip) = 63ce7fb5cb547ce7fcadbffa89e52049d7beca32e1a8c27bd1907ac6a597eff8
+SIZE (flightgear-aircraft/F80C_20140909.zip) = 1528349
+SHA256 (flightgear-aircraft/Hurricane_20140909.zip) = 457627b3139adf0fe836dedded82479fd76e9a1464d3bbac51128cfea008eb2a
+SIZE (flightgear-aircraft/Hurricane_20140909.zip) = 12062976
+SHA256 (flightgear-aircraft/IL-2_20140909.zip) = db1288463d54d173fcc3455f7ba31df4baebb575bd7fff0f1ea5741d0d0cb8d4
+SIZE (flightgear-aircraft/IL-2_20140909.zip) = 4801474
+SHA256 (flightgear-aircraft/Lightning_20140909.zip) = 5423e75c6c9952b5ec544b47c8295d540344d6fdd2a8cd27570a7bab0a990099
+SIZE (flightgear-aircraft/Lightning_20140909.zip) = 4785070
+SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = b2f3a4c86887c99584624b3747763497a6025f20f99283481e2bd27e2f181e66
+SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7528760
+SHA256 (flightgear-aircraft/Messerschmitt-P1101_20140909.zip) = d7aafa9d35b22bd77fd35ef271926b3f645eb062e8dcdeb5d7acfa67e5249e6f
+SIZE (flightgear-aircraft/Messerschmitt-P1101_20140909.zip) = 4359275
+SHA256 (flightgear-aircraft/MirageIII_20140909.zip) = a17cc4b9ff5090826cbbf9c453cf1160a10fc2a3106c3f546f5b454702031382
+SIZE (flightgear-aircraft/MirageIII_20140909.zip) = 11112464
+SHA256 (flightgear-aircraft/PaperAirplane_20140909.zip) = 0e8c8b52939a9d3a499a8eb844e036494ad02773c6480ba6a599f830a99cb7f3
+SIZE (flightgear-aircraft/PaperAirplane_20140909.zip) = 867872
+SHA256 (flightgear-aircraft/Pond-Racer_20140909.zip) = 13c5f6e88871790309e84ef4b2e7fe9cc7a29e3ea27fea67ef536c157bdfb061
+SIZE (flightgear-aircraft/Pond-Racer_20140909.zip) = 3063526
+SHA256 (flightgear-aircraft/R44_20140909.zip) = 52aac7955d17ba80ab82c5395232e744369964db8c3f6b3214546ecf298ed50e
+SIZE (flightgear-aircraft/R44_20140909.zip) = 8909152
+SHA256 (flightgear-aircraft/Spitfire_20140909.zip) = 417b80784f9f74008819a3ccb832ffcb578b4edd3fe0007acc499a09ec0bd041
+SIZE (flightgear-aircraft/Spitfire_20140909.zip) = 21052226
+SHA256 (flightgear-aircraft/Stieglitz_20140909.zip) = 0cbe50c305056ff58aaaf4d94e58d6f1eeff7a65c116c73bfbe58add2672f7c0
+SIZE (flightgear-aircraft/Stieglitz_20140909.zip) = 4499810
+SHA256 (flightgear-aircraft/Super-Etendard_20140909.zip) = b81db007cee7a4115c67da616f454e984b8f4b573892c9baf5437214dc8d0eca
+SIZE (flightgear-aircraft/Super-Etendard_20140909.zip) = 10418381
+SHA256 (flightgear-aircraft/Supermarine-S.6B_20140909.zip) = f0afb3de24c90972fff19f598085be62ada6528e87540be8b2df3184316cbc4d
+SIZE (flightgear-aircraft/Supermarine-S.6B_20140909.zip) = 3275253
+SHA256 (flightgear-aircraft/Superwal_20140909.zip) = f42a01ede38fd6aa7c603444fd2038c55bcfd2c6f0738ba291611ecc054078d4
+SIZE (flightgear-aircraft/Superwal_20140909.zip) = 2654839
+SHA256 (flightgear-aircraft/airwaveXtreme150_January-2015.zip) = 5ee8c38df687a9f6c785ea8ae1050b32fe7b5c2f6e00c8cac96f80b598e11b78
+SIZE (flightgear-aircraft/airwaveXtreme150_January-2015.zip) = 1222754
 SHA256 (flightgear-aircraft/asw20_June-2014.zip) = a0a0680fa68933f579f01462703151b907d895dee69d44d8e3007abc0dd9ad3c
 SIZE (flightgear-aircraft/asw20_June-2014.zip) = 3592394
-SHA256 (flightgear-aircraft/bf109_20130615.zip) = 1245ba5d1c00a01b74cef208f28f70ffe27f6285f7d52c4ddd901b370e3aca94
-SIZE (flightgear-aircraft/bf109_20130615.zip) = 24201689
-SHA256 (flightgear-aircraft/c310_20130209.zip) = 07d765eac4a6cb9bc115dc4d302fed972776f5148cb1154f666b6a7f3c27543a
-SIZE (flightgear-aircraft/c310_20130209.zip) = 615078
-SHA256 (flightgear-aircraft/dhc3_20120506.zip) = 808215533d23b9e2a23b0249bacff9504b72a8e4263a562058dea9c6060c12f9
-SIZE (flightgear-aircraft/dhc3_20120506.zip) = 20789012
-SHA256 (flightgear-aircraft/f16_20140612.zip) = b40dc7f9eca5976183cea0b0fbf71d7560c8e5166876d41ff682e43c89f59b73
-SIZE (flightgear-aircraft/f16_20140612.zip) = 19445894
-SHA256 (flightgear-aircraft/harrier_20130823.zip) = 35d1b2c95b2801651ce0fdd50b5e3015a75a120ab3f709cf2adb1dbd49bc26d7
-SIZE (flightgear-aircraft/harrier_20130823.zip) = 4208173
-SHA256 (flightgear-aircraft/pa24-250_20121128.zip) = dd78878bfbf21bb77405a3f5c1586f1043487c6d8499ec28361fbc3131500952
-SIZE (flightgear-aircraft/pa24-250_20121128.zip) = 2100194
-SHA256 (flightgear-aircraft/tu154_20081221.zip) = e52dae4b16fee2844417f91f76f12a5f8907dca780d553282a9f1326e60c4079
-SIZE (flightgear-aircraft/tu154_20081221.zip) = 1387134
-SHA256 (flightgear-aircraft/wrightFlyer1903_20070710.zip) = cc03ae8c61c11ab9d0fa4d4ae7192bbf0a0f579d4b42a40082be5060232dabe8
-SIZE (flightgear-aircraft/wrightFlyer1903_20070710.zip) = 1371750
+SHA256 (flightgear-aircraft/bf109_20140909.zip) = 5ed66f955de67d2a002e4b6dfa72f99d31857e896e1ca0cae66907aff6e90663
+SIZE (flightgear-aircraft/bf109_20140909.zip) = 24201689
+SHA256 (flightgear-aircraft/c310_20150114.zip) = 16c96ea6525bfb70acdbf0f764272c44931261e7d3455be18195ce4fe988211b
+SIZE (flightgear-aircraft/c310_20150114.zip) = 615076
+SHA256 (flightgear-aircraft/dhc3_0.1.zip) = 1e2d2e6e1837c58796aeaa2676bbf83ca4fd4a80ea24fbab8b066abb52904500
+SIZE (flightgear-aircraft/dhc3_0.1.zip) = 35577448
+SHA256 (flightgear-aircraft/f16_20140909.zip) = ee04929ed4efdb533b367fd694870aec6fb2545432d6c52c02d7f4badca8dc42
+SIZE (flightgear-aircraft/f16_20140909.zip) = 19445894
+SHA256 (flightgear-aircraft/harrier_20140909.zip) = d50e2920a5943ae6b9ba1b55316c455f9a3dd642362d0ce1bcfaa518de9b0e68
+SIZE (flightgear-aircraft/harrier_20140909.zip) = 4208173
+SHA256 (flightgear-aircraft/pa24-250_20140909.zip) = e3074d6bac8203c1ced052cfc7db0d7f3b85c2f908dcb442edfd5813940d07b5
+SIZE (flightgear-aircraft/pa24-250_20140909.zip) = 2100194
+SHA256 (flightgear-aircraft/tu154_20140909.zip) = d2982a40c4c4b865e9d6ec85b6695e9c94026181bd9452d5f8e9fbc071ac3a74
+SIZE (flightgear-aircraft/tu154_20140909.zip) = 1387134
+SHA256 (flightgear-aircraft/wrightFlyer1903_20140909.zip) = 797b51461ecf9db3737d88b0f65e575868c9a32baf4a47aa9e92d673a8483a87
+SIZE (flightgear-aircraft/wrightFlyer1903_20140909.zip) = 1371750
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index af671935c22b..5edbf4aa2350 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-data
-PORTVERSION=	3.2.0
+PORTVERSION=	3.4.0
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Shared/ \
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index 8702dc05fe45..7e2f8c0d2aa8 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FlightGear-data-3.2.0.tar.bz2) = bd48708931335698303ad5739146924fe70f1ff00c3cb8c6207c6d45140a27a4
-SIZE (FlightGear-data-3.2.0.tar.bz2) = 1264837989
+SHA256 (FlightGear-data-3.4.0.tar.bz2) = 8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b
+SIZE (FlightGear-data-3.4.0.tar.bz2) = 1145893777
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