simgear: Update wip/simgear to 3.4.0.

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Fri Nov 6 22:37:00 2015 +0100
Changeset:	b43d18a89261b468131e59a93f6dfdfc84efa998

Modified Files:
	simgear/Makefile
	simgear/PLIST
	simgear/buildlink3.mk
	simgear/distinfo
	simgear/patches/patch-simgear_scene_sky_cloud_cxx
Added Files:
	simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h
	simgear/patches/patch-simgear_canvas_elements_CanvasText.cxx
	simgear/patches/patch-simgear_scene_material_Technique.cxx
	simgear/patches/patch-simgear_scene_sky_CloudShaderGeometry.cxx
	simgear/patches/patch-simgear_scene_tgdb_ShaderGeometry.cxx
	simgear/patches/patch-simgear_scene_util_SGSceneFeatures.cxx

Log Message:
simgear: Update wip/simgear to 3.4.0.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b43d18a89261b468131e59a93f6dfdfc84efa998

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 simgear/Makefile                                   |   7 +-
 simgear/PLIST                                      | 162 +++++++++++++++------
 simgear/buildlink3.mk                              |   2 +-
 simgear/distinfo                                   |  16 +-
 .../patch-simgear_canvas_ShivaVG_src_shConfig.h    |  13 ++
 .../patch-simgear_canvas_elements_CanvasText.cxx   |  48 ++++++
 .../patch-simgear_scene_material_Technique.cxx     |  27 ++++
 ...patch-simgear_scene_sky_CloudShaderGeometry.cxx |  15 ++
 simgear/patches/patch-simgear_scene_sky_cloud_cxx  |   9 --
 .../patch-simgear_scene_tgdb_ShaderGeometry.cxx    |  15 ++
 .../patch-simgear_scene_util_SGSceneFeatures.cxx   |  70 +++++++++
 11 files changed, 323 insertions(+), 61 deletions(-)

diffs:
diff --git a/simgear/Makefile b/simgear/Makefile
index 27aa2d1..b86a97b 100644
--- a/simgear/Makefile
+++ b/simgear/Makefile
@@ -1,9 +1,10 @@
 # $NetBSD: Makefile,v 1.50 2015/06/30 09:57:36 ryoon Exp $
 
-DISTNAME=	simgear-2.8.0
-PKGREVISION=	24
+DISTNAME=	simgear-3.4.0
 CATEGORIES=	games devel
 MASTER_SITES=	ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \
+		ftp://mirrors.ibiblio.org/simgear/ftp/Source/ \
+		http://mirrors.ibiblio.org/simgear/ftp/Source/ \
 		ftp://ftp.goflyflightgear.com/simgear/
 EXTRACT_SUFX=	.tar.bz2
 
@@ -24,6 +25,6 @@ BUILDLINK_API_DEPENDS.plib+= plib>=1.8.5
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/osg/buildlink3.mk"
+.include "../../wip/osg/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/simgear/PLIST b/simgear/PLIST
index 08a2fa2..9ed1bdb 100644
--- a/simgear/PLIST
+++ b/simgear/PLIST
@@ -1,7 +1,65 @@
 @comment $NetBSD: PLIST,v 1.5 2012/09/30 01:50:15 dholland Exp $
+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
@@ -19,8 +77,15 @@ 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
@@ -44,6 +109,7 @@ 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
@@ -51,6 +117,7 @@ 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
@@ -62,8 +129,14 @@ 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
@@ -73,40 +146,46 @@ 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/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/bvh/BVHBoundingBoxVisitor.hxx
-include/simgear/scene/bvh/BVHDebugCollectVisitor.hxx
-include/simgear/scene/bvh/BVHGroup.hxx
-include/simgear/scene/bvh/BVHLineGeometry.hxx
-include/simgear/scene/bvh/BVHLineSegmentVisitor.hxx
-include/simgear/scene/bvh/BVHMotionTransform.hxx
-include/simgear/scene/bvh/BVHNearestPointVisitor.hxx
-include/simgear/scene/bvh/BVHNode.hxx
-include/simgear/scene/bvh/BVHStaticBinary.hxx
-include/simgear/scene/bvh/BVHStaticData.hxx
-include/simgear/scene/bvh/BVHStaticGeometry.hxx
-include/simgear/scene/bvh/BVHStaticGeometryBuilder.hxx
-include/simgear/scene/bvh/BVHStaticLeaf.hxx
-include/simgear/scene/bvh/BVHStaticNode.hxx
-include/simgear/scene/bvh/BVHStaticTriangle.hxx
-include/simgear/scene/bvh/BVHSubTreeCollector.hxx
-include/simgear/scene/bvh/BVHTransform.hxx
-include/simgear/scene/bvh/BVHVisitor.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/GLPredicate.hxx
 include/simgear/scene/material/Pass.hxx
 include/simgear/scene/material/Technique.hxx
 include/simgear/scene/material/TextureBuilder.hxx
