Update Simgear and Flightgear ports to 2.8.0

28 files changed, 133 insertions, 355 deletions

diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index fd5292dc3272..b180be93dc1f 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -6,52 +6,52 @@
 #
 
 PORTNAME=	flightgear-aircraft
-PORTVERSION=	20120309
+PORTVERSION=	20120830
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.6/ \
-		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.6/ \
-		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.6/ \
-		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.6/ \
-		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.6/
+MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.8/ \
+		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.8/ \
+		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.8/ \
+		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.8/ \
+		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.8/
 # 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_20110713.zip \
-		A-10_20120104.zip \
-		A300_20101217.zip \
-		Alouette-II_20110523.zip \
-		Alphajet_20110228.zip \
-		B-17_20110516.zip \
-		Breguet-XIX_20101217.zip \
-		C130_20101217.zip \
-		Caravelle_20101217.zip \
-		Caudron-G3_20101217.zip \
-		F80C_20110915.zip \
-		Hurricane_20111202.zip \
-		IL-2_20110324.zip \
-		Lightning_20111219.zip \
+DISTFILES=	737-200_20120506.zip \
+		A-10_20120717.zip \
+		A300_20120717.zip \
+		Alouette-II_20120506.zip \
+		Alphajet_20120506.zip \
+		B-17_20120506.zip \
+		Breguet-XIX_20100829.zip \
+		C130_20120717.zip \
+		Caravelle_20120506.zip \
+		Caudron-G3_20120506.zip \
+		F80C_20120717.zip \
+		Hurricane_20120806.zip \
+		IL-2_20110311.zip \
+		Lightning_20120717.zip \
 		Lockheed1049h_1.0.zip \
