Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Mar 2016 17:27:59 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r410636 - in head: devel/simgear devel/simgear/files games/flightgear games/flightgear-aircraft games/flightgear-data games/flightgear-data/files games/flightgear/files
Message-ID:  <201603081727.u28HRxEe051848@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Tue Mar  8 17:27:59 2016
New Revision: 410636
URL: https://svnweb.freebsd.org/changeset/ports/410636

Log:
  Update Simgear & Flightgear to 2016.1.1

Added:
  head/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c   (contents, props changed)
  head/games/flightgear/files/patch-src-GUI-resources.qrc   (contents, props changed)
Deleted:
  head/devel/simgear/files/
  head/games/flightgear-data/files/
  head/games/flightgear/files/patch-6a30e70
Modified:
  head/devel/simgear/Makefile
  head/devel/simgear/distinfo
  head/devel/simgear/pkg-plist
  head/games/flightgear-aircraft/Makefile
  head/games/flightgear-aircraft/distinfo
  head/games/flightgear-data/Makefile
  head/games/flightgear-data/distinfo
  head/games/flightgear/Makefile
  head/games/flightgear/distinfo
  head/games/flightgear/files/patch-CMakeLists.txt
  head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt
  head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/devel/simgear/Makefile	Tue Mar  8 17:27:59 2016	(r410636)
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	simgear
-PORTVERSION=	3.4.0
+PORTVERSION=	2016.1.1
 CATEGORIES=	devel games
-MASTER_SITES=	http://mirrors.ibiblio.org/simgear/ftp/Source/ \
-		ftp://ftp.de.flightgear.org/pub/simgear/Source/ \
-		ftp://goflyflightgear.com/simgear/Source/ \
-		ftp://flightgear.wo0t.de/simgear-ftp/ftp/Source/
+MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Toolkit for 3D games and simulations
@@ -18,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libosg.so:${PORTSDIR}/graphics/osg
 
-USE_XORG=	ice sm x11 xext xi xt xmu
+USE_XORG=	ice sm x11 xext xi xmu xt
 USE_GL=		gl glu glut
 USES=		alias cmake compiler cpe jpeg openal:al,alut tar:bzip2
 

Modified: head/devel/simgear/distinfo
==============================================================================
--- head/devel/simgear/distinfo	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/devel/simgear/distinfo	Tue Mar  8 17:27:59 2016	(r410636)
@@ -1,2 +1,2 @@
-SHA256 (simgear-3.4.0.tar.bz2) = 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894
-SIZE (simgear-3.4.0.tar.bz2) = 1057455
+SHA256 (simgear-2016.1.1.tar.bz2) = dbbc40115bc41563d930102484a3682e9fa4dda6f120feaa1fe82e0eb9d96c0d
+SIZE (simgear-2016.1.1.tar.bz2) = 1065810

Modified: head/devel/simgear/pkg-plist
==============================================================================
--- head/devel/simgear/pkg-plist	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/devel/simgear/pkg-plist	Tue Mar  8 17:27:59 2016	(r410636)
@@ -160,6 +160,7 @@ include/simgear/nasal/cppbind/detail/nas
 include/simgear/nasal/cppbind/detail/to_nasal_helper.hxx
 include/simgear/nasal/cppbind/from_nasal.hxx
 include/simgear/nasal/cppbind/to_nasal.hxx
+include/simgear/nasal/iolib.h
 include/simgear/nasal/naref.h
 include/simgear/nasal/nasal.h
 include/simgear/package/Catalog.hxx
@@ -327,3 +328,7 @@ include/simgear/version.h
 include/simgear/xml/easyxml.hxx
 lib/libSimGearCore.a
 lib/libSimGearScene.a
+lib/cmake/SimGear/SimGearConfig.cmake
+lib/cmake/SimGear/SimGearConfigVersion.cmake
+lib/cmake/SimGear/SimGearTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/SimGear/SimGearTargets.cmake

Modified: head/games/flightgear-aircraft/Makefile
==============================================================================
--- head/games/flightgear-aircraft/Makefile	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear-aircraft/Makefile	Tue Mar  8 17:27:59 2016	(r410636)
@@ -2,52 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-aircraft
-PORTVERSION=	20150303
+PORTVERSION=	20160305
 CATEGORIES=	games
-# see http://www.flightgear.org/templates.js
-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/
+# See http://www.flightgear.org/templates.js
+MASTER_SITES=	http://fgfs.goneabitbursar.com/official/ \
+	http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2016.1/ \
+	http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2016.1/
 # 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_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_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_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
