Changes 3.0.1:

* OpenGL ES 1.1, and OpenGL ES 2.0 support
* OpenGL 3.x and 4.x support along with associated OpenGL extensions
* Supoort for Android on tablets and phones
* Support for IOS on tablets and phones (end users applications have already
  been accepted on the App Store)
* Introduction of Present3D application for immersive 3D presentations
* New extensible serializers that provide new .osgb binary, .osgt ascii and
  .osgx xml file native formats
* New generalized serializable metadata architecture
* New osgQt library that makes it straight forward to integrate !OpenSceneGraph
  with Qt, including web browsing via QWebKit.
* New FBX plugin based on the Audodesk FBX DSK that enables reading of the the
  .fbx 3D authoring and interchange format
* New directshow plugin for handling movies under Windows
* New pov plugin for exporting a scene to POV-Ray format, enabling use of
  POV-Ray to do photo-realistic ray tracing
* New ply plugin for reading ply files
* Improvements to osgText that enable bevelling of 3D text and highter quality
  2D fonts
* Improvements to osgVolume enabling high quality ray traced volume rendering
* Improvements to osgManipulator making it more flexible
* Improvements to osgParticle to support shader based particle effects
* Revamped 3ds plugin for reading and writing of .3ds files
* Revamped dxf plugin for reading and writing of .dxf files
* Support for Cocoa and 64bit OSX build
* Improved thread safety and efficiency of database paging
* New Texture and buffer object pools for efficiently managing GL object
  resources

14 files changed, 285 insertions, 114 deletions

diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 24a574c22ea..292ae6991ef 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -1,20 +1,16 @@
-# $NetBSD: Makefile,v 1.12 2012/03/03 00:12:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/03/07 16:27:35 adam Exp $
 
-DISTNAME=	OpenSceneGraph-${OSGVER}
-PKGNAME=	osg-${OSGVER}
-PKGREVISION=	9
+DISTNAME=	OpenSceneGraph-3.0.1
+PKGNAME=	osg-3.0.1
 CATEGORIES=	graphics devel
-MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${OSGVER}/source/
+MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PKGVERION_NOREV}/source/
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openscenegraph.org/
 COMMENT=	High performance 3D graphics toolkit
-
 LICENSE=	gnu-lgpl-v2.1
 
-OSGVER=		2.8.3
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_CMAKE=		yes
@@ -25,21 +21,32 @@ PKGCONFIG_OVERRIDE+=	packaging/pkgconfig/openthreads.pc.in
 
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 
+PLIST_VARS+=	quartz x11
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+PLIST.quartz=	yes
+.else
+PLIST.x11=	yes
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../mk/giflib.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.endif
+
+.include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/osg/PLIST b/graphics/osg/PLIST
index 9d92b8e225e..ffeb6b0103b 100644
--- a/graphics/osg/PLIST
+++ b/graphics/osg/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2011/12/11 11:59:06 marino Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/03/07 16:27:35 adam Exp $
 bin/osgarchive
 bin/osgconv
 bin/osgfilecache
 bin/osgversion
 bin/osgviewer
+bin/present3D
 include/OpenThreads/Atomic
 include/OpenThreads/Barrier
 include/OpenThreads/Block
@@ -21,6 +22,7 @@ include/osg/AnimationPath
 include/osg/ApplicationUsage
 include/osg/ArgumentParser
 include/osg/Array
+include/osg/ArrayDispatchers
 include/osg/AudioStream
 include/osg/AutoTransform
 include/osg/Billboard
@@ -30,6 +32,7 @@ include/osg/BlendFunc
 include/osg/BoundingBox
 include/osg/BoundingSphere
 include/osg/BoundsChecking
+include/osg/BufferIndexBinding
 include/osg/BufferObject
 include/osg/Camera
 include/osg/CameraNode
@@ -66,12 +69,14 @@ include/osg/FrameStamp
 include/osg/FrontFace
 include/osg/GL
 include/osg/GL2Extensions
+include/osg/GLBeginEndAdapter
 include/osg/GLExtensions
 include/osg/GLObjects
 include/osg/GLU
 include/osg/Geode
 include/osg/Geometry
 include/osg/GraphicsContext
+include/osg/GraphicsCostEstimator
 include/osg/GraphicsThread
 include/osg/Group
 include/osg/Hint
@@ -102,6 +107,8 @@ include/osg/NodeTrackerCallback
 include/osg/NodeVisitor
 include/osg/Notify
 include/osg/Object
