Index: head/devel/simgear/files/patch-simgear-nasal-naref.h =================================================================== --- head/devel/simgear/files/patch-simgear-nasal-naref.h (revision 410635) +++ head/devel/simgear/files/patch-simgear-nasal-naref.h (nonexistent) @@ -1,13 +0,0 @@ -Clang 3.4.1 on FreeBSD 10.1/i386 with -std=c++11 does not define i386 - ---- simgear/nasal/naref.h.orig 2015-03-09 07:33:09.127727983 +0100 -+++ simgear/nasal/naref.h 2015-03-09 07:34:06.947658185 +0100 -@@ -10,7 +10,7 @@ - /* Win64 and Irix should work with this too, but have not been - * tested */ - # define NASAL_NAN64 --#elif defined(_M_IX86) || defined(i386) || defined(__x86_64) || \ -+#elif defined(_M_IX86) || defined(__i386) || defined(__x86_64) || \ - defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \ - defined(_M_X64) || defined(__alpha__) || \ - (defined(__sh__) && defined(__LITTLE_ENDIAN__)) Property changes on: head/devel/simgear/files/patch-simgear-nasal-naref.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/devel/simgear/Makefile =================================================================== --- head/devel/simgear/Makefile (revision 410635) +++ head/devel/simgear/Makefile (revision 410636) @@ -1,32 +1,29 @@ # $FreeBSD$ PORTNAME= simgear -PORTVERSION= 3.4.0 +PORTVERSION= 2016.1.1 CATEGORIES= devel games -MASTER_SITES= http://mirrors.ibiblio.org/simgear/ftp/Source/ \ - ftp://ftp.de.flightgear.org/pub/simgear/Source/ \ - ftp://goflyflightgear.com/simgear/Source/ \ - ftp://flightgear.wo0t.de/simgear-ftp/ftp/Source/ +MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= Toolkit for 3D games and simulations LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libosg.so:${PORTSDIR}/graphics/osg -USE_XORG= ice sm x11 xext xi xt xmu +USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut USES= alias cmake compiler cpe jpeg openal:al,alut tar:bzip2 .include # When building with Gcc, needs Gcc 4.6+ .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 USE_GCC= yes .endif .include Index: head/devel/simgear/distinfo =================================================================== --- head/devel/simgear/distinfo (revision 410635) +++ head/devel/simgear/distinfo (revision 410636) @@ -1,2 +1,2 @@ -SHA256 (simgear-3.4.0.tar.bz2) = 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 -SIZE (simgear-3.4.0.tar.bz2) = 1057455 +SHA256 (simgear-2016.1.1.tar.bz2) = dbbc40115bc41563d930102484a3682e9fa4dda6f120feaa1fe82e0eb9d96c0d +SIZE (simgear-2016.1.1.tar.bz2) = 1065810 Index: head/devel/simgear/pkg-plist =================================================================== --- head/devel/simgear/pkg-plist (revision 410635) +++ head/devel/simgear/pkg-plist (revision 410636) @@ -1,329 +1,334 @@ 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/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/DAVMultiStatus.hxx include/simgear/io/HTTPClient.hxx include/simgear/io/HTTPContentDecode.hxx include/simgear/io/HTTPFileRequest.hxx include/simgear/io/HTTPMemoryRequest.hxx include/simgear/io/HTTPRequest.hxx include/simgear/io/SVNDirectory.hxx include/simgear/io/SVNReportParser.hxx include/simgear/io/SVNRepository.hxx include/simgear/io/iochannel.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/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/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/gzcontainerfile.hxx include/simgear/misc/interpolator.hxx include/simgear/misc/make_new.hxx include/simgear/misc/sg_dir.hxx include/simgear/misc/sg_path.hxx include/simgear/misc/sgstream.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/texcoord.hxx include/simgear/misc/zfstream.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/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_group.hxx include/simgear/sound/sample_openal.hxx include/simgear/sound/sample_queue.hxx include/simgear/sound/soundmgr_openal.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 410635) +++ head/games/flightgear/Makefile (revision 410636) @@ -1,61 +1,61 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 3.4.0 -PORTREVISION= 1 +PORTVERSION= 2016.1.1 CATEGORIES= games -# see http://www.flightgear.org/templates.js -MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Source/ \ - http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Source/ \ - ftp://ftp.kingmont.com/flightsims/flightgear/Source/ \ - ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \ - ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Source/ +MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= The FlightGear flight simulator LICENSE= GPLv2 LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ libosg.so:${PORTSDIR}/graphics/osg \ libspeex.so:${PORTSDIR}/audio/speex BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear \ ${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data -USE_XORG= ice sm x11 xext xft xi xinerama xt xmu +USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glu glut USE_QT5= core buildtools qmake widgets -USES= alias cpe dos2unix cmake compiler jpeg openal:al,alut sqlite \ +USES= alias cmake compiler cpe dos2unix jpeg openal:al,alut sqlite \ tar:bzip2 DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DENABLE_JS_SERVER:BOOL=ON \ -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 OPTIONS_DEFAULT= DBUS DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus +DBUS_USES= pkgconfig DBUS_CMAKE_ON= -DUSE_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF .include # Chase devel/simgear compiler version .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 USE_GCC= yes .endif +post-patch: + ${MV} "${WRKSRC}/src/GUI/ndb-small-icon .png" \ + "${WRKSRC}/src/GUI/ndb-small-icon.png" + post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server \ + ${STAGEDIR}${PREFIX}/bin .include Index: head/games/flightgear/distinfo =================================================================== --- head/games/flightgear/distinfo (revision 410635) +++ head/games/flightgear/distinfo (revision 410636) @@ -1,2 +1,2 @@ -SHA256 (flightgear-3.4.0.tar.bz2) = b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 -SIZE (flightgear-3.4.0.tar.bz2) = 7522457 +SHA256 (flightgear-2016.1.1.tar.bz2) = acdffb8a6a000cd44b23816f5d1467dbcf375d3cbd6233b2998467bd55dd60ac +SIZE (flightgear-2016.1.1.tar.bz2) = 7541607 Index: head/games/flightgear/files/patch-6a30e70 =================================================================== --- head/games/flightgear/files/patch-6a30e70 (revision 410635) +++ head/games/flightgear/files/patch-6a30e70 (nonexistent) @@ -1,208 +0,0 @@ ---- src/Main/util.cxx.orig -+++ src/Main/util.cxx -@@ -33,6 +33,7 @@ - #include - #include - -+#include - #include "fg_io.hxx" - #include "fg_props.hxx" - #include "globals.hxx" -@@ -71,32 +72,142 @@ fgGetLowPass (double current, double target, double timeratio) - return current; - } - --// Write out path to validation node and read it back in. A Nasal --// listener is supposed to replace the path with a validated version --// or an empty string otherwise. --const char *fgValidatePath (const char *str, bool write) -+static string_list read_allowed_paths; -+static string_list write_allowed_paths; -+ -+// Allowed paths here are absolute, and may contain _one_ *, -+// which matches any string -+// FG_SCENERY is deliberately not allowed, as it would make -+// /sim/terrasync/scenery-dir a security hole -+void fgInitAllowedPaths() - { -- SGPropertyNode_ptr r, w; -- r = fgGetNode("/sim/paths/validate/read", true); -- r->setAttribute(SGPropertyNode::READ, true); -- r->setAttribute(SGPropertyNode::WRITE, true); -- -- w = fgGetNode("/sim/paths/validate/write", true); -- w->setAttribute(SGPropertyNode::READ, true); -- w->setAttribute(SGPropertyNode::WRITE, true); -- -- SGPropertyNode *prop = write ? w : r; -- prop->setStringValue(str); -- const char *result = prop->getStringValue(); -- return result[0] ? result : 0; -+ read_allowed_paths.clear(); -+ write_allowed_paths.clear(); -+ read_allowed_paths.push_back(globals->get_fg_root() + "/*"); -+ read_allowed_paths.push_back(globals->get_fg_home() + "/*"); -+ string_list const aircraft_paths = globals->get_aircraft_paths(); -+ for( string_list::const_iterator it = aircraft_paths.begin(); -+ it != aircraft_paths.end(); -+ ++it ) -+ { -+ read_allowed_paths.push_back(*it + "/*"); -+ } -+ -+ for( string_list::const_iterator it = read_allowed_paths.begin(); -+ it != read_allowed_paths.end(); -+ ++it ) -+ { // if we get the initialization order wrong, better to have an -+ // obvious error than a can-read-everything security hole... -+ if (!(it->compare("/*"))){ -+ flightgear::fatalMessageBox("Nasal initialization error", -+ "Empty string in FG_ROOT, FG_HOME or FG_AIRCRAFT", -+ "or fgInitAllowedPaths() called too early"); -+ exit(-1); -+ } -+ } -+ write_allowed_paths.push_back("/tmp/*.xml"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/*.sav"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/*.log"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/cache/*"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/Export/*"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/state/*.xml"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/aircraft-data/*.xml"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/Wildfire/*.xml"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/runtime-jetways/*.xml"); -+ write_allowed_paths.push_back(globals->get_fg_home() + "/Input/Joysticks/*.xml"); -+ -+ if(!fgValidatePath(globals->get_fg_home() + "/../no.log",true).empty() || -+ !fgValidatePath(globals->get_fg_home() + "/no.lot",true).empty() || -+ fgValidatePath((globals->get_fg_home() + "/nolog").c_str(),true) || -+ !fgValidatePath(globals->get_fg_home() + "no.log",true).empty() || -+ !fgValidatePath("..\\" + globals->get_fg_home() + "/no.log",false).empty() || -+ fgValidatePath("/tmp/no.xml",false) || -+ fgValidatePath(globals->get_fg_home() + "/./ff/../Export\\yes..gg",true).empty() || -+ !fgValidatePath((globals->get_fg_home() + "/aircraft-data/yes..xml").c_str(),true) || -+ fgValidatePath(globals->get_fg_root() + "/./\\yes.bmp",false).empty()) { -+ flightgear::fatalMessageBox("Nasal initialization error", -+ "fgInitAllowedPaths() does not work", -+ ""); -+ exit(-1); -+ } - } - --//------------------------------------------------------------------------------ --std::string fgValidatePath(const std::string& path, bool write) -+// Normalize a path -+// Unlike SGPath::realpath, does not require that the file already exists, -+// but does require that it be below the starting point -+static std::string fgNormalizePath (const std::string& path) - { -- const char* validate_path = fgValidatePath(path.c_str(), write); -- return std::string(validate_path ? validate_path : ""); --} -+ string_list path_parts; -+ char c; -+ std::string normed_path = "", this_part = ""; -+ -+ for (int pos = 0; ; pos++) { -+ c = path[pos]; -+ if (c == '\\') { c = '/'; } -+ if ((c == '/') || (c == 0)) { -+ if ((this_part == "/..") || (this_part == "..")) { -+ if (path_parts.empty()) { return ""; } -+ path_parts.pop_back(); -+ } else if ((this_part != "/.") && (this_part != "/")) { -+ path_parts.push_back(this_part); -+ } -+ this_part = ""; -+ } -+ if (c == 0) { break; } -+ this_part = this_part + c; -+ } -+ for( string_list::const_iterator it = path_parts.begin(); -+ it != path_parts.end(); -+ ++it ) -+ { -+ normed_path.append(*it); -+ } -+ return normed_path; -+ } -+ - -+// Check whether Nasal is allowed to access a path -+std::string fgValidatePath (const std::string& path, bool write) -+{ -+ const string_list& allowed_paths(write ? write_allowed_paths : read_allowed_paths); -+ int star_pos; -+ -+ // Normalize the path (prevents ../../.. trickery) -+ std::string normed_path = fgNormalizePath(path); -+ -+ // Check against each allowed pattern -+ for( string_list::const_iterator it = allowed_paths.begin(); -+ it != allowed_paths.end(); -+ ++it ) -+ { -+ star_pos = it->find('*'); -+ if (star_pos == std::string::npos) { -+ if (!(it->compare(normed_path))) { -+ return normed_path; -+ } -+ } else { -+ if ((it->size()-1 <= normed_path.size()) /* long enough to be a potential match */ -+ && !(it->substr(0,star_pos) -+ .compare(normed_path.substr(0,star_pos))) /* before-star parts match */ -+ && !(it->substr(star_pos+1,it->size()-star_pos-1) -+ .compare(normed_path.substr(star_pos+1+normed_path.size()-it->size(), -+ it->size()-star_pos-1))) /* after-star parts match */) { -+ return normed_path; -+ } -+ } -+ } -+ // no match found -+ return ""; -+} -+// s.c_str() becomes invalid when s is destroyed, so need a static s -+std::string validate_path_temp; -+const char* fgValidatePath(const char* path, bool write) -+{ -+ validate_path_temp = fgValidatePath(std::string(path), write); -+ if(validate_path_temp.empty()){ -+ return 0; -+ } -+ return validate_path_temp.c_str(); -+} - // end of util.cxx - ---- src/Main/util.hxx.orig -+++ src/Main/util.hxx -@@ -36,7 +36,7 @@ - double fgGetLowPass (double current, double target, double timeratio); - - /** -- * Validation listener interface for io.nas, used by fgcommands. -+ * File access control, used by Nasal and fgcommands. - * @param path Path to be validated - * @param write True for write operations and false for read operations. - * @return The validated path on success or 0 if access denied. -@@ -44,4 +44,9 @@ double fgGetLowPass (double current, double target, double timeratio); - const char *fgValidatePath (const char *path, bool write); - std::string fgValidatePath(const std::string& path, bool write); - -+/** -+ * Set allowed paths for fgValidatePath -+ */ -+void fgInitAllowedPaths(); -+ - #endif // __UTIL_HXX ---- src/Scripting/NasalSys.cxx.orig -+++ src/Scripting/NasalSys.cxx -@@ -835,6 +835,9 @@ void FGNasalSys::init() - .member("singleShot", &TimerObj::isSingleShot, &TimerObj::setSingleShot) - .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); Property changes on: head/games/flightgear/files/patch-6a30e70 ___________________________________________________________________ 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-hts_engine_API-lib-HTS_misc.c =================================================================== --- head/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c (nonexistent) +++ head/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c (revision 410636) @@ -0,0 +1,11 @@ +--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig 2016-03-04 22:01:27.406278681 +0000 ++++ 3rdparty/hts_engine_API/lib/HTS_misc.c 2016-03-04 22:01:51.791013177 +0000 +@@ -245,7 +245,7 @@ + } else if (fp->type == HTS_FILE) { + fpos_t pos; + fgetpos((FILE *) fp->pointer, &pos); +-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__) + return (size_t) pos; + #else + return (size_t) pos.__pos; Property changes on: head/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c ___________________________________________________________________ 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-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-CMakeLists.txt (revision 410635) +++ head/games/flightgear/files/patch-CMakeLists.txt (revision 410636) @@ -1,10 +1,10 @@ ---- CMakeLists.txt.orig 2015-08-07 18:59:55.669709204 +0000 -+++ CMakeLists.txt 2015-08-07 19:09:00.637025953 +0000 -@@ -355,6 +355,7 @@ +--- CMakeLists.txt.orig 2016-03-04 21:42:31.724356963 +0000 ++++ CMakeLists.txt 2016-03-04 21:44:48.254713994 +0000 +@@ -376,6 +376,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS} -D_REENTRANT") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} -D_REENTRANT ${BOOST_CXX_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lX11") include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} Index: head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt (revision 410635) +++ head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt (revision 410636) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2015-03-02 18:54:57.486432082 +0100 -+++ CMakeLists.txt 2015-03-02 18:55:21.109548415 +0100 -@@ -293,7 +293,7 @@ +--- CMakeLists.txt.orig 2016-03-04 21:42:31.724356963 +0000 ++++ CMakeLists.txt 2016-03-04 21:47:33.738336446 +0000 +@@ -310,7 +310,7 @@ endif (ENABLE_QT) ############################################################################## -find_package(PLIB REQUIRED puaux pu js fnt) +find_package(PLIB REQUIRED puaux pu js fnt net) # FlightGear and SimGear versions need to match find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED) Index: head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt (revision 410635) +++ head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt (revision 410636) @@ -1,13 +1,10 @@ ---- utils/CMakeLists.txt.orig 2013-10-01 16:13:22.000000000 +0200 -+++ utils/CMakeLists.txt 2013-10-01 16:13:47.000000000 +0200 -@@ -29,4 +29,8 @@ - - if(ENABLE_TERRASYNC) - add_subdirectory(TerraSync) --endif() -\ No newline at end of file -+endif() +--- utils/CMakeLists.txt.orig 2016-03-04 21:48:12.374333305 +0000 ++++ utils/CMakeLists.txt 2016-03-04 21:48:56.931894245 +0000 +@@ -34,3 +34,7 @@ + if(ENABLE_STGMERGE) + add_subdirectory(stgmerge) + endif() + +if(ENABLE_JS_SERVER) + add_subdirectory(js_server) +endif() Index: head/games/flightgear/files/patch-src-GUI-resources.qrc =================================================================== --- head/games/flightgear/files/patch-src-GUI-resources.qrc (nonexistent) +++ head/games/flightgear/files/patch-src-GUI-resources.qrc (revision 410636) @@ -0,0 +1,11 @@ +--- src/GUI/resources.qrc.orig 2016-03-04 22:06:39.209257057 +0000 ++++ src/GUI/resources.qrc 2016-03-04 22:06:55.142504964 +0000 +@@ -15,7 +15,7 @@ + airport-tower-icon.png + vor-dme-icon.png + seaport-tower-icon.png +- ndb-small-icon .png ++ ndb-small-icon.png + ndb-large-icon.png + airplane-icon.png + airport-closed-icon.png Property changes on: head/games/flightgear/files/patch-src-GUI-resources.qrc ___________________________________________________________________ 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-aircraft/Makefile =================================================================== --- head/games/flightgear-aircraft/Makefile (revision 410635) +++ head/games/flightgear-aircraft/Makefile (revision 410636) @@ -1,90 +1,88 @@ # Created by: Jean-Yves Lefort # $FreeBSD$ PORTNAME= flightgear-aircraft -PORTVERSION= 20150303 +PORTVERSION= 20160305 CATEGORIES= games -# see http://www.flightgear.org/templates.js -MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.4/ \ - http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.4/ \ - ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.4/ \ - ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.4/ \ - ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.4/ +# See http://www.flightgear.org/templates.js +MASTER_SITES= http://fgfs.goneabitbursar.com/official/ \ + http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2016.1/ \ + http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2016.1/ # Selection of production-ready/well-known planes # (planes already included in flightgear-data are excluded) -# Please contact the MAINTAINER if a plane is missing -DISTFILES= 737-200_20140909.zip \ - A-10_20140909.zip \ - A300_20140909.zip \ - Alouette-II_20140909.zip \ - Alphajet_20140909.zip \ - B-17_0.1.zip \ - Breguet-XIX_20140909.zip \ - C130_20140909.zip \ - Caravelle_20140909.zip \ - Caudron-G3_20140909.zip \ - F80C_20140909.zip \ - Hurricane_20140909.zip \ - IL-2_20140909.zip \ - Lightning_20140909.zip \ - Lockheed1049h_1.0.zip \ - Messerschmitt-P1101_20140909.zip \ - MirageIII_20140909.zip \ - PaperAirplane_20140909.zip \ - Pond-Racer_20140909.zip \ - R44_20140909.zip \ - Spitfire_20140909.zip \ - Stieglitz_20140909.zip \ - Super-Etendard_20140909.zip \ - Supermarine-S.6B_20140909.zip \ - Superwal_20140909.zip \ - airwaveXtreme150_January-2015.zip \ - asw20_June-2014.zip \ - bf109_20140909.zip \ - c310_20150114.zip \ - dhc3_0.1.zip \ - f16_20140909.zip \ - harrier_20140909.zip \ - pa24-250_20140909.zip \ - tu154_20140909.zip \ - wrightFlyer1903_20140909.zip +# Please contact MAINTAINER if a plane is missing +DISTFILES= 737-200.zip \ + A-10.zip \ + A300.zip \ + Alouette-II.zip \ + Alphajet.zip \ + B-17.zip \ + Breguet-XIX.zip \ + C130.zip \ + Caravelle.zip \ + Caudron-G3.zip \ + F80C.zip \ + Hurricane.zip \ + IL-2.zip \ + Lightning.zip \ + Lockheed1049h.zip \ + Messerschmitt-P1101.zip \ + MirageIII.zip \ + PaperAirplane.zip \ + Pond-Racer.zip \ + R44.zip \ + Spitfire.zip \ + Stieglitz.zip \ + Super-Etendard.zip \ + Supermarine-S.6B.zip \ + Superwal.zip \ + airwaveXtreme150.zip \ + asw20.zip \ + bf109.zip \ + c310.zip \ + dhc3.zip \ + f16.zip \ + harrier.zip \ + pa24-250.zip \ + tu154.zip \ + wrightFlyer1903.zip DIST_SUBDIR= ${PORTNAME} MAINTAINER= martymac@FreeBSD.org COMMENT= Selection of additional aircraft for the FlightGear flight simulator LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data NO_BUILD= yes USES= zip WRKSRC= ${WRKDIR}/fgaircraft EXTRACT_AFTER_ARGS= -d ${WRKSRC} DATADIR= ${PREFIX}/share/flightgear/Aircraft PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= %%DATADIR%% pre-extract: @${MKDIR} ${WRKSRC} post-patch: @${FIND} ${WRKSRC} -type f \ \( -name COPYING -or -name LICENSE -or -name copyright \) -delete pre-install: @${RM} -f ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type d -empty | ${SORT} \ | ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/Aircraft/|' >> ${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}) .include Index: head/games/flightgear-aircraft/distinfo =================================================================== --- head/games/flightgear-aircraft/distinfo (revision 410635) +++ head/games/flightgear-aircraft/distinfo (revision 410636) @@ -1,70 +1,70 @@ -SHA256 (flightgear-aircraft/737-200_20140909.zip) = 74be9c9f5de3ab752324bc5470a9554aea691e6937a1275a36efebc7036bb751 -SIZE (flightgear-aircraft/737-200_20140909.zip) = 12401593 -SHA256 (flightgear-aircraft/A-10_20140909.zip) = 172f116ec5f092fbfb05b3de960e5040b9c43b995634332f373c4af010b08043 -SIZE (flightgear-aircraft/A-10_20140909.zip) = 9328047 -SHA256 (flightgear-aircraft/A300_20140909.zip) = b1427fb29d2cbe3e489bcc8e48487411e46cbdf0dac51c35eb05d6ad3516ba74 -SIZE (flightgear-aircraft/A300_20140909.zip) = 386184 -SHA256 (flightgear-aircraft/Alouette-II_20140909.zip) = aef45f15e08fd56c6a7ccfc6d837c40b47ef7beb285292f8fc856317eeb724f5 -SIZE (flightgear-aircraft/Alouette-II_20140909.zip) = 5381104 -SHA256 (flightgear-aircraft/Alphajet_20140909.zip) = c2a57b9c1315ee07c7d55af518fc5cbb2fb65928c429e32ee878518c68b99850 -SIZE (flightgear-aircraft/Alphajet_20140909.zip) = 19410469 -SHA256 (flightgear-aircraft/B-17_0.1.zip) = 58c604f8cb38b082e0de606e276bd948560a1c3322d2de169e41640bd71b1d19 -SIZE (flightgear-aircraft/B-17_0.1.zip) = 17434364 -SHA256 (flightgear-aircraft/Breguet-XIX_20140909.zip) = 473951870ec8beaaaf8daf290326f4440038361d33a25eab9f8d0775bbc32129 -SIZE (flightgear-aircraft/Breguet-XIX_20140909.zip) = 4323944 -SHA256 (flightgear-aircraft/C130_20140909.zip) = caf25eda65e5778a4224d14b50c0313b6f9ea2984760e3b076d74d6b12f4ec3b -SIZE (flightgear-aircraft/C130_20140909.zip) = 23131488 -SHA256 (flightgear-aircraft/Caravelle_20140909.zip) = a666c0ad00b0818acf96f704711605e7e77d9c923cc114271038ac790db3f61b -SIZE (flightgear-aircraft/Caravelle_20140909.zip) = 14686948 -SHA256 (flightgear-aircraft/Caudron-G3_20140909.zip) = 3781487c4d993d37d4713b20c9ca863c44e86c3c3a9cf66deda3b982ca130332 -SIZE (flightgear-aircraft/Caudron-G3_20140909.zip) = 4531626 -SHA256 (flightgear-aircraft/F80C_20140909.zip) = 63ce7fb5cb547ce7fcadbffa89e52049d7beca32e1a8c27bd1907ac6a597eff8 -SIZE (flightgear-aircraft/F80C_20140909.zip) = 1528349 -SHA256 (flightgear-aircraft/Hurricane_20140909.zip) = 457627b3139adf0fe836dedded82479fd76e9a1464d3bbac51128cfea008eb2a -SIZE (flightgear-aircraft/Hurricane_20140909.zip) = 12062976 -SHA256 (flightgear-aircraft/IL-2_20140909.zip) = db1288463d54d173fcc3455f7ba31df4baebb575bd7fff0f1ea5741d0d0cb8d4 -SIZE (flightgear-aircraft/IL-2_20140909.zip) = 4801474 -SHA256 (flightgear-aircraft/Lightning_20140909.zip) = 5423e75c6c9952b5ec544b47c8295d540344d6fdd2a8cd27570a7bab0a990099 -SIZE (flightgear-aircraft/Lightning_20140909.zip) = 4785070 -SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = b2f3a4c86887c99584624b3747763497a6025f20f99283481e2bd27e2f181e66 -SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7528760 -SHA256 (flightgear-aircraft/Messerschmitt-P1101_20140909.zip) = d7aafa9d35b22bd77fd35ef271926b3f645eb062e8dcdeb5d7acfa67e5249e6f -SIZE (flightgear-aircraft/Messerschmitt-P1101_20140909.zip) = 4359275 -SHA256 (flightgear-aircraft/MirageIII_20140909.zip) = a17cc4b9ff5090826cbbf9c453cf1160a10fc2a3106c3f546f5b454702031382 -SIZE (flightgear-aircraft/MirageIII_20140909.zip) = 11112464 -SHA256 (flightgear-aircraft/PaperAirplane_20140909.zip) = 0e8c8b52939a9d3a499a8eb844e036494ad02773c6480ba6a599f830a99cb7f3 -SIZE (flightgear-aircraft/PaperAirplane_20140909.zip) = 867872 -SHA256 (flightgear-aircraft/Pond-Racer_20140909.zip) = 13c5f6e88871790309e84ef4b2e7fe9cc7a29e3ea27fea67ef536c157bdfb061 -SIZE (flightgear-aircraft/Pond-Racer_20140909.zip) = 3063526 -SHA256 (flightgear-aircraft/R44_20140909.zip) = 52aac7955d17ba80ab82c5395232e744369964db8c3f6b3214546ecf298ed50e -SIZE (flightgear-aircraft/R44_20140909.zip) = 8909152 -SHA256 (flightgear-aircraft/Spitfire_20140909.zip) = 417b80784f9f74008819a3ccb832ffcb578b4edd3fe0007acc499a09ec0bd041 -SIZE (flightgear-aircraft/Spitfire_20140909.zip) = 21052226 -SHA256 (flightgear-aircraft/Stieglitz_20140909.zip) = 0cbe50c305056ff58aaaf4d94e58d6f1eeff7a65c116c73bfbe58add2672f7c0 -SIZE (flightgear-aircraft/Stieglitz_20140909.zip) = 4499810 -SHA256 (flightgear-aircraft/Super-Etendard_20140909.zip) = b81db007cee7a4115c67da616f454e984b8f4b573892c9baf5437214dc8d0eca -SIZE (flightgear-aircraft/Super-Etendard_20140909.zip) = 10418381 -SHA256 (flightgear-aircraft/Supermarine-S.6B_20140909.zip) = f0afb3de24c90972fff19f598085be62ada6528e87540be8b2df3184316cbc4d -SIZE (flightgear-aircraft/Supermarine-S.6B_20140909.zip) = 3275253 -SHA256 (flightgear-aircraft/Superwal_20140909.zip) = f42a01ede38fd6aa7c603444fd2038c55bcfd2c6f0738ba291611ecc054078d4 -SIZE (flightgear-aircraft/Superwal_20140909.zip) = 2654839 -SHA256 (flightgear-aircraft/airwaveXtreme150_January-2015.zip) = 5ee8c38df687a9f6c785ea8ae1050b32fe7b5c2f6e00c8cac96f80b598e11b78 -SIZE (flightgear-aircraft/airwaveXtreme150_January-2015.zip) = 1222754 -SHA256 (flightgear-aircraft/asw20_June-2014.zip) = a0a0680fa68933f579f01462703151b907d895dee69d44d8e3007abc0dd9ad3c -SIZE (flightgear-aircraft/asw20_June-2014.zip) = 3592394 -SHA256 (flightgear-aircraft/bf109_20140909.zip) = 5ed66f955de67d2a002e4b6dfa72f99d31857e896e1ca0cae66907aff6e90663 -SIZE (flightgear-aircraft/bf109_20140909.zip) = 24201689 -SHA256 (flightgear-aircraft/c310_20150114.zip) = 16c96ea6525bfb70acdbf0f764272c44931261e7d3455be18195ce4fe988211b -SIZE (flightgear-aircraft/c310_20150114.zip) = 615076 -SHA256 (flightgear-aircraft/dhc3_0.1.zip) = 1e2d2e6e1837c58796aeaa2676bbf83ca4fd4a80ea24fbab8b066abb52904500 -SIZE (flightgear-aircraft/dhc3_0.1.zip) = 35577448 -SHA256 (flightgear-aircraft/f16_20140909.zip) = ee04929ed4efdb533b367fd694870aec6fb2545432d6c52c02d7f4badca8dc42 -SIZE (flightgear-aircraft/f16_20140909.zip) = 19445894 -SHA256 (flightgear-aircraft/harrier_20140909.zip) = d50e2920a5943ae6b9ba1b55316c455f9a3dd642362d0ce1bcfaa518de9b0e68 -SIZE (flightgear-aircraft/harrier_20140909.zip) = 4208173 -SHA256 (flightgear-aircraft/pa24-250_20140909.zip) = e3074d6bac8203c1ced052cfc7db0d7f3b85c2f908dcb442edfd5813940d07b5 -SIZE (flightgear-aircraft/pa24-250_20140909.zip) = 2100194 -SHA256 (flightgear-aircraft/tu154_20140909.zip) = d2982a40c4c4b865e9d6ec85b6695e9c94026181bd9452d5f8e9fbc071ac3a74 -SIZE (flightgear-aircraft/tu154_20140909.zip) = 1387134 -SHA256 (flightgear-aircraft/wrightFlyer1903_20140909.zip) = 797b51461ecf9db3737d88b0f65e575868c9a32baf4a47aa9e92d673a8483a87 -SIZE (flightgear-aircraft/wrightFlyer1903_20140909.zip) = 1371750 +SHA256 (flightgear-aircraft/737-200.zip) = ab55b00e2554fab1903dbdd94cfec38a4f432928c64eefab2b71782cc1bf18db +SIZE (flightgear-aircraft/737-200.zip) = 12401593 +SHA256 (flightgear-aircraft/A-10.zip) = 4f455c34decf30c1c8388641161b0487e277428bc70c10442374f1505bc54746 +SIZE (flightgear-aircraft/A-10.zip) = 9328044 +SHA256 (flightgear-aircraft/A300.zip) = 79a501bbef0bcef814a377cbd4b5cba1fb2495cbc77b5bf760a0c3dabcf9281b +SIZE (flightgear-aircraft/A300.zip) = 386184 +SHA256 (flightgear-aircraft/Alouette-II.zip) = 9969b461c1d081a37d1ad9885968842f5a123b678b9fc6df3badb51669ea7ed9 +SIZE (flightgear-aircraft/Alouette-II.zip) = 5381140 +SHA256 (flightgear-aircraft/Alphajet.zip) = a0b0127318415063b51cfcd1fa4d8c1c3f031797a4492c96f1568d8daef6625b +SIZE (flightgear-aircraft/Alphajet.zip) = 19410469 +SHA256 (flightgear-aircraft/B-17.zip) = 0c0d9f4b01e7761c56647465e32792b011cbf6fc085eb799a52b69d75ae765c9 +SIZE (flightgear-aircraft/B-17.zip) = 17434364 +SHA256 (flightgear-aircraft/Breguet-XIX.zip) = e7d99c113a885868e9ff07e4f74d33bcb59e41ffd1e2ec440ad326cc26d0484d +SIZE (flightgear-aircraft/Breguet-XIX.zip) = 6369018 +SHA256 (flightgear-aircraft/C130.zip) = 421224d9b4ca9776a88af18fc1795038d92544331f2283480f71a2b906a1f0e6 +SIZE (flightgear-aircraft/C130.zip) = 23131509 +SHA256 (flightgear-aircraft/Caravelle.zip) = 6e728348f0a61e898ce1edb3d573f3d56036fa28073c19d591bc4e717207d006 +SIZE (flightgear-aircraft/Caravelle.zip) = 14686948 +SHA256 (flightgear-aircraft/Caudron-G3.zip) = 72135b0ca1a2cd3028d9ce44ad5a71b25803b8a13ae6fb05f94bed2ca21176ac +SIZE (flightgear-aircraft/Caudron-G3.zip) = 4531626 +SHA256 (flightgear-aircraft/F80C.zip) = 128ece282cba5c7ce9cffb3d11655d85314c6c0f32a34392a6047bc990fff01d +SIZE (flightgear-aircraft/F80C.zip) = 1528349 +SHA256 (flightgear-aircraft/Hurricane.zip) = 29a69fb0b98990a1fdcd496d730302412346c796b75974b0cb0579a83d2e6334 +SIZE (flightgear-aircraft/Hurricane.zip) = 12062980 +SHA256 (flightgear-aircraft/IL-2.zip) = 93de73de118a2900cf5def09ad22376e7af07754127086510f48474745566b20 +SIZE (flightgear-aircraft/IL-2.zip) = 6093351 +SHA256 (flightgear-aircraft/Lightning.zip) = eb8846f0dac2c6dc9098b389e7bd9fe8c548c18e0ddb5fe33b5c35d43b3a40ac +SIZE (flightgear-aircraft/Lightning.zip) = 4734150 +SHA256 (flightgear-aircraft/Lockheed1049h.zip) = 7dd9233e9854546916176aa53cc7a0375c0e2d20939376b282efe51b54429a73 +SIZE (flightgear-aircraft/Lockheed1049h.zip) = 12383487 +SHA256 (flightgear-aircraft/Messerschmitt-P1101.zip) = 0e4fb20a8ea811f0b52a6855c5ac8f72b78c795c14e9ab066f89dfcbd86089b9 +SIZE (flightgear-aircraft/Messerschmitt-P1101.zip) = 4359275 +SHA256 (flightgear-aircraft/MirageIII.zip) = d4dd878fab7f05cdd58fe71b8a509414897cc38628d37502c7be5f24d7f79419 +SIZE (flightgear-aircraft/MirageIII.zip) = 11112483 +SHA256 (flightgear-aircraft/PaperAirplane.zip) = 2584d8d1248891c0d6324bd37b96d562c552dc4038eb43353990f65214cfe3d8 +SIZE (flightgear-aircraft/PaperAirplane.zip) = 867872 +SHA256 (flightgear-aircraft/Pond-Racer.zip) = e1b3fb2d6d56ac3d917c3b2619ccd9e0655d1b2bea86beb689505df3a9a61194 +SIZE (flightgear-aircraft/Pond-Racer.zip) = 3063526 +SHA256 (flightgear-aircraft/R44.zip) = 5081e501745a8d42675f6f09b3d798e3357968dea44523e59f6f989e4dc93562 +SIZE (flightgear-aircraft/R44.zip) = 8909199 +SHA256 (flightgear-aircraft/Spitfire.zip) = 2f8504c2e66abe010c3be1335472ec975ed28a87c3bf3d46e6e15f00ede8107b +SIZE (flightgear-aircraft/Spitfire.zip) = 21052304 +SHA256 (flightgear-aircraft/Stieglitz.zip) = d77cd955ebe6133cb9d45bc5801c33b77300bed638f501d77929ffeefacb6572 +SIZE (flightgear-aircraft/Stieglitz.zip) = 4499810 +SHA256 (flightgear-aircraft/Super-Etendard.zip) = 096446f0ece8a374768fdf7936f8e2fe9034607daeeb77ea182bb4ead9287b3b +SIZE (flightgear-aircraft/Super-Etendard.zip) = 10418381 +SHA256 (flightgear-aircraft/Supermarine-S.6B.zip) = 6b7df8d3f7c4d3cd929c6db4c663082553ac4d2fe0782a2cbcdf3bf4a147e3d0 +SIZE (flightgear-aircraft/Supermarine-S.6B.zip) = 3264085 +SHA256 (flightgear-aircraft/Superwal.zip) = fe2d85752c12cab0af9f54922870d08fd5ded3264388781fc976111ade0b0784 +SIZE (flightgear-aircraft/Superwal.zip) = 2654839 +SHA256 (flightgear-aircraft/airwaveXtreme150.zip) = 6e42c783810d5ee9efff2f3b6386edd4f8526fef74fc701e8fec1a05e0f2fc72 +SIZE (flightgear-aircraft/airwaveXtreme150.zip) = 1244151 +SHA256 (flightgear-aircraft/asw20.zip) = 2d72af7d408587a6a242212061fc41da031cbefe354b43b96ef3be40632002f6 +SIZE (flightgear-aircraft/asw20.zip) = 3599930 +SHA256 (flightgear-aircraft/bf109.zip) = 05bd7ded026ccbd81980ba1dd295b6ac4a893da602f3b673de10bb9ade6ad655 +SIZE (flightgear-aircraft/bf109.zip) = 24302759 +SHA256 (flightgear-aircraft/c310.zip) = eee4836077af1713310e771e4954eecc50f12cf9c6d26fefdb2bc5d0c9f75046 +SIZE (flightgear-aircraft/c310.zip) = 615101 +SHA256 (flightgear-aircraft/dhc3.zip) = eed1c76bc11858e0a3b167003b13e5e6a16b1fe8214a8c17befcf7b176899c87 +SIZE (flightgear-aircraft/dhc3.zip) = 35577481 +SHA256 (flightgear-aircraft/f16.zip) = be91c032017c72c01b1b194f2803bb9c2f1db1ae16dcad07de104fb8c427d91e +SIZE (flightgear-aircraft/f16.zip) = 17239505 +SHA256 (flightgear-aircraft/harrier.zip) = 80b1c55127208566b5b943b2adc5027e99f9a7644f430f20f5b1d10695a705b6 +SIZE (flightgear-aircraft/harrier.zip) = 4235554 +SHA256 (flightgear-aircraft/pa24-250.zip) = c8d9b8abef5d751a3308c06f75ecd8ab74edf607bf8a3e72366e02f3244e0aa9 +SIZE (flightgear-aircraft/pa24-250.zip) = 2100211 +SHA256 (flightgear-aircraft/tu154.zip) = 85d259c9a2abd3938bde850e783e2edaaaa86dc5e40f657d85fb68ebe0e8eb76 +SIZE (flightgear-aircraft/tu154.zip) = 1387134 +SHA256 (flightgear-aircraft/wrightFlyer1903.zip) = 5b6379b7524fd2b098fd5cd712201bfb4b48f9a77c6be55f7c0491846ff8311b +SIZE (flightgear-aircraft/wrightFlyer1903.zip) = 1402359 Index: head/games/flightgear-data/files/patch-60da209 =================================================================== --- head/games/flightgear-data/files/patch-60da209 (revision 410635) +++ head/games/flightgear-data/files/patch-60da209 (nonexistent) @@ -1,10 +0,0 @@ ---- Nasal/IOrules.orig -+++ Nasal/IOrules -@@ -28,7 +28,6 @@ - READ ALLOW $FG_ROOT/* - READ ALLOW $FG_HOME/* - READ ALLOW $FG_AIRCRAFT/* --READ ALLOW $FG_SCENERY/* - - WRITE ALLOW /tmp/*.xml - WRITE ALLOW $FG_HOME/*.sav Property changes on: head/games/flightgear-data/files/patch-60da209 ___________________________________________________________________ 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 410635) +++ head/games/flightgear-data/Makefile (revision 410636) @@ -1,48 +1,42 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear-data -PORTVERSION= 3.4.0 -PORTREVISION= 1 +PORTVERSION= 2016.1.1 CATEGORIES= games -# see http://www.flightgear.org/templates.js -MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Shared/ \ - http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Shared/ \ - ftp://ftp.kingmont.com/flightsims/flightgear/Shared/ \ - ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ \ - ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Shared/ -DISTNAME= FlightGear-data-${PORTVERSION} +MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} +DISTNAME= FlightGear-${PORTVERSION}-data MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear scenery, textures, and aircraft models LICENSE= GPLv2 NO_BUILD= yes USES= tar:bzip2 WRKSRC= ${WRKDIR}/fgdata DATADIR= ${PREFIX}/share/flightgear PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= %%DATADIR%% MANUAL_PACKAGE_BUILD= very large distfile (>1 GB) post-patch: @${RM} -f ${WRKSRC}/COPYING pre-install: @${RM} -f ${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 .gitignore') + (cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! ( -name .git -o -name .gitignore )") .include Index: head/games/flightgear-data/distinfo =================================================================== --- head/games/flightgear-data/distinfo (revision 410635) +++ head/games/flightgear-data/distinfo (revision 410636) @@ -1,2 +1,2 @@ -SHA256 (FlightGear-data-3.4.0.tar.bz2) = 8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b -SIZE (FlightGear-data-3.4.0.tar.bz2) = 1145893777 +SHA256 (FlightGear-2016.1.1-data.tar.bz2) = 36016ac5ab83fc6ad44c5cebe0f4fa7a14cf55ff5b699016abdeacf5a04c4c18 +SIZE (FlightGear-2016.1.1-data.tar.bz2) = 1266743984