+# Please contact MAINTAINER if a plane is missing
+DISTFILES=	737-200.zip \
+	A-10.zip \
+	A300.zip \
+	Alouette-II.zip \
+	Alphajet.zip \
+	B-17.zip \
+	Breguet-XIX.zip \
+	C130.zip \
+	Caravelle.zip \
+	Caudron-G3.zip \
+	F80C.zip \
+	Hurricane.zip \
+	IL-2.zip \
+	Lightning.zip \
+	Lockheed1049h.zip \
+	Messerschmitt-P1101.zip \
+	MirageIII.zip \
+	PaperAirplane.zip \
+	Pond-Racer.zip \
+	R44.zip \
+	Spitfire.zip \
+	Stieglitz.zip \
+	Super-Etendard.zip \
+	Supermarine-S.6B.zip \
+	Superwal.zip \
+	airwaveXtreme150.zip \
+	asw20.zip \
+	bf109.zip \
+	c310.zip \
+	dhc3.zip \
+	f16.zip \
+	harrier.zip \
+	pa24-250.zip \
+	tu154.zip \
+	wrightFlyer1903.zip
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	martymac@FreeBSD.org

Modified: head/games/flightgear-aircraft/distinfo
==============================================================================
--- head/games/flightgear-aircraft/distinfo	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear-aircraft/distinfo	Tue Mar  8 17:27:59 2016	(r410636)
@@ -1,70 +1,70 @@
-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_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
+SHA256 (flightgear-aircraft/737-200.zip) = ab55b00e2554fab1903dbdd94cfec38a4f432928c64eefab2b71782cc1bf18db
+SIZE (flightgear-aircraft/737-200.zip) = 12401593
+SHA256 (flightgear-aircraft/A-10.zip) = 4f455c34decf30c1c8388641161b0487e277428bc70c10442374f1505bc54746
+SIZE (flightgear-aircraft/A-10.zip) = 9328044
+SHA256 (flightgear-aircraft/A300.zip) = 79a501bbef0bcef814a377cbd4b5cba1fb2495cbc77b5bf760a0c3dabcf9281b
+SIZE (flightgear-aircraft/A300.zip) = 386184
+SHA256 (flightgear-aircraft/Alouette-II.zip) = 9969b461c1d081a37d1ad9885968842f5a123b678b9fc6df3badb51669ea7ed9
+SIZE (flightgear-aircraft/Alouette-II.zip) = 5381140
+SHA256 (flightgear-aircraft/Alphajet.zip) = a0b0127318415063b51cfcd1fa4d8c1c3f031797a4492c96f1568d8daef6625b
+SIZE (flightgear-aircraft/Alphajet.zip) = 19410469
+SHA256 (flightgear-aircraft/B-17.zip) = 0c0d9f4b01e7761c56647465e32792b011cbf6fc085eb799a52b69d75ae765c9
+SIZE (flightgear-aircraft/B-17.zip) = 17434364
+SHA256 (flightgear-aircraft/Breguet-XIX.zip) = e7d99c113a885868e9ff07e4f74d33bcb59e41ffd1e2ec440ad326cc26d0484d
+SIZE (flightgear-aircraft/Breguet-XIX.zip) = 6369018
+SHA256 (flightgear-aircraft/C130.zip) = 421224d9b4ca9776a88af18fc1795038d92544331f2283480f71a2b906a1f0e6
+SIZE (flightgear-aircraft/C130.zip) = 23131509
+SHA256 (flightgear-aircraft/Caravelle.zip) = 6e728348f0a61e898ce1edb3d573f3d56036fa28073c19d591bc4e717207d006
+SIZE (flightgear-aircraft/Caravelle.zip) = 14686948
+SHA256 (flightgear-aircraft/Caudron-G3.zip) = 72135b0ca1a2cd3028d9ce44ad5a71b25803b8a13ae6fb05f94bed2ca21176ac
+SIZE (flightgear-aircraft/Caudron-G3.zip) = 4531626
+SHA256 (flightgear-aircraft/F80C.zip) = 128ece282cba5c7ce9cffb3d11655d85314c6c0f32a34392a6047bc990fff01d
+SIZE (flightgear-aircraft/F80C.zip) = 1528349
+SHA256 (flightgear-aircraft/Hurricane.zip) = 29a69fb0b98990a1fdcd496d730302412346c796b75974b0cb0579a83d2e6334
+SIZE (flightgear-aircraft/Hurricane.zip) = 12062980
+SHA256 (flightgear-aircraft/IL-2.zip) = 93de73de118a2900cf5def09ad22376e7af07754127086510f48474745566b20
+SIZE (flightgear-aircraft/IL-2.zip) = 6093351
+SHA256 (flightgear-aircraft/Lightning.zip) = eb8846f0dac2c6dc9098b389e7bd9fe8c548c18e0ddb5fe33b5c35d43b3a40ac
+SIZE (flightgear-aircraft/Lightning.zip) = 4734150
+SHA256 (flightgear-aircraft/Lockheed1049h.zip) = 7dd9233e9854546916176aa53cc7a0375c0e2d20939376b282efe51b54429a73
+SIZE (flightgear-aircraft/Lockheed1049h.zip) = 12383487
+SHA256 (flightgear-aircraft/Messerschmitt-P1101.zip) = 0e4fb20a8ea811f0b52a6855c5ac8f72b78c795c14e9ab066f89dfcbd86089b9
+SIZE (flightgear-aircraft/Messerschmitt-P1101.zip) = 4359275
+SHA256 (flightgear-aircraft/MirageIII.zip) = d4dd878fab7f05cdd58fe71b8a509414897cc38628d37502c7be5f24d7f79419
+SIZE (flightgear-aircraft/MirageIII.zip) = 11112483
+SHA256 (flightgear-aircraft/PaperAirplane.zip) = 2584d8d1248891c0d6324bd37b96d562c552dc4038eb43353990f65214cfe3d8
+SIZE (flightgear-aircraft/PaperAirplane.zip) = 867872
+SHA256 (flightgear-aircraft/Pond-Racer.zip) = e1b3fb2d6d56ac3d917c3b2619ccd9e0655d1b2bea86beb689505df3a9a61194
+SIZE (flightgear-aircraft/Pond-Racer.zip) = 3063526
+SHA256 (flightgear-aircraft/R44.zip) = 5081e501745a8d42675f6f09b3d798e3357968dea44523e59f6f989e4dc93562
+SIZE (flightgear-aircraft/R44.zip) = 8909199
+SHA256 (flightgear-aircraft/Spitfire.zip) = 2f8504c2e66abe010c3be1335472ec975ed28a87c3bf3d46e6e15f00ede8107b
+SIZE (flightgear-aircraft/Spitfire.zip) = 21052304
+SHA256 (flightgear-aircraft/Stieglitz.zip) = d77cd955ebe6133cb9d45bc5801c33b77300bed638f501d77929ffeefacb6572
+SIZE (flightgear-aircraft/Stieglitz.zip) = 4499810
+SHA256 (flightgear-aircraft/Super-Etendard.zip) = 096446f0ece8a374768fdf7936f8e2fe9034607daeeb77ea182bb4ead9287b3b
+SIZE (flightgear-aircraft/Super-Etendard.zip) = 10418381
+SHA256 (flightgear-aircraft/Supermarine-S.6B.zip) = 6b7df8d3f7c4d3cd929c6db4c663082553ac4d2fe0782a2cbcdf3bf4a147e3d0
+SIZE (flightgear-aircraft/Supermarine-S.6B.zip) = 3264085
+SHA256 (flightgear-aircraft/Superwal.zip) = fe2d85752c12cab0af9f54922870d08fd5ded3264388781fc976111ade0b0784
+SIZE (flightgear-aircraft/Superwal.zip) = 2654839
+SHA256 (flightgear-aircraft/airwaveXtreme150.zip) = 6e42c783810d5ee9efff2f3b6386edd4f8526fef74fc701e8fec1a05e0f2fc72
+SIZE (flightgear-aircraft/airwaveXtreme150.zip) = 1244151
+SHA256 (flightgear-aircraft/asw20.zip) = 2d72af7d408587a6a242212061fc41da031cbefe354b43b96ef3be40632002f6
+SIZE (flightgear-aircraft/asw20.zip) = 3599930
+SHA256 (flightgear-aircraft/bf109.zip) = 05bd7ded026ccbd81980ba1dd295b6ac4a893da602f3b673de10bb9ade6ad655
+SIZE (flightgear-aircraft/bf109.zip) = 24302759
+SHA256 (flightgear-aircraft/c310.zip) = eee4836077af1713310e771e4954eecc50f12cf9c6d26fefdb2bc5d0c9f75046
+SIZE (flightgear-aircraft/c310.zip) = 615101
+SHA256 (flightgear-aircraft/dhc3.zip) = eed1c76bc11858e0a3b167003b13e5e6a16b1fe8214a8c17befcf7b176899c87
+SIZE (flightgear-aircraft/dhc3.zip) = 35577481
+SHA256 (flightgear-aircraft/f16.zip) = be91c032017c72c01b1b194f2803bb9c2f1db1ae16dcad07de104fb8c427d91e
+SIZE (flightgear-aircraft/f16.zip) = 17239505
+SHA256 (flightgear-aircraft/harrier.zip) = 80b1c55127208566b5b943b2adc5027e99f9a7644f430f20f5b1d10695a705b6
+SIZE (flightgear-aircraft/harrier.zip) = 4235554
+SHA256 (flightgear-aircraft/pa24-250.zip) = c8d9b8abef5d751a3308c06f75ecd8ab74edf607bf8a3e72366e02f3244e0aa9
+SIZE (flightgear-aircraft/pa24-250.zip) = 2100211
+SHA256 (flightgear-aircraft/tu154.zip) = 85d259c9a2abd3938bde850e783e2edaaaa86dc5e40f657d85fb68ebe0e8eb76
+SIZE (flightgear-aircraft/tu154.zip) = 1387134
+SHA256 (flightgear-aircraft/wrightFlyer1903.zip) = 5b6379b7524fd2b098fd5cd712201bfb4b48f9a77c6be55f7c0491846ff8311b
+SIZE (flightgear-aircraft/wrightFlyer1903.zip) = 1402359

