- Update to 2.9.10

3 files changed, 28 insertions, 27 deletions

diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 78f079ef1dda..22a5347b9849 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	osg
-PORTVERSION=	2.9.8
-PORTREVISION=	1
+PORTVERSION=	2.9.10
 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=66 \
+		OSG_SHLIBVER=68 \
 		OPENTHREADS_VERSION=2.5.0 \
 		OPENTHREADS_SHLIBVER=12
 
@@ -60,11 +59,9 @@ OPTIONS=	CURL     "Support for cURL"                 off \
 .include <bsd.port.options.mk>
 
 # GUI toolkits are only needed for building examples, which are not even installed
-FORCE_IGNORE=	FLTK GLUT FOX Qt3 Qt4 wxWidgets OpenAL # only for examples
-FORCE_IGNORE+=	COLLADA Performer OurDCMTK XUL        # not in ports
-FORCE_REQUIRE=	Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight
-FORCE_PC_IGNORE=	GTK GTKGL                     # only for examples
-FORCE_PC_REQUIRE=
+FORCE_IGNORE=	FLTK GLUT FOX Qt3 Qt4 wxWidgets OpenAL GtkGl # only for examples
+FORCE_IGNORE+=	COLLADA Performer OurDCMTK XUL FBX           # not in ports
+FORCE_REQUIRE=	Threads OpenGL X11 JPEG PNG TIFF ZLIB        # common & lightweight
 
 # options that affect FIND_PACKAGE
 .if defined(WITH_CURL)
@@ -187,28 +184,25 @@ FORCE_IGNORE+=	SDL
 
 # options that affect PKG_CHECK_MODULES
 .if defined(WITH_SVG)
-FORCE_PC_REQUIRE+=RSVG
+FORCE_REQUIRE+=	RSVG
 LIB_DEPENDS+=	rsvg-2:${PORTSDIR}/graphics/librsvg2
 PLIST_SUB+=	SVG=""
 .else
-FORCE_PC_IGNORE+=RSVG
+FORCE_IGNORE+=	RSVG
 PLIST_SUB+=	SVG="@comment "
 .endif
 
 .if defined(WITH_PDF)
-FORCE_PC_REQUIRE+=POPPLER
+FORCE_REQUIRE+=	Poppler-glib
 LIB_DEPENDS+=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
 PLIST_SUB+=	PDF=""
 .else
-FORCE_PC_IGNORE+=POPPLER
+FORCE_IGNORE+=	Poppler-glib
 PLIST_SUB+=	PDF="@comment "
 .endif
 
 .if defined(WITH_SVG) || defined(WITH_PDF)
-FORCE_PC_REQUIRE+=CAIRO
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-.else
-FORCE_PC_IGNORE+=CAIRO
 .endif
 
 # other options
@@ -239,13 +233,5 @@ post-patch:
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|^|#|' \
 		${WRKSRC}/CMakeLists.txt
 .endfor
-.for p in ${FORCE_PC_REQUIRE}
-	@${REINPLACE_CMD} -e 's|PKG_CHECK_MODULES.*${p}|& REQUIRED| ' \
-		${WRKSRC}/CMakeLists.txt
-.endfor
-.for p in ${FORCE_PC_IGNORE}
-	@${REINPLACE_CMD} -e '/PKG_CHECK_MODULES.*${p}/ s|^|#|' \
-		${WRKSRC}/CMakeLists.txt
-.endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/osg-devel/distinfo b/graphics/osg-devel/distinfo
index 3c00124bd353..e4b3372a2219 100644
--- a/graphics/osg-devel/distinfo
+++ b/graphics/osg-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (OpenSceneGraph-2.9.8.zip) = 1eeaa00ef02a551814b740ac73ecd372
-SHA256 (OpenSceneGraph-2.9.8.zip) = 948da62d00e1824add4d1010ddded42a17d3e5dc50f2cb1f2e1ddb53c7146a1a
-SIZE (OpenSceneGraph-2.9.8.zip) = 7899303
+SHA256 (OpenSceneGraph-2.9.10.zip) = f7f6be2fc9c7cb3ae2f0c4ad591c8352b2f7e2b9ccce209cc0798415a4ff078c
+SIZE (OpenSceneGraph-2.9.10.zip) = 6910310
diff --git a/graphics/osg-devel/pkg-plist b/graphics/osg-devel/pkg-plist
index cb6c848a4415..6545b0896f98 100644
--- a/graphics/osg-devel/pkg-plist
+++ b/graphics/osg-devel/pkg-plist
@@ -31,6 +31,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
@@ -129,6 +130,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
@@ -290,6 +293,7 @@ include/osgGA/GUIActionAdapter
 include/osgGA/GUIEventAdapter
 include/osgGA/GUIEventHandler
 include/osgGA/KeySwitchMatrixManipulator
+include/osgGA/MultiTouchTrackballManipulator
 include/osgGA/NodeTrackerManipulator
 include/osgGA/OrbitManipulator
 include/osgGA/SphericalManipulator
@@ -324,14 +328,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
@@ -343,6 +353,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
@@ -357,6 +368,7 @@ include/osgParticle/RandomRateCounter
 include/osgParticle/SectorPlacer
 include/osgParticle/SegmentPlacer
 include/osgParticle/Shooter
+include/osgParticle/SinkOperator
 include/osgParticle/SmokeEffect
 include/osgParticle/SmokeTrailEffect
 include/osgParticle/VariableRateCounter
@@ -364,6 +376,7 @@ include/osgParticle/Version
 include/osgParticle/range
 include/osgPresentation/AnimationMaterial
 include/osgPresentation/CompileSlideCallback
+include/osgPresentation/Export
 include/osgPresentation/PickEventHandler
 include/osgPresentation/SlideEventHandler
 include/osgPresentation/SlideShowConstructor
@@ -423,8 +436,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
@@ -629,6 +644,8 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_pic.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_ply.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_png.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so
@@ -663,7 +680,6 @@ libdata/pkgconfig/openscenegraph-osgAnimation.pc
 libdata/pkgconfig/openscenegraph-osgDB.pc
 libdata/pkgconfig/openscenegraph-osgFX.pc
 libdata/pkgconfig/openscenegraph-osgGA.pc
-libdata/pkgconfig/openscenegraph-osgIntrospection.pc
 libdata/pkgconfig/openscenegraph-osgManipulator.pc
 libdata/pkgconfig/openscenegraph-osgParticle.pc
 libdata/pkgconfig/openscenegraph-osgShadow.pc