-		Messerschmitt-P1101_20101217.zip \
-		MirageIII_20110124.zip \
-		PaperAirplane_20110103.zip \
-		Pond-Racer_20101217.zip \
-		R44_20111024.zip \
-		Spitfire_20120217.zip \
-		Stieglitz_20101217.zip \
-		Super-Etendard_20110324.zip \
-		Supermarine-S.6B_20110118.zip \
-		Superwal_20101217.zip \
-		airwaveXtreme150_20101217.zip \
-		asw20_20101217.zip \
-		bf109_20111212.zip \
-		c310_20120117.zip \
-		dhc3_20110411.zip \
-		f16_20120104.zip \
-		harrier_20101217.zip \
-		pa24-250_20110222.zip \
-		tu154_20101217.zip \
-		wrightFlyer1903_20101217.zip
+		Messerschmitt-P1101_20101005.zip \
+		MirageIII_20120222.zip \
+		PaperAirplane_20101229.zip \
+		Pond-Racer_20120506.zip \
+		R44_20120506.zip \
+		Spitfire_20120717.zip \
+		Stieglitz_20091025.zip \
+		Super-Etendard_20120501.zip \
+		Supermarine-S.6B_20110114.zip \
+		Superwal_20100330.zip \
+		airwaveXtreme150_July-2012.zip \
+		asw20_20081019.zip \
+		bf109_20120717.zip \
+		c310_20120307.zip \
+		dhc3_20120506.zip \
+		f16_20120717.zip \
+		harrier_20120717.zip \
+		pa24-250_20120717.zip \
+		tu154_20081221.zip \
+		wrightFlyer1903_20070710.zip
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	martymac@FreeBSD.org
diff --git a/games/flightgear-aircraft/distinfo b/games/flightgear-aircraft/distinfo
index 8889dd930f34..87b424a608db 100644
--- a/games/flightgear-aircraft/distinfo
+++ b/games/flightgear-aircraft/distinfo
@@ -1,70 +1,70 @@
-SHA256 (flightgear-aircraft/737-200_20110713.zip) = b915993c41d5e9383a7338baac8dfddffb12cf91ae11d8433815f014e6b09948
-SIZE (flightgear-aircraft/737-200_20110713.zip) = 12401584
-SHA256 (flightgear-aircraft/A-10_20120104.zip) = 097e6a3bc16b1f22becac0494cf551e18e7a081dfe5a404ef89085d9d58be20a
-SIZE (flightgear-aircraft/A-10_20120104.zip) = 9056138
-SHA256 (flightgear-aircraft/A300_20101217.zip) = 7bc4087825a98222af4fc0ae6cc1d8650567dba439a5309dbb577e7e57a39530
-SIZE (flightgear-aircraft/A300_20101217.zip) = 386184
-SHA256 (flightgear-aircraft/Alouette-II_20110523.zip) = 9529f86fa82e1aca24e319436a043ec0fbb6a49582ad167c4db88be38d9c4647
-SIZE (flightgear-aircraft/Alouette-II_20110523.zip) = 5381078
-SHA256 (flightgear-aircraft/Alphajet_20110228.zip) = 2336b57b25f4543209f7653fb50973ef14220fb86cd4cf2af6d62be4608e16b3
-SIZE (flightgear-aircraft/Alphajet_20110228.zip) = 18186505
-SHA256 (flightgear-aircraft/B-17_20110516.zip) = 5a24bc39a3bf88a7eb3bd6e4dac2e28d5c4aa82649c0ebf72e038890eda608bb
-SIZE (flightgear-aircraft/B-17_20110516.zip) = 11850686
-SHA256 (flightgear-aircraft/Breguet-XIX_20101217.zip) = a6e0b85e26447329e97ea6b8f6d37dbb5ce5b823ab7b66f1d2061be0e1624670
-SIZE (flightgear-aircraft/Breguet-XIX_20101217.zip) = 4323944
-SHA256 (flightgear-aircraft/C130_20101217.zip) = 578a55508cbd7aec170129b3c2b000efbdf4548a63cdb679071da31455371d41
-SIZE (flightgear-aircraft/C130_20101217.zip) = 24933297
-SHA256 (flightgear-aircraft/Caravelle_20101217.zip) = 215752d77ee19f70b8e7e6e9ec1eb8af514212fa49cfb7c0ff20ecd05a667903
-SIZE (flightgear-aircraft/Caravelle_20101217.zip) = 14686920
-SHA256 (flightgear-aircraft/Caudron-G3_20101217.zip) = b363af4796c483f1e56d44f2d291e2aab1771144f2b9449bdf29b4c4c4693dd8
-SIZE (flightgear-aircraft/Caudron-G3_20101217.zip) = 4531623
-SHA256 (flightgear-aircraft/F80C_20110915.zip) = a79f64e0f85577b9a64992ad5fc67530b54cd6038ed3612f7c3348281f691e5c
-SIZE (flightgear-aircraft/F80C_20110915.zip) = 1528349
-SHA256 (flightgear-aircraft/Hurricane_20111202.zip) = 4218b911ee68f50a18c185565d52e03c543aa68770c31a80d68851053d50952d
-SIZE (flightgear-aircraft/Hurricane_20111202.zip) = 10586483
-SHA256 (flightgear-aircraft/IL-2_20110324.zip) = 5726bb6d6ad225ad67e7e87a3466fed1a291b1e8e853c8e8c44cc02909250a71
-SIZE (flightgear-aircraft/IL-2_20110324.zip) = 3933481
-SHA256 (flightgear-aircraft/Lightning_20111219.zip) = b1ab2a666c3a4186e4da6746c0e44ec71e96d96f61e9cfc05ab89b075232e0f7
-SIZE (flightgear-aircraft/Lightning_20111219.zip) = 4854327
+SHA256 (flightgear-aircraft/737-200_20120506.zip) = 8aadefbd4cd6fec5297176fe08bbc15206388da5d4d55c4b277909c92f335f5c
+SIZE (flightgear-aircraft/737-200_20120506.zip) = 12401593
+SHA256 (flightgear-aircraft/A-10_20120717.zip) = 92ef4c82f40c54d1a6b159ca9d3461bc8ecb701a7e6589e9ede49ebd33d5cc72
+SIZE (flightgear-aircraft/A-10_20120717.zip) = 8871714
+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_20120506.zip) = 26fbc985759d0ec6050484644a14cdca485a67fe61014d007665983e0222b525
+SIZE (flightgear-aircraft/Alphajet_20120506.zip) = 18819048
+SHA256 (flightgear-aircraft/B-17_20120506.zip) = b0910020ec348ca461b617d1fbb8494ab5cab06ff7b16560f337d683c52d9b28
+SIZE (flightgear-aircraft/B-17_20120506.zip) = 11850690
+SHA256 (flightgear-aircraft/Breguet-XIX_20100829.zip) = 9405ec3e475e8b3ef63ed3357273dfc5f83e88074fb1ced90764a23eb3d5a1af
+SIZE (flightgear-aircraft/Breguet-XIX_20100829.zip) = 4323944
+SHA256 (flightgear-aircraft/C130_20120717.zip) = 36e4a819dd077f4896b4bb6e09ec28de7527bd2fa7662585cd754752e1b1561e
+SIZE (flightgear-aircraft/C130_20120717.zip) = 31813153
+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_20120806.zip) = 7483ee6d5d2de37ab3e61d86edffa51c05b42bb10bf4902b4d77b11f10478289
+SIZE (flightgear-aircraft/Hurricane_20120806.zip) = 11957844
+SHA256 (flightgear-aircraft/IL-2_20110311.zip) = 1c7e126956247f7a6ed93cd4fc2abe65c756b07275559ed1f0bd03d731a51ee0
+SIZE (flightgear-aircraft/IL-2_20110311.zip) = 3933481
+SHA256 (flightgear-aircraft/Lightning_20120717.zip) = 94135bb7f65a01f1502e99f8cdb25ba9bb2292b4713c5aec5476be0571e8f441
+SIZE (flightgear-aircraft/Lightning_20120717.zip) = 4854327
 SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7374e32aab617e466c228262004d1c292d9667375e74481d74f7a5210dfd60fd
 SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529096