Modified: head/games/flightgear-data/Makefile
==============================================================================
--- head/games/flightgear-data/Makefile	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear-data/Makefile	Tue Mar  8 17:27:59 2016	(r410636)
@@ -2,16 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-data
-PORTVERSION=	3.4.0
-PORTREVISION=	1
+PORTVERSION=	2016.1.1
 CATEGORIES=	games
-# see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Shared/ \
-		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Shared/ \
-		ftp://ftp.kingmont.com/flightsims/flightgear/Shared/ \
-		ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ \
-		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Shared/
-DISTNAME=	FlightGear-data-${PORTVERSION}
+MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
+DISTNAME=	FlightGear-${PORTVERSION}-data
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	FlightGear scenery, textures, and aircraft models
@@ -43,6 +37,6 @@ pre-install:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} '! -name .gitignore')
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! ( -name .git -o -name .gitignore )")
 
 .include <bsd.port.mk>

Modified: head/games/flightgear-data/distinfo
==============================================================================
--- head/games/flightgear-data/distinfo	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear-data/distinfo	Tue Mar  8 17:27:59 2016	(r410636)
@@ -1,2 +1,2 @@
-SHA256 (FlightGear-data-3.4.0.tar.bz2) = 8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b
-SIZE (FlightGear-data-3.4.0.tar.bz2) = 1145893777
+SHA256 (FlightGear-2016.1.1-data.tar.bz2) = 36016ac5ab83fc6ad44c5cebe0f4fa7a14cf55ff5b699016abdeacf5a04c4c18
+SIZE (FlightGear-2016.1.1-data.tar.bz2) = 1266743984