+include/osg/Observer
+include/osg/ObserverNodePath
 include/osg/OccluderNode
 include/osg/OcclusionQueryNode
 include/osg/OperationThread
@@ -125,6 +132,8 @@ include/osg/Scissor
 include/osg/Sequence
 include/osg/ShadeModel
 include/osg/Shader
+include/osg/ShaderAttribute
+include/osg/ShaderComposer
 include/osg/ShadowVolumeOccluder
 include/osg/Shape
 include/osg/ShapeDrawable
@@ -147,6 +156,7 @@ include/osg/Texture
 include/osg/Texture1D
 include/osg/Texture2D
 include/osg/Texture2DArray
+include/osg/Texture2DMultisample
 include/osg/Texture3D
 include/osg/TextureCubeMap
 include/osg/TextureRectangle
@@ -156,6 +166,8 @@ include/osg/Transform
 include/osg/TriangleFunctor
 include/osg/TriangleIndexFunctor
 include/osg/Uniform
+include/osg/UserDataContainer
+include/osg/ValueObject
 include/osg/Vec2
 include/osg/Vec2b
 include/osg/Vec2d
@@ -228,21 +240,27 @@ include/osgAnimation/Vec3Packed
 include/osgAnimation/VertexInfluence
 include/osgDB/Archive
 include/osgDB/AuthenticationMap
+include/osgDB/Callbacks
 include/osgDB/ConvertUTF
+include/osgDB/DataTypes
 include/osgDB/DatabasePager
+include/osgDB/DatabaseRevisions
 include/osgDB/DotOsgWrapper
 include/osgDB/DynamicLibrary
 include/osgDB/Export
-include/osgDB/Field
-include/osgDB/FieldReader
-include/osgDB/FieldReaderIterator
+include/osgDB/ExternalFileWriter
 include/osgDB/FileCache
 include/osgDB/FileNameUtils
 include/osgDB/FileUtils
 include/osgDB/ImageOptions
 include/osgDB/ImagePager
+include/osgDB/ImageProcessor
 include/osgDB/Input
+include/osgDB/InputStream
+include/osgDB/ObjectWrapper
+include/osgDB/Options
 include/osgDB/Output
+include/osgDB/OutputStream
 include/osgDB/ParameterOutput
 include/osgDB/PluginQuery
 include/osgDB/ReadFile
@@ -250,8 +268,10 @@ include/osgDB/ReaderWriter
 include/osgDB/Registry
 include/osgDB/Serializer
 include/osgDB/SharedStateManager
+include/osgDB/StreamOperator
 include/osgDB/Version
 include/osgDB/WriteFile
+include/osgDB/XmlParser
 include/osgDB/fstream
 include/osgFX/AnisotropicLighting
 include/osgFX/BumpMapping
@@ -259,6 +279,7 @@ include/osgFX/Cartoon
 include/osgFX/Effect
 include/osgFX/Export
 include/osgFX/MultiTextureControl
+include/osgFX/Outline
 include/osgFX/Registry
 include/osgFX/Scribe
 include/osgFX/SpecularHighlights
@@ -266,18 +287,23 @@ include/osgFX/Technique
 include/osgFX/Validator
 include/osgFX/Version
 include/osgGA/AnimationPathManipulator
+include/osgGA/CameraManipulator
 include/osgGA/CameraViewSwitchManipulator
 include/osgGA/DriveManipulator
 include/osgGA/EventQueue
 include/osgGA/EventVisitor
 include/osgGA/Export
+include/osgGA/FirstPersonManipulator
 include/osgGA/FlightManipulator
 include/osgGA/GUIActionAdapter
 include/osgGA/GUIEventAdapter
 include/osgGA/GUIEventHandler
 include/osgGA/KeySwitchMatrixManipulator
-include/osgGA/MatrixManipulator
+include/osgGA/MultiTouchTrackballManipulator
 include/osgGA/NodeTrackerManipulator
+include/osgGA/OrbitManipulator
+include/osgGA/SphericalManipulator
+include/osgGA/StandardManipulator
 include/osgGA/StateSetManipulator
 include/osgGA/TerrainManipulator
 include/osgGA/TrackballManipulator
@@ -297,6 +323,7 @@ include/osgManipulator/Scale2DDragger
 include/osgManipulator/ScaleAxisDragger
 include/osgManipulator/Selection
 include/osgManipulator/TabBoxDragger
+include/osgManipulator/TabBoxTrackballDragger
 include/osgManipulator/TabPlaneDragger
 include/osgManipulator/TabPlaneTrackballDragger
 include/osgManipulator/TrackballDragger