@@ -114,18 +193,24 @@ 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
@@ -150,9 +235,12 @@ 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
@@ -163,9 +251,13 @@ 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
@@ -185,6 +277,7 @@ 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
@@ -193,6 +286,7 @@ 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
@@ -211,12 +305,16 @@ 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
@@ -228,27 +326,5 @@ include/simgear/timing/timestamp.hxx
 include/simgear/timing/timezone.h
 include/simgear/version.h
 include/simgear/xml/easyxml.hxx
-lib/libsgbucket.a
-lib/libsgbvh.a
-lib/libsgdebug.a
-lib/libsgenvironment.a
-lib/libsgephem.a
-lib/libsgio.a
-lib/libsgmagvar.a
-lib/libsgmaterial.a
-lib/libsgmath.a
-lib/libsgmisc.a
-lib/libsgmodel.a
-lib/libsgnasal.a
-lib/libsgprops.a
-lib/libsgscreen.a
-lib/libsgserial.a
-lib/libsgsky.a
-lib/libsgsound.a
-lib/libsgstructure.a
-lib/libsgtgdb.a
-lib/libsgthreads.a
-lib/libsgtiming.a
-lib/libsgtsync.a
-lib/libsgutil.a
-lib/libsgxml.a
+lib/libSimGearCore.a
+lib/libSimGearScene.a
diff --git a/simgear/buildlink3.mk b/simgear/buildlink3.mk
index a8d9081..646edee 100644
--- a/simgear/buildlink3.mk
+++ b/simgear/buildlink3.mk
@@ -7,7 +7,7 @@ SIMGEAR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.simgear+=	simgear>=2.0.0nb6
 BUILDLINK_ABI_DEPENDS.simgear+=	simgear>=2.8.0nb23
-BUILDLINK_PKGSRCDIR.simgear?=	../../games/simgear
+BUILDLINK_PKGSRCDIR.simgear?=	../../wip/simgear
 BUILDLINK_DEPMETHOD.simgear?=	build
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/simgear/distinfo b/simgear/distinfo
index 2d7c3af..0ea72b1 100644
--- a/simgear/distinfo
+++ b/simgear/distinfo
@@ -1,9 +1,15 @@
 $NetBSD: distinfo,v 1.6 2015/11/03 20:57:04 agc Exp $
 