-SHA256 (flightgear-aircraft/Messerschmitt-P1101_20101217.zip) = a4136e1030c93e217a43d155c4027fe29e020876eef102de3b8410750b917acf
-SIZE (flightgear-aircraft/Messerschmitt-P1101_20101217.zip) = 4565272
-SHA256 (flightgear-aircraft/MirageIII_20110124.zip) = addcea18293e10c157483746089e57747642567f91e2b989b589f489770b779f
-SIZE (flightgear-aircraft/MirageIII_20110124.zip) = 15268883
-SHA256 (flightgear-aircraft/PaperAirplane_20110103.zip) = 8f592b92718c9d4140031f7ebebd366b431854b2ab3afaca186c0b40564ccf97
-SIZE (flightgear-aircraft/PaperAirplane_20110103.zip) = 867872
-SHA256 (flightgear-aircraft/Pond-Racer_20101217.zip) = fa1a6525182c733564c4e71984c69d65dcdf2446dc665578000afe5a2992ea38
-SIZE (flightgear-aircraft/Pond-Racer_20101217.zip) = 3063481
-SHA256 (flightgear-aircraft/R44_20111024.zip) = 3e6514a050dbb960edd7735b85ab863f1a7b755c8ab197bc18ec45bfdffb0ec7
-SIZE (flightgear-aircraft/R44_20111024.zip) = 11161369
-SHA256 (flightgear-aircraft/Spitfire_20120217.zip) = f0377e73c30d6c2393e2ef0c4aa05a97b99da0de8147a65fe32f224046096c81
-SIZE (flightgear-aircraft/Spitfire_20120217.zip) = 15539898
-SHA256 (flightgear-aircraft/Stieglitz_20101217.zip) = 466fdf901014c94f82d5fc74ff4f3393da619074b824381458f96f24b359a0ed
-SIZE (flightgear-aircraft/Stieglitz_20101217.zip) = 4499810
-SHA256 (flightgear-aircraft/Super-Etendard_20110324.zip) = 8bdaa175df1568450d47dc6279a530751786681b6d312e4cdbf93faeaeddbd81
-SIZE (flightgear-aircraft/Super-Etendard_20110324.zip) = 12386980
-SHA256 (flightgear-aircraft/Supermarine-S.6B_20110118.zip) = ea70dc690b97af5f4f369dd950b625ec75e00f6e7427d6b335398da6ba60dd92
-SIZE (flightgear-aircraft/Supermarine-S.6B_20110118.zip) = 3154967
-SHA256 (flightgear-aircraft/Superwal_20101217.zip) = 901ae47b6311d9e17174c3e6edb0ace7d675d7d7c8e788844f077652bf892351
-SIZE (flightgear-aircraft/Superwal_20101217.zip) = 2654839
-SHA256 (flightgear-aircraft/airwaveXtreme150_20101217.zip) = 407e94aa62b8931d75617dbd9b47681ef61e01ff546b29a0d6afc9feb41925f0
-SIZE (flightgear-aircraft/airwaveXtreme150_20101217.zip) = 29789
-SHA256 (flightgear-aircraft/asw20_20101217.zip) = 261380f07a1a4d05e53d316ca2dd6128e3e71537c6b1b82f5b804ead56ee43b5
-SIZE (flightgear-aircraft/asw20_20101217.zip) = 286802
-SHA256 (flightgear-aircraft/bf109_20111212.zip) = f7ff8e66eb2c377bcba0d80c4622b0681b6bda39b98c1cca6dfeaf36a17b96ed
-SIZE (flightgear-aircraft/bf109_20111212.zip) = 24201651
-SHA256 (flightgear-aircraft/c310_20120117.zip) = 1eea7c3116bfd40d9e133f20884466fd7c302c2e7210798d61e6e0fa1bf3b2a3
-SIZE (flightgear-aircraft/c310_20120117.zip) = 615092
-SHA256 (flightgear-aircraft/dhc3_20110411.zip) = 64110a7544eb21477a155364e2f870b8f9a120a6ed1448d273f51bab76c5331d
-SIZE (flightgear-aircraft/dhc3_20110411.zip) = 20788992
-SHA256 (flightgear-aircraft/f16_20120104.zip) = 8919618279e6527806358d8a51ae1a0ba5480249d78d588f451060523dd5386c
-SIZE (flightgear-aircraft/f16_20120104.zip) = 19551076
-SHA256 (flightgear-aircraft/harrier_20101217.zip) = 49669fd3c6a37b83014e454ec99512fd3eef8a06da484a97cb30398e202336f6
-SIZE (flightgear-aircraft/harrier_20101217.zip) = 4208120
-SHA256 (flightgear-aircraft/pa24-250_20110222.zip) = 0e9b537d15f6393444d2f1c7e4eaec168abb777a3f1d983ac56bdfd9c5c56792
-SIZE (flightgear-aircraft/pa24-250_20110222.zip) = 2100101
-SHA256 (flightgear-aircraft/tu154_20101217.zip) = e05d0206c4903d6eb0937d01a1da16fb6d81f1a83459ac90c178b9dee3266808
-SIZE (flightgear-aircraft/tu154_20101217.zip) = 1387134
-SHA256 (flightgear-aircraft/wrightFlyer1903_20101217.zip) = 011041a5cb43419f212b26e73d5038307bf76ad9bee74785de9d125b2b11bd2c
-SIZE (flightgear-aircraft/wrightFlyer1903_20101217.zip) = 1371750
+SHA256 (flightgear-aircraft/Messerschmitt-P1101_20101005.zip) = 76c1a79348a59fa2eccd0a6eb1218db4d706ba967b7d626ddc263abda6d12ed1
+SIZE (flightgear-aircraft/Messerschmitt-P1101_20101005.zip) = 4565272
+SHA256 (flightgear-aircraft/MirageIII_20120222.zip) = f99bd3f446a5d861a0ee04df08c6e6ced04ebff2cb3c810ea9f9a78fdfa57a7b
+SIZE (flightgear-aircraft/MirageIII_20120222.zip) = 11112429
+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_20120506.zip) = 4a8534af61ceb7749b7596cae6b30edbac23d2ee6c1473dd40277423ad9ad097
+SIZE (flightgear-aircraft/R44_20120506.zip) = 11161383
+SHA256 (flightgear-aircraft/Spitfire_20120717.zip) = 87d268fb56110a869916c31458676d509ba07a314f1b529b23d1ff030ddc7f7c
+SIZE (flightgear-aircraft/Spitfire_20120717.zip) = 19022040
+SHA256 (flightgear-aircraft/Stieglitz_20091025.zip) = 05393d31f11bc718bbbe43d539f18020b2ab9ed34b68c6bf7dff8c543b6fb3bd
+SIZE (flightgear-aircraft/Stieglitz_20091025.zip) = 4499810
+SHA256 (flightgear-aircraft/Super-Etendard_20120501.zip) = e89f96034f2ee64f34917a8062e6e87f75674ff7f595be5a884ae4b4904a5eb5
+SIZE (flightgear-aircraft/Super-Etendard_20120501.zip) = 9855236
+SHA256 (flightgear-aircraft/Supermarine-S.6B_20110114.zip) = 0c197f1b2ca811bf40f2fe0fc90dae760ade845659c3af4f96c41ec58f023325
+SIZE (flightgear-aircraft/Supermarine-S.6B_20110114.zip) = 3154967
+SHA256 (flightgear-aircraft/Superwal_20100330.zip) = cd013f6c6ab073cea4c5eef59acb3b51c8a40d47652a3dfcbebfc79c30504384
+SIZE (flightgear-aircraft/Superwal_20100330.zip) = 2654839
+SHA256 (flightgear-aircraft/airwaveXtreme150_July-2012.zip) = 9c20e9bd435c35921003aae82954e7538636710c1f3f0c34665bd670acf33b3e
+SIZE (flightgear-aircraft/airwaveXtreme150_July-2012.zip) = 1208012
+SHA256 (flightgear-aircraft/asw20_20081019.zip) = 8e74533447a4d35f00117c86b65cee4661a69230f3acc726678399a4d4f741ae
+SIZE (flightgear-aircraft/asw20_20081019.zip) = 286802
+SHA256 (flightgear-aircraft/bf109_20120717.zip) = a34162707163a871cf5456559a3bf0f8a161cbbdb635d395ce924cdd1b2e13ec
+SIZE (flightgear-aircraft/bf109_20120717.zip) = 24201651
+SHA256 (flightgear-aircraft/c310_20120307.zip) = 86a587fe250823ce26ff756ec3893631cde8b6164663c8a100b641ab9c1146b9
+SIZE (flightgear-aircraft/c310_20120307.zip) = 615092
+SHA256 (flightgear-aircraft/dhc3_20120506.zip) = 808215533d23b9e2a23b0249bacff9504b72a8e4263a562058dea9c6060c12f9
+SIZE (flightgear-aircraft/dhc3_20120506.zip) = 20789012
+SHA256 (flightgear-aircraft/f16_20120717.zip) = bde84953b96b67269f5553b521a877534f9861d7b192d7ad36daa42a919c1e24
+SIZE (flightgear-aircraft/f16_20120717.zip) = 19551059
+SHA256 (flightgear-aircraft/harrier_20120717.zip) = 588a6a3ac42975426c63b754b56c8d26e1789c9772ceb6848a2b9857481d7ec6
+SIZE (flightgear-aircraft/harrier_20120717.zip) = 4208120
+SHA256 (flightgear-aircraft/pa24-250_20120717.zip) = 448292aa10e3466cb66e8892417f4d6c03bfa69ad8f415af512799046d50ab10
+SIZE (flightgear-aircraft/pa24-250_20120717.zip) = 2100101
+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
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 50d58072bcd9..0a9663eb3670 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	flightgear-data
-PORTVERSION=	2.6.0
+PORTVERSION=	2.8.0
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/ \
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index fd9a7d05e062..eeef12e9d69a 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FlightGear-data-2.6.0.tar.bz2) = fabbb20c50c251e75e2f9500432d01fa78b3f8292d79f39d7adc1bca40c59800
-SIZE (FlightGear-data-2.6.0.tar.bz2) = 560727464
+SHA256 (FlightGear-data-2.8.0.tar.bz2) = ad9ba1d12b5c771193561d452ec300e4c9321749d478dd6c1f59976932ba8d74
+SIZE (FlightGear-data-2.8.0.tar.bz2) = 685330156
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index bb36aa4d54f5..e71c534c6364 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	flightgear
-PORTVERSION=	2.6.0
-PORTREVISION=	3
+PORTVERSION=	2.8.0
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \
@@ -38,19 +37,12 @@ USE_OPENAL=	al alut
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DJPEG_FACTORY:BOOL=ON \
 		-DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \
