4 files changed, 38 insertions, 14 deletions

diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 49f8f450b4b6..65f23579ec7c 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	osg
-PORTVERSION=	2.9.5
-PORTREVISION=	1
+PORTVERSION=	2.9.6
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -32,7 +31,7 @@ USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
-		OSG_SHLIBVER=60 \
+		OSG_SHLIBVER=62 \
 		OPENTHREADS_VERSION=2.4.0 \
 		OPENTHREADS_SHLIBVER=11
 
diff --git a/graphics/osg-devel/distinfo b/graphics/osg-devel/distinfo
index 1270674f6372..7e340f4b01dd 100644
--- a/graphics/osg-devel/distinfo
+++ b/graphics/osg-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenSceneGraph-2.9.5.zip) = c22bb0595071a143c3d68ae7f53e1ffe
-SHA256 (OpenSceneGraph-2.9.5.zip) = 983e8cf2c323660e1049b80784da7c7cf962bab8479e0df40be0437da6d11a68
-SIZE (OpenSceneGraph-2.9.5.zip) = 7202802
+MD5 (OpenSceneGraph-2.9.6.zip) = f27a69499f3eadf1d8ad2ee22f6d5e85
+SHA256 (OpenSceneGraph-2.9.6.zip) = 9aa8ce2a581d42f8c9bac14dff5069c66633ddf73370a1e7412873048d643e9a
+SIZE (OpenSceneGraph-2.9.6.zip) = 7401321
diff --git a/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.c++ b/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.c++
index d1997c322f3f..1991714a0271 100644
--- a/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.c++
+++ b/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.c++
@@ -1,14 +1,14 @@
---- src/OpenThreads/pthreads/PThread.c++.orig	2008-11-05 13:27:49.000000000 +0300
-+++ src/OpenThreads/pthreads/PThread.c++	2009-02-04 18:06:28.000000000 +0300
+--- src/OpenThreads/pthreads/PThread.c++.orig	2009-11-20 13:27:43.000000000 +0300
++++ src/OpenThreads/pthreads/PThread.c++	2009-12-15 20:26:51.000000000 +0300
 @@ -21,6 +21,7 @@
  #include <sys/types.h>
  #include <unistd.h>
  #include <pthread.h>
 +#include <pthread_np.h>
+ #include <limits.h>
  
  #if defined __linux || defined __sun || defined __APPLE__
- #include <string.h>
-@@ -125,7 +126,7 @@
+@@ -123,7 +124,7 @@
  #if defined(__sgi)
              pthread_setrunon_np( pd->cpunum );
  #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
@@ -17,7 +17,7 @@
              CPU_ZERO( &cpumask );
              CPU_SET( pd->cpunum, &cpumask );
  