-SHA1 (simgear-2.8.0.tar.bz2) = 63f030e4969a014326eb9835d33e3da6b26d2900
-RMD160 (simgear-2.8.0.tar.bz2) = 1d3f832d88abc85e2e253ba99fc1946e1a5ff746
-SHA512 (simgear-2.8.0.tar.bz2) = ead06fd394b10a7ae3c98422cc469b3c97450162f6994c40c7cb4818f88e0d25cf0b5dc9c39a10e2b9c0fd849dd322451df93e4febcbacf2fc23fe1860917064
-Size (simgear-2.8.0.tar.bz2) = 766340 bytes
-SHA1 (patch-simgear_scene_sky_cloud_cxx) = 670c1b2470c449545382040ccba75365d642f72a
+SHA1 (simgear-3.4.0.tar.bz2) = 3021692be05ca1c983ffa7a4483a74934ec02dbb
+RMD160 (simgear-3.4.0.tar.bz2) = d296d818fae183afc3a3ccf67fc8545663d4c5da
+SHA512 (simgear-3.4.0.tar.bz2) = 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320
+Size (simgear-3.4.0.tar.bz2) = 1057455 bytes
+SHA1 (patch-simgear_canvas_ShivaVG_src_shConfig.h) = c4ebe072a6a60f627b1a28e19de48db4e4f01ce2
+SHA1 (patch-simgear_canvas_elements_CanvasText.cxx) = 4b42ec6066357286dc11eaf87601212daea638ea
+SHA1 (patch-simgear_scene_material_Technique.cxx) = a7b40f3311b7586459f764fe392e9fbea78b79ea
+SHA1 (patch-simgear_scene_sky_CloudShaderGeometry.cxx) = d28b8164da756d899db01e7ecb944c41198f3772
+SHA1 (patch-simgear_scene_sky_cloud_cxx) = c2a259d96f4aa2bad413874203316b61fb3506c8
+SHA1 (patch-simgear_scene_tgdb_ShaderGeometry.cxx) = 7992319b775573b802150f391a446fff9b1ed419
+SHA1 (patch-simgear_scene_util_SGSceneFeatures.cxx) = fe05df427b8fdfd1c7b1b1fae081633d4def9c97
 SHA1 (patch-simgear_sound_sample__group_cxx) = ef4dd3534aa902ed1d3945f5879bfe3ef20d31ca
 SHA1 (patch-simgear_timing_timestamp_cxx) = 20101dd1802c9d18a6680c9b4868efd5c937f973