-		-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
-		-DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR}
-
-PORTDOCS=	README README.OSG README.OpenAL README.SimGear README.plib
+		-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man
 
 MAN1=	js_demo.1 fgjs.1 gl-info.1 fgfs.1 fgpanel.1 terrasync.1
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MDOCS)
-CMAKE_ARGS+=	-DNOPORTDOCS:BOOL=ON
-.endif
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${PREFIX}/bin
 	@${CAT} ${PKGMESSAGE}
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 7ed5b8470acd..8ec8b59e4d34 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flightgear-2.6.0.tar.bz2) = 1554efbe20ad5002ad169225605ae95fca46d381bdff03dd624d92cf24b1a40f
-SIZE (flightgear-2.6.0.tar.bz2) = 2280644
+SHA256 (flightgear-2.8.0.tar.bz2) = bfda4f269d90128f4e4cb828de692a49dc0b93db41fe20a2b5272f3f271f3a01
+SIZE (flightgear-2.8.0.tar.bz2) = 2311023
diff --git a/games/flightgear/files/patch-CMakeLists.txt b/games/flightgear/files/patch-CMakeLists.txt
index 1abbcffbfb62..4d92c0ec8292 100644
--- a/games/flightgear/files/patch-CMakeLists.txt
+++ b/games/flightgear/files/patch-CMakeLists.txt
@@ -1,22 +1,11 @@
---- CMakeLists.txt.orig	2012-02-17 23:41:13.982306000 +0100
-+++ CMakeLists.txt	2012-03-09 15:39:46.949702574 +0100
-@@ -226,7 +226,7 @@
- 	endif(LIBSVN_FOUND)
+--- 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)
  
 -find_package(PLIB REQUIRED puaux pu js fnt)
 +find_package(PLIB REQUIRED puaux pu js fnt net)