@@ -307,14 +334,20 @@ include/osgManipulator/TranslatePlaneDragger
 include/osgManipulator/Version
 include/osgParticle/AccelOperator
 include/osgParticle/AngularAccelOperator
+include/osgParticle/AngularDampingOperator
+include/osgParticle/BounceOperator
 include/osgParticle/BoxPlacer
 include/osgParticle/CenteredPlacer
+include/osgParticle/CompositePlacer
 include/osgParticle/ConnectedParticleSystem
 include/osgParticle/ConstantRateCounter
 include/osgParticle/Counter
+include/osgParticle/DampingOperator
+include/osgParticle/DomainOperator
 include/osgParticle/Emitter
 include/osgParticle/ExplosionDebrisEffect
 include/osgParticle/ExplosionEffect
+include/osgParticle/ExplosionOperator
 include/osgParticle/Export
 include/osgParticle/FireEffect
 include/osgParticle/FluidFrictionOperator
@@ -326,6 +359,7 @@ include/osgParticle/ModularEmitter
 include/osgParticle/ModularProgram
 include/osgParticle/MultiSegmentPlacer
 include/osgParticle/Operator
+include/osgParticle/OrbitOperator
 include/osgParticle/Particle
 include/osgParticle/ParticleEffect
 include/osgParticle/ParticleProcessor
@@ -340,11 +374,18 @@ include/osgParticle/RandomRateCounter
 include/osgParticle/SectorPlacer
 include/osgParticle/SegmentPlacer
 include/osgParticle/Shooter
+include/osgParticle/SinkOperator
 include/osgParticle/SmokeEffect
 include/osgParticle/SmokeTrailEffect
 include/osgParticle/VariableRateCounter
 include/osgParticle/Version
 include/osgParticle/range
+include/osgPresentation/AnimationMaterial
+include/osgPresentation/CompileSlideCallback
+include/osgPresentation/Export
+include/osgPresentation/PickEventHandler
+include/osgPresentation/SlideEventHandler
+include/osgPresentation/SlideShowConstructor
 include/osgShadow/ConvexPolyhedron
 include/osgShadow/DebugShadowMap
 include/osgShadow/Export
@@ -401,8 +442,10 @@ include/osgText/Export
 include/osgText/FadeText
 include/osgText/Font
 include/osgText/Font3D
+include/osgText/Glyph
 include/osgText/KerningType
 include/osgText/String
+include/osgText/Style
 include/osgText/Text
 include/osgText/Text3D
 include/osgText/TextBase
@@ -418,14 +461,17 @@ include/osgUtil/Export
 include/osgUtil/GLObjectsVisitor
 include/osgUtil/HalfWayMapGenerator
 include/osgUtil/HighlightMapGenerator
+include/osgUtil/IncrementalCompileOperation
 include/osgUtil/IntersectVisitor
 include/osgUtil/IntersectionVisitor
 include/osgUtil/LineSegmentIntersector
+include/osgUtil/MeshOptimizers
 include/osgUtil/OperationArrayFunctor
 include/osgUtil/Optimizer
 include/osgUtil/PlaneIntersector
 include/osgUtil/PolytopeIntersector
 include/osgUtil/PositionalStateContainer
+include/osgUtil/PrintVisitor
 include/osgUtil/ReflectionMapGenerator
 include/osgUtil/RenderBin
 include/osgUtil/RenderLeaf
@@ -433,6 +479,7 @@ include/osgUtil/RenderStage
 include/osgUtil/ReversePrimitiveFunctor
 include/osgUtil/SceneGraphBuilder
 include/osgUtil/SceneView
+include/osgUtil/ShaderGen
 include/osgUtil/Simplifier
 include/osgUtil/SmoothingVisitor
 include/osgUtil/StateGraph
@@ -447,8 +494,6 @@ include/osgUtil/Version
 include/osgViewer/CompositeViewer
 include/osgViewer/Export
 include/osgViewer/GraphicsWindow
-include/osgViewer/GraphicsWindowX11
-include/osgViewer/PixelBufferX11
 include/osgViewer/Renderer
 include/osgViewer/Scene
 include/osgViewer/Version
@@ -456,8 +501,12 @@ include/osgViewer/View
 include/osgViewer/Viewer
 include/osgViewer/ViewerBase
 include/osgViewer/ViewerEventHandlers
