Index: head/devel/simgear/Makefile =================================================================== --- head/devel/simgear/Makefile (revision 537143) +++ head/devel/simgear/Makefile (revision 537144) @@ -1,39 +1,38 @@ # $FreeBSD$ PORTNAME= simgear -PORTVERSION= 2019.1.1 -PORTREVISION= 2 +PORTVERSION= 2020.1.2 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/osg34 \ + libosg.so:graphics/osg \ libexpat.so:textproc/expat2 \ libcurl.so:ftp/curl USES= alias cmake compiler:c++11-lib cpe gl jpeg openal:al,alut \ tar:bzip2 xorg USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut USE_LDCONFIG= yes LDFLAGS_gcc= -losgDB LDFLAGS+= ${LDFLAGS_${CHOSEN_COMPILER_TYPE}} CMAKE_ARGS+= -DSYSTEM_EXPAT:BOOL=ON post-patch: # Avoid conflict with C++20 by adding .txt suffix @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt @${REINPLACE_CMD} -Ei .c++20 '/file|set_prop/s/version[[:>:]]/&.txt/' \ ${WRKSRC}/CMakeLists.txt .include Index: head/devel/simgear/distinfo =================================================================== --- head/devel/simgear/distinfo (revision 537143) +++ head/devel/simgear/distinfo (revision 537144) @@ -1,3 +1,3 @@ -TIMESTAMP = 1566505056 -SHA256 (simgear-2019.1.1.tar.bz2) = 201ed4cc841aa99e1c84acb3035a95fa36a77dd96c0dca290c46d21a290a548b -SIZE (simgear-2019.1.1.tar.bz2) = 1370523 +TIMESTAMP = 1590834603 +SHA256 (simgear-2020.1.2.tar.bz2) = afc5563c9bfe1ddafd6767017b05a851e896539d6da3316bd10cf20db0e07889 +SIZE (simgear-2020.1.2.tar.bz2) = 1393059 Index: head/devel/simgear/files/patch-simgear-misc-sg_path.cxx =================================================================== --- head/devel/simgear/files/patch-simgear-misc-sg_path.cxx (nonexistent) +++ head/devel/simgear/files/patch-simgear-misc-sg_path.cxx (revision 537144) @@ -0,0 +1,12 @@ +Add missing include for unlink(2) call + +--- simgear/misc/sg_path.cxx.orig 2020-05-22 20:11:33 UTC ++++ simgear/misc/sg_path.cxx +@@ -31,6 +31,7 @@ + + #include + #include ++#include + #include + #include + #include Property changes on: head/devel/simgear/files/patch-simgear-misc-sg_path.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt =================================================================== --- head/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt (nonexistent) +++ head/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt (revision 537144) @@ -0,0 +1,26 @@ +Skip test failing to build with Clang on FreeBSD: + +In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/test/cppbind_test_ghost.cxx:4: +In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/test/TestContext.hxx:23: +In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/NasalContext.hxx:125: +In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/from_nasal.hxx:23: +In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/detail/from_nasal_helper.hxx:23: +/wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/detail/nasal_traits.hxx:148:14: error: call to function 'get_pointer' that is neither visible in the template definition nor found by argument-dependent lookup + +--- simgear/nasal/cppbind/CMakeLists.txt.orig 2020-05-22 20:11:33 UTC ++++ simgear/nasal/cppbind/CMakeLists.txt +@@ -35,10 +35,10 @@ set(SOURCES + simgear_component(nasal/cppbind nasal/cppbind "${SOURCES}" "${HEADERS}") + simgear_component(nasal/cppbind/detail nasal/cppbind/detail "" "${DETAIL_HEADERS}") + +-add_boost_test(cppbind_ghost +- SOURCES test/cppbind_test_ghost.cxx +- LIBRARIES ${TEST_LIBS} +-) ++#add_boost_test(cppbind_ghost ++# SOURCES test/cppbind_test_ghost.cxx ++# LIBRARIES ${TEST_LIBS} ++#) + + add_boost_test(cppbind_misc + SOURCES test/cppbind_test.cxx Property changes on: head/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/simgear/files/patch-simgear-package-md5.h =================================================================== --- head/devel/simgear/files/patch-simgear-package-md5.h (revision 537143) +++ head/devel/simgear/files/patch-simgear-package-md5.h (revision 537144) @@ -1,18 +1,11 @@ ---- simgear/package/md5.h.orig 2016-11-22 11:03:23.506026000 +0000 -+++ simgear/package/md5.h 2016-11-22 11:08:06.727103000 +0000 +--- simgear/package/md5.h.orig 2020-05-22 20:11:33 UTC ++++ simgear/package/md5.h @@ -23,6 +23,8 @@ typedef unsigned char u_int8_t; typedef unsigned int u_int32_t; typedef unsigned __int64 u_int64_t; +#else +#include #endif #define MD5_BLOCK_LENGTH 64 -@@ -49,4 +51,4 @@ - - - -- -\ No newline at end of file -+ Index: head/devel/simgear/pkg-plist =================================================================== --- head/devel/simgear/pkg-plist (revision 537143) +++ head/devel/simgear/pkg-plist (revision 537144) @@ -1,348 +1,359 @@ 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/emesary/Emesary.hxx +include/simgear/emesary/INotification.hxx +include/simgear/emesary/IReceiver.hxx +include/simgear/emesary/ITransmitter.hxx +include/simgear/emesary/ReceiptStatus.hxx +include/simgear/emesary/Transmitter.hxx +include/simgear/emesary/notifications.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/gzcontainerfile.hxx +include/simgear/io/iostreams/gzfstream.hxx +include/simgear/io/iostreams/sgstream.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/lru_cache.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/simgear_optional.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/NasalEmesaryInterface.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/cppbind_fwd.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/SGLight.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/SGImageUtils.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/scene/viewer/ClusteredForward.hxx +include/simgear/scene/viewer/ClusteredShading.hxx include/simgear/scene/viewer/Compositor.hxx include/simgear/scene/viewer/CompositorBuffer.hxx include/simgear/scene/viewer/CompositorPass.hxx include/simgear/scene/viewer/CompositorUtil.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/cmake/SimGear/SimGearConfig.cmake lib/cmake/SimGear/SimGearConfigVersion.cmake lib/cmake/SimGear/SimGearTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SimGear/SimGearTargets.cmake lib/libSimGearCore.so -lib/libSimGearCore.so.2019.1.1 +lib/libSimGearCore.so.2020.1.2 lib/libSimGearScene.so -lib/libSimGearScene.so.2019.1.1 +lib/libSimGearScene.so.2020.1.2 Index: head/games/flightgear/Makefile =================================================================== --- head/games/flightgear/Makefile (revision 537143) +++ head/games/flightgear/Makefile (revision 537144) @@ -1,63 +1,63 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 2019.1.1 -PORTREVISION= 2 +PORTVERSION= 2020.1.2 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear flight simulator LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libboost_thread.so:devel/boost-libs \ libfltk.so:x11-toolkits/fltk \ libfreetype.so:print/freetype2 \ - libosg.so:graphics/osg34 \ + libosg.so:graphics/osg \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ libcurl.so:ftp/curl \ libudev.so:devel/libudev-devd \ libexpat.so:textproc/expat2 \ libSimGearCore.so:devel/simgear BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data # Disable ninja, see https://sourceforge.net/p/flightgear/codetickets/2118/ USES= alias cmake:noninja compiler:c++11-lang cpe dos2unix gl jpeg \ openal:al,alut sqlite tar:bzip2 xorg 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 \ + -DENABLE_HID_INPUT:BOOL=OFF \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS_i386= -Wl,-znotext 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,svg post-patch: # Avoid conflict with C++20 by adding .txt suffix @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt @${REINPLACE_CMD} -Ei .c++20 '/file|set_prop/s/version[[:>:]]/&.txt/' \ ${WRKSRC}/CMakeLists.txt .include Index: head/games/flightgear/distinfo =================================================================== --- head/games/flightgear/distinfo (revision 537143) +++ head/games/flightgear/distinfo (revision 537144) @@ -1,3 +1,3 @@ -TIMESTAMP = 1566506228 -SHA256 (flightgear-2019.1.1.tar.bz2) = d1dff396b9ee96d454dbce8e9ab1aedee9829ced5fd57bcaf999a68b00553ca1 -SIZE (flightgear-2019.1.1.tar.bz2) = 8440986 +TIMESTAMP = 1590610973 +SHA256 (flightgear-2020.1.2.tar.bz2) = 6b5f7c19968da2ddcdca12596b3ef7a3ddaf59c2a127d54cd7e0fca3f89be09c +SIZE (flightgear-2020.1.2.tar.bz2) = 8504580 Index: head/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx =================================================================== --- head/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx (revision 537143) +++ head/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx (nonexistent) @@ -1,67 +0,0 @@ -Import extra patch from x11-toolkits/plib - ---- 3rdparty/joystick/jsBSD.cxx.orig 2018-05-30 23:47:01.351096000 +0200 -+++ 3rdparty/joystick/jsBSD.cxx 2018-05-30 23:47:28.474434000 +0200 -@@ -64,6 +64,7 @@ - # else - # define HAVE_USBHID_H 1 - # include -+# include - # endif - } - #endif -@@ -116,54 +117,12 @@ - static char * - walkusbdev(int f, char *dev, char *out, int outlen) - { -- struct usb_device_info di; -- int i, a; -- char *cp; -- -- for (a = 1; a < USB_MAX_DEVICES; a++) { -- di.udi_addr = a; -- if (ioctl(f, USB_DEVICEINFO, &di) != 0) -- return NULL; -- for (i = 0; i < USB_MAX_DEVNAMES; i++) -- if (di.udi_devnames[i][0] && -- strcmp(di.udi_devnames[i], dev) == 0) { -- cp = new char[strlen(di.udi_vendor) + strlen(di.udi_product) + 2]; -- strcpy(cp, di.udi_vendor); -- strcat(cp, " "); -- strcat(cp, di.udi_product); -- strncpy(out, cp, outlen - 1); -- out[outlen - 1] = 0; -- delete cp; -- return out; -- } -- } - return NULL; - } - - static int - findusbdev(char *name, char *out, int outlen) - { -- int i, f; -- char buf[50]; -- char *cp; -- static int protection_warned = 0; -- -- for (i = 0; i < 16; i++) { -- sprintf(buf, "%s%d", USBDEV, i); -- f = open(buf, O_RDONLY); -- if (f >= 0) { -- cp = walkusbdev(f, name, out, outlen); -- close(f); -- if (cp) -- return 1; -- } else if (errno == EACCES) { -- if (!protection_warned) { -- fprintf(stderr, "Can't open %s for read!\n", -- buf); -- protection_warned = 1; -- } -- } -- } - return 0; - } - Property changes on: head/games/flightgear/files/patch-PLIB-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-src-Input-FGLinuxEventInput.cxx =================================================================== --- head/games/flightgear/files/patch-src-Input-FGLinuxEventInput.cxx (revision 537143) +++ head/games/flightgear/files/patch-src-Input-FGLinuxEventInput.cxx (nonexistent) @@ -1,29 +0,0 @@ -Avoid crashing when udev_device_get_parent() returns a NULL pointer - -Backport from commit 66e6afb - ---- src/Input/FGLinuxEventInput.cxx.orig -+++ src/Input/FGLinuxEventInput.cxx -@@ -481,13 +481,15 @@ void FGLinuxEventInput::postinit() - struct udev_device *dev = udev_device_new_from_syspath(udev, path); - const char * node = udev_device_get_devnode(dev); - -- dev = udev_device_get_parent( dev ); -- const char * name = udev_device_get_sysattr_value(dev,"name"); -- const char * serial = udev_device_get_sysattr_value(dev, "serial"); -- SG_LOG(SG_INPUT,SG_DEBUG, "name=" << (name?name:"") << ", node=" << (node?node:"")); -- if( name && node ) { -- std::string serialString = serial ? serial : std::string{}; -- AddDevice( new FGLinuxInputDevice(name, node, serialString) ); -+ struct udev_device * parent_dev = udev_device_get_parent( dev ); -+ if ( parent_dev != NULL ) { -+ const char * name = udev_device_get_sysattr_value(parent_dev,"name"); -+ const char * serial = udev_device_get_sysattr_value(parent_dev, "serial"); -+ SG_LOG(SG_INPUT,SG_DEBUG, "name=" << (name?name:"") << ", node=" << (node?node:"")); -+ if( name && node ) { -+ std::string serialString = serial ? serial : std::string{}; -+ AddDevice( new FGLinuxInputDevice(name, node, serialString) ); -+ } - } - - udev_device_unref(dev); Property changes on: head/games/flightgear/files/patch-src-Input-FGLinuxEventInput.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 (nonexistent) +++ head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx (revision 537144) @@ -0,0 +1,10 @@ +--- 3rdparty/joystick/jsBSD.cxx.orig 2020-05-28 21:56:43 UTC ++++ 3rdparty/joystick/jsBSD.cxx +@@ -52,6 +52,7 @@ + #include + #include + ++#include + #include + #include + #include Property changes on: head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-src-Input-fgjs.cxx =================================================================== --- head/games/flightgear/files/patch-src-Input-fgjs.cxx (nonexistent) +++ head/games/flightgear/files/patch-src-Input-fgjs.cxx (revision 537144) @@ -0,0 +1,11 @@ +--- src/Input/fgjs.cxx.orig 2020-05-28 21:56:43 UTC ++++ src/Input/fgjs.cxx +@@ -38,6 +38,8 @@ + #include + #include + ++#include ++ + using std::fstream; + using std::cout; + using std::cin; Property changes on: head/games/flightgear/files/patch-src-Input-fgjs.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/flightgear-data/Makefile =================================================================== --- head/games/flightgear-data/Makefile (revision 537143) +++ head/games/flightgear-data/Makefile (revision 537144) @@ -1,44 +1,44 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear-data -PORTVERSION= 2019.1.1 +PORTVERSION= 2020.1.2 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_mips64= Fails to install: runaway process USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes 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 537143) +++ head/games/flightgear-data/distinfo (revision 537144) @@ -1,3 +1,3 @@ -TIMESTAMP = 1566506031 -SHA256 (FlightGear-2019.1.1-data.tar.bz2) = 0ee261a4f916554e47ccc2acf889e0825fc22e0cc3880399278a2da83f04f593 -SIZE (FlightGear-2019.1.1-data.tar.bz2) = 1748213475 +TIMESTAMP = 1590515680 +SHA256 (FlightGear-2020.1.2-data.tar.bz2) = d3f30f76abb74df6f2e4736aa480baa2716581e8c4116b604acba249ca92ba51 +SIZE (FlightGear-2020.1.2-data.tar.bz2) = 1954932485 Index: head/games/flightgear-terragear/Makefile =================================================================== --- head/games/flightgear-terragear/Makefile (revision 537143) +++ head/games/flightgear-terragear/Makefile (revision 537144) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= flightgear-terragear PORTVERSION= 20171007 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MAINTAINER= ports@FreeBSD.org COMMENT= Tools for building scenery for the FlightGear project LICENSE= GPLv2 BUILD_DEPENDS= cgal>0:math/cgal LIB_DEPENDS= libgdal.so:graphics/gdal \ libmpfr.so:math/mpfr \ libgmp.so:math/gmp \ libboost_thread.so:devel/boost-libs \ libboost_system.so:devel/boost-libs \ libboost_chrono.so:devel/boost-libs \ libboost_date_time.so:devel/boost-libs \ libboost_atomic.so:devel/boost-libs \ libtiff.so:graphics/tiff \ libSimGearCore.so:devel/simgear USES= cmake compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= flightgear GH_PROJECT= terragear GH_TAGNAME= 5b5e5fc .include