From owner-svn-ports-head@FreeBSD.ORG Fri Mar 28 14:13:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29560E84; Fri, 28 Mar 2014 14:13:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 120C7196; Fri, 28 Mar 2014 14:13:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2SED6ZQ007000; Fri, 28 Mar 2014 14:13:06 GMT (envelope-from martymac@svn.freebsd.org) Received: (from martymac@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2SED28P006977; Fri, 28 Mar 2014 14:13:02 GMT (envelope-from martymac@svn.freebsd.org) Message-Id: <201403281413.s2SED28P006977@svn.freebsd.org> From: Ganael LAPLANCHE Date: Fri, 28 Mar 2014 14:13:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349425 - in head: devel/simgear devel/simgear/files games/flightgear games/flightgear-aircraft games/flightgear-data games/flightgear/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Mar 2014 14:13:06 -0000 Author: martymac Date: Fri Mar 28 14:13:02 2014 New Revision: 349425 URL: http://svnweb.freebsd.org/changeset/ports/349425 QAT: https://qat.redports.org/buildarchive/r349425/ Log: Update Simgear and Flightgear ports to 3.0.0 Added: head/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h (contents, props changed) head/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt (contents, props changed) head/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h (contents, props changed) head/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c (contents, props changed) Modified: head/devel/simgear/Makefile head/devel/simgear/distinfo head/devel/simgear/files/patch-CMakeLists.txt 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/pkg-plist Modified: head/devel/simgear/Makefile ============================================================================== --- head/devel/simgear/Makefile Fri Mar 28 14:10:58 2014 (r349424) +++ head/devel/simgear/Makefile Fri Mar 28 14:13:02 2014 (r349425) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= simgear -PORTVERSION= 2.12.1 -PORTREVISION= 1 +PORTVERSION= 3.0.0 CATEGORIES= devel games MASTER_SITES= http://mirrors.ibiblio.org/simgear/ftp/Source/ \ ftp://ftp.de.flightgear.org/pub/simgear/Source/ \ @@ -20,10 +19,9 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libosg.so:${PORTSDIR}/graphics/osg -USE_BZIP2= yes USE_XORG= ice sm x11 xext xi xt xmu USE_GL= gl glu glut -USES= cmake openal:al,alut +USES= tar:bzip2 cmake openal:al,alut CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON .include Modified: head/devel/simgear/distinfo ============================================================================== --- head/devel/simgear/distinfo Fri Mar 28 14:10:58 2014 (r349424) +++ head/devel/simgear/distinfo Fri Mar 28 14:13:02 2014 (r349425) @@ -1,2 +1,2 @@ -SHA256 (simgear-2.12.1.tar.bz2) = 24d20fc592bff20b3572a960afa973ff4586850126f5ec520001dc47dfcf0d71 -SIZE (simgear-2.12.1.tar.bz2) = 962809 +SHA256 (simgear-3.0.0.tar.bz2) = 09448f87e6c2b5b6101a5a4eac331c1e1b998d61ec2e59614449110de2e68016 +SIZE (simgear-3.0.0.tar.bz2) = 969971 Modified: head/devel/simgear/files/patch-CMakeLists.txt ============================================================================== --- head/devel/simgear/files/patch-CMakeLists.txt Fri Mar 28 14:10:58 2014 (r349424) +++ head/devel/simgear/files/patch-CMakeLists.txt Fri Mar 28 14:13:02 2014 (r349425) @@ -1,11 +1,44 @@ ---- CMakeLists.txt.orig 2013-02-23 10:59:16.000000000 +0100 -+++ CMakeLists.txt 2013-02-23 10:59:35.000000000 +0100 -@@ -327,7 +327,7 @@ - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}") +--- CMakeLists.txt.orig 2014-02-15 01:04:11.000000000 +0100 ++++ CMakeLists.txt 2014-03-10 18:06:13.000000000 +0100 +@@ -259,18 +259,20 @@ + endif(HAVE_CLOCK_GETTIME) + + set(DL_LIBRARY "") +-check_cxx_source_compiles( +- "#include +- int main(void) { +- return 0; +- } +- " +- HAVE_DLFCN_H) +- +-if(HAVE_DLFCN_H) +- check_library_exists(dl dlerror "" HAVE_DL) +- set(DL_LIBRARY "dl") +-endif() ++if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") ++ check_cxx_source_compiles( ++ "#include ++ int main(void) { ++ return 0; ++ } ++ " ++ HAVE_DLFCN_H) ++ ++ if(HAVE_DLFCN_H) ++ check_library_exists(dl dlerror "" HAVE_DL) ++ set(DL_LIBRARY "dl") ++ endif() ++endif (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + + SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually 'd' on windows") + SET(CMAKE_RELEASE_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows") +@@ -342,7 +344,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") -include_directories(${PROJECT_SOURCE_DIR}) +include_directories(BEFORE ${PROJECT_SOURCE_DIR}) include_directories(${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include) include_directories(${PROJECT_BINARY_DIR}/simgear) - include_directories(${PROJECT_BINARY_DIR}/simgear/xml) + Modified: head/devel/simgear/pkg-plist ============================================================================== --- head/devel/simgear/pkg-plist Fri Mar 28 14:10:58 2014 (r349424) +++ head/devel/simgear/pkg-plist Fri Mar 28 14:13:02 2014 (r349425) @@ -22,7 +22,6 @@ include/simgear/bvh/BVHTransform.hxx include/simgear/bvh/BVHVisitor.hxx include/simgear/canvas/Canvas.hxx include/simgear/canvas/CanvasEvent.hxx -include/simgear/canvas/CanvasEventListener.hxx include/simgear/canvas/CanvasEventManager.hxx include/simgear/canvas/CanvasEventTypes.hxx include/simgear/canvas/CanvasEventVisitor.hxx @@ -65,6 +64,9 @@ include/simgear/ephemeris/uranus.hxx include/simgear/ephemeris/venus.hxx include/simgear/io/DAVMultiStatus.hxx include/simgear/io/HTTPClient.hxx +include/simgear/io/HTTPContentDecode.hxx +include/simgear/io/HTTPFileRequest.hxx +include/simgear/io/HTTPMemoryRequest.hxx include/simgear/io/HTTPRequest.hxx include/simgear/io/SVNDirectory.hxx include/simgear/io/SVNReportParser.hxx @@ -113,6 +115,7 @@ include/simgear/math/sg_geodesy.hxx include/simgear/math/sg_random.h include/simgear/math/sg_types.hxx include/simgear/misc/CSSBorder.hxx +include/simgear/misc/ListDiff.hxx include/simgear/misc/ResourceManager.hxx include/simgear/misc/gzcontainerfile.hxx include/simgear/misc/interpolator.hxx @@ -129,7 +132,9 @@ include/simgear/misc/zfstream.hxx include/simgear/nasal/cppbind/Ghost.hxx include/simgear/nasal/cppbind/NasalCallContext.hxx include/simgear/nasal/cppbind/NasalHash.hxx +include/simgear/nasal/cppbind/NasalObjectHolder.hxx include/simgear/nasal/cppbind/NasalString.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 include/simgear/nasal/cppbind/detail/nasal_traits.hxx @@ -161,7 +166,6 @@ include/simgear/scene/material/Effect.hx include/simgear/scene/material/EffectBuilder.hxx include/simgear/scene/material/EffectCullVisitor.hxx include/simgear/scene/material/EffectGeode.hxx -include/simgear/scene/material/GLPredicate.hxx include/simgear/scene/material/Pass.hxx include/simgear/scene/material/Technique.hxx include/simgear/scene/material/TextureBuilder.hxx @@ -230,6 +234,7 @@ include/simgear/scene/util/DeletionManag include/simgear/scene/util/NodeAndDrawableVisitor.hxx include/simgear/scene/util/Noise.hxx include/simgear/scene/util/OptionsReadFileCallback.hxx +include/simgear/scene/util/OsgDebug.hxx include/simgear/scene/util/OsgMath.hxx include/simgear/scene/util/OsgSingleton.hxx include/simgear/scene/util/PrimitiveUtils.hxx @@ -285,6 +290,7 @@ include/simgear/structure/commands.hxx include/simgear/structure/event_mgr.hxx include/simgear/structure/exception.hxx include/simgear/structure/intern.hxx +include/simgear/structure/map.hxx include/simgear/structure/singleton.hpp include/simgear/structure/subsystem_mgr.hxx include/simgear/threads/SGGuard.hxx Modified: head/games/flightgear-aircraft/Makefile ============================================================================== --- head/games/flightgear-aircraft/Makefile Fri Mar 28 14:10:58 2014 (r349424) +++ head/games/flightgear-aircraft/Makefile Fri Mar 28 14:13:02 2014 (r349425) @@ -2,19 +2,19 @@ # $FreeBSD$ PORTNAME= flightgear-aircraft -PORTVERSION= 20131001 +PORTVERSION= 20140319 CATEGORIES= games # see http://www.flightgear.org/templates.js -MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2.12/ \ - http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.12/ \ - ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.12/ \ - ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.12/ \ - ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.12/ +MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.0/ \ + http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.0/ \ + ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.0/ \ + ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.0/ \ + ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.0/ # 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_20121203.zip \ + A-10_20140116.zip \ A300_20120717.zip \ Alouette-II_20120506.zip \ Alphajet_20130225.zip \ @@ -24,18 +24,18 @@ DISTFILES= 737-200_20120506.zip \ Caravelle_20120506.zip \ Caudron-G3_20120506.zip \ F80C_20120717.zip \ - Hurricane_20130315.zip \ + Hurricane_20130823.zip \ IL-2_20110311.zip \ - Lightning_20121005.zip \ + Lightning_20140116.zip \ Lockheed1049h_1.0.zip \ Messerschmitt-P1101_20130315.zip \ - MirageIII_20120222.zip \ + MirageIII_20131008.zip \ PaperAirplane_20101229.zip \ Pond-Racer_20120506.zip \ R44_20130426.zip \ Spitfire_20130310.zip \ Stieglitz_20091025.zip \ - Super-Etendard_20120501.zip \ + Super-Etendard_20131008.zip \ Supermarine-S.6B_20130312.zip \ Superwal_20100330.zip \ airwaveXtreme150_July-2013.zip \ @@ -44,7 +44,7 @@ DISTFILES= 737-200_20120506.zip \ c310_20130209.zip \ dhc3_20120506.zip \ f16_20120812.zip \ - harrier_20120717.zip \ + harrier_20130823.zip \ pa24-250_20121128.zip \ tu154_20081221.zip \ wrightFlyer1903_20070710.zip Modified: head/games/flightgear-aircraft/distinfo ============================================================================== --- head/games/flightgear-aircraft/distinfo Fri Mar 28 14:10:58 2014 (r349424) +++ head/games/flightgear-aircraft/distinfo Fri Mar 28 14:13:02 2014 (r349425) @@ -1,7 +1,7 @@ SHA256 (flightgear-aircraft/737-200_20120506.zip) = 8aadefbd4cd6fec5297176fe08bbc15206388da5d4d55c4b277909c92f335f5c SIZE (flightgear-aircraft/737-200_20120506.zip) = 12401593 -SHA256 (flightgear-aircraft/A-10_20121203.zip) = 0e6dc3c1243419fb3df4bd3a2c80185178951b1192750a08778f4de949d2992d -SIZE (flightgear-aircraft/A-10_20121203.zip) = 9328046 +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 @@ -20,18 +20,18 @@ SHA256 (flightgear-aircraft/Caudron-G3_2 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_20130315.zip) = f224341124f6f696a0dd5991cc6ed925a3bf5b6098459e74a7287c7c027223b3 -SIZE (flightgear-aircraft/Hurricane_20130315.zip) = 12062920 +SHA256 (flightgear-aircraft/Hurricane_20130823.zip) = 10dfe10c5365c7232fdd324a0c3af6c1b2c90cd5373af263ac35eb031b3b4fb5 +SIZE (flightgear-aircraft/Hurricane_20130823.zip) = 12062976 SHA256 (flightgear-aircraft/IL-2_20110311.zip) = 1c7e126956247f7a6ed93cd4fc2abe65c756b07275559ed1f0bd03d731a51ee0 SIZE (flightgear-aircraft/IL-2_20110311.zip) = 3933481 -SHA256 (flightgear-aircraft/Lightning_20121005.zip) = 6f8a27edf887aceef8da17465c658c110cf6b1d55c10ba023cb2660dd61a66ab -SIZE (flightgear-aircraft/Lightning_20121005.zip) = 4784876 -SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7374e32aab617e466c228262004d1c292d9667375e74481d74f7a5210dfd60fd -SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529096 +SHA256 (flightgear-aircraft/Lightning_20140116.zip) = 607ce5957aeac09f1e223d5add0687c7d0e6e5651b0fa9f576934c8150798e3f +SIZE (flightgear-aircraft/Lightning_20140116.zip) = 4784925 +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_20120222.zip) = f99bd3f446a5d861a0ee04df08c6e6ced04ebff2cb3c810ea9f9a78fdfa57a7b -SIZE (flightgear-aircraft/MirageIII_20120222.zip) = 11112429 +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 @@ -42,16 +42,16 @@ SHA256 (flightgear-aircraft/Spitfire_201 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_20120501.zip) = e89f96034f2ee64f34917a8062e6e87f75674ff7f595be5a884ae4b4904a5eb5 -SIZE (flightgear-aircraft/Super-Etendard_20120501.zip) = 9855236 +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_July-2013.zip) = 12ca13fe06e7ff4e7a2e9bf7971c2397b86a06b2e83f2eb2e21b640edc5ab817 SIZE (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 1209981 -SHA256 (flightgear-aircraft/asw20_July-2013.zip) = 4c5aeb273f2f9e2ae3f4c2f3bcdc44b1079681fdfbef20e8f669891cccc73064 -SIZE (flightgear-aircraft/asw20_July-2013.zip) = 3588458 +SHA256 (flightgear-aircraft/asw20_July-2013.zip) = 22728d2d24c7b54fb7a41789ffe7ebbb73e1acb39e8230d63b2bdc6ce1fbd9f3 +SIZE (flightgear-aircraft/asw20_July-2013.zip) = 3592090 SHA256 (flightgear-aircraft/bf109_20130615.zip) = 1245ba5d1c00a01b74cef208f28f70ffe27f6285f7d52c4ddd901b370e3aca94 SIZE (flightgear-aircraft/bf109_20130615.zip) = 24201689 SHA256 (flightgear-aircraft/c310_20130209.zip) = 07d765eac4a6cb9bc115dc4d302fed972776f5148cb1154f666b6a7f3c27543a @@ -60,8 +60,8 @@ SHA256 (flightgear-aircraft/dhc3_2012050 SIZE (flightgear-aircraft/dhc3_20120506.zip) = 20789012 SHA256 (flightgear-aircraft/f16_20120812.zip) = c4782fbcfeba7fea5204d048a0cb36499e0901b1ef514c8c638b14928ce7396a SIZE (flightgear-aircraft/f16_20120812.zip) = 19445799 -SHA256 (flightgear-aircraft/harrier_20120717.zip) = 588a6a3ac42975426c63b754b56c8d26e1789c9772ceb6848a2b9857481d7ec6 -SIZE (flightgear-aircraft/harrier_20120717.zip) = 4208120 +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 Modified: head/games/flightgear-data/Makefile ============================================================================== --- head/games/flightgear-data/Makefile Fri Mar 28 14:10:58 2014 (r349424) +++ head/games/flightgear-data/Makefile Fri Mar 28 14:13:02 2014 (r349425) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flightgear-data -PORTVERSION= 2.12.1 +PORTVERSION= 3.0.0 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Shared/ \ @@ -18,7 +18,7 @@ COMMENT= FlightGear scenery, textures, a LICENSE= GPLv2 NO_BUILD= yes -USE_BZIP2= yes +USES= tar:bzip2 WRKSRC= ${WRKDIR}/fgdata DATADIR= ${PREFIX}/share/flightgear Modified: head/games/flightgear-data/distinfo ============================================================================== --- head/games/flightgear-data/distinfo Fri Mar 28 14:10:58 2014 (r349424) +++ head/games/flightgear-data/distinfo Fri Mar 28 14:13:02 2014 (r349425) @@ -1,2 +1,2 @@ -SHA256 (FlightGear-data-2.12.1.tar.bz2) = 74568a130cf7e4490ca5f9b67a443b6e65ba78245b77b2eae0df5f11fedf9a42 -SIZE (FlightGear-data-2.12.1.tar.bz2) = 983305357 +SHA256 (FlightGear-data-3.0.0.tar.bz2) = 048349a167d55c2a6f84a71dd5654cba0b7866ce43c6f06a12a1be8fe0840557 +SIZE (FlightGear-data-3.0.0.tar.bz2) = 1078366345 Modified: head/games/flightgear/Makefile ============================================================================== --- head/games/flightgear/Makefile Fri Mar 28 14:10:58 2014 (r349424) +++ head/games/flightgear/Makefile Fri Mar 28 14:13:02 2014 (r349425) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 2.12.1 -PORTREVISION= 2 +PORTVERSION= 3.0.0 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Source/ \ @@ -21,25 +20,35 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap libpng15.so:${PORTSDIR}/graphics/png \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ - libosg.so:${PORTSDIR}/graphics/osg + libosg.so:${PORTSDIR}/graphics/osg \ + libdbus-1.so:${PORTSDIR}/devel/dbus BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear \ ${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data -USE_BZIP2= yes USE_XORG= ice sm x11 xext xft xi xinerama xt xmu USE_GL= gl glu glut -USES= cmake openal:al,alut +USE_SQLITE= 3 + +USES= tar:bzip2 dos2unix cmake compiler:features openal:al,alut +DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON \ -DENABLE_JS_SERVER:BOOL=ON \ + -DUSE_DBUS:BOOL=ON \ + -DSYSTEM_SQLITE:BOOL=ON \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ - -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man + -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ + -DFGCOM_DATA_PATH:PATH=${DATADIR} + +.include -.include +.if ${COMPILER_FEATURES:Mlibc++} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h +.endif post-install: ${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${STAGEDIR}${PREFIX}/bin -.include +.include Modified: head/games/flightgear/distinfo ============================================================================== --- head/games/flightgear/distinfo Fri Mar 28 14:10:58 2014 (r349424) +++ head/games/flightgear/distinfo Fri Mar 28 14:13:02 2014 (r349425) @@ -1,2 +1,2 @@ -SHA256 (flightgear-2.12.1.tar.bz2) = bcc7478825c435bad1c93318c91d6a38d75d802bfbec4a3d2580e09b665240f2 -SIZE (flightgear-2.12.1.tar.bz2) = 3423670 +SHA256 (flightgear-3.0.0.tar.bz2) = e4bf1922825920a404539e6611c36eb5567b85d46a726fd8c6f9b19c138ba6e9 +SIZE (flightgear-3.0.0.tar.bz2) = 5874662 Added: head/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h Fri Mar 28 14:13:02 2014 (r349425) @@ -0,0 +1,30 @@ +--- src/FDM/JSBSim/input_output/string_utilities.h.orig 2014-03-12 18:30:00.000000000 +0100 ++++ src/FDM/JSBSim/input_output/string_utilities.h 2014-03-12 18:31:18.000000000 +0100 +@@ -73,9 +73,11 @@ + extern bool is_number(const std::string& str); + std::vector split(std::string str, char d); + /* Comment out to_string functions when they are defined already - C++ 11 defines these */ ++/* + extern std::string to_string(int); + extern std::string to_string(double); + extern std::string to_string(float); ++*/ + extern std::string replace(std::string str, const std::string& old, const std::string& newstr); + #else + #include +@@ -159,6 +161,7 @@ + return str_array; + } + /* Comment out to_string functions when they are defined already - C++ 11 defines these */ ++/* + string to_string(int i) + { + char buffer[32]; +@@ -179,6 +182,7 @@ + if (!(o << x)) cerr << "Bad double to string conversion" << endl; + return o.str(); + } ++*/ + + string replace(string str, const string& oldstr, const string& newstr) + { Added: head/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt Fri Mar 28 14:13:02 2014 (r349425) @@ -0,0 +1,11 @@ +--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-03-12 18:13:58.000000000 +0100 ++++ 3rdparty/iaxclient/lib/CMakeLists.txt 2014-03-12 18:14:39.000000000 +0100 +@@ -88,7 +88,7 @@ + libspeex/vq.c + ) + +- include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include) ++ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include) + endif(ENABLE_SPEXX) + + if (ENABLE_ALSA) Added: head/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h Fri Mar 28 14:13:02 2014 (r349425) @@ -0,0 +1,11 @@ +--- 3rdparty/iaxclient/lib/iaxclient.h.orig 2014-03-17 07:06:55.000000000 +0100 ++++ 3rdparty/iaxclient/lib/iaxclient.h 2014-03-17 07:09:42.000000000 +0100 +@@ -45,6 +45,8 @@ + #include + #endif + ++#include ++ + #ifdef BUILDING_DLL + # if defined(WIN32) || defined(_WIN32_WCE) + # ifdef _MSC_VER Added: head/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c Fri Mar 28 14:13:02 2014 (r349425) @@ -0,0 +1,11 @@ +--- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig 2014-03-12 18:16:21.000000000 +0100 ++++ 3rdparty/iaxclient/lib/libiax2/src/iax.c 2014-03-12 18:18:38.000000000 +0100 +@@ -72,7 +72,7 @@ + #include + #include + +-#if !defined(MACOSX) && !defined(__OpenBSD__) ++#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) + #include + #if !defined(SOLARIS) + #include Modified: head/games/flightgear/pkg-plist ============================================================================== --- head/games/flightgear/pkg-plist Fri Mar 28 14:10:58 2014 (r349424) +++ head/games/flightgear/pkg-plist Fri Mar 28 14:13:02 2014 (r349425) @@ -2,6 +2,7 @@ bin/GPSsmooth bin/MIDGsmooth bin/UGsmooth bin/fgadmin +bin/fgcom bin/fgelev bin/fgfs bin/fgjs @@ -16,6 +17,8 @@ bin/yasim-proptest man/man1/fgfs.1.gz man/man1/fgjs.1.gz man/man1/fgpanel.1.gz -man/man1/gl-info.1.gz man/man1/js_demo.1.gz man/man1/terrasync.1.gz +%%DATADIR%%/positions.txt +%%DATADIR%%/special_frequencies.txt +@dirrm %%DATADIR%%