-include/osgViewer/api/X11/GraphicsWindowX11
-include/osgViewer/api/X11/PixelBufferX11
+${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsHandleCarbon
+${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsWindowCarbon
+${PLIST.quartz}include/osgViewer/api/Carbon/PixelBufferCarbon
+${PLIST.x11}include/osgViewer/api/X11/GraphicsHandleX11
+${PLIST.x11}include/osgViewer/api/X11/GraphicsWindowX11
+${PLIST.x11}include/osgViewer/api/X11/PixelBufferX11
 include/osgVolume/Export
 include/osgVolume/FixedFunctionTechnique
 include/osgVolume/Layer
@@ -493,53 +542,56 @@ include/osgWidget/Widget
 include/osgWidget/Window
 include/osgWidget/WindowManager
 lib/libOpenThreads.so
-lib/libOpenThreads.so.11
-lib/libOpenThreads.so.2.4.0
+lib/libOpenThreads.so.12
+lib/libOpenThreads.so.2.6.0
 lib/libosg.so
 lib/libosg.so.${PKGVERSION}
-lib/libosg.so.65
+lib/libosg.so.80
 lib/libosgAnimation.so
 lib/libosgAnimation.so.${PKGVERSION}
-lib/libosgAnimation.so.65
+lib/libosgAnimation.so.80
 lib/libosgDB.so
 lib/libosgDB.so.${PKGVERSION}
-lib/libosgDB.so.65
+lib/libosgDB.so.80
 lib/libosgFX.so
 lib/libosgFX.so.${PKGVERSION}
-lib/libosgFX.so.65
+lib/libosgFX.so.80
 lib/libosgGA.so
 lib/libosgGA.so.${PKGVERSION}
-lib/libosgGA.so.65
+lib/libosgGA.so.80
 lib/libosgManipulator.so
 lib/libosgManipulator.so.${PKGVERSION}
-lib/libosgManipulator.so.65
+lib/libosgManipulator.so.80
 lib/libosgParticle.so
 lib/libosgParticle.so.${PKGVERSION}
-lib/libosgParticle.so.65
+lib/libosgParticle.so.80
+lib/libosgPresentation.so
+lib/libosgPresentation.so.${PKGVERSION}
+lib/libosgPresentation.so.80
 lib/libosgShadow.so
 lib/libosgShadow.so.${PKGVERSION}
-lib/libosgShadow.so.65
+lib/libosgShadow.so.80
 lib/libosgSim.so
 lib/libosgSim.so.${PKGVERSION}
-lib/libosgSim.so.65
+lib/libosgSim.so.80
 lib/libosgTerrain.so
 lib/libosgTerrain.so.${PKGVERSION}
-lib/libosgTerrain.so.65
+lib/libosgTerrain.so.80
 lib/libosgText.so
 lib/libosgText.so.${PKGVERSION}
-lib/libosgText.so.65
+lib/libosgText.so.80
 lib/libosgUtil.so
 lib/libosgUtil.so.${PKGVERSION}
-lib/libosgUtil.so.65
+lib/libosgUtil.so.80
 lib/libosgViewer.so
 lib/libosgViewer.so.${PKGVERSION}
-lib/libosgViewer.so.65
+lib/libosgViewer.so.80
 lib/libosgVolume.so
 lib/libosgVolume.so.${PKGVERSION}
-lib/libosgVolume.so.65
+lib/libosgVolume.so.80
 lib/libosgWidget.so
 lib/libosgWidget.so.${PKGVERSION}
-lib/libosgWidget.so.65
+lib/libosgWidget.so.80
 lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
 lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ac.so
@@ -549,19 +601,32 @@ lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so
 lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_curl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dds.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osg.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osganimation.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgfx.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgparticle.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgshadow.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgsim.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgterrain.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgtext.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgviewer.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgvolume.so
+lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgwidget.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dw.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
+lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so
 lib/osgPlugins-${PKGVERSION}/osgdb_geo.so
-lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
+${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
 lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_gz.so
 lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so
+${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_imageio.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ive.so
 lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
-lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
+${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_logo.so
 lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so
 lib/osgPlugins-${PKGVERSION}/osgdb_lws.so
@@ -569,39 +634,62 @@ lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
 lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_normals.so
 lib/osgPlugins-${PKGVERSION}/osgdb_obj.so
+lib/osgPlugins-${PKGVERSION}/osgdb_ogr.so
 lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osga.so
-lib/osgPlugins-${PKGVERSION}/osgdb_osganimation.so
-lib/osgPlugins-${PKGVERSION}/osgdb_osgfx.so
-lib/osgPlugins-${PKGVERSION}/osgdb_osgparticle.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osgshadow.so
-lib/osgPlugins-${PKGVERSION}/osgdb_osgsim.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osgterrain.so
-lib/osgPlugins-${PKGVERSION}/osgdb_osgtext.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osgtgz.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osgviewer.so
-lib/osgPlugins-${PKGVERSION}/osgdb_osgvolume.so
-lib/osgPlugins-${PKGVERSION}/osgdb_osgwidget.so
+lib/osgPlugins-${PKGVERSION}/osgdb_p3d.so
 lib/osgPlugins-${PKGVERSION}/osgdb_pic.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ply.so
-lib/osgPlugins-${PKGVERSION}/osgdb_png.so
+${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_png.so
 lib/osgPlugins-${PKGVERSION}/osgdb_pnm.so
+lib/osgPlugins-${PKGVERSION}/osgdb_pov.so
+lib/osgPlugins-${PKGVERSION}/osgdb_pvr.so
+lib/osgPlugins-${PKGVERSION}/osgdb_revisions.so
 lib/osgPlugins-${PKGVERSION}/osgdb_rgb.so
 lib/osgPlugins-${PKGVERSION}/osgdb_rot.so
 lib/osgPlugins-${PKGVERSION}/osgdb_scale.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osg.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osganimation.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgfx.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgmanipulator.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgparticle.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgshadow.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgsim.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgterrain.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgtext.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgvolume.so
 lib/osgPlugins-${PKGVERSION}/osgdb_shp.so
 lib/osgPlugins-${PKGVERSION}/osgdb_stl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_svg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_tga.so
 lib/osgPlugins-${PKGVERSION}/osgdb_tgz.so
-lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so
+${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so
 lib/osgPlugins-${PKGVERSION}/osgdb_trans.so
 lib/osgPlugins-${PKGVERSION}/osgdb_txf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_txp.so
 lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_x.so
-lib/osgPlugins-${PKGVERSION}/osgdb_xine.so
+${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_xine.so
 lib/osgPlugins-${PKGVERSION}/osgdb_zip.so
+lib/pkgconfig/openscenegraph-osg.pc
+lib/pkgconfig/openscenegraph-osgAnimation.pc
+lib/pkgconfig/openscenegraph-osgDB.pc
+lib/pkgconfig/openscenegraph-osgFX.pc
+lib/pkgconfig/openscenegraph-osgGA.pc
+lib/pkgconfig/openscenegraph-osgManipulator.pc
+lib/pkgconfig/openscenegraph-osgParticle.pc
+lib/pkgconfig/openscenegraph-osgShadow.pc
+lib/pkgconfig/openscenegraph-osgSim.pc
+lib/pkgconfig/openscenegraph-osgTerrain.pc
+lib/pkgconfig/openscenegraph-osgText.pc
+lib/pkgconfig/openscenegraph-osgUtil.pc
+lib/pkgconfig/openscenegraph-osgViewer.pc
+lib/pkgconfig/openscenegraph-osgVolume.pc
+lib/pkgconfig/openscenegraph-osgWidget.pc
 lib/pkgconfig/openscenegraph.pc
 lib/pkgconfig/openthreads.pc
diff --git a/graphics/osg/buildlink3.mk b/graphics/osg/buildlink3.mk
index aaf6120b0ba..05a00a1142c 100644
--- a/graphics/osg/buildlink3.mk
+++ b/graphics/osg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/03/03 00:12:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2012/03/07 16:27:35 adam Exp $
 
 BUILDLINK_TREE+=	osg
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	osg
 OSG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.osg+=	osg>=2.8.3
-BUILDLINK_ABI_DEPENDS.osg?=	osg>=2.8.3nb9
+BUILDLINK_ABI_DEPENDS.osg+=	osg>=2.8.3nb9
 BUILDLINK_PKGSRCDIR.osg?=	../../graphics/osg
 
 .include "../../graphics/cairo/buildlink3.mk"
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index 19b94eb2b3c..7a72e6b5383 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.3 2011/12/11 11:59:06 marino Exp $
+$NetBSD: distinfo,v 1.4 2012/03/07 16:27:35 adam Exp $
 
-SHA1 (OpenSceneGraph-2.8.3.zip) = 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc
-RMD160 (OpenSceneGraph-2.8.3.zip) = 40a4988f4aefff7dbb6aab5225204ae41c945277
-Size (OpenSceneGraph-2.8.3.zip) = 6740017 bytes
-SHA1 (patch-ab) = 28049bfe9e70301e5dba5c916ead51a31c86ac6c
-SHA1 (patch-ac) = bc35c9b0a9c7612137c66018b36b35b9897065be
-SHA1 (patch-ad) = 846f4f93104812125bffc8644948637de206bdc0
-SHA1 (patch-ae) = d882f09acac61f74a25cf3efc8f3b7b3756adae3
-SHA1 (patch-src-osgPlugins-curl-ReaderWriterCURL.cpp) = 4ece011ff1284011b7777f00b838d6673c22bd2a
-SHA1 (patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp) = c828563699eb726214995bae63fcf028ff3a374a
+SHA1 (OpenSceneGraph-3.0.1.zip) = 13c7e39f6d62047ad944d8d28a0f0eb60384ce33
+RMD160 (OpenSceneGraph-3.0.1.zip) = 54b315c318b7ade2bcc65703cea5f41377e93a71
+Size (OpenSceneGraph-3.0.1.zip) = 6780282 bytes
+SHA1 (patch-ab) = 70b58b8b42af77018a09d4024afaffb874b74ddf
+SHA1 (patch-ac) = 1f237646034ca837c837e44aff753cd590c47900
+SHA1 (patch-ad) = 2a9594128e357b20f7f8146398b7cb4068aca405
+SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
+SHA1 (patch-applications_present3D_Cluster.cpp) = 51d952c863966c851d03cd7f4165abe9db27c9d3
+SHA1 (patch-include_OpenThreads_Atomic) = 663f76cf4ffe5f52f24a1c68701c35bb8763063a
+SHA1 (patch-src_OpenThreads_common_Atomic.cpp) = 34687f53ba01832b7ea3e0b124a951efc0afe343
+SHA1 (patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp) = 1552f78a0ed17fcdaed9d87fe3d1f8220712f403
+SHA1 (patch-src_osgViewer_DarwinUtils.mm) = 4ab021cb797cb6959bee4ba33caf257b2a6cedf3
diff --git a/graphics/osg/patches/patch-ab b/graphics/osg/patches/patch-ab
index 90f00ea98ca..5605b300d79 100644
--- a/graphics/osg/patches/patch-ab
+++ b/graphics/osg/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2011/12/11 11:59:06 marino Exp $
+$NetBSD: patch-ab,v 1.3 2012/03/07 16:27:35 adam Exp $
 
 --- src/osgDB/FileUtils.cpp.orig	2009-01-12 17:28:37.000000000 +0200
 +++ src/osgDB/FileUtils.cpp	2009-01-12 17:30:14.000000000 +0200
-@@ -47,7 +47,7 @@
+@@ -76,7 +76,7 @@
      #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
          #define stat64 stat
      #endif
diff --git a/graphics/osg/patches/patch-ac b/graphics/osg/patches/patch-ac
index cfddf4ab225..e637ece6326 100644
--- a/graphics/osg/patches/patch-ac
+++ b/graphics/osg/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
+$NetBSD: patch-ac,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- ./include/osg/Math.orig	2008-11-23 13:35:43.000000000 +0200
-+++ ./include/osg/Math	2009-01-14 09:49:00.000000000 +0200
+--- include/osg/Math.orig	2008-11-23 13:35:43.000000000 +0200
++++ include/osg/Math	2009-01-14 09:49:00.000000000 +0200
 @@ -14,7 +14,7 @@
  #ifndef __OSG_MATH
  #define __OSG_MATH
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
  
  #include <osg/Export>
  
-@@ -200,14 +200,14 @@
+@@ -207,14 +207,14 @@
      inline bool isNaN(float v) { return _isnan(v)!=0; }
      inline bool isNaN(double v) { return _isnan(v)!=0; }
  #else
diff --git a/graphics/osg/patches/patch-ad b/graphics/osg/patches/patch-ad
index 3601630f675..90fe5595ecd 100644
--- a/graphics/osg/patches/patch-ad
+++ b/graphics/osg/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
+$NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- ./src/OpenThreads/pthreads/PThread.c++.orig	2009-06-22 12:51:46.000000000 +0200
-+++ ./src/OpenThreads/pthreads/PThread.c++	2009-06-22 16:55:54.000000000 +0200
-@@ -124,6 +124,15 @@
+--- src/OpenThreads/pthreads/PThread.cpp.orig	2011-06-23 20:09:26.000000000 +0000
++++ src/OpenThreads/pthreads/PThread.cpp
+@@ -135,6 +135,15 @@ private:
          {
  #if defined(__sgi)
              pthread_setrunon_np( pd->cpunum );
@@ -18,7 +18,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
  #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
              cpu_set_t cpumask;
              CPU_ZERO( &cpumask );
-@@ -537,6 +546,18 @@
+@@ -565,6 +574,18 @@ int Thread::setProcessorAffinity(unsigne
      status = pthread_attr_setscope( &thread_attr, PTHREAD_SCOPE_BOUND_NP );
      return status;
  
@@ -37,7 +37,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
  #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
  
      if (pd->isRunning && Thread::CurrentThread()==this)
-@@ -974,7 +995,16 @@
+@@ -1030,7 +1051,16 @@ int OpenThreads::SetProcessorAffinityOfC
      }
      else
      {
diff --git a/graphics/osg/patches/patch-ae b/graphics/osg/patches/patch-ae
index a611399696c..7c887353c15 100644
--- a/graphics/osg/patches/patch-ae
+++ b/graphics/osg/patches/patch-ae
@@ -1,24 +1,19 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $
+$NetBSD: patch-ae,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- ./CMakeLists.txt.orig	2009-06-22 19:23:08.000000000 +0200
-+++ ./CMakeLists.txt	2009-06-22 19:23:54.000000000 +0200
-@@ -457,12 +457,13 @@
-   ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
- ENDIF(CYGWIN)
+PkgSrc does not use lib64.
+
+--- CMakeLists.txt.orig	2011-07-31 07:50:34.000000000 +0000
++++ CMakeLists.txt
+@@ -586,12 +586,6 @@ IF(CYGWIN)
+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ ENDIF()
  
 -IF(UNIX AND NOT WIN32 AND NOT APPLE)
 -  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
 -      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
 -      MARK_AS_ADVANCED(LIB_POSTFIX)
--  ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
--ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
-+# pkgsrc does not use lib64
-+#IF(UNIX AND NOT WIN32 AND NOT APPLE)
-+#  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-+#      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
-+#      MARK_AS_ADVANCED(LIB_POSTFIX)
-+#  ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-+#ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+-  ENDIF()
+-ENDIF()
  IF(NOT DEFINED LIB_POSTFIX)
      SET(LIB_POSTFIX "")
- ENDIF(NOT DEFINED LIB_POSTFIX)
+ ENDIF()
diff --git a/graphics/osg/patches/patch-applications_present3D_Cluster.cpp b/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
new file mode 100644
index 00000000000..0d5251d65c0
--- /dev/null
+++ b/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.1 2012/03/07 16:27:35 adam Exp $
+
+Support more platforms.
+
+--- applications/present3D/Cluster.cpp.orig	2012-03-05 16:33:33.000000000 +0000
++++ applications/present3D/Cluster.cpp
+@@ -33,7 +33,7 @@
+ #if defined(__linux)
+     #include <unistd.h>
+     #include <linux/sockios.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+     #include <unistd.h>
+     #include <sys/sockio.h>
+ #elif defined(__sgi)
+@@ -336,7 +336,7 @@ void Receiver::sync( void )
+         return;
+     }
+ 
+-#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
++#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__NetBSD__) || defined(__OpenBSD__)
+     socklen_t 
+ #else
+     int
diff --git a/graphics/osg/patches/patch-include_OpenThreads_Atomic b/graphics/osg/patches/patch-include_OpenThreads_Atomic
new file mode 100644
index 00000000000..9f0a9a7a2f7
--- /dev/null
+++ b/graphics/osg/patches/patch-include_OpenThreads_Atomic
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_OpenThreads_Atomic,v 1.1 2012/03/07 16:27:35 adam Exp $
+
+Fix C error.
+
+--- include/OpenThreads/Atomic.orig	2012-03-06 16:27:45.000000000 +0000
++++ include/OpenThreads/Atomic
+@@ -241,7 +241,7 @@ _OPENTHREADS_ATOMIC_INLINE bool
+ AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
+ {
+ #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
+-    return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
++    return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew);
+ #elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
+     return __compare_and_swap((unsigned long*)&_ptr, (unsigned long)ptrOld, (unsigned long)ptrNew);
+ #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
diff --git a/graphics/osg/patches/patch-src-osgPlugins-curl-ReaderWriterCURL.cpp b/graphics/osg/patches/patch-src-osgPlugins-curl-ReaderWriterCURL.cpp
deleted file mode 100644
index e36ec92b778..00000000000
--- a/graphics/osg/patches/patch-src-osgPlugins-curl-ReaderWriterCURL.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src-osgPlugins-curl-ReaderWriterCURL.cpp,v 1.1 2011/09/24 12:58:11 joerg Exp $
-
---- src/osgPlugins/curl/ReaderWriterCURL.cpp.orig	2011-09-22 15:21:48.000000000 +0000
-+++ src/osgPlugins/curl/ReaderWriterCURL.cpp
-@@ -21,7 +21,6 @@
- #include <fstream>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- 
- #include "ReaderWriterCURL.h"
- 
diff --git a/graphics/osg/patches/patch-src_OpenThreads_common_Atomic.cpp b/graphics/osg/patches/patch-src_OpenThreads_common_Atomic.cpp
new file mode 100644
index 00000000000..bc6e5c15942
--- /dev/null
+++ b/graphics/osg/patches/patch-src_OpenThreads_common_Atomic.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_OpenThreads_common_Atomic.cpp,v 1.1 2012/03/07 16:27:35 adam Exp $
+
+Fix C error.
+
+--- src/OpenThreads/common/Atomic.cpp.orig	2012-03-05 21:26:31.000000000 +0000
++++ src/OpenThreads/common/Atomic.cpp
+@@ -143,7 +143,7 @@ bool
+ AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
+ {
+ #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
+-    return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
++    return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew);
+ #elif defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
+     return ptrOld == InterlockedCompareExchangePointer((PVOID volatile*)&_ptr, (PVOID)ptrNew, (PVOID)ptrOld);
+ #elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
diff --git a/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp b/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
index d454266de26..58894936cee 100644
--- a/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
+++ b/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
@@ -1,12 +1,11 @@
-$NetBSD: patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp,v 1.1 2011/12/11 11:59:06 marino Exp $
+$NetBSD: patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.orig	2010-03-19 08:03:02.000000000 +0000
+Point to correct header files.
+
+--- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.orig	2012-03-05 21:20:14.000000000 +0000
 +++ src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
-@@ -6,11 +6,12 @@
- extern "C"
- {
- #define __STDC_CONSTANT_MACROS
-+#define FF_API_OLD_SAMPLE_FMT 0
+@@ -9,9 +9,9 @@ extern "C"
+ #define FF_API_OLD_SAMPLE_FMT 0
  #include <errno.h>    // for error codes defined in avformat.h
  #include <stdint.h>
 -#include <avcodec.h>
diff --git a/graphics/osg/patches/patch-src_osgViewer_DarwinUtils.mm b/graphics/osg/patches/patch-src_osgViewer_DarwinUtils.mm
new file mode 100644
index 00000000000..14b0faf0331
--- /dev/null
+++ b/graphics/osg/patches/patch-src_osgViewer_DarwinUtils.mm
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_osgViewer_DarwinUtils.mm,v 1.1 2012/03/07 16:27:35 adam Exp $
+
+Work around depreciated API.
+
+--- src/osgViewer/DarwinUtils.mm.orig	2012-03-06 14:49:28.000000000 +0000
++++ src/osgViewer/DarwinUtils.mm
+@@ -313,7 +313,11 @@ void DarwinWindowingSystemInterface::get
+     CGDirectDisplayID id = getDisplayID(si);
+     resolution.width = CGDisplayPixelsWide(id);
+     resolution.height = CGDisplayPixelsHigh(id);
+-    resolution.colorDepth = CGDisplayBitsPerPixel(id);
++    CGDisplayModeRef displayMode = CGDisplayCopyDisplayMode(id);
++    CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(displayMode);
++    CGDisplayModeRelease(displayMode);
++    resolution.colorDepth = CFStringGetLength(pixelEncoding);
++    CFRelease(pixelEncoding);
+     resolution.refreshRate = getDictDouble (CGDisplayCurrentMode(id), kCGDisplayRefreshRate);        // Not tested
+     if (resolution.refreshRate<0) resolution.refreshRate = 0;
+ }
+@@ -402,7 +406,7 @@ bool DarwinWindowingSystemInterface::set
+     CFDictionaryRef display_mode_values =
+         CGDisplayBestModeForParametersAndRefreshRate(
+                         displayid, 
+-                        CGDisplayBitsPerPixel(displayid), 
++                        32, 
+                         width, height,  
+                         refresh,  
+                         NULL);
+@@ -432,7 +436,7 @@ bool DarwinWindowingSystemInterface::set
+     CFDictionaryRef display_mode_values =
+         CGDisplayBestModeForParametersAndRefreshRate(
+                         displayid, 
+-                        CGDisplayBitsPerPixel(displayid), 
++                        32, 
+                         width, height,  
+                         refreshRate,  
+                         &success);