- find_package(SimGear 2.6.0 REQUIRED)
  
- if (JPEG_FACTORY)
-@@ -342,7 +342,9 @@
- 	README.OSG
- 	README.SimGear)
- 
--INSTALL(FILES ${INSTALL_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
-+if(NOT NOPORTDOCS)
-+	INSTALL(FILES ${INSTALL_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
-+endif()
- 
- #-----------------------------------------------------------------------------
- ### uninstall target
+ # FlightGear and SimGear versions need to match
+ find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
diff --git a/games/flightgear/files/patch-src-AIModel-AIFlightPlanCreate.cxx b/games/flightgear/files/patch-src-AIModel-AIFlightPlanCreate.cxx
deleted file mode 100644
index d2827ffb333d..000000000000
--- a/games/flightgear/files/patch-src-AIModel-AIFlightPlanCreate.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/AIModel/AIFlightPlanCreate.cxx.orig	2012-04-28 20:11:14.268235838 +0300
-+++ src/AIModel/AIFlightPlanCreate.cxx	2012-04-28 20:11:29.798235529 +0300
-@@ -18,6 +18,8 @@
-  *
-  **************************************************************************/
- 
-+#include <cstdlib>
-+
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
-
diff --git a/games/flightgear/files/patch-src-AIModel-AIFlightPlanCreatePushBack.cxx b/games/flightgear/files/patch-src-AIModel-AIFlightPlanCreatePushBack.cxx
deleted file mode 100644
index d952a8d6441d..000000000000
--- a/games/flightgear/files/patch-src-AIModel-AIFlightPlanCreatePushBack.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/AIModel/AIFlightPlanCreatePushBack.cxx.orig	2012-04-29 00:33:37.069233986 +0300
-+++ src/AIModel/AIFlightPlanCreatePushBack.cxx	2012-04-29 00:33:57.598237572 +0300
-@@ -18,6 +18,8 @@
- *
- **************************************************************************/
- 
-+#include <cstdlib>
-+
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
-
diff --git a/games/flightgear/files/patch-src-ATCDCL-ATCutils.cxx b/games/flightgear/files/patch-src-ATCDCL-ATCutils.cxx
deleted file mode 100644
index 181fd2e809af..000000000000
--- a/games/flightgear/files/patch-src-ATCDCL-ATCutils.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ATCDCL/ATCutils.cxx.orig	2012-04-28 17:24:45.174236639 +0300
-+++ src/ATCDCL/ATCutils.cxx	2012-04-28 17:25:02.640237400 +0300
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <sstream>
-+#include <cstdlib>
- 
- #include <simgear/math/SGMath.hxx>
- #include <simgear/constants.h>
-
diff --git a/games/flightgear/files/patch-src-Airports-runwayprefs.cxx b/games/flightgear/files/patch-src-Airports-runwayprefs.cxx
deleted file mode 100644
index 3ea13d8fbf70..000000000000
--- a/games/flightgear/files/patch-src-Airports-runwayprefs.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Airports/runwayprefs.cxx.orig	2012-04-28 17:05:44.544236696 +0300
-+++ src/Airports/runwayprefs.cxx	2012-04-28 17:06:08.564242690 +0300
-@@ -26,6 +26,7 @@
- #endif
- 
- #include <math.h>
-+#include <cstdlib>
- #include <cstring>
- 
- #include <simgear/compiler.h>
-
diff --git a/games/flightgear/files/patch-src-Autopilot-inputvalue.cxx b/games/flightgear/files/patch-src-Autopilot-inputvalue.cxx
deleted file mode 100644
index b21a20bb77ce..000000000000
--- a/games/flightgear/files/patch-src-Autopilot-inputvalue.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Autopilot/inputvalue.cxx.orig	2012-04-28 17:33:36.379238729 +0300
-+++ src/Autopilot/inputvalue.cxx	2012-04-28 17:33:54.516724154 +0300
-@@ -18,6 +18,8 @@
- // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- //
- 
-+#include <cstdlib>
-+
- #include "inputvalue.hxx"
- #include <Main/fg_props.hxx>
- using namespace FGXMLAutopilot;
-
diff --git a/games/flightgear/files/patch-src-Canvas-ShivaVG-src-shDefs.h b/games/flightgear/files/patch-src-Canvas-ShivaVG-src-shDefs.h
new file mode 100644
index 000000000000..88b18b7f334c
--- /dev/null
+++ b/games/flightgear/files/patch-src-Canvas-ShivaVG-src-shDefs.h
@@ -0,0 +1,11 @@
+--- src/Canvas/ShivaVG/src/shDefs.h.orig	2012-08-28 17:51:24.000000000 +0200
++++ src/Canvas/ShivaVG/src/shDefs.h	2012-08-28 17:52:06.000000000 +0200
+@@ -34,7 +34,7 @@
+ #include <math.h>
+ #include <float.h>
+ 
+-#ifndef VG_API_MACOSX
++#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__)
+ #  include <malloc.h>
+ #endif
+ 
diff --git a/games/flightgear/files/patch-src-FDM-YASim-YASim.cxx b/games/flightgear/files/patch-src-FDM-YASim-YASim.cxx
deleted file mode 100644
index 5a4386025815..000000000000
--- a/games/flightgear/files/patch-src-FDM-YASim-YASim.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/FDM/YASim/YASim.cxx.orig	2012-04-30 11:28:08.392553266 +0300
-+++ src/FDM/YASim/YASim.cxx	2012-04-30 11:28:24.816555317 +0300
-@@ -3,6 +3,8 @@
- #  include "config.h"
- #endif
- 
-+#include <cstdlib>
-+
- #include <simgear/debug/logstream.hxx>
- #include <simgear/math/sg_geodesy.hxx>
- #include <simgear/misc/sg_path.hxx>
-
diff --git a/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89.cxx b/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89.cxx
deleted file mode 100644
index 09b105da84b7..000000000000
--- a/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Instrumentation/KLN89/kln89.cxx.orig	2012-04-28 19:44:36.140236845 +0300
-+++ src/Instrumentation/KLN89/kln89.cxx	2012-04-28 19:44:58.548236276 +0300
-@@ -1032,7 +1032,7 @@ void KLN89::DrawApt(int x, int y) {
- 	++j;
- 	for(i=x-2; i<=x+2; ++i) _instrument->DrawPixel(i, j, (i != x ? true : false));
- 	++j;
--	for(i=x-2; i<=x+2; ++i) _instrument->DrawPixel(i, j, (abs(i - x) > 1 ? true : false));
-+	for(i=x-2; i<=x+2; ++i) _instrument->DrawPixel(i, j, (std::abs(i - x) > 1 ? true : false));
- 	++j;
- 	for(i=x-2; i<=x+2; ++i) _instrument->DrawPixel(i, j, (i != x ? true : false));
- 	++j;
-
diff --git a/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89_page_cal.cxx b/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89_page_cal.cxx
deleted file mode 100644
index cdad2f72d7ec..000000000000
--- a/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89_page_cal.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Instrumentation/KLN89/kln89_page_cal.cxx.orig	2012-04-28 20:06:37.121237686 +0300
-+++ src/Instrumentation/KLN89/kln89_page_cal.cxx	2012-04-28 20:06:54.865235431 +0300
-@@ -21,6 +21,8 @@
- //
- // $Id$
- 
-+#include <cstdlib>
-+
- #ifdef HAVE_CONFIG_H
- #  include "config.h"
- #endif
-
diff --git a/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89_page_nav.cxx b/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89_page_nav.cxx
deleted file mode 100644
index 16c155d3b4b0..000000000000
--- a/games/flightgear/files/patch-src-Instrumentation-KLN89-kln89_page_nav.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Instrumentation/KLN89/kln89_page_nav.cxx.orig	2012-04-30 17:00:03.000000000 +0200
-+++ src/Instrumentation/KLN89/kln89_page_nav.cxx	2012-04-30 17:03:56.000000000 +0200
-@@ -21,6 +21,8 @@
- //
- // $Id$
- 
-+#include <cstdlib>
-+
- #ifdef HAVE_CONFIG_H
- #  include "config.h"
- #endif
diff --git a/games/flightgear/files/patch-src-Instrumentation-dclgps.cxx b/games/flightgear/files/patch-src-Instrumentation-dclgps.cxx
deleted file mode 100644
index cd308966fde9..000000000000
--- a/games/flightgear/files/patch-src-Instrumentation-dclgps.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Instrumentation/dclgps.cxx.orig	2012-04-28 19:17:14.631235381 +0300
-+++ src/Instrumentation/dclgps.cxx	2012-04-28 19:17:34.070236096 +0300
-@@ -39,6 +39,7 @@
- 
- #include <fstream>
- #include <iostream>
-+#include <cstdlib>
- 
- using namespace std;
- 
-
diff --git a/games/flightgear/files/patch-src-Network-ATC-Inputs.cxx b/games/flightgear/files/patch-src-Network-ATC-Inputs.cxx
deleted file mode 100644
index 098192a1c9c2..000000000000
--- a/games/flightgear/files/patch-src-Network-ATC-Inputs.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Network/ATC-Inputs.cxx.orig	2012-04-29 01:15:22.403234567 +0300
-+++ src/Network/ATC-Inputs.cxx	2012-04-29 01:16:16.046237193 +0300
-@@ -31,6 +31,7 @@
- #  include <sys/types.h>
- #  include <sys/stat.h>
- #  include <fcntl.h>
-+#  include <stdlib.h>
- #  include <unistd.h>
- #  include <istream>
- #endif
-
diff --git a/games/flightgear/files/patch-src-Network-ATC-Outputs.cxx b/games/flightgear/files/patch-src-Network-ATC-Outputs.cxx
deleted file mode 100644
index 22521ad5b800..000000000000
--- a/games/flightgear/files/patch-src-Network-ATC-Outputs.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Network/ATC-Outputs.cxx.orig	2012-04-29 01:16:36.569235929 +0300
-+++ src/Network/ATC-Outputs.cxx	2012-04-29 01:16:53.428236074 +0300
-@@ -31,6 +31,7 @@
- #  include <sys/types.h>
- #  include <sys/stat.h>
- #  include <fcntl.h>
-+#  include <stdlib.h>
- #  include <unistd.h>
- #  include <ostream>
- #endif
-
diff --git a/games/flightgear/files/patch-src-Network-AV400.cxx b/games/flightgear/files/patch-src-Network-AV400.cxx
deleted file mode 100644
index 8be5dfdd587f..000000000000
--- a/games/flightgear/files/patch-src-Network-AV400.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Network/AV400.cxx.orig	2012-04-29 01:21:15.898235552 +0300
-+++ src/Network/AV400.cxx	2012-04-29 01:21:32.302236489 +0300
-@@ -25,6 +25,7 @@
- #  include "config.h"
- #endif
- 
-+#include <cstdlib>
- #include <cstring>
- 
- #include <simgear/debug/logstream.hxx>
-
diff --git a/games/flightgear/files/patch-src-Network-AV400Sim.cxx b/games/flightgear/files/patch-src-Network-AV400Sim.cxx
deleted file mode 100644
index 8fde1f46c414..000000000000
--- a/games/flightgear/files/patch-src-Network-AV400Sim.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Network/AV400Sim.cxx.orig	2012-04-29 01:21:53.059237359 +0300
-+++ src/Network/AV400Sim.cxx	2012-04-29 01:22:08.308236000 +0300
-@@ -29,6 +29,7 @@
- #  include "config.h"
- #endif
- 
-+#include <cstdlib>
- #include <cstring>
- 
- #include <simgear/debug/logstream.hxx>
-
diff --git a/games/flightgear/files/patch-src-Network-atlas.cxx b/games/flightgear/files/patch-src-Network-atlas.cxx
deleted file mode 100644
index 2abe511a6b9e..000000000000
--- a/games/flightgear/files/patch-src-Network-atlas.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Network/atlas.cxx.orig	2012-04-29 11:25:56.839235311 +0300
-+++ src/Network/atlas.cxx	2012-04-29 11:26:08.073235344 +0300
-@@ -24,6 +24,7 @@
- #  include "config.h"
- #endif
- 
-+#include <cstdlib>
- #include <cstring>
- 
- #include <simgear/debug/logstream.hxx>
-
diff --git a/games/flightgear/files/patch-src-Network-garmin.cxx b/games/flightgear/files/patch-src-Network-garmin.cxx
deleted file mode 100644
index b3c73112f10c..000000000000
--- a/games/flightgear/files/patch-src-Network-garmin.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Network/garmin.cxx.orig	2012-04-29 11:43:22.790235105 +0300
-+++ src/Network/garmin.cxx	2012-04-29 11:43:38.200345541 +0300
-@@ -25,6 +25,7 @@
- #endif
- 
- #include <iostream>
-+#include <cstdlib>
- #include <cstring>
- 
- #include <simgear/debug/logstream.hxx>
-
diff --git a/games/flightgear/files/patch-src-Network-nmea.cxx b/games/flightgear/files/patch-src-Network-nmea.cxx
deleted file mode 100644
index ca10856b74fa..000000000000
--- a/games/flightgear/files/patch-src-Network-nmea.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Network/nmea.cxx.orig	2012-04-29 11:44:11.629236922 +0300
-+++ src/Network/nmea.cxx	2012-04-29 11:44:22.384235831 +0300
-@@ -24,6 +24,7 @@
- #  include "config.h"
- #endif
- 
-+#include <cstdlib>
- #include <cstring>
- 
- #include <simgear/debug/logstream.hxx>
-
diff --git a/games/flightgear/files/patch-src-Systems-electrical.cxx b/games/flightgear/files/patch-src-Systems-electrical.cxx
deleted file mode 100644
index 5567382a39f5..000000000000
--- a/games/flightgear/files/patch-src-Systems-electrical.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Systems/electrical.cxx.orig	2012-04-30 10:16:40.139557199 +0300
-+++ src/Systems/electrical.cxx	2012-04-30 10:16:50.765555099 +0300
-@@ -24,6 +24,7 @@
- #  include <config.h>
- #endif
- 
-+#include <cstdlib>
- #include <cstring>
- 
- #include <simgear/structure/exception.hxx>
-
diff --git a/games/flightgear/files/patch-src-Systems-system_mgr.cxx b/games/flightgear/files/patch-src-Systems-system_mgr.cxx
deleted file mode 100644
index 91937bf14b52..000000000000
--- a/games/flightgear/files/patch-src-Systems-system_mgr.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Systems/system_mgr.cxx.orig	2012-04-30 10:59:27.756554918 +0300
-+++ src/Systems/system_mgr.cxx	2012-04-30 10:59:44.991555084 +0300
-@@ -16,6 +16,7 @@
- #include <Main/globals.hxx>
- #include <Main/util.hxx>
- 
-+#include <cstdlib>
- #include <iostream>
- #include <string>
- #include <sstream>
-
diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist
index 24131eba1ed9..5a5d06292a30 100644
--- a/games/flightgear/pkg-plist
+++ b/games/flightgear/pkg-plist
@@ -6,6 +6,7 @@ bin/fgjs
 bin/metar
 bin/terrasync
 bin/yasim
+bin/yasim-proptest
 bin/GPSsmooth
 bin/MIDGsmooth
 bin/UGsmooth