-@@ -541,7 +542,7 @@
+@@ -539,7 +540,7 @@
  
      if (pd->isRunning && Thread::CurrentThread()==this)
      {
@@ -26,7 +26,7 @@
          CPU_ZERO( &cpumask );
          CPU_SET( pd->cpunum, &cpumask );
  #if defined(HAVE_PTHREAD_SETAFFINITY_NP)
-@@ -975,7 +976,7 @@
+@@ -969,7 +970,7 @@
      else
      {
  #if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
diff --git a/graphics/osg-devel/pkg-plist b/graphics/osg-devel/pkg-plist
index 7e8ead352177..5e233ff39611 100644
--- a/graphics/osg-devel/pkg-plist
+++ b/graphics/osg-devel/pkg-plist
@@ -3,7 +3,7 @@ bin/osgconv
 bin/osgfilecache
 bin/osgversion
 bin/osgviewer
-bin/present3D-osg
+bin/present3D
 include/OpenThreads/Atomic
 include/OpenThreads/Barrier
 include/OpenThreads/Block
@@ -21,6 +21,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
@@ -66,6 +67,7 @@ include/osg/FrameStamp
 include/osg/FrontFace
 include/osg/GL
 include/osg/GL2Extensions
+include/osg/GLBeginEndAdapter
 include/osg/GLExtensions
 include/osg/GLObjects
 include/osg/GLU
@@ -130,6 +132,7 @@ include/osg/Shape
 include/osg/ShapeDrawable
 include/osg/State
 include/osg/StateAttribute
+include/osg/StateAttributeCallback
 include/osg/StateSet
 include/osg/Stats
 include/osg/Stencil
@@ -181,26 +184,35 @@ include/osg/io_utils
 include/osg/observer_ptr
 include/osg/ref_ptr
 include/osgAnimation/Action
+include/osgAnimation/ActionAnimation
+include/osgAnimation/ActionBlendIn
+include/osgAnimation/ActionBlendOut
 include/osgAnimation/ActionCallback
+include/osgAnimation/ActionStripAnimation
 include/osgAnimation/ActionVisitor
 include/osgAnimation/Animation
 include/osgAnimation/AnimationManagerBase
 include/osgAnimation/Assert
 include/osgAnimation/BasicAnimationManager
 include/osgAnimation/Bone
+include/osgAnimation/BoneMapVisitor
 include/osgAnimation/Channel
+include/osgAnimation/ComputeBindMatrixVisitor
 include/osgAnimation/CubicBezier
 include/osgAnimation/EaseMotion
 include/osgAnimation/Export
+include/osgAnimation/FindParentAnimationManagerVisitor
 include/osgAnimation/FrameAction
 include/osgAnimation/Interpolator
 include/osgAnimation/Keyframe
 include/osgAnimation/LinkVisitor
 include/osgAnimation/MorphGeometry
 include/osgAnimation/RigGeometry
+include/osgAnimation/RigTransform
+include/osgAnimation/RigTransformHardware
+include/osgAnimation/RigTransformSoftware
 include/osgAnimation/Sampler
 include/osgAnimation/Skeleton
-include/osgAnimation/Skinning
 include/osgAnimation/StatsHandler
 include/osgAnimation/StatsVisitor
 include/osgAnimation/Target
@@ -246,6 +258,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
@@ -285,6 +298,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
@@ -333,6 +347,11 @@ include/osgParticle/SmokeTrailEffect
 include/osgParticle/VariableRateCounter
 include/osgParticle/Version
 include/osgParticle/range
+include/osgPresentation/AnimationMaterial
+include/osgPresentation/CompileSlideCallback
+include/osgPresentation/PickEventHandler
+include/osgPresentation/SlideEventHandler
+include/osgPresentation/SlideShowConstructor
 include/osgShadow/ConvexPolyhedron
 include/osgShadow/DebugShadowMap
 include/osgShadow/Export
@@ -437,6 +456,7 @@ include/osgUtil/UpdateVisitor
 include/osgUtil/Version
 include/osgViewer/CompositeViewer
 include/osgViewer/Export
+include/osgViewer/GraphicsHandleX11
 include/osgViewer/GraphicsWindow
 include/osgViewer/GraphicsWindowX11
 include/osgViewer/PixelBufferX11
@@ -447,6 +467,7 @@ include/osgViewer/View
 include/osgViewer/Viewer
 include/osgViewer/ViewerBase
 include/osgViewer/ViewerEventHandlers
+include/osgViewer/api/X11/GraphicsHandleX11
 include/osgViewer/api/X11/GraphicsWindowX11
 include/osgViewer/api/X11/PixelBufferX11
 include/osgVolume/Export
@@ -507,6 +528,9 @@ lib/libosgManipulator.so.%%OSG_SHLIBVER%%
 lib/libosgParticle.so
 lib/libosgParticle.so.%%OSG_VERSION%%
 lib/libosgParticle.so.%%OSG_SHLIBVER%%
+lib/libosgPresentation.so
+lib/libosgPresentation.so.%%OSG_VERSION%%
+lib/libosgPresentation.so.%%OSG_SHLIBVER%%
 lib/libosgShadow.so
 lib/libosgShadow.so.%%OSG_VERSION%%
 lib/libosgShadow.so.%%OSG_SHLIBVER%%
@@ -633,6 +657,7 @@ libdata/pkgconfig/openthreads.pc
 @dirrm include/osgTerrain
 @dirrm include/osgSim
 @dirrm include/osgShadow
+@dirrm include/osgPresentation
 @dirrm include/osgParticle
 @dirrm include/osgManipulator
 @dirrm include/osgGA