diff --git a/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h b/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h
new file mode 100644
index 0000000..2f30a4c
--- /dev/null
+++ b/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- simgear/canvas/ShivaVG/src/shConfig.h.orig	2015-02-18 20:10:39.000000000 +0000
++++ simgear/canvas/ShivaVG/src/shConfig.h
+@@ -26,7 +26,7 @@
+     // MacOS
+     #define VG_API_MACOSX
+ 
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+ 
+     // FreeBSD
+     #define VG_API_FREEBSD
diff --git a/simgear/patches/patch-simgear_canvas_elements_CanvasText.cxx b/simgear/patches/patch-simgear_canvas_elements_CanvasText.cxx
new file mode 100644
index 0000000..6ff18cd
--- /dev/null
+++ b/simgear/patches/patch-simgear_canvas_elements_CanvasText.cxx
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Text::GlyphQuads::Coords2 changed type from std::vector<osg::Vec2>
+in 3.2.0 of osc to osg::ref_ptr<osg::Vec2Array> in 3.4.0
+
+--- simgear/canvas/elements/CanvasText.cxx.orig	2015-11-05 17:00:10.000000000 +0000
++++ simgear/canvas/elements/CanvasText.cxx
+@@ -165,15 +165,15 @@ namespace canvas
+ 
+     if( global_i == _begin )
+       // before first character of line
+-      pos.x() = coords[_begin * 4].x();
++      pos.x() = (*coords)[_begin * 4].x();
+     else if( global_i == _end )
+       // After Last character of line
+-      pos.x() = coords[(_end - 1) * 4 + 2].x();
++      pos.x() = (*coords)[(_end - 1) * 4 + 2].x();
+     else
+     {
+-      float prev_l = coords[(global_i - 1) * 4].x(),
+-            prev_r = coords[(global_i - 1) * 4 + 2].x(),
+-            cur_l = coords[global_i * 4].x();
++      float prev_l = (*coords)[(global_i - 1) * 4].x(),
++            prev_r = (*coords)[(global_i - 1) * 4 + 2].x(),
++            cur_l = (*coords)[global_i * 4].x();
+ 
+       if( prev_l == prev_r )
+         // If previous character width is zero set to begin of next character
+@@ -205,7 +205,7 @@ namespace canvas
+     {
+       // Get threshold for mouse x position for setting cursor before or after
+       // current character
+-      float threshold = coords[i * 4].x()
++      float threshold = (*coords)[i * 4].x()
+                       + HIT_FRACTION * glyphs[i]->getHorizontalAdvance()
+                                      * character_width;
+ 
+@@ -652,8 +652,8 @@ namespace canvas
+         // osg::Vec2 lowRight = local+osg::Vec2(width+fHorizQuadMargin, ...);
+         // osg::Vec2 upRight = local+osg::Vec2(width+fHorizQuadMargin, ...);
+ 
+-        float left = coords[i * 4].x(),
+-              right = coords[i * 4 + 2].x(),
++        float left = (*coords)[i * 4].x(),
++              right = (*coords)[i * 4 + 2].x(),
+               width = glyphs[i]->getWidth() * wr;
+ 
+         // (local + width + fHoriz) - (local - fHoriz) = width + 2*fHoriz | -width
diff --git a/simgear/patches/patch-simgear_scene_material_Technique.cxx b/simgear/patches/patch-simgear_scene_material_Technique.cxx
new file mode 100644
index 0000000..1ad7db9
--- /dev/null
+++ b/simgear/patches/patch-simgear_scene_material_Technique.cxx
@@ -0,0 +1,27 @@
+$NetBSD$
+
+osg 3.4 compatibility changes
+
+--- simgear/scene/material/Technique.cxx.orig	2015-02-18 20:10:39.000000000 +0000
++++ simgear/scene/material/Technique.cxx
+@@ -326,9 +326,9 @@ public:
+             = GL2Extensions::Get(static_cast<unsigned>(contextId), true);
+         if (!extensions)
+             return;
+-        if (!extensions->isGlslSupported())
++        if (!extensions->isGlslSupported)
+             return;
+-        value = extensions->getLanguageVersion();
++        value = extensions->glslLanguageVersion;
+     }
+ };
+ 
+@@ -357,7 +357,7 @@ public:
+            = GL2Extensions::Get(static_cast<unsigned>(contextId), true);
+        if (!extensions)
+            return;
+-       value = extensions->isGlslSupported();
++       value = extensions->isGlslSupported;
+    }
+ };
+ 
diff --git a/simgear/patches/patch-simgear_scene_sky_CloudShaderGeometry.cxx b/simgear/patches/patch-simgear_scene_sky_CloudShaderGeometry.cxx
new file mode 100644
index 0000000..4c73d9b
--- /dev/null
+++ b/simgear/patches/patch-simgear_scene_sky_CloudShaderGeometry.cxx
@@ -0,0 +1,15 @@
+$NetBSD$
+
+osg 3.4 compatibility changes
+
+--- simgear/scene/sky/CloudShaderGeometry.cxx.orig	2015-02-18 20:10:39.000000000 +0000
++++ simgear/scene/sky/CloudShaderGeometry.cxx
+@@ -128,7 +128,7 @@ void CloudShaderGeometry::drawImplementa
+         sortData.frameSorted = frameNumber;
+     }
+     
+-    const Extensions* extensions = getExtensions(state.getContextID(),true);
++    const GLExtensions* extensions = GLExtensions::Get(state.getContextID(),true);
+     GLfloat ua1[3] = { (GLfloat) alpha_factor,
+                        (GLfloat) shade_factor,
+                        (GLfloat) cloud_height };
diff --git a/simgear/patches/patch-simgear_scene_sky_cloud_cxx b/simgear/patches/patch-simgear_scene_sky_cloud_cxx
index 2040087..a491674 100644
--- a/simgear/patches/patch-simgear_scene_sky_cloud_cxx
+++ b/simgear/patches/patch-simgear_scene_sky_cloud_cxx
@@ -13,12 +13,3 @@ Fix build failure on NetBSD.
  
  #include <simgear/structure/OSGVersion.hxx>
  #include <osg/AlphaFunc>
