Index: head/devel/simgear/Makefile =================================================================== --- head/devel/simgear/Makefile (revision 487290) +++ head/devel/simgear/Makefile (revision 487291) @@ -1,31 +1,30 @@ # $FreeBSD$ PORTNAME= simgear -PORTVERSION= 2018.2.2 -PORTREVISION= 3 +PORTVERSION= 2018.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 USES= alias cmake compiler:c++11-lib cpe gl jpeg openal:al,alut \ tar:bzip2 USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut LDFLAGS_mips= -losgDB LDFLAGS_mips64= -losgDB LDFLAGS_powerpc64= -losgDB LDFLAGS_powerpc= -losgDB LDFLAGS_powerpcspe= -losgDB LDFLAGS_sparc64= -losgDB .include Index: head/devel/simgear/distinfo =================================================================== --- head/devel/simgear/distinfo (revision 487290) +++ head/devel/simgear/distinfo (revision 487291) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535914817 -SHA256 (simgear-2018.2.2.tar.bz2) = f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5 -SIZE (simgear-2018.2.2.tar.bz2) = 1313890 +TIMESTAMP = 1544043372 +SHA256 (simgear-2018.3.1.tar.bz2) = 294580c8e98044f660d2a9d202856970a4ce9d81ff0107fffcbd701d36daa06a +SIZE (simgear-2018.3.1.tar.bz2) = 1330322 Index: head/devel/simgear/pkg-plist =================================================================== --- head/devel/simgear/pkg-plist (revision 487290) +++ head/devel/simgear/pkg-plist (revision 487291) @@ -1,339 +1,340 @@ 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/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/OsgIoCapture.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/embedded_resources/EmbeddedResourceProxy.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/NasalMe.hxx include/simgear/nasal/cppbind/NasalMethodHolder.hxx include/simgear/nasal/cppbind/NasalObject.hxx include/simgear/nasal/cppbind/NasalObjectHolder.hxx include/simgear/nasal/cppbind/NasalString.hxx include/simgear/nasal/cppbind/detail/from_nasal_helper.hxx include/simgear/nasal/cppbind/detail/nasal_traits.hxx include/simgear/nasal/cppbind/detail/to_nasal_helper.hxx include/simgear/nasal/cppbind/cppbind_fwd.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/filters.hxx 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/std/integer_sequence.hxx include/simgear/std/type_traits.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/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 487290) +++ head/games/flightgear/Makefile (revision 487291) @@ -1,54 +1,53 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 2018.2.2 -PORTREVISION= 3 +PORTVERSION= 2018.3.1 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= 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 LLD_UNSAFE= yes USES= alias cmake compiler cpe dos2unix gl jpeg openal:al,alut \ sqlite tar:bzip2 USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glew glu glut DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -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_USES= qt:5 -QT5_USE= QT=core,buildtools,gui,declarative,network,qmake,widgets +QT5_USE= QT=core,buildtools,gui,declarative,network,qmake,widgets,svg .include Index: head/games/flightgear/distinfo =================================================================== --- head/games/flightgear/distinfo (revision 487290) +++ head/games/flightgear/distinfo (revision 487291) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535914762 -SHA256 (flightgear-2018.2.2.tar.bz2) = 61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147 -SIZE (flightgear-2018.2.2.tar.bz2) = 8346698 +TIMESTAMP = 1544037940 +SHA256 (flightgear-2018.3.1.tar.bz2) = 3d4a1f37e4d5cb376c16f02c111aac9d3e6b05529015c7d068ce2c00ecb5a640 +SIZE (flightgear-2018.3.1.tar.bz2) = 8404294 Index: head/games/flightgear/files/patch-3rdparty-joystick-js.h =================================================================== --- head/games/flightgear/files/patch-3rdparty-joystick-js.h (revision 487290) +++ head/games/flightgear/files/patch-3rdparty-joystick-js.h (nonexistent) @@ -1,25 +0,0 @@ -Add missing defines and includes from removed ul.h - ---- 3rdparty/joystick/js.h.orig 2018-05-30 23:24:08.180090000 +0200 -+++ 3rdparty/joystick/js.h 2018-05-30 23:32:04.841896000 +0200 -@@ -25,10 +25,20 @@ - #define __INCLUDED_JS_H__ 1 - #define JS_NEW - -+#ifndef TRUE -+#define TRUE 1 -+#define FALSE 0 -+#endif -+ -+#include -+#include -+ - #include - #include - #include - -+#include /* for jsSetError and SG_WARN */ -+ - #define _JS_MAX_AXES 16 - #define _JS_MAX_BUTTONS 32 - #define _JS_MAX_HATS 4 Property changes on: head/games/flightgear/files/patch-3rdparty-joystick-js.h ___________________________________________________________________ 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-clang7-stack_scope.diff =================================================================== --- head/games/flightgear/files/patch-clang7-stack_scope.diff (revision 487290) +++ head/games/flightgear/files/patch-clang7-stack_scope.diff (nonexistent) @@ -1,46 +0,0 @@ -Fix scope of 'stack' when building with clang 7: - -error: reference to 'stack' is ambiguous - ---- src/FDM/UIUCModel/uiuc_aircraft.h.orig 2018-08-31 19:26:14.641298000 +0200 -+++ src/FDM/UIUCModel/uiuc_aircraft.h 2018-08-31 19:50:35.444961000 +0200 -@@ -150,7 +150,7 @@ - #include "uiuc_parsefile.h" - #include "uiuc_flapdata.h" - --typedef stack :: iterator LIST; -+typedef ::stack :: iterator LIST; - - /* Add more keywords here if required*/ - enum {init_flag = 1000, geometry_flag, controlSurface_flag, controlsMixer_flag, ---- src/FDM/UIUCModel/uiuc_parsefile.h.orig 2018-08-31 19:34:45.641135000 +0200 -+++ src/FDM/UIUCModel/uiuc_parsefile.h 2018-08-31 19:35:35.903930000 +0200 -@@ -23,7 +23,7 @@ - { - private: - -- stack commands; -+ ::stack commands; - ifstream file; - void readFile(); - -@@ -37,7 +37,7 @@ - void removeComments(string& inputLine); - string getToken(string inputLine, int tokenNo); - void storeCommands(string inputLine); -- stack getCommands(); -+ ::stack getCommands(); - }; - - #endif // _PARSE_FILE_H_ ---- src/FDM/UIUCModel/uiuc_recorder.cpp.orig 2018-08-31 19:16:32.680030000 +0200 -+++ src/FDM/UIUCModel/uiuc_recorder.cpp 2018-08-31 19:16:57.872109000 +0200 -@@ -102,7 +102,7 @@ - - void uiuc_recorder( double dt ) - { -- stack command_list; -+ ::stack command_list; - string linetoken; - // static int init = 0; - static int recordStep = 0; Property changes on: head/games/flightgear/files/patch-clang7-stack_scope.diff ___________________________________________________________________ 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-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx =================================================================== --- head/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx (revision 487290) +++ head/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx (nonexistent) @@ -1,15 +0,0 @@ -Fix build with clang 7: - -src/AIModel/AIFlightPlanCreatePushBack.cxx:96:48: error: ordered comparison between pointer and zero ('FGTaxiNode *' and 'int') - ---- src/AIModel/AIFlightPlanCreatePushBack.cxx.orig 2018-08-17 19:14:25.768512000 +0200 -+++ src/AIModel/AIFlightPlanCreatePushBack.cxx 2018-08-17 19:14:44.343865000 +0200 -@@ -93,7 +93,7 @@ - - FGGroundNetwork* groundNet = dep->groundNetwork(); - FGParking *parking = gate.parking(); -- if (parking && parking->getPushBackPoint() > 0) { -+ if (parking && parking->getPushBackPoint() != nullptr) { - FGTaxiRoute route = groundNet->findShortestRoute(parking, parking->getPushBackPoint(), false); - - int size = route.size(); Property changes on: head/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.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/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx =================================================================== --- head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx (revision 487290) +++ head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx (nonexistent) @@ -1,15 +0,0 @@ -jsSetError() takes only two arguments (unlike ulSetError()) - ---- 3rdparty/joystick/jsBSD.cxx.orig 2018-05-28 23:22:56.449679000 +0200 -+++ 3rdparty/joystick/jsBSD.cxx 2018-05-28 23:50:32.852422000 +0200 -@@ -326,8 +289,8 @@ - error = ( joyfile == NULL ) ; - if ( error ) - { -- jsSetError ( SG_WARN, "unable to open calibration file %s (%s), joystick %i disabled (you can generate the calibration file with the plib-jscal utility)", -- joyfname, strerror ( errno ), id + 1 ); -+ jsSetError ( SG_WARN, "unable to open calibration file, you can generate " -+ "the calibration file with the plib-jscal utility" ); - return ; - } - Property changes on: head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.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/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake =================================================================== --- head/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake (revision 487290) +++ head/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake (nonexistent) @@ -1,13 +0,0 @@ -Use all linker flags from pkgconf, including library path - ---- CMakeModules/SetupFGFSLibraries.cmake.orig 2018-05-29 23:46:55.859412000 +0200 -+++ CMakeModules/SetupFGFSLibraries.cmake 2018-05-29 23:47:59.869522000 +0200 -@@ -27,7 +27,7 @@ - endif() - - if(USE_DBUS) -- target_link_libraries(${target} ${DBUS_LIBRARIES}) -+ target_link_libraries(${target} ${DBUS_LDFLAGS}) - endif() - - if(FG_HAVE_GPERFTOOLS) Property changes on: head/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake ___________________________________________________________________ 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-data/Makefile =================================================================== --- head/games/flightgear-data/Makefile (revision 487290) +++ head/games/flightgear-data/Makefile (revision 487291) @@ -1,43 +1,43 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear-data -PORTVERSION= 2018.2.2 +PORTVERSION= 2018.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 BROKEN_aarch64= Fails to install: runaway process BROKEN_mips64= Fails to install: runaway process NO_BUILD= yes USES= tar:bzip2 WRKSRC= ${WRKDIR}/fgdata DATADIR= ${PREFIX}/share/flightgear PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= %%DATADIR%% 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 487290) +++ head/games/flightgear-data/distinfo (revision 487291) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535914967 -SHA256 (FlightGear-2018.2.2-data.tar.bz2) = c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4 -SIZE (FlightGear-2018.2.2-data.tar.bz2) = 1624681801 +TIMESTAMP = 1544038436 +SHA256 (FlightGear-2018.3.1-data.tar.bz2) = b03a74a69cf02370e4ff3cf3dd09fff9ae217b2873f9938803935082a48bc9c0 +SIZE (FlightGear-2018.3.1-data.tar.bz2) = 1735407015