Modified: head/games/flightgear/Makefile
==============================================================================
--- head/games/flightgear/Makefile	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear/Makefile	Tue Mar  8 17:27:59 2016	(r410636)
@@ -2,15 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	3.4.0
-PORTREVISION=	1
+PORTVERSION=	2016.1.1
 CATEGORIES=	games
-# see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Source/ \
-		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Source/ \
-		ftp://ftp.kingmont.com/flightsims/flightgear/Source/ \
-		ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \
-		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Source/
+MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	The FlightGear flight simulator
@@ -28,11 +22,11 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.
 		${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear \
 		${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
 
-USE_XORG=	ice sm x11 xext xft xi xinerama xt xmu
+USE_XORG=	ice sm x11 xext xft xi xinerama xmu xt
 USE_GL=		gl glu glut
 USE_QT5=	core buildtools qmake widgets
 
-USES=		alias cpe dos2unix cmake compiler jpeg openal:al,alut sqlite \
+USES=		alias cmake compiler cpe dos2unix jpeg openal:al,alut sqlite \
 		tar:bzip2
 DOS2UNIX_REGEX=	.*\.(c|h|cxx|cpp|hxx|hpp)
 CMAKE_ARGS+=	-DENABLE_JS_SERVER:BOOL=ON \
@@ -45,6 +39,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=	DBUS
 OPTIONS_DEFAULT=	DBUS
 DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_USES=	pkgconfig
 DBUS_CMAKE_ON=	-DUSE_DBUS:BOOL=ON
 DBUS_CMAKE_OFF=	-DUSE_DBUS:BOOL=OFF
 
@@ -55,7 +50,12 @@ DBUS_CMAKE_OFF=	-DUSE_DBUS:BOOL=OFF
 USE_GCC=	yes
 .endif
 
+post-patch:
+	${MV} "${WRKSRC}/src/GUI/ndb-small-icon .png" \
+		"${WRKSRC}/src/GUI/ndb-small-icon.png"
+
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server \
+		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>

Modified: head/games/flightgear/distinfo
==============================================================================
--- head/games/flightgear/distinfo	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear/distinfo	Tue Mar  8 17:27:59 2016	(r410636)
@@ -1,2 +1,2 @@
-SHA256 (flightgear-3.4.0.tar.bz2) = b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780
-SIZE (flightgear-3.4.0.tar.bz2) = 7522457
+SHA256 (flightgear-2016.1.1.tar.bz2) = acdffb8a6a000cd44b23816f5d1467dbcf375d3cbd6233b2998467bd55dd60ac
+SIZE (flightgear-2016.1.1.tar.bz2) = 7541607

Added: head/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c	Tue Mar  8 17:27:59 2016	(r410636)
@@ -0,0 +1,11 @@
+--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig	2016-03-04 22:01:27.406278681 +0000
++++ 3rdparty/hts_engine_API/lib/HTS_misc.c	2016-03-04 22:01:51.791013177 +0000
+@@ -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(__FreeBSD__) || defined(__ANDROID__)
+       return (size_t) pos;
+ #else
+       return (size_t) pos.__pos;

Modified: head/games/flightgear/files/patch-CMakeLists.txt
==============================================================================
--- head/games/flightgear/files/patch-CMakeLists.txt	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear/files/patch-CMakeLists.txt	Tue Mar  8 17:27:59 2016	(r410636)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-08-07 18:59:55.669709204 +0000
-+++ CMakeLists.txt	2015-08-07 19:09:00.637025953 +0000
-@@ -355,6 +355,7 @@
+--- CMakeLists.txt.orig	2016-03-04 21:42:31.724356963 +0000
++++ CMakeLists.txt	2016-03-04 21:44:48.254713994 +0000
+@@ -376,6 +376,7 @@
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS} -D_REENTRANT")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} -D_REENTRANT ${BOOST_CXX_FLAGS}")
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}")