-@@ -733,7 +733,7 @@ bool SGCloudLayer::reposition( const SGV
-             // this happens, lets just use the last known good course.
-             // This is a hack, and it would probably be better to make
-             // calc_gc_course_dist() more robust.
--            if ( isnan(course) ) {
-+            if ( std::isnan(course) ) {
-                 course = last_course;
-             } else {
-                 last_course = course;
diff --git a/simgear/patches/patch-simgear_scene_tgdb_ShaderGeometry.cxx b/simgear/patches/patch-simgear_scene_tgdb_ShaderGeometry.cxx
new file mode 100644
index 0000000..bef6fb7
--- /dev/null
+++ b/simgear/patches/patch-simgear_scene_tgdb_ShaderGeometry.cxx
@@ -0,0 +1,15 @@
+$NetBSD$
+
+osg 3.4 compatibility changes
+
+--- simgear/scene/tgdb/ShaderGeometry.cxx.orig	2015-02-18 20:10:39.000000000 +0000
++++ simgear/scene/tgdb/ShaderGeometry.cxx
+@@ -47,7 +47,7 @@ void ShaderGeometry::addObject(const Vec
+ void ShaderGeometry::drawImplementation(osg::RenderInfo& renderInfo) const
+ {
+     State& state = *renderInfo.getState();
+-    const Extensions* extensions = getExtensions(state.getContextID(), true);
++    const GLExtensions* extensions = GLExtensions::Get(state.getContextID(), true);
+     Vec4Array::const_iterator citer = _posScaleArray->begin();
+     Vec4Array::const_iterator cend = _posScaleArray->end();
+     FloatArray::const_iterator viter = _vertexAttribArray->begin();
diff --git a/simgear/patches/patch-simgear_scene_util_SGSceneFeatures.cxx b/simgear/patches/patch-simgear_scene_util_SGSceneFeatures.cxx
new file mode 100644
index 0000000..452b971
--- /dev/null
+++ b/simgear/patches/patch-simgear_scene_util_SGSceneFeatures.cxx
@@ -0,0 +1,70 @@
+$NetBSD$
+
+osg 3.4 compatibility changes
+
+--- simgear/scene/util/SGSceneFeatures.cxx.orig	2015-02-18 20:10:39.000000000 +0000
++++ simgear/scene/util/SGSceneFeatures.cxx
+@@ -25,10 +25,7 @@
+ 
+ #include "SGSceneFeatures.hxx"
+ 
+-#include <osg/FragmentProgram>
+-#include <osg/VertexProgram>
+-#include <osg/Point>
+-#include <osg/PointSprite>
++#include <osg/GLExtensions>
+ #include <osg/Texture>
+ 
+ #include <OpenThreads/Mutex>
+@@ -84,17 +81,17 @@ SGSceneFeatures::setTextureCompression(o
+ bool
+ SGSceneFeatures::getHavePointSprites(unsigned contextId) const
+ {
+-  return osg::PointSprite::isPointSpriteSupported(contextId);
++  return osg::GLExtensions::Get(contextId, true)->isPointSpriteSupported;
+ }
+ 
+ bool
+ SGSceneFeatures::getHaveFragmentPrograms(unsigned contextId) const
+ {
+-  const osg::FragmentProgram::Extensions* fpe;
+-  fpe = osg::FragmentProgram::getExtensions(contextId, true);
++  const osg::GLExtensions* fpe;
++  fpe = osg::GLExtensions::Get(contextId, true);
+   if (!fpe)
+     return false;
+-  if (!fpe->isFragmentProgramSupported())
++  if (!fpe->isFragmentProgramSupported)
+     return false;
+   
+   return true;
+@@ -103,11 +100,11 @@ SGSceneFeatures::getHaveFragmentPrograms
+ bool
+ SGSceneFeatures::getHaveVertexPrograms(unsigned contextId) const
+ {
+-  const osg::VertexProgram::Extensions* vpe;
+-  vpe = osg::VertexProgram::getExtensions(contextId, true);
++  const osg::GLExtensions* vpe;
++  vpe = osg::GLExtensions::Get(contextId, true);
+   if (!vpe)
+     return false;
+-  if (!vpe->isVertexProgramSupported())
++  if (!vpe->isVertexProgramSupported)
+     return false;
+   
+   return true;
+@@ -124,11 +121,11 @@ SGSceneFeatures::getHaveShaderPrograms(u
+ bool
+ SGSceneFeatures::getHavePointParameters(unsigned contextId) const
+ {
+-  const osg::Point::Extensions* pe;
+-  pe = osg::Point::getExtensions(contextId, true);
++  const osg::GLExtensions* pe;
++  pe = osg::GLExtensions::Get(contextId, true);
+   if (!pe)
+     return false;
+-  if (!pe->isPointParametersSupported())
++  if (!pe->isPointParametersSupported)
+     return false;
+   return true;
+ }