Index: head/devel/simgear/Makefile =================================================================== --- head/devel/simgear/Makefile (revision 450909) +++ head/devel/simgear/Makefile (revision 450910) @@ -1,30 +1,29 @@ # $FreeBSD$ PORTNAME= simgear -PORTVERSION= 2017.1.3 -PORTREVISION= 8 +PORTVERSION= 2017.3.1 CATEGORIES= devel games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= Toolkit for 3D games and simulations LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libosg.so:graphics/osg USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut USES= alias cmake compiler:c++11-lib cpe jpeg openal:al,alut tar:bzip2 .include # Work around "'to_string' is not a member of 'std'" when building with Gcc < 6 .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 60 CFLAGS+= -D_GLIBCXX_USE_C99 .endif .include Index: head/devel/simgear/distinfo =================================================================== --- head/devel/simgear/distinfo (revision 450909) +++ head/devel/simgear/distinfo (revision 450910) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491386012 -SHA256 (simgear-2017.1.3.tar.bz2) = 85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 -SIZE (simgear-2017.1.3.tar.bz2) = 1235062 +TIMESTAMP = 1506362997 +SHA256 (simgear-2017.3.1.tar.bz2) = 0ee08550b737b249dcc91590ec0cb9c5dc9080998f6ba66a7d7209cdfce6e1f4 +SIZE (simgear-2017.3.1.tar.bz2) = 1302704 Index: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx =================================================================== --- head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx (revision 450909) +++ head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx (nonexistent) @@ -1,27 +0,0 @@ ---- simgear/scene/material/Effect.cxx.orig 2017-04-04 09:24:44.000000000 +0200 -+++ simgear/scene/material/Effect.cxx 2017-07-16 21:55:10.888904000 +0200 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - - #include - #include -@@ -832,13 +832,13 @@ - - // XXX Should these be protected by a mutex? Probably - --typedef tr1::unordered_map, -+typedef std::unordered_map, - boost::hash, ProgramKey::EqualTo> - ProgramMap; - ProgramMap programMap; - ProgramMap resolvedProgramMap; // map with resolved shader file names - --typedef tr1::unordered_map, boost::hash > -+typedef std::unordered_map, boost::hash > - ShaderMap; - ShaderMap shaderMap; - Property changes on: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx =================================================================== --- head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx (revision 450909) +++ head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx (nonexistent) @@ -1,20 +0,0 @@ ---- simgear/scene/material/Effect.hxx.orig 2017-04-04 09:24:44.000000000 +0200 -+++ simgear/scene/material/Effect.hxx 2017-07-16 21:55:33.247324000 +0200 -@@ -19,7 +19,7 @@ - - #include - #include --#include -+#include - - #include - -@@ -127,7 +127,7 @@ - bool operator()(const Key& lhs, const Key& rhs) const; - }; - }; -- typedef std::tr1::unordered_map, -+ typedef std::unordered_map, - boost::hash, Key::EqualTo> Cache; - Cache* getCache() - { Property changes on: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/simgear/pkg-plist =================================================================== --- head/devel/simgear/pkg-plist (revision 450909) +++ head/devel/simgear/pkg-plist (revision 450910) @@ -1,334 +1,341 @@ 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 include/simgear/bvh/BVHLineGeometry.hxx include/simgear/bvh/BVHLineSegmentVisitor.hxx include/simgear/bvh/BVHMaterial.hxx include/simgear/bvh/BVHMotionTransform.hxx include/simgear/bvh/BVHNearestPointVisitor.hxx include/simgear/bvh/BVHNode.hxx include/simgear/bvh/BVHPageNode.hxx include/simgear/bvh/BVHPageRequest.hxx include/simgear/bvh/BVHPager.hxx include/simgear/bvh/BVHStaticBinary.hxx include/simgear/bvh/BVHStaticData.hxx include/simgear/bvh/BVHStaticGeometry.hxx include/simgear/bvh/BVHStaticGeometryBuilder.hxx include/simgear/bvh/BVHStaticLeaf.hxx include/simgear/bvh/BVHStaticNode.hxx include/simgear/bvh/BVHStaticTriangle.hxx include/simgear/bvh/BVHSubTreeCollector.hxx include/simgear/bvh/BVHTransform.hxx include/simgear/bvh/BVHVisitor.hxx include/simgear/canvas/Canvas.hxx include/simgear/canvas/CanvasEvent.hxx include/simgear/canvas/CanvasEventManager.hxx include/simgear/canvas/CanvasEventTypes.hxx include/simgear/canvas/CanvasEventVisitor.hxx include/simgear/canvas/CanvasMgr.hxx include/simgear/canvas/CanvasObjectPlacement.hxx include/simgear/canvas/CanvasPlacement.hxx include/simgear/canvas/CanvasSystemAdapter.hxx include/simgear/canvas/CanvasWindow.hxx include/simgear/canvas/ODGauge.hxx include/simgear/canvas/ShivaVG/openvg.h include/simgear/canvas/ShivaVG/vgu.h include/simgear/canvas/VGInitOperation.hxx include/simgear/canvas/canvas_fwd.hxx include/simgear/canvas/elements/CanvasElement.hxx include/simgear/canvas/elements/CanvasGroup.hxx include/simgear/canvas/elements/CanvasImage.hxx include/simgear/canvas/elements/CanvasMap.hxx 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 include/simgear/canvas/layout/NasalWidget.hxx include/simgear/canvas/layout/SpacerItem.hxx include/simgear/compiler.h include/simgear/constants.h include/simgear/debug/BufferedLogCallback.hxx include/simgear/debug/debug_types.h include/simgear/debug/logstream.hxx +include/simgear/embedded_resources/EmbeddedResource.hxx +include/simgear/embedded_resources/EmbeddedResourceManager.hxx include/simgear/environment/metar.hxx include/simgear/environment/precipitation.hxx include/simgear/ephemeris/celestialBody.hxx include/simgear/ephemeris/ephemeris.hxx include/simgear/ephemeris/jupiter.hxx include/simgear/ephemeris/mars.hxx include/simgear/ephemeris/mercury.hxx include/simgear/ephemeris/moonpos.hxx include/simgear/ephemeris/neptune.hxx include/simgear/ephemeris/pluto.hxx include/simgear/ephemeris/saturn.hxx include/simgear/ephemeris/star.hxx include/simgear/ephemeris/stardata.hxx include/simgear/ephemeris/uranus.hxx include/simgear/ephemeris/venus.hxx include/simgear/io/iostreams/gzcontainerfile.hxx include/simgear/io/iostreams/gzfstream.hxx include/simgear/io/iostreams/sgstream.hxx include/simgear/io/DNSClient.hxx include/simgear/io/HTTPClient.hxx include/simgear/io/HTTPFileRequest.hxx include/simgear/io/HTTPMemoryRequest.hxx include/simgear/io/HTTPRepository.hxx include/simgear/io/HTTPRequest.hxx include/simgear/io/iochannel.hxx +include/simgear/io/iostreams/CharArrayStream.hxx +include/simgear/io/iostreams/zlibstream.hxx include/simgear/io/lowlevel.hxx include/simgear/io/raw_socket.hxx include/simgear/io/sg_binobj.hxx include/simgear/io/sg_file.hxx include/simgear/io/sg_netBuffer.hxx include/simgear/io/sg_netChannel.hxx include/simgear/io/sg_netChat.hxx include/simgear/io/sg_serial.hxx include/simgear/io/sg_socket.hxx include/simgear/io/sg_socket_udp.hxx include/simgear/io/untar.hxx include/simgear/magvar/coremag.hxx include/simgear/magvar/magvar.hxx include/simgear/math/SGBox.hxx include/simgear/math/SGCMath.hxx include/simgear/math/SGGeoc.hxx include/simgear/math/SGGeod.hxx include/simgear/math/SGGeodesy.hxx include/simgear/math/SGGeometry.hxx include/simgear/math/SGGeometryFwd.hxx include/simgear/math/SGIntersect.hxx include/simgear/math/SGLimits.hxx include/simgear/math/SGLineSegment.hxx include/simgear/math/SGLocation.hxx include/simgear/math/SGMath.hxx include/simgear/math/SGMathFwd.hxx include/simgear/math/SGMatrix.hxx include/simgear/math/SGMisc.hxx include/simgear/math/SGPlane.hxx include/simgear/math/SGQuat.hxx include/simgear/math/SGRay.hxx include/simgear/math/SGRect.hxx include/simgear/math/SGSphere.hxx include/simgear/math/SGTriangle.hxx include/simgear/math/SGVec2.hxx include/simgear/math/SGVec3.hxx include/simgear/math/SGVec4.hxx include/simgear/math/beziercurve.hxx include/simgear/math/interpolater.hxx include/simgear/math/leastsqs.hxx include/simgear/math/sg_geodesy.hxx include/simgear/math/sg_random.h include/simgear/math/sg_types.hxx include/simgear/math/simd.hxx include/simgear/math/simd4x4.hxx include/simgear/misc/CSSBorder.hxx include/simgear/misc/ListDiff.hxx include/simgear/misc/ResourceManager.hxx include/simgear/misc/SVGpreserveAspectRatio.hxx include/simgear/misc/SimpleMarkdown.hxx +include/simgear/misc/argparse.hxx include/simgear/misc/interpolator.hxx include/simgear/misc/make_new.hxx include/simgear/misc/sg_dir.hxx include/simgear/misc/sg_hash.hxx include/simgear/misc/sg_path.hxx include/simgear/misc/stdint.hxx include/simgear/misc/stopwatch.hxx include/simgear/misc/strutils.hxx include/simgear/misc/tabbed_values.hxx +include/simgear/misc/test_macros.hxx include/simgear/misc/texcoord.hxx include/simgear/nasal/cppbind/Ghost.hxx include/simgear/nasal/cppbind/NasalCallContext.hxx include/simgear/nasal/cppbind/NasalContext.hxx 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 include/simgear/nasal/cppbind/detail/nasal_traits.hxx 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 include/simgear/package/Delegate.hxx include/simgear/package/Install.hxx include/simgear/package/Package.hxx include/simgear/package/Root.hxx include/simgear/props/AtomicChangeListener.hxx include/simgear/props/ExtendedPropertyAdapter.hxx include/simgear/props/PropertyBasedElement.hxx include/simgear/props/PropertyBasedMgr.hxx include/simgear/props/PropertyInterpolationMgr.hxx include/simgear/props/PropertyInterpolator.hxx include/simgear/props/condition.hxx include/simgear/props/easing_functions.hxx include/simgear/props/propertyObject.hxx include/simgear/props/props.hxx include/simgear/props/props_io.hxx include/simgear/props/propsfwd.hxx include/simgear/props/tiedpropertylist.hxx include/simgear/props/vectorPropTemplates.hxx include/simgear/scene/material/Effect.hxx include/simgear/scene/material/EffectBuilder.hxx include/simgear/scene/material/EffectCullVisitor.hxx include/simgear/scene/material/EffectGeode.hxx include/simgear/scene/material/Pass.hxx include/simgear/scene/material/Technique.hxx include/simgear/scene/material/TextureBuilder.hxx include/simgear/scene/material/mat.hxx include/simgear/scene/material/matlib.hxx include/simgear/scene/material/matmodel.hxx include/simgear/scene/material/mipmap.hxx include/simgear/scene/material/parseBlendFunc.hxx include/simgear/scene/model/BVHDebugCollectVisitor.hxx include/simgear/scene/model/BVHPageNodeOSG.hxx include/simgear/scene/model/BoundingVolumeBuildVisitor.hxx include/simgear/scene/model/CheckSceneryVisitor.hxx include/simgear/scene/model/ConditionNode.hxx include/simgear/scene/model/ModelRegistry.hxx include/simgear/scene/model/PrimitiveCollector.hxx include/simgear/scene/model/SGClipGroup.hxx include/simgear/scene/model/SGInteractionAnimation.hxx include/simgear/scene/model/SGMaterialAnimation.hxx include/simgear/scene/model/SGOffsetTransform.hxx include/simgear/scene/model/SGPickAnimation.hxx include/simgear/scene/model/SGReaderWriterXML.hxx include/simgear/scene/model/SGRotateTransform.hxx include/simgear/scene/model/SGScaleTransform.hxx include/simgear/scene/model/SGText.hxx include/simgear/scene/model/SGTrackToAnimation.hxx include/simgear/scene/model/SGTranslateTransform.hxx include/simgear/scene/model/animation.hxx include/simgear/scene/model/model.hxx include/simgear/scene/model/modellib.hxx include/simgear/scene/model/particles.hxx include/simgear/scene/model/persparam.hxx include/simgear/scene/model/placement.hxx include/simgear/scene/sky/CloudShaderGeometry.hxx include/simgear/scene/sky/cloud.hxx include/simgear/scene/sky/cloudfield.hxx include/simgear/scene/sky/dome.hxx include/simgear/scene/sky/moon.hxx include/simgear/scene/sky/newcloud.hxx include/simgear/scene/sky/oursun.hxx include/simgear/scene/sky/sky.hxx include/simgear/scene/sky/sphere.hxx include/simgear/scene/sky/stars.hxx include/simgear/scene/tgdb/GroundLightManager.hxx include/simgear/scene/tgdb/ReaderWriterSPT.hxx include/simgear/scene/tgdb/ReaderWriterSTG.hxx 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 include/simgear/scene/tgdb/ShaderGeometry.hxx include/simgear/scene/tgdb/TreeBin.hxx include/simgear/scene/tgdb/apt_signs.hxx include/simgear/scene/tgdb/obj.hxx include/simgear/scene/tgdb/pt_lights.hxx include/simgear/scene/tgdb/userdata.hxx include/simgear/scene/tsync/terrasync.hxx include/simgear/scene/util/ColorInterpolator.hxx include/simgear/scene/util/CopyOp.hxx include/simgear/scene/util/DeletionManager.hxx 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 include/simgear/scene/util/QuadTreeBuilder.hxx include/simgear/scene/util/RenderConstants.hxx include/simgear/scene/util/SGDebugDrawCallback.hxx include/simgear/scene/util/SGEnlargeBoundingBox.hxx include/simgear/scene/util/SGNodeMasks.hxx include/simgear/scene/util/SGPickCallback.hxx include/simgear/scene/util/SGReaderWriterOptions.hxx include/simgear/scene/util/SGSceneFeatures.hxx include/simgear/scene/util/SGSceneUserData.hxx include/simgear/scene/util/SGStateAttributeVisitor.hxx include/simgear/scene/util/SGTextureStateAttributeVisitor.hxx +include/simgear/scene/util/SGTransientModelData.hxx include/simgear/scene/util/SGUpdateVisitor.hxx include/simgear/scene/util/SplicingVisitor.hxx include/simgear/scene/util/StateAttributeFactory.hxx include/simgear/scene/util/UpdateOnceCallback.hxx include/simgear/scene/util/VectorArrayAdapter.hxx include/simgear/scene/util/parse_color.hxx include/simgear/scene/util/project.hxx include/simgear/screen/colors.hxx include/simgear/screen/extensions.hxx include/simgear/screen/screen-dump.hxx include/simgear/screen/tr.h include/simgear/serial/serial.hxx include/simgear/sg_inlines.h include/simgear/simgear_config.h include/simgear/sound/readwav.hxx include/simgear/sound/sample.hxx include/simgear/sound/sample_group.hxx include/simgear/sound/soundmgr.hxx include/simgear/sound/xmlsound.hxx include/simgear/structure/OSGUtils.hxx include/simgear/structure/OSGVersion.hxx include/simgear/structure/SGAtomic.hxx include/simgear/structure/SGBinding.hxx include/simgear/structure/SGExpression.hxx include/simgear/structure/SGPerfMon.hxx include/simgear/structure/SGReferenced.hxx include/simgear/structure/SGSharedPtr.hxx include/simgear/structure/SGSmplhist.hxx include/simgear/structure/SGSmplstat.hxx include/simgear/structure/SGWeakPtr.hxx include/simgear/structure/SGWeakReferenced.hxx include/simgear/structure/Singleton.hxx include/simgear/structure/StateMachine.hxx include/simgear/structure/StringTable.hxx include/simgear/structure/callback.hxx include/simgear/structure/commands.hxx include/simgear/structure/detail/function_list_template.hxx include/simgear/structure/event_mgr.hxx include/simgear/structure/exception.hxx include/simgear/structure/function_list.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 include/simgear/threads/SGQueue.hxx include/simgear/threads/SGThread.hxx include/simgear/timing/lowleveltime.h include/simgear/timing/sg_time.hxx include/simgear/timing/timestamp.hxx include/simgear/timing/timezone.h 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 Index: head/games/flightgear/Makefile =================================================================== --- head/games/flightgear/Makefile (revision 450909) +++ head/games/flightgear/Makefile (revision 450910) @@ -1,65 +1,64 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 2017.1.3 -PORTREVISION= 9 +PORTVERSION= 2017.3.1 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= The FlightGear flight simulator LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ libboost_thread.so:devel/boost-libs \ libfltk.so:x11-toolkits/fltk \ libfreetype.so:print/freetype2 \ libosg.so:graphics/osg \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ libcurl.so:ftp/curl \ libudev.so:devel/libudev-devd BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glew glu glut 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 \ -DSYSTEM_SQLITE:BOOL=ON \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DBUS QT5 OPTIONS_DEFAULT= DBUS QT5 DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_USES= pkgconfig DBUS_CMAKE_ON= -DUSE_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF QT5_CMAKE_ON= -DENABLE_QT:BOOL=ON QT5_CMAKE_OFF= -DENABLE_QT:BOOL=OFF -QT5_USE= QT5=core,buildtools,gui,qmake,widgets +QT5_USE= QT5=core,buildtools,gui,qmake,qml,widgets .include # Chase devel/simgear compiler version .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 USE_GCC= yes CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif post-install: ${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server \ ${STAGEDIR}${PREFIX}/bin .include Index: head/games/flightgear/distinfo =================================================================== --- head/games/flightgear/distinfo (revision 450909) +++ head/games/flightgear/distinfo (revision 450910) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491386247 -SHA256 (flightgear-2017.1.3.tar.bz2) = 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad -SIZE (flightgear-2017.1.3.tar.bz2) = 8056402 +TIMESTAMP = 1506363097 +SHA256 (flightgear-2017.3.1.tar.bz2) = 6f2e1d992e2f202b8f9c918c9fb19124ef06824ea0e767e2f4dff6ba43728ccd +SIZE (flightgear-2017.3.1.tar.bz2) = 8098283 Index: head/games/flightgear/files/patch-INPUT-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-INPUT-CMakeLists.txt (revision 450909) +++ head/games/flightgear/files/patch-INPUT-CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2017-06-30 11:44:05.757902000 +0200 -+++ CMakeLists.txt 2017-06-30 11:49:07.188128000 +0200 -@@ -226,7 +226,7 @@ - if(EVENT_INPUT) - if(APPLE) - add_definitions(-DWITH_EVENTINPUT) -- elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") -+ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD") - if(NOT UDEV_FOUND) - message(WARNING "UDev not found, event input is disabled!") - set(EVENT_INPUT 0) Property changes on: head/games/flightgear/files/patch-INPUT-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-utils-fgpanel-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-utils-fgpanel-CMakeLists.txt (revision 450909) +++ head/games/flightgear/files/patch-utils-fgpanel-CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- utils/fgpanel/CMakeLists.txt.orig 2017-03-03 06:18:49.698586000 +0000 -+++ utils/fgpanel/CMakeLists.txt 2017-03-03 06:24:25.570507000 +0000 -@@ -19,7 +19,7 @@ - ) - - include_directories( -- /usr/include/freetype2 -+ ${FREETYPE_INCLUDE_DIRS} - ${PNG_INCLUDE_DIR} - ) - Property changes on: head/games/flightgear/files/patch-utils-fgpanel-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-CVE-2017-8921.txt =================================================================== --- head/games/flightgear/files/patch-CVE-2017-8921.txt (revision 450909) +++ head/games/flightgear/files/patch-CVE-2017-8921.txt (nonexistent) @@ -1,28 +0,0 @@ -Fix for CVE-2017-8921 (backport of commit faf872e7) - ---- src/Autopilot/route_mgr.cxx.orig -+++ src/Autopilot/route_mgr.cxx -@@ -74,7 +74,22 @@ static bool commandSaveFlightPlan(const SGPropertyNode* arg) - { - FGRouteMgr* self = (FGRouteMgr*) globals->get_subsystem("route-manager"); - SGPath path = SGPath::fromUtf8(arg->getStringValue("path")); -- return self->saveRoute(path); -+ SGPath authorizedPath = fgValidatePath(path, true /* write */); -+ -+ if (!authorizedPath.isNull()) { -+ return self->saveRoute(authorizedPath); -+ } else { -+ std::string msg = -+ "The route manager was asked to write the flightplan to '" + -+ path.utf8Str() + "', but this path is not authorized for writing. " + -+ "Please choose another location, for instance in the $FG_HOME/Export " -+ "folder (" + (globals->get_fg_home() / "Export").utf8Str() + ")."; -+ -+ SG_LOG(SG_AUTOPILOT, SG_ALERT, msg); -+ modalMessageBox("FlightGear", "Unable to write to the specified file", -+ msg); -+ return false; -+ } - } - - static bool commandActivateFlightPlan(const SGPropertyNode* arg) Property changes on: head/games/flightgear/files/patch-CVE-2017-8921.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-src-Main-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-src-Main-CMakeLists.txt (revision 450909) +++ head/games/flightgear/files/patch-src-Main-CMakeLists.txt (nonexistent) @@ -1,13 +0,0 @@ ---- src/Main/CMakeLists.txt.orig 2017-02-22 17:29:45.000000000 +0000 -+++ src/Main/CMakeLists.txt 2017-02-28 12:42:12.797102000 +0000 -@@ -157,6 +157,10 @@ - target_link_libraries(fgfs Qt5::Widgets fglauncher) - endif() - -+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ target_link_libraries(fgfs execinfo) -+endif() -+ - if (APPLE) - install(TARGETS fgfs BUNDLE DESTINATION .) - else() Property changes on: head/games/flightgear/files/patch-src-Main-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-CVE-2017-13709.txt =================================================================== --- head/games/flightgear/files/patch-CVE-2017-13709.txt (revision 450909) +++ head/games/flightgear/files/patch-CVE-2017-13709.txt (nonexistent) @@ -1,129 +0,0 @@ -Backport of commits 0ba2ac31 and 1ad2bf44 - -Fixes CVE-2017-13709. - ---- src/Main/fg_init.cxx.orig -+++ src/Main/fg_init.cxx -@@ -1090,7 +1090,12 @@ void fgStartNewReset() - fgInitGeneral(); // all of this? - - flightgear::Options::sharedInstance()->processOptions(); -- -+ -+ // Rebuild the lists of allowed paths for cases where a path comes from an -+ // untrusted source, such as the global property tree (this uses $FG_HOME -+ // and other paths set by Options::processOptions()). -+ fgInitAllowedPaths(); -+ - // PRESERVED properties over-write state from options, intentionally - if ( copyProperties(preserved, globals->get_props()) ) { - SG_LOG( SG_GENERAL, SG_INFO, "Preserved state restored successfully" ); ---- src/Main/main.cxx.orig -+++ src/Main/main.cxx -@@ -536,7 +536,12 @@ int fgMainInit( int argc, char **argv ) - } else if (configResult == flightgear::FG_OPTIONS_EXIT) { - return EXIT_SUCCESS; - } -- -+ -+ // Set the lists of allowed paths for cases where a path comes from an -+ // untrusted source, such as the global property tree (this uses $FG_HOME -+ // and other paths set by Options::processOptions()). -+ fgInitAllowedPaths(); -+ - // Initialize the Window/Graphics environment. - fgOSInit(&argc, argv); - _bootstrap_OSInit++; ---- src/Scripting/NasalSys.cxx.orig -+++ src/Scripting/NasalSys.cxx -@@ -909,10 +909,6 @@ void FGNasalSys::init() - .member("simulatedTime", &TimerObj::isSimTime, &f_timerObj_setSimTime) - .member("isRunning", &TimerObj::isRunning); - -- -- // Set allowed paths for Nasal I/O -- fgInitAllowedPaths(); -- - // Now load the various source files in the Nasal directory - simgear::Dir nasalDir(SGPath(globals->get_fg_root(), "Nasal")); - loadScriptDirectory(nasalDir); ---- src/Main/logger.cxx.orig -+++ src/Main/logger.cxx -@@ -9,12 +9,17 @@ - - #include "logger.hxx" - --#include -+#include - #include -+#include - - #include -+#include -+#include - - #include "fg_props.hxx" -+#include "globals.hxx" -+#include "util.hxx" - - using std::string; - using std::endl; -@@ -59,6 +64,25 @@ FGLogger::init () - child->setStringValue("filename", filename.c_str()); - } - -+ // Security: the path comes from the global Property Tree; it *must* be -+ // validated before we overwrite the file. -+ const SGPath authorizedPath = fgValidatePath(SGPath::fromUtf8(filename), -+ /* write */ true); -+ -+ if (authorizedPath.isNull()) { -+ const string propertyPath = child->getChild("filename") -+ ->getPath(/* simplify */ true); -+ const string msg = -+ "The FGLogger logging system, via the '" + propertyPath + "' property, " -+ "was asked to write to '" + filename + "', however this path is not " -+ "authorized for writing anymore for security reasons. " + -+ "Please choose another location, for instance in the $FG_HOME/Export " -+ "folder (" + (globals->get_fg_home() / "Export").utf8Str() + ")."; -+ -+ SG_LOG(SG_GENERAL, SG_ALERT, msg); -+ exit(EXIT_FAILURE); -+ } -+ - string delimiter = child->getStringValue("delimiter"); - if (delimiter.empty()) { - delimiter = ","; -@@ -68,7 +92,8 @@ FGLogger::init () - log.interval_ms = child->getLongValue("interval-ms"); - log.last_time_ms = globals->get_sim_time_sec() * 1000; - log.delimiter = delimiter.c_str()[0]; -- log.output = new std::ofstream(filename.c_str()); -+ // Security: use the return value of fgValidatePath() -+ log.output = new sg_ofstream(authorizedPath, std::ios_base::out); - if (!log.output) { - SG_LOG(SG_GENERAL, SG_ALERT, "Cannot write log to " << filename); - continue; ---- src/Main/logger.hxx.orig -+++ src/Main/logger.hxx -@@ -6,10 +6,10 @@ - #ifndef __LOGGER_HXX - #define __LOGGER_HXX 1 - --#include - #include - - #include -+#include - #include - #include - -@@ -39,7 +39,7 @@ private: - Log (); - virtual ~Log (); - std::vector nodes; -- std::ostream * output; -+ sg_ofstream * output; - long interval_ms; - double last_time_ms; - char delimiter; Property changes on: head/games/flightgear/files/patch-CVE-2017-13709.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/pkg-plist =================================================================== --- head/games/flightgear/pkg-plist (revision 450909) +++ head/games/flightgear/pkg-plist (revision 450910) @@ -1,21 +1,42 @@ bin/GPSsmooth bin/JSBSim bin/MIDGsmooth bin/UGsmooth bin/fgcom bin/fgelev bin/fgfs bin/fgjs bin/fgpanel bin/fgtraffic bin/fgviewer bin/js_demo bin/js_server bin/metar bin/yasim bin/yasim-proptest +man/it/man1/GPSsmooth.1.gz +man/it/man1/JSBSim.1.gz +man/it/man1/MIDGsmooth.1.gz +man/it/man1/UGsmooth.1.gz +man/it/man1/fgcom.1.gz +man/it/man1/fgelev.1.gz +man/it/man1/fgfs.1.gz +man/it/man1/fgjs.1.gz +man/it/man1/fgpanel.1.gz +man/it/man1/fgviewer.1.gz +man/it/man1/js_demo.1.gz +man/it/man1/metar.1.gz +man/it/man5/fgfsrc.5.gz +man/man1/GPSsmooth.1.gz +man/man1/JSBSim.1.gz +man/man1/MIDGsmooth.1.gz +man/man1/UGsmooth.1.gz +man/man1/fgcom.1.gz +man/man1/fgelev.1.gz man/man1/fgfs.1.gz man/man1/fgjs.1.gz man/man1/fgpanel.1.gz +man/man1/fgviewer.1.gz man/man1/js_demo.1.gz -man/man1/terrasync.1.gz +man/man1/metar.1.gz +man/man5/fgfsrc.5.gz Index: head/games/flightgear-data/Makefile =================================================================== --- head/games/flightgear-data/Makefile (revision 450909) +++ head/games/flightgear-data/Makefile (revision 450910) @@ -1,44 +1,44 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear-data -PORTVERSION= 2017.1.3 +PORTVERSION= 2017.3.1 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} DISTNAME= FlightGear-${PORTVERSION}-data MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear scenery, textures, and aircraft models LICENSE= GPLv2 NO_BUILD= yes USES= tar:bzip2 WRKSRC= ${WRKDIR}/fgdata DATADIR= ${PREFIX}/share/flightgear PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= %%DATADIR%% BROKEN_aarch64= Fails to install: runaway process BROKEN_armv6= Fails to install: runaway process BROKEN_mips64= Fails to install: runaway process post-patch: @${RM} ${WRKSRC}/COPYING pre-install: @${RM} ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type d -empty | ${SORT} \ | ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/|' >> ${PLIST} && \ ${FIND} * -type f | ${SORT} \ | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} -r \ | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} do-install: ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! ( -name .git -o -name .gitignore )") .include Index: head/games/flightgear-data/distinfo =================================================================== --- head/games/flightgear-data/distinfo (revision 450909) +++ head/games/flightgear-data/distinfo (revision 450910) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491386357 -SHA256 (FlightGear-2017.1.3-data.tar.bz2) = bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365 -SIZE (FlightGear-2017.1.3-data.tar.bz2) = 1460527272 +TIMESTAMP = 1506363053 +SHA256 (FlightGear-2017.3.1-data.tar.bz2) = df08b06e88a29a9f80f29186afd54d278636a663281a1b68e8f484bbb403d898 +SIZE (FlightGear-2017.3.1-data.tar.bz2) = 1560855079