Modified: head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt
==============================================================================
--- head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt	Tue Mar  8 17:27:59 2016	(r410636)
@@ -1,6 +1,6 @@
---- 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 @@
+--- CMakeLists.txt.orig	2016-03-04 21:42:31.724356963 +0000
++++ CMakeLists.txt	2016-03-04 21:47:33.738336446 +0000
+@@ -310,7 +310,7 @@
  endif (ENABLE_QT)
  ##############################################################################
  

Modified: head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt
==============================================================================
--- head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt	Tue Mar  8 17:09:02 2016	(r410635)
+++ head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt	Tue Mar  8 17:27:59 2016	(r410636)
@@ -1,12 +1,9 @@
---- utils/CMakeLists.txt.orig	2013-10-01 16:13:22.000000000 +0200
-+++ utils/CMakeLists.txt	2013-10-01 16:13:47.000000000 +0200
-@@ -29,4 +29,8 @@
- 
- if(ENABLE_TERRASYNC)
-     add_subdirectory(TerraSync)
--endif()
-\ No newline at end of file
-+endif()
+--- utils/CMakeLists.txt.orig	2016-03-04 21:48:12.374333305 +0000
++++ utils/CMakeLists.txt	2016-03-04 21:48:56.931894245 +0000
+@@ -34,3 +34,7 @@
+ if(ENABLE_STGMERGE)
+     add_subdirectory(stgmerge)
+ endif()
 +
 +if(ENABLE_JS_SERVER)
 +    add_subdirectory(js_server)

Added: head/games/flightgear/files/patch-src-GUI-resources.qrc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/flightgear/files/patch-src-GUI-resources.qrc	Tue Mar  8 17:27:59 2016	(r410636)
@@ -0,0 +1,11 @@
+--- src/GUI/resources.qrc.orig	2016-03-04 22:06:39.209257057 +0000
++++ src/GUI/resources.qrc	2016-03-04 22:06:55.142504964 +0000
+@@ -15,7 +15,7 @@
+         <file alias="airport-tower-icon">airport-tower-icon.png</file>
+         <file alias="vor-dme-icon">vor-dme-icon.png</file>
+         <file alias="seaport-tower-icon">seaport-tower-icon.png</file>
+-        <file alias="ndb-small-icon">ndb-small-icon .png</file>
++        <file alias="ndb-small-icon">ndb-small-icon.png</file>
+         <file alias="ndb-large-icon">ndb-large-icon.png</file>
+         <file alias="airplane-icon">airplane-icon.png</file>
+         <file alias="airport-closed-icon">airport-closed-icon.png</file>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603081727.u28HRxEe051848>