Index: head/devel/simgear/Makefile =================================================================== --- head/devel/simgear/Makefile (revision 372110) +++ head/devel/simgear/Makefile (revision 372111) @@ -1,28 +1,33 @@ # $FreeBSD$ PORTNAME= simgear -PORTVERSION= 3.0.0 -PORTREVISION= 2 +PORTVERSION= 3.2.0 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/ 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= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libosg.so:${PORTSDIR}/graphics/osg USE_XORG= ice sm x11 xext xi xt xmu USE_GL= gl glu glut -USES= tar:bzip2 cmake openal:al,alut -CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON +USES= tar:bzip2 cmake compiler openal:al,alut -.include +.include + +# When building with Gcc, needs Gcc 4.6+ +.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 +USE_GCC= 4.6+ +.endif + +.include Index: head/devel/simgear/distinfo =================================================================== --- head/devel/simgear/distinfo (revision 372110) +++ head/devel/simgear/distinfo (revision 372111) @@ -1,2 +1,2 @@ -SHA256 (simgear-3.0.0.tar.bz2) = 09448f87e6c2b5b6101a5a4eac331c1e1b998d61ec2e59614449110de2e68016 -SIZE (simgear-3.0.0.tar.bz2) = 969971 +SHA256 (simgear-3.2.0.tar.bz2) = b456cdc63b37d609bc24b347d43dc275eb7d06f5d92b18aeb0e66eedd3819c86 +SIZE (simgear-3.2.0.tar.bz2) = 1020432 Index: head/devel/simgear/files/patch-simgear-timing-timestamp.cxx =================================================================== --- head/devel/simgear/files/patch-simgear-timing-timestamp.cxx (revision 372110) +++ head/devel/simgear/files/patch-simgear-timing-timestamp.cxx (nonexistent) @@ -1,20 +0,0 @@ ---- simgear/timing/timestamp.cxx.orig 2012-03-09 10:37:52.770699568 +0100 -+++ simgear/timing/timestamp.cxx 2012-03-09 10:38:40.266717310 +0100 -@@ -139,7 +139,7 @@ - // the timer tick) accuracy which is too bad to catch 60Hz... - bool SGTimeStamp::sleepUntil(const SGTimeStamp& abstime) - { --#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) -+#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) && !defined(__FreeBSD__) - SGTimeStamp abstimeForSleep = abstime; - - // Always undersleep by resolution of the clock -@@ -234,7 +234,7 @@ - - bool SGTimeStamp::sleepFor(const SGTimeStamp& reltime) - { --#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) -+#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) && !defined(__FreeBSD__) - struct timespec ts; - ts.tv_sec = reltime._sec; - ts.tv_nsec = reltime._nsec; Property changes on: head/devel/simgear/files/patch-simgear-timing-timestamp.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/simgear/files/patch-CMakeLists.txt =================================================================== --- head/devel/simgear/files/patch-CMakeLists.txt (revision 372110) +++ head/devel/simgear/files/patch-CMakeLists.txt (revision 372111) @@ -1,44 +1,17 @@ ---- CMakeLists.txt.orig 2014-02-15 01:04:11.000000000 +0100 -+++ CMakeLists.txt 2014-03-10 18:06:13.000000000 +0100 -@@ -259,18 +259,20 @@ - endif(HAVE_CLOCK_GETTIME) +--- CMakeLists.txt.orig 2014-10-21 07:26:42.608036396 +0200 ++++ CMakeLists.txt 2014-10-21 07:27:18.571673862 +0200 +@@ -276,12 +276,12 @@ + # isnan might not be real symbol, so can't check using function_exists + check_cxx_source_compiles( + "#include +- void f() { isnan(0.0);} " ++ int main() { return isnan(0.0);} " + HAVE_ISNAN) - set(DL_LIBRARY "") --check_cxx_source_compiles( -- "#include -- int main(void) { -- return 0; -- } -- " -- HAVE_DLFCN_H) -- --if(HAVE_DLFCN_H) -- check_library_exists(dl dlerror "" HAVE_DL) -- set(DL_LIBRARY "dl") --endif() -+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ check_cxx_source_compiles( -+ "#include -+ int main(void) { -+ return 0; -+ } -+ " -+ HAVE_DLFCN_H) -+ -+ if(HAVE_DLFCN_H) -+ check_library_exists(dl dlerror "" HAVE_DL) -+ set(DL_LIBRARY "dl") -+ endif() -+endif (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + check_cxx_source_compiles( + "#include +- void f() { std::isnan(0.0);} " ++ int main() { return std::isnan(0.0);} " + HAVE_STD_ISNAN) - SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually 'd' on windows") - SET(CMAKE_RELEASE_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows") -@@ -342,7 +344,7 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") - --include_directories(${PROJECT_SOURCE_DIR}) -+include_directories(BEFORE ${PROJECT_SOURCE_DIR}) - include_directories(${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include) - include_directories(${PROJECT_BINARY_DIR}/simgear) - + if(CMAKE_COMPILER_IS_GNUCXX) Index: head/devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h =================================================================== --- head/devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h (revision 372110) +++ head/devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h (revision 372111) @@ -1,11 +1,11 @@ ---- simgear/canvas/ShivaVG/src/shDefs.h.orig 2013-02-20 17:17:38.000000000 +0100 -+++ simgear/canvas/ShivaVG/src/shDefs.h 2013-02-20 17:18:16.000000000 +0100 -@@ -34,7 +34,7 @@ - #include - #include +--- simgear/canvas/ShivaVG/src/shDefs.h.orig 2014-10-28 09:45:41.492715364 +0100 ++++ simgear/canvas/ShivaVG/src/shDefs.h 2014-10-28 09:54:06.791735417 +0100 +@@ -156,7 +156,7 @@ --#ifndef VG_API_MACOSX -+#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__) - # include - #endif + /* OpenGL headers */ +-#if defined(VG_API_LINUX) ++#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD) + #include + #include + #elif defined(VG_API_MACOSX) Index: head/devel/simgear/files/patch-simgear-debug-BufferedLogCallback.cxx =================================================================== --- head/devel/simgear/files/patch-simgear-debug-BufferedLogCallback.cxx (nonexistent) +++ head/devel/simgear/files/patch-simgear-debug-BufferedLogCallback.cxx (revision 372111) @@ -0,0 +1,11 @@ +--- simgear/debug/BufferedLogCallback.cxx.orig 2014-10-27 09:26:46.499707738 +0100 ++++ simgear/debug/BufferedLogCallback.cxx 2014-10-27 09:27:54.034557089 +0100 +@@ -26,6 +26,8 @@ + #include + #include + #include ++ ++#include // for malloc + + namespace simgear + { Property changes on: head/devel/simgear/files/patch-simgear-debug-BufferedLogCallback.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/pkg-plist =================================================================== --- head/devel/simgear/pkg-plist (revision 372110) +++ head/devel/simgear/pkg-plist (revision 372111) @@ -1,306 +1,318 @@ 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/MouseEvent.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/MouseEvent.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/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/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/SGOceanTile.hxx include/simgear/scene/tgdb/SGReaderWriterBTG.hxx include/simgear/scene/tgdb/SGTexturedTriangleBin.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/jpgfactory.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 Index: head/games/flightgear/Makefile =================================================================== --- head/games/flightgear/Makefile (revision 372110) +++ head/games/flightgear/Makefile (revision 372111) @@ -1,59 +1,59 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 3.0.0 -PORTREVISION= 4 +PORTVERSION= 3.2.0 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/ MAINTAINER= martymac@FreeBSD.org COMMENT= The FlightGear flight simulator LICENSE= GPLv2 LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng15.so:${PORTSDIR}/graphics/png \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ - libosg.so:${PORTSDIR}/graphics/osg + libosg.so:${PORTSDIR}/graphics/osg \ + 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_GL= gl glu glut USE_SQLITE= 3 -USES= tar:bzip2 dos2unix cmake compiler:features openal:al,alut +USES= tar:bzip2 dos2unix cmake compiler openal:al,alut DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) -CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON \ - -DENABLE_JS_SERVER:BOOL=ON \ +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} OPTIONS_DEFINE= DBUS OPTIONS_DEFAULT= DBUS DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CMAKE_ON= -DUSE_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF .include -.if ${COMPILER_FEATURES:Mlibc++} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h +# Chase devel/simgear compiler version +.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 +USE_GCC= 4.6+ .endif post-install: ${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${STAGEDIR}${PREFIX}/bin .include Index: head/games/flightgear/distinfo =================================================================== --- head/games/flightgear/distinfo (revision 372110) +++ head/games/flightgear/distinfo (revision 372111) @@ -1,2 +1,2 @@ -SHA256 (flightgear-3.0.0.tar.bz2) = e4bf1922825920a404539e6611c36eb5567b85d46a726fd8c6f9b19c138ba6e9 -SIZE (flightgear-3.0.0.tar.bz2) = 5874662 +SHA256 (flightgear-3.2.0.tar.bz2) = addac512375b9f800a77e5733c7c0e4214442ed61a0b2712abedc0a506ac5f12 +SIZE (flightgear-3.2.0.tar.bz2) = 6950249 Index: head/games/flightgear/files/patch-utils-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-utils-CMakeLists.txt (revision 372110) +++ head/games/flightgear/files/patch-utils-CMakeLists.txt (nonexistent) @@ -1,13 +0,0 @@ ---- 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() -+ -+if(ENABLE_JS_SERVER) -+ add_subdirectory(js_server) -+endif() Property changes on: head/games/flightgear/files/patch-utils-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h =================================================================== --- head/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h (revision 372110) +++ head/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h (nonexistent) @@ -1,30 +0,0 @@ ---- src/FDM/JSBSim/input_output/string_utilities.h.orig 2014-03-12 18:30:00.000000000 +0100 -+++ src/FDM/JSBSim/input_output/string_utilities.h 2014-03-12 18:31:18.000000000 +0100 -@@ -73,9 +73,11 @@ - extern bool is_number(const std::string& str); - std::vector split(std::string str, char d); - /* Comment out to_string functions when they are defined already - C++ 11 defines these */ -+/* - extern std::string to_string(int); - extern std::string to_string(double); - extern std::string to_string(float); -+*/ - extern std::string replace(std::string str, const std::string& old, const std::string& newstr); - #else - #include -@@ -159,6 +161,7 @@ - return str_array; - } - /* Comment out to_string functions when they are defined already - C++ 11 defines these */ -+/* - string to_string(int i) - { - char buffer[32]; -@@ -179,6 +182,7 @@ - if (!(o << x)) cerr << "Bad double to string conversion" << endl; - return o.str(); - } -+*/ - - string replace(string str, const string& oldstr, const string& newstr) - { Property changes on: head/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.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-3rdparty-iaxclient-lib-iaxclient.h =================================================================== --- head/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h (revision 372110) +++ head/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h (nonexistent) @@ -1,11 +0,0 @@ ---- 3rdparty/iaxclient/lib/iaxclient.h.orig 2014-03-17 07:06:55.000000000 +0100 -+++ 3rdparty/iaxclient/lib/iaxclient.h 2014-03-17 07:09:42.000000000 +0100 -@@ -45,6 +45,8 @@ - #include - #endif - -+#include -+ - #ifdef BUILDING_DLL - # if defined(WIN32) || defined(_WIN32_WCE) - # ifdef _MSC_VER Property changes on: head/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.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-3rdparty-iaxclient-lib-libiax2-src-iax.c =================================================================== --- head/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c (revision 372110) +++ head/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c (nonexistent) @@ -1,11 +0,0 @@ ---- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig 2014-03-12 18:16:21.000000000 +0100 -+++ 3rdparty/iaxclient/lib/libiax2/src/iax.c 2014-03-12 18:18:38.000000000 +0100 -@@ -72,7 +72,7 @@ - #include - #include - --#if !defined(MACOSX) && !defined(__OpenBSD__) -+#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #include - #if !defined(SOLARIS) - #include Property changes on: head/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-utils-js_server-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-utils-js_server-CMakeLists.txt (revision 372110) +++ head/games/flightgear/files/patch-utils-js_server-CMakeLists.txt (nonexistent) @@ -1,10 +0,0 @@ ---- utils/js_server/CMakeLists.txt.orig 2012-03-09 14:44:22.999701740 +0100 -+++ utils/js_server/CMakeLists.txt 2012-03-09 14:59:36.643375244 +0100 -@@ -0,0 +1,7 @@ -+add_executable(js_server js_server.cxx) -+ -+target_link_libraries(js_server -+ ${PLIB_LIBRARIES} -+) -+ -+install(TARGETS js_server RUNTIME DESTINATION bin) Property changes on: head/games/flightgear/files/patch-utils-js_server-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx =================================================================== --- head/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx (revision 372110) +++ head/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx (nonexistent) @@ -1,12 +0,0 @@ ---- src/FDM/JSBSim/JSBSim.cxx.orig 2012-04-30 11:31:18.119554386 +0300 -+++ src/FDM/JSBSim/JSBSim.cxx 2012-04-30 11:31:38.251553602 +0300 -@@ -28,7 +28,7 @@ - #include - #include - --#include // size_t -+#include // size_t - #include - - #include - Property changes on: head/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.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-Airports-airports_fwd.hxx =================================================================== --- head/games/flightgear/files/patch-src-Airports-airports_fwd.hxx (revision 372110) +++ head/games/flightgear/files/patch-src-Airports-airports_fwd.hxx (nonexistent) @@ -1,10 +0,0 @@ ---- src/Airports/airports_fwd.hxx.orig 2013-10-09 15:45:38.000000000 +0200 -+++ src/Airports/airports_fwd.hxx 2013-10-09 10:56:51.000000000 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - // forward decls - class FGAirport; Property changes on: head/games/flightgear/files/patch-src-Airports-airports_fwd.hxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/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 372111) @@ -0,0 +1,11 @@ +--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig 2014-10-21 18:20:10.716009721 +0200 ++++ 3rdparty/hts_engine_API/lib/HTS_misc.c 2014-10-21 18:21:32.200933884 +0200 +@@ -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(__ANDROID__) || defined(__FreeBSD__) + 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-3rdparty-iaxclient-lib-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt (revision 372110) +++ head/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt (revision 372111) @@ -1,11 +1,28 @@ ---- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-03-12 18:13:58.000000000 +0100 -+++ 3rdparty/iaxclient/lib/CMakeLists.txt 2014-03-12 18:14:39.000000000 +0100 -@@ -88,7 +88,7 @@ - libspeex/vq.c - ) +--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-10-21 18:27:37.041376820 +0200 ++++ 3rdparty/iaxclient/lib/CMakeLists.txt 2014-10-21 18:27:53.883368567 +0200 +@@ -1,6 +1,6 @@ + # CMakeLists.txt, for utils/iaxclient/lib - 20130925 + # even if we don't select the codec, speex is used for pre-processing audio +-set(ENABLE_SPEXX 1) ++set(ENABLE_SPEEX 1) + + set(IAXCLIENT_BASE_SOURCES + audio_encode.c +@@ -57,7 +57,7 @@ + list(APPEND IAXCLIENT_BASE_SOURCES unixfuncs.c) + endif(WIN32) + +-if (ENABLE_SPEXX) ++if (ENABLE_SPEEX) + list(APPEND IAXCLIENT_BASE_SOURCES codec_speex.c) + + if (SYSTEM_SPEEX) +@@ -115,7 +115,7 @@ -- include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include) -+ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include) - endif(ENABLE_SPEXX) + include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include) + endif(SPEEX_FOUND AND SPEEXDSP_FOUND) +-endif(ENABLE_SPEXX) ++endif(ENABLE_SPEEX) if (ENABLE_ALSA) + list(APPEND IAXCLIENT_BASE_SOURCES audio_alsa.c) Index: head/games/flightgear/files/patch-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-CMakeLists.txt (revision 372110) +++ head/games/flightgear/files/patch-CMakeLists.txt (revision 372111) @@ -1,11 +1,16 @@ ---- CMakeLists.txt.orig 2012-08-27 18:14:13.000000000 +0200 -+++ CMakeLists.txt 2012-08-27 18:14:52.000000000 +0200 -@@ -225,7 +225,7 @@ - endif(LIBSVN_FOUND) - endif(ENABLE_LIBSVN) +--- CMakeLists.txt.orig 2014-10-21 18:32:02.620104085 +0200 ++++ CMakeLists.txt 2014-10-22 06:52:20.912083280 +0200 +@@ -96,10 +96,11 @@ + find_library(COCOA_LIBRARY Cocoa) + list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY}) --find_package(PLIB REQUIRED puaux pu js fnt) -+find_package(PLIB REQUIRED puaux pu js fnt net) +-elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") ++elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ++ ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + set(USE_DBUS_DEFAULT 1) +- find_package(UDev) - # FlightGear and SimGear versions need to match - find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED) ++ find_package(UDev) + if(UDEV_FOUND) + set(EVENT_INPUT_DEFAULT 1) + endif(UDEV_FOUND) Index: head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt (nonexistent) +++ head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt (revision 372111) @@ -0,0 +1,17 @@ +--- CMakeLists.txt.orig 2014-10-22 07:01:17.414717967 +0200 ++++ CMakeLists.txt 2014-10-22 07:01:34.267267822 +0200 +@@ -266,13 +266,13 @@ + + # Sqlite always depends on the threading lib + list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT}) + + ############################################################################## + +-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) + + ############################################################################## + Property changes on: head/games/flightgear/files/patch-JS_SERVER-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/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt (nonexistent) +++ head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt (revision 372111) @@ -0,0 +1,13 @@ +--- 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() ++ ++if(ENABLE_JS_SERVER) ++ add_subdirectory(js_server) ++endif() Property changes on: head/games/flightgear/files/patch-JS_SERVER-utils-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/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt (nonexistent) +++ head/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt (revision 372111) @@ -0,0 +1,10 @@ +--- utils/js_server/CMakeLists.txt.orig 2012-03-09 14:44:22.999701740 +0100 ++++ utils/js_server/CMakeLists.txt 2012-03-09 14:59:36.643375244 +0100 +@@ -0,0 +1,7 @@ ++add_executable(js_server js_server.cxx) ++ ++target_link_libraries(js_server ++ ${PLIB_LIBRARIES} ++) ++ ++install(TARGETS js_server RUNTIME DESTINATION bin) Property changes on: head/games/flightgear/files/patch-JS_SERVER-utils-js_server-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/games/flightgear-aircraft/Makefile =================================================================== --- head/games/flightgear-aircraft/Makefile (revision 372110) +++ head/games/flightgear-aircraft/Makefile (revision 372111) @@ -1,90 +1,90 @@ # Created by: Jean-Yves Lefort # $FreeBSD$ PORTNAME= flightgear-aircraft -PORTVERSION= 20140319 +PORTVERSION= 20141022 CATEGORIES= games # see http://www.flightgear.org/templates.js -MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.0/ \ - http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.0/ \ - ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.0/ \ - ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.0/ \ - ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.0/ +MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.2/ \ + http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.2/ \ + ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.2/ \ + ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.2/ \ + ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.2/ # Selection of production-ready/well-known planes # (planes already included in flightgear-data are excluded) # Please contact the MAINTAINER if a plane is missing DISTFILES= 737-200_20120506.zip \ A-10_20140116.zip \ A300_20120717.zip \ Alouette-II_20120506.zip \ Alphajet_20130225.zip \ B-17_20130706.zip \ Breguet-XIX_20100829.zip \ C130_20130810.zip \ Caravelle_20120506.zip \ Caudron-G3_20120506.zip \ F80C_20120717.zip \ Hurricane_20130823.zip \ - IL-2_20110311.zip \ - Lightning_20140116.zip \ + IL-2_20140508.zip \ + Lightning_20140613.zip \ Lockheed1049h_1.0.zip \ Messerschmitt-P1101_20130315.zip \ MirageIII_20131008.zip \ PaperAirplane_20101229.zip \ Pond-Racer_20120506.zip \ R44_20130426.zip \ Spitfire_20130310.zip \ Stieglitz_20091025.zip \ Super-Etendard_20131008.zip \ Supermarine-S.6B_20130312.zip \ Superwal_20100330.zip \ - airwaveXtreme150_July-2013.zip \ - asw20_July-2013.zip \ + airwaveXtreme150_June-2014.zip \ + asw20_June-2014.zip \ bf109_20130615.zip \ c310_20130209.zip \ dhc3_20120506.zip \ - f16_20120812.zip \ + f16_20140612.zip \ harrier_20130823.zip \ pa24-250_20121128.zip \ tu154_20081221.zip \ wrightFlyer1903_20070710.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 372110) +++ head/games/flightgear-aircraft/distinfo (revision 372111) @@ -1,70 +1,70 @@ SHA256 (flightgear-aircraft/737-200_20120506.zip) = 8aadefbd4cd6fec5297176fe08bbc15206388da5d4d55c4b277909c92f335f5c SIZE (flightgear-aircraft/737-200_20120506.zip) = 12401593 SHA256 (flightgear-aircraft/A-10_20140116.zip) = 85b48a7185595dfafdec47967b9f55ece704007f47b27efc20e1fdad56df546a SIZE (flightgear-aircraft/A-10_20140116.zip) = 9328047 SHA256 (flightgear-aircraft/A300_20120717.zip) = 913236da87fd3abe1177b7e59d2dff69d8ee9803a3f60192f071f507eb23107d SIZE (flightgear-aircraft/A300_20120717.zip) = 386184 SHA256 (flightgear-aircraft/Alouette-II_20120506.zip) = 755bc4bc620d1cceb208def0d979f4c4535667df42abcd0adb30dbf317d1b42c SIZE (flightgear-aircraft/Alouette-II_20120506.zip) = 5381104 SHA256 (flightgear-aircraft/Alphajet_20130225.zip) = 2f6460be7c9948d53681830b05f55c6add7b2d4b12a9d56564698a9ac7ba9b10 SIZE (flightgear-aircraft/Alphajet_20130225.zip) = 19410469 SHA256 (flightgear-aircraft/B-17_20130706.zip) = bb01931aad4bf50cfc74ab98dd69cb64307fd4d68d1cb34272363b1f60fc0060 SIZE (flightgear-aircraft/B-17_20130706.zip) = 12486789 SHA256 (flightgear-aircraft/Breguet-XIX_20100829.zip) = 9405ec3e475e8b3ef63ed3357273dfc5f83e88074fb1ced90764a23eb3d5a1af SIZE (flightgear-aircraft/Breguet-XIX_20100829.zip) = 4323944 SHA256 (flightgear-aircraft/C130_20130810.zip) = 38e9a897cd14a785a0848314484ff75c1698d50c2789e52e3f29a196fdee3b84 SIZE (flightgear-aircraft/C130_20130810.zip) = 25474281 SHA256 (flightgear-aircraft/Caravelle_20120506.zip) = b936271471312502cf3b755f9b1c8ca6a68c1d1172508c0274ea4b3cebb68412 SIZE (flightgear-aircraft/Caravelle_20120506.zip) = 14686948 SHA256 (flightgear-aircraft/Caudron-G3_20120506.zip) = 191a68c00fa75a034ee0d6f75e0cc456e152fd1cc735dac401da48ad8b283902 SIZE (flightgear-aircraft/Caudron-G3_20120506.zip) = 4531626 SHA256 (flightgear-aircraft/F80C_20120717.zip) = 633016a2ea70f9be59927d5201c48af985ef7d2414888ddff3488f25261526d5 SIZE (flightgear-aircraft/F80C_20120717.zip) = 1528349 SHA256 (flightgear-aircraft/Hurricane_20130823.zip) = 10dfe10c5365c7232fdd324a0c3af6c1b2c90cd5373af263ac35eb031b3b4fb5 SIZE (flightgear-aircraft/Hurricane_20130823.zip) = 12062976 -SHA256 (flightgear-aircraft/IL-2_20110311.zip) = 1c7e126956247f7a6ed93cd4fc2abe65c756b07275559ed1f0bd03d731a51ee0 -SIZE (flightgear-aircraft/IL-2_20110311.zip) = 3933481 -SHA256 (flightgear-aircraft/Lightning_20140116.zip) = 607ce5957aeac09f1e223d5add0687c7d0e6e5651b0fa9f576934c8150798e3f -SIZE (flightgear-aircraft/Lightning_20140116.zip) = 4784925 +SHA256 (flightgear-aircraft/IL-2_20140508.zip) = 8e6ecb37fa5b5d0c6c8a6aac8a7aad55071582183d16851323e99c68aa451d97 +SIZE (flightgear-aircraft/IL-2_20140508.zip) = 4801474 +SHA256 (flightgear-aircraft/Lightning_20140613.zip) = 4c72b9cda1b901cd95c89361cbad3bb730e59cf1084658ce1fb6f619e050ec87 +SIZE (flightgear-aircraft/Lightning_20140613.zip) = 4785070 SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 624d85fe96380870387bb35c0c43601cbe0fb19506f6915e69bb49853c836371 SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529095 SHA256 (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 6a1a53902ffd6ff33c412a1d605e2a43615b3dcdaa7efebdff1f647ebe4b40ec SIZE (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 4359275 SHA256 (flightgear-aircraft/MirageIII_20131008.zip) = 04e387b578c0ca10119605d775012f152aae44e003ad8227ccf2ea91ab45e240 SIZE (flightgear-aircraft/MirageIII_20131008.zip) = 11112464 SHA256 (flightgear-aircraft/PaperAirplane_20101229.zip) = b458c06510d1687b2be5769db5823fa0bb9165a3e5aef6094e4a23803efb3bb4 SIZE (flightgear-aircraft/PaperAirplane_20101229.zip) = 867872 SHA256 (flightgear-aircraft/Pond-Racer_20120506.zip) = 707d8401d394095475e0f3442cd01a66b9c3e7f8c08512dd685824e8d782ef94 SIZE (flightgear-aircraft/Pond-Racer_20120506.zip) = 3063526 SHA256 (flightgear-aircraft/R44_20130426.zip) = fef35003f5d8c10df1deaeab1f70d00825ba376bb837d1f58ffbd5bf35b10a89 SIZE (flightgear-aircraft/R44_20130426.zip) = 8909152 SHA256 (flightgear-aircraft/Spitfire_20130310.zip) = cb886772228c4cea6a301b037dad4f9c6ee5afee593c04822369bff422c88ed8 SIZE (flightgear-aircraft/Spitfire_20130310.zip) = 21052226 SHA256 (flightgear-aircraft/Stieglitz_20091025.zip) = 05393d31f11bc718bbbe43d539f18020b2ab9ed34b68c6bf7dff8c543b6fb3bd SIZE (flightgear-aircraft/Stieglitz_20091025.zip) = 4499810 SHA256 (flightgear-aircraft/Super-Etendard_20131008.zip) = 118b2b6ca1da9d56fe2f5dc85d03b1c8ebf3b84163b3cde9443d08d9660ca14a SIZE (flightgear-aircraft/Super-Etendard_20131008.zip) = 10418381 SHA256 (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 4222889bf64693630d1a0c9abcaefcc1a61af2529c3a00730f1f6a36bdaba5d4 SIZE (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 3275253 SHA256 (flightgear-aircraft/Superwal_20100330.zip) = cd013f6c6ab073cea4c5eef59acb3b51c8a40d47652a3dfcbebfc79c30504384 SIZE (flightgear-aircraft/Superwal_20100330.zip) = 2654839 -SHA256 (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 12ca13fe06e7ff4e7a2e9bf7971c2397b86a06b2e83f2eb2e21b640edc5ab817 -SIZE (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 1209981 -SHA256 (flightgear-aircraft/asw20_July-2013.zip) = 22728d2d24c7b54fb7a41789ffe7ebbb73e1acb39e8230d63b2bdc6ce1fbd9f3 -SIZE (flightgear-aircraft/asw20_July-2013.zip) = 3592090 +SHA256 (flightgear-aircraft/airwaveXtreme150_June-2014.zip) = 67d58564d244f1aeb3fae20b3a996cf9a8eeb7ff3136039d4e05f8bbfcd9050e +SIZE (flightgear-aircraft/airwaveXtreme150_June-2014.zip) = 1219396 +SHA256 (flightgear-aircraft/asw20_June-2014.zip) = a0a0680fa68933f579f01462703151b907d895dee69d44d8e3007abc0dd9ad3c +SIZE (flightgear-aircraft/asw20_June-2014.zip) = 3592394 SHA256 (flightgear-aircraft/bf109_20130615.zip) = 1245ba5d1c00a01b74cef208f28f70ffe27f6285f7d52c4ddd901b370e3aca94 SIZE (flightgear-aircraft/bf109_20130615.zip) = 24201689 SHA256 (flightgear-aircraft/c310_20130209.zip) = 07d765eac4a6cb9bc115dc4d302fed972776f5148cb1154f666b6a7f3c27543a SIZE (flightgear-aircraft/c310_20130209.zip) = 615078 SHA256 (flightgear-aircraft/dhc3_20120506.zip) = 808215533d23b9e2a23b0249bacff9504b72a8e4263a562058dea9c6060c12f9 SIZE (flightgear-aircraft/dhc3_20120506.zip) = 20789012 -SHA256 (flightgear-aircraft/f16_20120812.zip) = c4782fbcfeba7fea5204d048a0cb36499e0901b1ef514c8c638b14928ce7396a -SIZE (flightgear-aircraft/f16_20120812.zip) = 19445799 +SHA256 (flightgear-aircraft/f16_20140612.zip) = b40dc7f9eca5976183cea0b0fbf71d7560c8e5166876d41ff682e43c89f59b73 +SIZE (flightgear-aircraft/f16_20140612.zip) = 19445894 SHA256 (flightgear-aircraft/harrier_20130823.zip) = 35d1b2c95b2801651ce0fdd50b5e3015a75a120ab3f709cf2adb1dbd49bc26d7 SIZE (flightgear-aircraft/harrier_20130823.zip) = 4208173 SHA256 (flightgear-aircraft/pa24-250_20121128.zip) = dd78878bfbf21bb77405a3f5c1586f1043487c6d8499ec28361fbc3131500952 SIZE (flightgear-aircraft/pa24-250_20121128.zip) = 2100194 SHA256 (flightgear-aircraft/tu154_20081221.zip) = e52dae4b16fee2844417f91f76f12a5f8907dca780d553282a9f1326e60c4079 SIZE (flightgear-aircraft/tu154_20081221.zip) = 1387134 SHA256 (flightgear-aircraft/wrightFlyer1903_20070710.zip) = cc03ae8c61c11ab9d0fa4d4ae7192bbf0a0f579d4b42a40082be5060232dabe8 SIZE (flightgear-aircraft/wrightFlyer1903_20070710.zip) = 1371750 Index: head/games/flightgear-data/Makefile =================================================================== --- head/games/flightgear-data/Makefile (revision 372110) +++ head/games/flightgear-data/Makefile (revision 372111) @@ -1,47 +1,47 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear-data -PORTVERSION= 3.0.0 +PORTVERSION= 3.2.0 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} 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 (>900 MB) +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') .include Index: head/games/flightgear-data/distinfo =================================================================== --- head/games/flightgear-data/distinfo (revision 372110) +++ head/games/flightgear-data/distinfo (revision 372111) @@ -1,2 +1,2 @@ -SHA256 (FlightGear-data-3.0.0.tar.bz2) = 048349a167d55c2a6f84a71dd5654cba0b7866ce43c6f06a12a1be8fe0840557 -SIZE (FlightGear-data-3.0.0.tar.bz2) = 1078366345 +SHA256 (FlightGear-data-3.2.0.tar.bz2) = bd48708931335698303ad5739146924fe70f1ff00c3cb8c6207c6d45140a27a4 +SIZE (FlightGear-data-3.2.0.tar.bz2) = 1264837989