ports/77257: [PATCH] graphics/osg: unbreak, update to 0.9.8, adopt

Sam Lawrance boris at brooknet.com.au
Tue Feb 8 10:50:19 UTC 2005


>Number:         77257
>Category:       ports
>Synopsis:       [PATCH] graphics/osg: unbreak, update to 0.9.8, adopt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 08 10:50:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sam Lawrance
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD dirk.no.domain 5.3-STABLE FreeBSD 5.3-STABLE #0: Sat Jan 22 13:45:56 EST 2005
>Description:
- Update to 0.9.8
- 1 new file to add (files/freebsd4-osg-patches)
- Take maintainership. I've had no response from the maintainer since
  I emailed them on 23 Jan 2005 asking about this, so consider it timed
  out.

Just in case:
When building, I recommend using ccache: CXX="ccache g++". The build
takes quite a while, and ccache really speeds up rebuilds when tweaking.

Port maintainer (yinjieh at csie.nctu.edu.tw) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- osg-0.9.8.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/osg/Makefile,v
retrieving revision 1.22
diff -u -u -r1.22 Makefile
--- Makefile	18 Dec 2004 23:02:26 -0000	1.22
+++ Makefile	8 Feb 2005 05:29:36 -0000
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	osg
-PORTVERSION=	0.9.6.2
+PORTVERSION=	0.9.8
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	openscenegraph
-DISTNAME=	OpenSceneGraph-${PORTVERSION:R}-${PORTVERSION:E}
+MASTER_SITES=	http://www.openscenegraph.org/downloads/
+DISTNAME=	OSG_OP_OT-${PORTVERSION}-2
 
-MAINTAINER=	yinjieh at csie.nctu.edu.tw
+MAINTAINER=	boris at brooknet.com.au
 COMMENT=	C++ OpenGL scene graph library for real-time rendering
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \
 		${X11BASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+RUN_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \
+		${X11BASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif \
@@ -26,35 +25,42 @@
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-BROKEN=		"Does not compile"
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
-
+USE_ZIP=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_MESA=	yes
+USE_GL=		yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	OSGHOME=${WRKSRC} \
-		PTHREAD_LIBS=${PTHREAD_LIBS}
+MAKE_ENV=	OSGHOME="${WRKSRC}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		EXAMPLESDIR="${EXAMPLESDIR}" \
+		DOCSDIR="${DOCSDIR}" \
+		DATADIR="${DATADIR}" \
+		OPTF="${CXXFLAGS}"
 MAKEFILE=	GNUmakefile
-WRKSRC=		${WRKDIR}/OpenSceneGraph-${PORTVERSION:R}-${PORTVERSION:E}
+WRKSRC=		${WRKDIR}/${DISTNAME}/OpenSceneGraph
 
 # opt = optimized ($OPTF added); debug = debug ($DBGF added); opt is default
 ALL_TARGET=	opt
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|malloc\.h|stdlib.h|"
-	 @${REINPLACE_CMD} -e 's,%%CXXFLAGS%%,${CXXFLAGS},g' \
-		${WRKSRC}/Make/makedefs
+.if ${OSVERSION} < 500035
+EXTRA_PATCHES=	${FILESDIR}/freebsd4-osg-patches
+.endif
 
-post-install:
 .if !defined(NOPORTDOCS)
+
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+PORTDOCS=	html
+
+post-build:
+	cd ${WRKSRC}/doc/Doxyfiles && OSGHOME=${WRKSRC} doxygen all_Doxyfile
+
+post-install:
 	@${MKDIR} ${DOCSDIR}
-	${CP} -r ${WRKSRC}/doc/ ${DOCSDIR}
+	${CP} -r ${WRKSRC}/doc/doxygen/ ${DOCSDIR}
+
 .endif
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/osg/distinfo,v
retrieving revision 1.10
diff -u -u -r1.10 distinfo
--- distinfo	31 Mar 2004 03:08:21 -0000	1.10
+++ distinfo	25 Jan 2005 07:08:30 -0000
@@ -1,2 +1,2 @@
-MD5 (OpenSceneGraph-0.9.6-2.tar.gz) = 7023c86478aa85ce2da3e16332f01f32
-SIZE (OpenSceneGraph-0.9.6-2.tar.gz) = 2398062
+MD5 (OSG_OP_OT-0.9.8-2.zip) = 4c3fe8b7701e5a5932a4268075b60cda
+SIZE (OSG_OP_OT-0.9.8-2.zip) = 3805142
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/osg/pkg-plist,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist
--- pkg-plist	13 Nov 2003 11:36:40 -0000	1.9
+++ pkg-plist	7 Feb 2005 03:56:04 -0000
@@ -13,16 +13,18 @@
 include/osg/ClearNode
 include/osg/ClipNode
 include/osg/ClipPlane
+include/osg/ClusterCullingCallback
 include/osg/CollectOccludersVisitor
 include/osg/ColorMask
 include/osg/ColorMatrix
 include/osg/ConvexPlanarOccluder
 include/osg/ConvexPlanarPolygon
+include/osg/CoordinateSystemNode
 include/osg/CopyOp
 include/osg/CullFace
+include/osg/CullSettings
 include/osg/CullStack
 include/osg/CullingSet
-include/osg/DOFTransform
 include/osg/Depth
 include/osg/DisplaySettings
 include/osg/DrawPixels
@@ -40,6 +42,7 @@
 include/osg/Geometry
 include/osg/Group
 include/osg/Image
+include/osg/ImageStream
 include/osg/Impostor
 include/osg/ImpostorSprite
 include/osg/LOD
@@ -65,6 +68,7 @@
 include/osg/PagedLOD
 include/osg/Plane
 include/osg/Point
+include/osg/PointSprite
 include/osg/PolygonMode
 include/osg/PolygonOffset
 include/osg/PolygonStipple
@@ -73,6 +77,7 @@
 include/osg/PrimitiveSet
 include/osg/Projection
 include/osg/Quat
+include/osg/RefNodePath
 include/osg/Referenced
 include/osg/Sequence
 include/osg/ShadeModel
@@ -86,7 +91,9 @@
 include/osg/Switch
 include/osg/TexEnv
 include/osg/TexEnvCombine
+include/osg/TexEnvFilter
 include/osg/TexGen
+include/osg/TexGenNode
 include/osg/TexMat
 include/osg/Texture
 include/osg/Texture1D
@@ -97,17 +104,25 @@
 include/osg/Timer
 include/osg/Transform
 include/osg/TriangleFunctor
+include/osg/TriangleIndexFunctor
 include/osg/UByte4
 include/osg/UnitTestFramework
 include/osg/Vec2
+include/osg/Vec2d
+include/osg/Vec2f
 include/osg/Vec3
+include/osg/Vec3d
+include/osg/Vec3f
 include/osg/Vec4
+include/osg/Vec4d
+include/osg/Vec4f
 include/osg/Version
 include/osg/VertexProgram
 include/osg/Viewport
 include/osg/buffered_value
 include/osg/fast_back_stack
 include/osg/ref_ptr
+include/osgDB/Archive
 include/osgDB/DatabasePager
 include/osgDB/DotOsgWrapper
 include/osgDB/DynamicLibrary
@@ -117,12 +132,15 @@
 include/osgDB/FieldReaderIterator
 include/osgDB/FileNameUtils
 include/osgDB/FileUtils
+include/osgDB/ImageOptions
 include/osgDB/Input
 include/osgDB/Output
 include/osgDB/ParameterOutput
 include/osgDB/ReadFile
 include/osgDB/ReaderWriter
+include/osgDB/ReentrantMutex
 include/osgDB/Registry
+include/osgDB/SharedStateManager
 include/osgDB/Version
 include/osgDB/WriteFile
 include/osgFX/AnisotropicLighting
@@ -145,20 +163,25 @@
 include/osgGA/GUIEventHandlerVisitor
 include/osgGA/KeySwitchMatrixManipulator
 include/osgGA/MatrixManipulator
+include/osgGA/NodeTrackerManipulator
 include/osgGA/SetSceneViewVisitor
 include/osgGA/StateSetManipulator
+include/osgGA/TerrainManipulator
 include/osgGA/TrackballManipulator
 include/osgGA/Version
 include/osgGL2/Export
 include/osgGL2/Extensions
 include/osgGL2/ProgramObject
+include/osgGL2/UniformValue
 include/osgGL2/Version
 include/osgParticle/AccelOperator
 include/osgParticle/AngularAccelOperator
 include/osgParticle/CenteredPlacer
 include/osgParticle/Counter
 include/osgParticle/Emitter
+include/osgParticle/ExplosionEffect
 include/osgParticle/Export
+include/osgParticle/FireEffect
 include/osgParticle/FluidFrictionOperator
 include/osgParticle/ForceOperator
 include/osgParticle/Interpolator
@@ -168,6 +191,7 @@
 include/osgParticle/MultiSegmentPlacer
 include/osgParticle/Operator
 include/osgParticle/Particle
+include/osgParticle/ParticleEffect
 include/osgParticle/ParticleProcessor
 include/osgParticle/ParticleSystem
 include/osgParticle/ParticleSystemUpdater
@@ -179,6 +203,7 @@
 include/osgParticle/SectorPlacer
 include/osgParticle/SegmentPlacer
 include/osgParticle/Shooter
+include/osgParticle/SmokeEffect
 include/osgParticle/VariableRateCounter
 include/osgParticle/Version
 include/osgParticle/range
@@ -192,14 +217,24 @@
 include/osgProducer/ViewerEventHandler
 include/osgSim/BlinkSequence
 include/osgSim/ColorRange
+include/osgSim/DOFTransform
 include/osgSim/Export
+include/osgSim/GeographicLocation
 include/osgSim/LightPoint
 include/osgSim/LightPointNode
+include/osgSim/LightPointSystem
+include/osgSim/MultiSwitch
 include/osgSim/ScalarBar
 include/osgSim/ScalarsToColors
 include/osgSim/Sector
 include/osgSim/SphereSegment
 include/osgSim/Version
+include/osgSim/VisibilityGroup
+include/osgTerrain/DataSet
+include/osgTerrain/Export
+include/osgTerrain/HeightFieldNode
+include/osgTerrain/HeightFieldRenderer
+include/osgTerrain/Version
 include/osgText/Export
 include/osgText/Font
 include/osgText/String
@@ -208,9 +243,9 @@
 include/osgUtil/CubeMapGenerator
 include/osgUtil/CullVisitor
 include/osgUtil/DelaunayTriangulator
-include/osgUtil/DisplayListVisitor
 include/osgUtil/DisplayRequirementsVisitor
 include/osgUtil/Export
+include/osgUtil/GLObjectsVisitor
 include/osgUtil/HalfWayMapGenerator
 include/osgUtil/HighlightMapGenerator
 include/osgUtil/InsertImpostorsVisitor
@@ -224,6 +259,7 @@
 include/osgUtil/RenderStageLighting
 include/osgUtil/RenderToTextureStage
 include/osgUtil/SceneView
+include/osgUtil/Simplifier
 include/osgUtil/SmoothingVisitor
 include/osgUtil/Statistics
 include/osgUtil/TangentSpaceGenerator
@@ -252,26 +288,32 @@
 lib/osgPlugins/osgdb_flt.so
 lib/osgPlugins/osgdb_freetype.so
 lib/osgPlugins/osgdb_gif.so
-lib/osgPlugins/osgdb_iv.so
 lib/osgPlugins/osgdb_ive.so
 lib/osgPlugins/osgdb_jpeg.so
 lib/osgPlugins/osgdb_logo.so
 lib/osgPlugins/osgdb_lwo.so
+lib/osgPlugins/osgdb_lws.so
 lib/osgPlugins/osgdb_md2.so
+lib/osgPlugins/osgdb_net.so
 lib/osgPlugins/osgdb_obj.so
 lib/osgPlugins/osgdb_osg.so
 lib/osgPlugins/osgdb_osgFX.so
 lib/osgPlugins/osgdb_osgParticle.so
 lib/osgPlugins/osgdb_osgSim.so
 lib/osgPlugins/osgdb_osgText.so
+lib/osgPlugins/osgdb_osga.so
 lib/osgPlugins/osgdb_osgtgz.so
 lib/osgPlugins/osgdb_pic.so
 lib/osgPlugins/osgdb_png.so
 lib/osgPlugins/osgdb_pnm.so
 lib/osgPlugins/osgdb_rgb.so
+lib/osgPlugins/osgdb_rot.so
+lib/osgPlugins/osgdb_scale.so
+lib/osgPlugins/osgdb_stl.so
 lib/osgPlugins/osgdb_tga.so
 lib/osgPlugins/osgdb_tgz.so
 lib/osgPlugins/osgdb_tiff.so
+lib/osgPlugins/osgdb_trans.so
 lib/osgPlugins/osgdb_txp.so
 lib/osgPlugins/osgdb_x.so
 lib/osgPlugins/osgdb_zip.so
@@ -283,10 +325,12 @@
 @dirrm include/osgParticle
 @dirrm include/osgProducer
 @dirrm include/osgSim
+ at dirrm include/osgTerrain
 @dirrm include/osgText
 @dirrm include/osgUtil
 @dirrm lib/osgPlugins
 %%EXAMPLESDIR%%/bin/osganimate
+%%EXAMPLESDIR%%/bin/osgarchive
 %%EXAMPLESDIR%%/bin/osgautotransform
 %%EXAMPLESDIR%%/bin/osgbillboard
 %%EXAMPLESDIR%%/bin/osgcallback
@@ -296,6 +340,8 @@
 %%EXAMPLESDIR%%/bin/osgconv
 %%EXAMPLESDIR%%/bin/osgcopy
 %%EXAMPLESDIR%%/bin/osgcubemap
+%%EXAMPLESDIR%%/bin/osgdepthshadow
+%%EXAMPLESDIR%%/bin/osgdistortion
 %%EXAMPLESDIR%%/bin/osgforest
 %%EXAMPLESDIR%%/bin/osgfxbrowser
 %%EXAMPLESDIR%%/bin/osggeodemo
@@ -304,15 +350,21 @@
 %%EXAMPLESDIR%%/bin/osghud
 %%EXAMPLESDIR%%/bin/osgimpostor
 %%EXAMPLESDIR%%/bin/osgkeyboard
+%%EXAMPLESDIR%%/bin/osgkeyboardmouse
+%%EXAMPLESDIR%%/bin/osglauncher
 %%EXAMPLESDIR%%/bin/osglight
 %%EXAMPLESDIR%%/bin/osglightpoint
 %%EXAMPLESDIR%%/bin/osglogo
+%%EXAMPLESDIR%%/bin/osgmotionblur
+%%EXAMPLESDIR%%/bin/osgmovie
 %%EXAMPLESDIR%%/bin/osgmultitexture
 %%EXAMPLESDIR%%/bin/osgoccluder
 %%EXAMPLESDIR%%/bin/osgpagedlod
 %%EXAMPLESDIR%%/bin/osgparticle
 %%EXAMPLESDIR%%/bin/osgpick
+%%EXAMPLESDIR%%/bin/osgplanets
 %%EXAMPLESDIR%%/bin/osgpoints
+%%EXAMPLESDIR%%/bin/osgpointsprite
 %%EXAMPLESDIR%%/bin/osgprerender
 %%EXAMPLESDIR%%/bin/osgprerendercubemap
 %%EXAMPLESDIR%%/bin/osgreflect
@@ -322,10 +374,15 @@
 %%EXAMPLESDIR%%/bin/osgshaders
 %%EXAMPLESDIR%%/bin/osgshadowtexture
 %%EXAMPLESDIR%%/bin/osgshape
-%%EXAMPLESDIR%%/bin/osgsimulation
+%%EXAMPLESDIR%%/bin/osgsimple
+%%EXAMPLESDIR%%/bin/osgsimplepager
+%%EXAMPLESDIR%%/bin/osgsimplifier
+%%EXAMPLESDIR%%/bin/osgspacewarp
 %%EXAMPLESDIR%%/bin/osgspheresegment
+%%EXAMPLESDIR%%/bin/osgspotlight
 %%EXAMPLESDIR%%/bin/osgstereoimage
 %%EXAMPLESDIR%%/bin/osgteapot
+%%EXAMPLESDIR%%/bin/osgtesselate
 %%EXAMPLESDIR%%/bin/osgtext
 %%EXAMPLESDIR%%/bin/osgtexture1D
 %%EXAMPLESDIR%%/bin/osgtexture2D
@@ -335,16 +392,20 @@
 %%EXAMPLESDIR%%/bin/osgversion
 %%EXAMPLESDIR%%/bin/osgvertexprogram
 %%EXAMPLESDIR%%/bin/osgviewer
+%%EXAMPLESDIR%%/bin/osgvolume
 %%EXAMPLESDIR%%/bin/osgwindows
-%%EXAMPLESDIR%%/bin/slideshow3D
 %%EXAMPLESDIR%%/src/Make/makedefs
 %%EXAMPLESDIR%%/src/Make/makerules
 %%EXAMPLESDIR%%/src/osganimate/GNUmakefile
 %%EXAMPLESDIR%%/src/osganimate/osganimate.cpp
+%%EXAMPLESDIR%%/src/osgarchive/GNUmakefile
+%%EXAMPLESDIR%%/src/osgarchive/osgarchive.cpp
 %%EXAMPLESDIR%%/src/osgautotransform/GNUmakefile
 %%EXAMPLESDIR%%/src/osgautotransform/osgautotransform.cpp
 %%EXAMPLESDIR%%/src/osgbillboard/GNUmakefile
 %%EXAMPLESDIR%%/src/osgbillboard/osgbillboard.cpp
+%%EXAMPLESDIR%%/src/osgbluemarble/GNUmakefile
+%%EXAMPLESDIR%%/src/osgbluemarble/osgbluemarble.cpp
 %%EXAMPLESDIR%%/src/osgcallback/GNUmakefile
 %%EXAMPLESDIR%%/src/osgcallback/osgcallback.cpp
 %%EXAMPLESDIR%%/src/osgcameragroup/GNUmakefile
@@ -367,8 +428,14 @@
 %%EXAMPLESDIR%%/src/osgcopy/osgcopy.cpp
 %%EXAMPLESDIR%%/src/osgcubemap/GNUmakefile
 %%EXAMPLESDIR%%/src/osgcubemap/osgcubemap.cpp
+%%EXAMPLESDIR%%/src/osgdem/GNUmakefile
+%%EXAMPLESDIR%%/src/osgdem/osgdem.cpp
 %%EXAMPLESDIR%%/src/osgdemeter/GNUmakefile
 %%EXAMPLESDIR%%/src/osgdemeter/osgdemeter.cpp
+%%EXAMPLESDIR%%/src/osgdepthshadow/GNUmakefile
+%%EXAMPLESDIR%%/src/osgdepthshadow/osgdepthshadow.cpp
+%%EXAMPLESDIR%%/src/osgdistortion/GNUmakefile
+%%EXAMPLESDIR%%/src/osgdistortion/osgdistortion.cpp
 %%EXAMPLESDIR%%/src/osgforest/GNUmakefile
 %%EXAMPLESDIR%%/src/osgforest/osgforest.cpp
 %%EXAMPLESDIR%%/src/osgfxbrowser/Frame.cpp
@@ -399,12 +466,20 @@
 %%EXAMPLESDIR%%/src/osgimpostor/osgimpostor.cpp
 %%EXAMPLESDIR%%/src/osgkeyboard/GNUmakefile
 %%EXAMPLESDIR%%/src/osgkeyboard/osgkeyboard.cpp
+%%EXAMPLESDIR%%/src/osgkeyboardmouse/GNUmakefile
+%%EXAMPLESDIR%%/src/osgkeyboardmouse/osgkeyboardmouse.cpp
+%%EXAMPLESDIR%%/src/osglauncher/GNUmakefile
+%%EXAMPLESDIR%%/src/osglauncher/osglauncher.cpp
 %%EXAMPLESDIR%%/src/osglight/GNUmakefile
 %%EXAMPLESDIR%%/src/osglight/osglight.cpp
 %%EXAMPLESDIR%%/src/osglightpoint/GNUmakefile
 %%EXAMPLESDIR%%/src/osglightpoint/osglightpoint.cpp
 %%EXAMPLESDIR%%/src/osglogo/GNUmakefile
 %%EXAMPLESDIR%%/src/osglogo/osglogo.cpp
+%%EXAMPLESDIR%%/src/osgmotionblur/GNUmakefile
+%%EXAMPLESDIR%%/src/osgmotionblur/osgmotionblur.cpp
+%%EXAMPLESDIR%%/src/osgmovie/GNUmakefile
+%%EXAMPLESDIR%%/src/osgmovie/osgmovie.cpp
 %%EXAMPLESDIR%%/src/osgmultitexture/GNUmakefile
 %%EXAMPLESDIR%%/src/osgmultitexture/osgmultitexture.cpp
 %%EXAMPLESDIR%%/src/osgoccluder/GNUmakefile
@@ -413,10 +488,18 @@
 %%EXAMPLESDIR%%/src/osgpagedlod/osgpagedlod.cpp
 %%EXAMPLESDIR%%/src/osgparticle/GNUmakefile
 %%EXAMPLESDIR%%/src/osgparticle/osgparticle.cpp
+%%EXAMPLESDIR%%/src/osgphotoalbum/GNUmakefile
+%%EXAMPLESDIR%%/src/osgphotoalbum/ImageReaderWriter.cpp
+%%EXAMPLESDIR%%/src/osgphotoalbum/PhotoArchive.cpp
+%%EXAMPLESDIR%%/src/osgphotoalbum/osgphotoalbum.cpp
 %%EXAMPLESDIR%%/src/osgpick/GNUmakefile
 %%EXAMPLESDIR%%/src/osgpick/osgpick.cpp
+%%EXAMPLESDIR%%/src/osgplanets/GNUmakefile
+%%EXAMPLESDIR%%/src/osgplanets/osgplanets.cpp
 %%EXAMPLESDIR%%/src/osgpoints/GNUmakefile
 %%EXAMPLESDIR%%/src/osgpoints/osgpoints.cpp
+%%EXAMPLESDIR%%/src/osgpointsprite/GNUmakefile
+%%EXAMPLESDIR%%/src/osgpointsprite/osgpointsprite.cpp
 %%EXAMPLESDIR%%/src/osgprerender/GNUmakefile
 %%EXAMPLESDIR%%/src/osgprerender/osgprerender.cpp
 %%EXAMPLESDIR%%/src/osgprerendercubemap/GNUmakefile
@@ -431,20 +514,33 @@
 %%EXAMPLESDIR%%/src/osgsequence/osgsequence.cpp
 %%EXAMPLESDIR%%/src/osgshaders/GL2Scene.cpp
 %%EXAMPLESDIR%%/src/osgshaders/GNUmakefile
+%%EXAMPLESDIR%%/src/osgshaders/Noise.cpp
 %%EXAMPLESDIR%%/src/osgshaders/osgshaders.cpp
 %%EXAMPLESDIR%%/src/osgshadowtexture/CreateShadowedScene.cpp
 %%EXAMPLESDIR%%/src/osgshadowtexture/GNUmakefile
 %%EXAMPLESDIR%%/src/osgshadowtexture/osgshadowtexture.cpp
 %%EXAMPLESDIR%%/src/osgshape/GNUmakefile
 %%EXAMPLESDIR%%/src/osgshape/osgshape.cpp
+%%EXAMPLESDIR%%/src/osgsimple/GNUmakefile
+%%EXAMPLESDIR%%/src/osgsimple/osgsimple.cpp
+%%EXAMPLESDIR%%/src/osgsimplepager/GNUmakefile
+%%EXAMPLESDIR%%/src/osgsimplepager/osgsimplepager.cpp
+%%EXAMPLESDIR%%/src/osgsimplifier/GNUmakefile
+%%EXAMPLESDIR%%/src/osgsimplifier/osgsimplifier.cpp
 %%EXAMPLESDIR%%/src/osgsimulation/GNUmakefile
 %%EXAMPLESDIR%%/src/osgsimulation/osgsimulation.cpp
+%%EXAMPLESDIR%%/src/osgspacewarp/GNUmakefile
+%%EXAMPLESDIR%%/src/osgspacewarp/osgspacewarp.cpp
 %%EXAMPLESDIR%%/src/osgspheresegment/GNUmakefile
 %%EXAMPLESDIR%%/src/osgspheresegment/osgspheresegment.cpp
+%%EXAMPLESDIR%%/src/osgspotlight/GNUmakefile
+%%EXAMPLESDIR%%/src/osgspotlight/osgspotlight.cpp
 %%EXAMPLESDIR%%/src/osgstereoimage/GNUmakefile
 %%EXAMPLESDIR%%/src/osgstereoimage/osgstereoimage.cpp
 %%EXAMPLESDIR%%/src/osgteapot/GNUmakefile
 %%EXAMPLESDIR%%/src/osgteapot/osgteapot.cpp
+%%EXAMPLESDIR%%/src/osgtesselate/GNUmakefile
+%%EXAMPLESDIR%%/src/osgtesselate/osgtesselate.cpp
 %%EXAMPLESDIR%%/src/osgtext/GNUmakefile
 %%EXAMPLESDIR%%/src/osgtext/osgtext.cpp
 %%EXAMPLESDIR%%/src/osgtexture1D/GNUmakefile
@@ -463,19 +559,17 @@
 %%EXAMPLESDIR%%/src/osgvertexprogram/osgvertexprogram.cpp
 %%EXAMPLESDIR%%/src/osgviewer/GNUmakefile
 %%EXAMPLESDIR%%/src/osgviewer/osgviewer.cpp
+%%EXAMPLESDIR%%/src/osgvolume/GNUmakefile
+%%EXAMPLESDIR%%/src/osgvolume/osgvolume.cpp
 %%EXAMPLESDIR%%/src/osgwindows/GNUmakefile
 %%EXAMPLESDIR%%/src/osgwindows/osgwindows.cpp
-%%EXAMPLESDIR%%/src/slideshow3D/GNUmakefile
-%%EXAMPLESDIR%%/src/slideshow3D/PointsEventHandler.cpp
-%%EXAMPLESDIR%%/src/slideshow3D/ReaderWriterXML.cpp
-%%EXAMPLESDIR%%/src/slideshow3D/SlideEventHandler.cpp
-%%EXAMPLESDIR%%/src/slideshow3D/SlideShowConstructor.cpp
-%%EXAMPLESDIR%%/src/slideshow3D/slideshow3D.cpp
 @dirrm %%EXAMPLESDIR%%/bin
 @dirrm %%EXAMPLESDIR%%/src/Make
 @dirrm %%EXAMPLESDIR%%/src/osganimate
+ at dirrm %%EXAMPLESDIR%%/src/osgarchive
 @dirrm %%EXAMPLESDIR%%/src/osgautotransform
 @dirrm %%EXAMPLESDIR%%/src/osgbillboard
+ at dirrm %%EXAMPLESDIR%%/src/osgbluemarble
 @dirrm %%EXAMPLESDIR%%/src/osgcallback
 @dirrm %%EXAMPLESDIR%%/src/osgcameragroup
 @dirrm %%EXAMPLESDIR%%/src/osgclip
@@ -483,7 +577,10 @@
 @dirrm %%EXAMPLESDIR%%/src/osgconv
 @dirrm %%EXAMPLESDIR%%/src/osgcopy
 @dirrm %%EXAMPLESDIR%%/src/osgcubemap
+ at dirrm %%EXAMPLESDIR%%/src/osgdem
 @dirrm %%EXAMPLESDIR%%/src/osgdemeter
+ at dirrm %%EXAMPLESDIR%%/src/osgdepthshadow
+ at dirrm %%EXAMPLESDIR%%/src/osgdistortion
 @dirrm %%EXAMPLESDIR%%/src/osgforest
 @dirrm %%EXAMPLESDIR%%/src/osgfxbrowser
 @dirrm %%EXAMPLESDIR%%/src/osggeodemo
@@ -492,16 +589,23 @@
 @dirrm %%EXAMPLESDIR%%/src/osghud
 @dirrm %%EXAMPLESDIR%%/src/osgimpostor
 @dirrm %%EXAMPLESDIR%%/src/osgkeyboard
+ at dirrm %%EXAMPLESDIR%%/src/osgkeyboardmouse
+ at dirrm %%EXAMPLESDIR%%/src/osglauncher
 @dirrm %%EXAMPLESDIR%%/src/osglight
 @dirrm %%EXAMPLESDIR%%/src/osglightpoint
 @dirrm %%EXAMPLESDIR%%/src/osglogo
+ at dirrm %%EXAMPLESDIR%%/src/osgmotionblur
+ at dirrm %%EXAMPLESDIR%%/src/osgmovie
 @dirrm %%EXAMPLESDIR%%/src/osgmultitexture
 @dirrm %%EXAMPLESDIR%%/src/osgoccluder
 @dirrm %%EXAMPLESDIR%%/src/osgpagedlod
 @dirrm %%EXAMPLESDIR%%/src/osgparticle
 @dirrm %%EXAMPLESDIR%%/src/osgpbuffer
+ at dirrm %%EXAMPLESDIR%%/src/osgphotoalbum
 @dirrm %%EXAMPLESDIR%%/src/osgpick
+ at dirrm %%EXAMPLESDIR%%/src/osgplanets
 @dirrm %%EXAMPLESDIR%%/src/osgpoints
+ at dirrm %%EXAMPLESDIR%%/src/osgpointsprite
 @dirrm %%EXAMPLESDIR%%/src/osgprerender
 @dirrm %%EXAMPLESDIR%%/src/osgprerendercubemap
 @dirrm %%EXAMPLESDIR%%/src/osgreflect
@@ -511,10 +615,16 @@
 @dirrm %%EXAMPLESDIR%%/src/osgshaders
 @dirrm %%EXAMPLESDIR%%/src/osgshadowtexture
 @dirrm %%EXAMPLESDIR%%/src/osgshape
+ at dirrm %%EXAMPLESDIR%%/src/osgsimple
+ at dirrm %%EXAMPLESDIR%%/src/osgsimplepager
+ at dirrm %%EXAMPLESDIR%%/src/osgsimplifier
 @dirrm %%EXAMPLESDIR%%/src/osgsimulation
+ at dirrm %%EXAMPLESDIR%%/src/osgspacewarp
 @dirrm %%EXAMPLESDIR%%/src/osgspheresegment
+ at dirrm %%EXAMPLESDIR%%/src/osgspotlight
 @dirrm %%EXAMPLESDIR%%/src/osgstereoimage
 @dirrm %%EXAMPLESDIR%%/src/osgteapot
+ at dirrm %%EXAMPLESDIR%%/src/osgtesselate
 @dirrm %%EXAMPLESDIR%%/src/osgtext
 @dirrm %%EXAMPLESDIR%%/src/osgtexture1D
 @dirrm %%EXAMPLESDIR%%/src/osgtexture2D
@@ -524,592 +634,8 @@
 @dirrm %%EXAMPLESDIR%%/src/osgversion
 @dirrm %%EXAMPLESDIR%%/src/osgvertexprogram
 @dirrm %%EXAMPLESDIR%%/src/osgviewer
+ at dirrm %%EXAMPLESDIR%%/src/osgvolume
 @dirrm %%EXAMPLESDIR%%/src/osgwindows
- at dirrm %%EXAMPLESDIR%%/src/slideshow3D
 @dirrm %%EXAMPLESDIR%%/src
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/Doxyfiles/all_Doxyfile
-%%PORTDOCS%%%%DOCSDIR%%/Doxyfiles/auto_Doxyfile
-%%PORTDOCS%%%%DOCSDIR%%/Doxyfiles/auto_Mainpage
-%%PORTDOCS%%%%DOCSDIR%%/Doxyfiles/core_Doxyfile
-%%PORTDOCS%%%%DOCSDIR%%/Doxyfiles/custom_Footer.html
-%%PORTDOCS%%%%DOCSDIR%%/MindMaps/DesignPatterns.mmp
-%%PORTDOCS%%%%DOCSDIR%%/MindMaps/DesignPatterns/DesignPatterns.gif
-%%PORTDOCS%%%%DOCSDIR%%/MindMaps/DesignPatterns/DesignPatterns.html
-%%PORTDOCS%%%%DOCSDIR%%/MindMaps/Mission.mmp
-%%PORTDOCS%%%%DOCSDIR%%/MindMaps/Mission/Mission.gif
-%%PORTDOCS%%%%DOCSDIR%%/MindMaps/Mission/Mission.html
-%%PORTDOCS%%%%DOCSDIR%%/UML/osg.png
-%%PORTDOCS%%%%DOCSDIR%%/UML/osgutils.png
-%%PORTDOCS%%%%DOCSDIR%%/contents.html
-%%PORTDOCS%%%%DOCSDIR%%/data.html
-%%PORTDOCS%%%%DOCSDIR%%/dependencies.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/AlphaFunc.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/AnimationPath.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/AnimationPathCallback.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ApplicationUsage.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ApplicationUsageProxy.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ArgumentParser.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Array.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ArrayVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/AttributeFunctor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/AutoTransform.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Billboard.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/BlendFunc.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/BoundingBox.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/BoundingSphere.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Box.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/COMPARE_StateAttribute_Parameter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/COMPARE_StateAttribute_Types.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Camera.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ClearNode.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ClipNode.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ClipPlane.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/CollectOccludersVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ColorMask.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ColorMatrix.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/CompositeShape.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Cone.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ConstArrayVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ConstAttributeFunctor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ConstShapeVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ConstValueVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ConvexHull.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ConvexPlanarOccluder.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ConvexPlanarPolygon.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/CopyOp.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/CullFace.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/CullStack.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/CullingSet.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Cylinder.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DOFTransform.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DatabaseRequestHandler.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DeleteHandler.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Depth.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DisplaySettings.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DrawArrayLengths.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DrawArrays.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DrawElementsUByte.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DrawElementsUInt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DrawElementsUShort.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/DrawPixels.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Drawable.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Endian.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Extensions.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Extensions.3.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Extensions.4.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Extensions.5.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Extensions.6.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Extensions.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Fog.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/FragmentProgram.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/FrameStamp.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/FrontFace.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/GeoSet.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Geode.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Geometry.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Grid.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Group.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/HeightField.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Image.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Impostor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ImpostorSprite.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ImpostorSpriteManager.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/IndexArray.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/InfinitePlane.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/LOD.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Light.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/LightModel.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/LightSource.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/LineSegment.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/LineStipple.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/LineWidth.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/META_Node.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/META_Object.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/META_Shape.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/META_StateAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Material.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Matrix.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/MatrixTransform.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Matrixd.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Matrixf.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Node.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/NodeAcceptOp.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/NodeCallback.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/NodePath.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/NodeVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/NotifySeverity.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_ADD_TESTCASE.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_ADD_TESTSUITE.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_AUTOREGISTER_TESTSUITE.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_AUTOREGISTER_TESTSUITE_AT.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_BEGIN_TESTSUITE.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_END_TESTSUITE.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_TESTSUITE.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_TEST_E.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSGUTX_TEST_F.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OSG_GL_DEBUG.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Object.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/OccluderNode.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/PagedLOD.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Plane.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Point.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/PolygonMode.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/PolygonOffset.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/PolygonStipple.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Polytope.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/PositionAttitudeTransform.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/PrimitiveFunctor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/PrimitiveSet.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Projection.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/QualifiedTestPrinter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Quat.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/RefMatrix.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/RefMatrixd.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/RefMatrixf.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Referenced.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Sequence.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ShadeModel.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ShadowVolumeOccluder.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ShadowVolumeOccluderList.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Shape.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ShapeDrawable.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ShapeVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Sphere.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/State.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/StateAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/StateSet.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Statistics.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Stencil.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/SubloadCallback.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/SubloadCallback.3.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/SubloadCallback.4.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/SubloadCallback.5.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/SubloadCallback.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Switch.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TemplateArray.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TemplateIndexArray.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TessellationHints.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Test.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestCase.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestCase_.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestContext.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestErrorX.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestFailureX.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestGraph.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestQualifier.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestRecord.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestReport.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestRunner.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestSuite.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestSuiteAutoRegistrationAgent.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TestX.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TexEnv.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TexEnvCombine.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TexGen.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TexMat.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Texture.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Texture1D.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Texture2D.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Texture3D.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TextureCubeMap.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TextureObject.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TextureObjectManager.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TextureRectangle.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Timer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TraceStream.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Transform.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TriangleFunctor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/TriangleMesh.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/UByte4.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ValueVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Vec2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Vec3.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Vec4.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VectorSizei.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VectorSizei.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VectorUByte.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VectorUByte.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VectorUInt.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VectorUInt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VectorUShort.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VectorUShort.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/VertexProgram.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/Viewport.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/buffered_object.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/buffered_value.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArray3BetweenRange.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArray3GEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArray3LEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArray4BetweenRange.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArray4GEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArray4LEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArrayElementBetweenRange.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArrayElementGEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArrayElementLEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArrayElementsBetweenRange.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArrayElementsGEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampArrayElementsLEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampBetweenRange.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampGEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/clampLEQUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/computeEyeToLocal.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/computeLocalToEye.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/computeLocalToWorld.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/computeWorldToLocal.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/createGeodeForImage.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/createGeodeForImage.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/createTexturedQuadGeometry.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/fast_back_stack.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/for_each_triangle.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/getGLExtensionDisableString.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/getGLExtensionFuncPtr.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/getGLExtensionFuncPtr.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/getNotifyLevel.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/globalnotifylevel..html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/globalnotifynulstream..html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/initNotifyLevel.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/isGLExtensionSupported.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/isGLUExtensionSupported.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/notify.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/operator.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/operator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/osg.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/osgGetLibraryName.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/osgGetVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/osgUtx.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/ref_ptr.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/setGLExtensionDisableString.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/setNotifyLevel.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/xternSG_EXPORTNotifySeverityg_NotifyLevel.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/xternSG_EXPORTboolg_NotifyInit.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osg/xternSG_EXPORTstdauto_ptrstdofstreamg_NotifyNulStream.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/DatabasePager.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/DirectoryContents.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/DotOsgWrapper.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/DynamicLibrary.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/Field.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/FieldReader.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/FieldReaderIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/FilePathList.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/Input.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/Options.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/Output.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/ParameterOutput.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/PushAndPopDataPath.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/ReadResult.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/ReaderWriter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/RegisterDotOsgWrapperProxy.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/RegisterReaderWriterProxy.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/Registry.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/WriteResult.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/basic_type_wrapper.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/fileExists.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/findFileInDirectory.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/findFileInPath.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/getDirectoryContents.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/osgDB.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/osgDBGetLibraryName.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/osgDBGetVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/readCommandLine.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/readImageFile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/readNodeFile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/readNodeFiles.2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/readNodeFiles.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/readObjectFile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/type_wrapper.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/writeImageFile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/writeNodeFile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgDB/writeObjectFile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/AnisotropicLighting.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/BumpMapping.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/Cartoon.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/Effect.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/META_Effect.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/META_Technique.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/Registry.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/Scribe.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/SpecularHighlights.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/Technique.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/Validator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgFX/osgFX.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/AnimationPathManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/CameraManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/CompositeGUIEventHandler.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/DriveManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/FlightManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/GUIActionAdapter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/GUIEventAdapter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/GUIEventHandler.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/GUIEventHandlerVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/KeySwitchCameraManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/KeySwitchMatrixManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/MatrixManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/SetSceneViewVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/StateSetManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/TrackballManipulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/osgGA.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/osgGAGetLibraryName.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/osgGAGetVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGA/spaceosgGA.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/Extensions.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/PerContextProgObj.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/PerContextShaderObj.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/ProgramObject.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/ShaderObject.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgGL2/osgGL2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/AccelOperator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/AngularAccelOperator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/CenteredPlacer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/Counter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/Emitter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/FluidFrictionOperator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ForceOperator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/Interpolator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/LinearInterpolator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ModularEmitter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ModularProgram.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/MultiSegmentPlacer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/Operator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/Particle.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ParticleProcessor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ParticleSystem.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/ParticleSystemUpdater.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/Placer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/PointPlacer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/Program.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/RadialShooter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/RandomRateCounter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/SectorPlacer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/SegmentPlacer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/Shooter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/VariableRateCounter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/osgParticle.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/range.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/rangef.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/rangev2.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/rangev3.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgParticle/rangev4.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/Callback.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/EventAdapter.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/KeyboardMouseCallback.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/OsgCameraGroup.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/OsgSceneHandler.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/RealizeCallback.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/Viewer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/ViewerEventHandler.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/osgProducer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/osgProducerGetLibraryName.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgProducer/osgProducerGetVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/AzimElevationSector.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/AzimRange.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/AzimSector.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/BlinkSequence.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ColorRange.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ConeSector.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ElevationRange.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ElevationSector.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/LightPoint.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/LightPointNode.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ScalarBar.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/ScalarsToColors.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/Sector.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/SequenceGroup.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/SphereSegment.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/osgSim.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/osgSimGetLibraryName.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgSim/osgSimGetVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/DefaultFont.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/Font.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/FontImplementation.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/Glyph.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/GlyphTexture.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/KerningType.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/String.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/Text.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/osgText.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/osgTextGetLibraryName.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/osgTextGetVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgText/readFontFile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/ClassGraph.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/ClassGraphPanel.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/ClassLayout.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/CombineLODsVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/ConvertGeoSetsToGeometryVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/CubeMapGenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/CullVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/DelaunayTriangulator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/DisplayListVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/DisplayRequirementsVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/FlattenStaticTransformsVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/General.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/HIER.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/HIERjava.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/HalfWayMapGenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/HighlightMapGenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/Hit.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/InsertImpostorsVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/IntersectState.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/IntersectVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/LeafDepthSortFunctor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/MergeGeometryVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/NavigatorButton.class
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/Optimizer.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/PickIntersectVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/PickVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/ReflectionMapGenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RegisterRenderBinProxy.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RemoveEmptyNodesVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RemoveRedundantNodesVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RenderBin.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RenderGraph.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RenderLeaf.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RenderStage.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RenderStageLighting.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/RenderToTextureStage.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/SceneView.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/SmoothingVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/StateVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/Statistics.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/Tesselator.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/TransformAttributeFunctor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/TransformCallback.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/TriStripVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/UpdateVisitor.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/icon1.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/icon2.gif
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/osgUtil.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/osgUtilGetLibraryName.html
-%%PORTDOCS%%%%DOCSDIR%%/doc++/osgUtil/osgUtilGetVersion.html
-%%PORTDOCS%%%%DOCSDIR%%/documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/examples.html
-%%PORTDOCS%%%%DOCSDIR%%/images/OpenSceneGraphBanner_Distribution.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/hangglide.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgbillboard.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgcube.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osghud.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgimpostor.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgreflect.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgscribe.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgstereoimage.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgtext.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgtexture.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgviewer_cow.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgviewer_stereo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/osgwindows.jpg
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/osgviewer.html
-%%PORTDOCS%%%%DOCSDIR%%/plan.html
-%%PORTDOCS%%%%DOCSDIR%%/stereo.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Doxyfiles
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/MindMaps/DesignPatterns
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/MindMaps/Mission
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/MindMaps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/UML
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgDB
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgFX
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgGA
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgGL2
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgParticle
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgProducer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgSim
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgText
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++/osgUtil
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc++
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-Make::makedefs
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/osg/files/patch-Make::makedefs,v
retrieving revision 1.2
diff -u -u -r1.2 patch-Make::makedefs
--- files/patch-Make::makedefs	13 Nov 2003 11:36:41 -0000	1.2
+++ files/patch-Make::makedefs	8 Feb 2005 05:24:22 -0000
@@ -1,6 +1,6 @@
---- Make/makedefs.orig	Thu Oct  2 22:43:39 2003
-+++ Make/makedefs	Sat Oct 18 01:04:39 2003
-@@ -359,17 +359,17 @@
+--- Make/makedefs.orig	Sun Dec  5 11:03:43 2004
++++ Make/makedefs	Mon Feb  7 10:59:22 2005
+@@ -402,24 +402,35 @@
  
  #### FreeBSD specific definitions
  ifeq ($(OS),FreeBSD)
@@ -8,38 +8,36 @@
 +  C++               = ${CXX}
    DEPARG            = -MM
 -  INC               +=  -I/usr/local/include -I/usr/X11R6/include
-+  INC               += -I${LOCALBASE}/include -I${X11BASE}/include
++  INC               +=  -I${LOCALBASE}/include -I${X11BASE}/include
    DEF               += -W -Wall
 -  OPTF              = -O2 
-+  OPTF              = %%CXXFLAGS%%
++  OPTF              ?= -O2
    DBGF              = -g -DOSG_COMPILE_UNIT_TESTS
    SHARED            = -shared
    ARCH              = 
    ARCHINST          = 
    ARCHARGS          = 
--  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
-+  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib
-   DYNAMICLIBRARYLIB = 
+-  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -pthread
++  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib -pthread
+  DYNAMICLIBRARYLIB = 
    OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
-   FREETYPE_LIB      = -lfreetype
-@@ -377,9 +377,17 @@
+   GL_LIBS           = -lGLU -lGL 
    X_INC             = -I/usr/X11R6/include
    X_LIBS            = -lXmu -lX11
    SOCKET_LIBS       = 
 -  OTHER_LIBS        = -lOpenThreads
--  INST_LOCATION     = /opt/X11R6
--  INST_SHARE        = /usr/share/OpenSceneGraph
 +  OTHER_LIBS        = -lOpenThreads ${PTHREAD_LIBS}
++  # PREFIX, EXAMPLESDIR, DOCSDIR, and DATADIR are defined by the port
 +  INST_LOCATION     = ${PREFIX}
 +  INST_SHARE        = ${PREFIX}/share
-+  INST_EXAMPLES     = ${INST_SHARE}/examples/osg/bin
-+  INST_EXAMPLE_SRC  = ${INST_SHARE}/examples/osg/src
-+  INST_DOC          = ${INST_SHARE}/doc/osg
-+  INST_SRC          = ${INST_EXAMPLE_SRC}
-+  INST_DATA         = ${INST_SHARE}/osg
++  INST_EXAMPLES     = ${EXAMPLESDIR}/bin
++  INST_EXAMPLE_SRC  = ${EXAMPLESDIR}/src
++  INST_DOC          = ${DOCSDIR}
++  INST_SRC          = ${EXAMPLESDIR}/src
++  INST_DATA         = ${DATADIR}
 +  INSTBINCMD        = ${BSD_INSTALL_PROGRAM}
 +  INSTDEVCMD        = ${BSD_INSTALL_DATA}
 +  LIBXML2_INCLUDE   = -I${LOCALBASE}/include/libxml2
- endif
- 
- #### MacOS X specific definitions
+   PNG_LIBS          = -lpng
+   JPEG_LIBS         = -ljpeg
+   TIFF_LIB          = -ltiff
--- osg-0.9.8.patch ends here ---

--- /dev/null	Tue Feb  8 14:55:01 2005
+++ files/freebsd4-osg-patches	Tue Feb  8 12:44:31 2005
@@ -0,0 +1,688 @@
+diff -urN ../OpenSceneGraph.orig/examples/osgtesselate/osgtesselate.cpp ./examples/osgtesselate/osgtesselate.cpp
+--- ../OpenSceneGraph.orig/examples/osgtesselate/osgtesselate.cpp	Sun Oct 24 20:03:59 2004
++++ ./examples/osgtesselate/osgtesselate.cpp	Tue Feb  8 01:28:23 2005
+@@ -562,7 +562,7 @@
+     setTesselateVisitor():osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {
+     }
+     virtual void apply(osg::Geode& geode) {
+-        if (geode.getName().compare(0,9,"tesselate")==0) {
++        if (geode.getName().compare("tesselate",0,9)==0) {
+             for(unsigned int i=0;i<geode.getNumDrawables();++i)
+             {
+                 osg::Geometry* geom = dynamic_cast<osg::Geometry*>(geode.getDrawable(i));
+diff -urN ../OpenSceneGraph.orig/examples/osgunittests/osgunittests.cpp ./examples/osgunittests/osgunittests.cpp
+--- ../OpenSceneGraph.orig/examples/osgunittests/osgunittests.cpp	Wed Nov 10 21:28:06 2004
++++ ./examples/osgunittests/osgunittests.cpp	Tue Feb  8 01:28:23 2005
+@@ -113,9 +113,6 @@
+   std::cout<<"sizeof(float)=="<<sizeof(float)<<std::endl;
+   std::cout<<"sizeof(double)=="<<sizeof(double)<<std::endl;
+ 
+-  std::cout<<"sizeof(std::istream::pos_type)=="<<sizeof(std::istream::pos_type)<<std::endl;
+-  std::cout<<"sizeof(std::istream::off_type)=="<<sizeof(std::istream::off_type)<<std::endl;
+-
+ }
+ 
+ 
+diff -urN ../OpenSceneGraph.orig/include/osg/AnimationPath ./include/osg/AnimationPath
+--- ../OpenSceneGraph.orig/include/osg/AnimationPath	Wed Sep  1 08:34:49 2004
++++ ./include/osg/AnimationPath	Tue Feb  8 01:28:24 2005
+@@ -15,7 +15,7 @@
+ #define OSG_ANIMATIONPATH 1
+ 
+ #include <map>
+-#include <istream>
++#include <istream.h>
+ #include <float.h>
+ 
+ #include <osg/Matrixf>
+diff -urN ../OpenSceneGraph.orig/include/osg/ApplicationUsage ./include/osg/ApplicationUsage
+--- ../OpenSceneGraph.orig/include/osg/ApplicationUsage	Mon Oct 25 19:16:56 2004
++++ ./include/osg/ApplicationUsage	Tue Feb  8 01:28:24 2005
+@@ -18,7 +18,7 @@
+ 
+ #include <map>
+ #include <string>
+-#include <ostream>
++#include <ostream.h>
+ 
+ namespace osg {
+ 
+diff -urN ../OpenSceneGraph.orig/include/osg/ArgumentParser ./include/osg/ArgumentParser
+--- ../OpenSceneGraph.orig/include/osg/ArgumentParser	Tue Sep 28 09:14:03 2004
++++ ./include/osg/ArgumentParser	Tue Feb  8 01:28:24 2005
+@@ -18,7 +18,7 @@
+ 
+ #include <map>
+ #include <string>
+-#include <ostream>
++#include <ostream.h>
+ 
+ namespace osg {
+ 
+diff -urN ../OpenSceneGraph.orig/include/osg/Matrixd ./include/osg/Matrixd
+--- ../OpenSceneGraph.orig/include/osg/Matrixd	Tue Aug 31 13:19:30 2004
++++ ./include/osg/Matrixd	Tue Feb  8 01:28:24 2005
+@@ -23,7 +23,7 @@
+ 
+ #include <string.h>
+ 
+-#include <ostream>
++#include <ostream.h>
+ #include <algorithm>
+ 
+ namespace osg {
+diff -urN ../OpenSceneGraph.orig/include/osg/Matrixf ./include/osg/Matrixf
+--- ../OpenSceneGraph.orig/include/osg/Matrixf	Tue Aug 31 13:19:30 2004
++++ ./include/osg/Matrixf	Tue Feb  8 01:28:24 2005
+@@ -23,7 +23,7 @@
+ 
+ #include <string.h>
+ 
+-#include <ostream>
++#include <ostream.h>
+ #include <algorithm>
+ 
+ namespace osg {
+diff -urN ../OpenSceneGraph.orig/include/osg/Notify ./include/osg/Notify
+--- ../OpenSceneGraph.orig/include/osg/Notify	Thu Sep  2 19:10:33 2004
++++ ./include/osg/Notify	Tue Feb  8 01:28:24 2005
+@@ -16,7 +16,7 @@
+ 
+ #include <osg/Export>
+ 
+-#include <ostream>
++#include <ostream.h>
+ 
+ namespace osg {
+ 
+diff -urN ../OpenSceneGraph.orig/include/osg/UByte4 ./include/osg/UByte4
+--- ../OpenSceneGraph.orig/include/osg/UByte4	Mon Sep 13 15:14:11 2004
++++ ./include/osg/UByte4	Tue Feb  8 01:28:24 2005
+@@ -16,7 +16,7 @@
+ 
+ #include <osg/Vec3>
+ 
+-#include <ostream>
++#include <ostream.h>
+ 
+ namespace osg {
+ 
+diff -urN ../OpenSceneGraph.orig/include/osg/Vec2f ./include/osg/Vec2f
+--- ../OpenSceneGraph.orig/include/osg/Vec2f	Wed Sep 15 19:10:15 2004
++++ ./include/osg/Vec2f	Tue Feb  8 01:28:24 2005
+@@ -14,7 +14,7 @@
+ #ifndef OSG_VEC2F
+ #define OSG_VEC2F 1
+ 
+-#include <ostream>
++#include <ostream.h>
+ 
+ #include <osg/Math>
+ 
+diff -urN ../OpenSceneGraph.orig/include/osg/Vec3f ./include/osg/Vec3f
+--- ../OpenSceneGraph.orig/include/osg/Vec3f	Mon Oct 18 18:36:40 2004
++++ ./include/osg/Vec3f	Tue Feb  8 01:28:24 2005
+@@ -14,7 +14,7 @@
+ #ifndef OSG_VEC3F
+ #define OSG_VEC3F 1
+ 
+-#include <ostream>
++#include <ostream.h>
+ 
+ #include <osg/Vec2f>
+ #include <osg/Math>
+diff -urN ../OpenSceneGraph.orig/include/osgDB/FieldReader ./include/osgDB/FieldReader
+--- ../OpenSceneGraph.orig/include/osgDB/FieldReader	Wed Mar  3 13:27:18 2004
++++ ./include/osgDB/FieldReader	Tue Feb  8 01:28:24 2005
+@@ -19,7 +19,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include <istream>
++#include <istream.h>
+ 
+ namespace osgDB {
+ 
+diff -urN ../OpenSceneGraph.orig/include/osgSim/GeographicLocation ./include/osgSim/GeographicLocation
+--- ../OpenSceneGraph.orig/include/osgSim/GeographicLocation	Tue Mar  2 16:12:11 2004
++++ ./include/osgSim/GeographicLocation	Tue Feb  8 01:28:24 2005
+@@ -17,7 +17,7 @@
+ #include <osg/Math>
+ #include <osg/Referenced>
+ 
+-#include <ostream>
++#include <ostream.h>
+ 
+ namespace osgSim {
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgDB/Archive.cpp ./src/osgDB/Archive.cpp
+--- ../OpenSceneGraph.orig/src/osgDB/Archive.cpp	Thu Nov 25 15:09:56 2004
++++ ./src/osgDB/Archive.cpp	Tue Feb  8 01:28:24 2005
+@@ -18,7 +18,7 @@
+ #include <osgDB/FileNameUtils>
+ #include <osgDB/Archive>
+ 
+-#include <streambuf>
++#include <streambuf.h>
+ 
+ using namespace osgDB;
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgDB/FileNameUtils.cpp ./src/osgDB/FileNameUtils.cpp
+--- ../OpenSceneGraph.orig/src/osgDB/FileNameUtils.cpp	Wed Oct  6 13:11:04 2004
++++ ./src/osgDB/FileNameUtils.cpp	Tue Feb  8 01:28:23 2005
+@@ -16,8 +16,6 @@
+     #include <ctype.h>
+ #elif defined(__GNUC__) || !defined(WIN32) || defined(__MWERKS__)
+     #include <cctype>
+-    using std::tolower;
+-    using std::strlen;    
+ #endif
+ 
+ using namespace std;
+@@ -119,13 +117,13 @@
+ {
+     // need to check for http://
+     if (filename.size()<7) return false;
+-    if (filename.compare(0,7,"http://")==0) return true;
++    if (filename.compare("http://",0,7)==0) return true;
+     return false;
+ }
+ 
+ std::string osgDB::getServerAddress(const std::string& filename)
+ {
+-    if (filename.size()>=7 && filename.compare(0,7,"http://")==0)
++    if (filename.size()>=7 && filename.compare("http://",0,7)==0)
+     {
+         std::string::size_type pos_slash = filename.find_first_of('/',7);
+         if (pos_slash!=std::string::npos)
+@@ -142,7 +140,7 @@
+ 
+ std::string osgDB::getServerFileName(const std::string& filename)
+ {
+-    if (filename.size()>=7 && filename.compare(0,7,"http://")==0)
++    if (filename.size()>=7 && filename.compare("http://",0,7)==0)
+     {
+         std::string::size_type pos_slash = filename.find_first_of('/',7);
+         if (pos_slash!=std::string::npos)
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/ac3d/Geode.cpp ./src/osgPlugins/ac3d/Geode.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/ac3d/Geode.cpp	Thu Nov 18 10:08:29 2004
++++ ./src/osgPlugins/ac3d/Geode.cpp	Tue Feb  8 01:28:23 2005
+@@ -12,7 +12,7 @@
+ #include <osg/Texture2D>
+ #include <osg/Drawable>
+ #include <osg/Geometry>
+-#include <limits>
++#include <limits.h>
+ #include <iomanip>
+ 
+ #include "Exception.h"
+@@ -796,8 +796,8 @@
+ 								if (NULL != pTexCoords)
+ 								{
+ 									// Find max min s coords
+-									float fMin = std::numeric_limits<float>::max();
+-									float fMax = std::numeric_limits<float>::min();
++									float fMin = FLT_MAX;
++									float fMax = FLT_MIN;
+ 									unsigned int iNumTexCoords = pGeometry->getTexCoordArray(0)->getNumElements();
+ 									
+ 									for (j = 0; j < iNumTexCoords; j++)
+@@ -809,8 +809,8 @@
+ 									}
+ 									fRep_s = fMax - fMin;
+ 									fOffset_s = fMin;
+-									fMin = std::numeric_limits<float>::max();
+-									fMax = std::numeric_limits<float>::min();
++									fMin = FLT_MAX;
++									fMax = FLT_MIN;
+ 									for (j = 0; j < iNumTexCoords; j++)
+ 									{
+ 										if (pTexCoords[j][1] > fMax)
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/ac3d/ac3d.cpp ./src/osgPlugins/ac3d/ac3d.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/ac3d/ac3d.cpp	Tue Nov 23 15:29:51 2004
++++ ./src/osgPlugins/ac3d/ac3d.cpp	Tue Feb  8 01:28:25 2005
+@@ -6,9 +6,9 @@
+ 
+ 
+ #include <stdio.h>
+-// Where is malloc.h really needed?
++// Where is stdlib.h really needed?
+ #if !defined(__APPLE__) && !defined(macintosh) && !defined(__FreeBSD__)
+-#include <malloc.h>
++#include <stdlib.h>
+ #endif
+ #include <math.h>
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/flt/Input.cpp ./src/osgPlugins/flt/Input.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/flt/Input.cpp	Mon Nov 22 23:54:44 2004
++++ ./src/osgPlugins/flt/Input.cpp	Tue Feb  8 01:28:25 2005
+@@ -1,7 +1,7 @@
+ // Input.cpp
+ 
+ #include <string>
+-// #include <malloc.h>
++// #include <stdlib.h>
+ #include <assert.h>
+ 
+ #include <osg/Notify>
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/camera.cpp ./src/osgPlugins/lib3ds/camera.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/camera.cpp	Fri Jan 24 15:12:52 2003
++++ ./src/osgPlugins/lib3ds/camera.cpp	Tue Feb  8 01:28:25 2005
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include "config.h"
+ #ifdef WITH_DMALLOC
+-#include <dmalloc.h>
++#include <dstdlib.h>
+ #endif
+ 
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/file.cpp ./src/osgPlugins/lib3ds/file.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/file.cpp	Fri Jan 24 15:12:53 2003
++++ ./src/osgPlugins/lib3ds/file.cpp	Tue Feb  8 01:28:25 2005
+@@ -34,7 +34,7 @@
+ #include <math.h>
+ #include "config.h"
+ #ifdef WITH_DMALLOC
+-#include <dmalloc.h>
++#include <dstdlib.h>
+ #endif
+ 
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/light.cpp ./src/osgPlugins/lib3ds/light.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/light.cpp	Fri Jan 24 15:12:53 2003
++++ ./src/osgPlugins/lib3ds/light.cpp	Tue Feb  8 01:28:25 2005
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include "config.h"
+ #ifdef WITH_DMALLOC
+-#include <dmalloc.h>
++#include <dstdlib.h>
+ #endif
+ 
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/material.cpp ./src/osgPlugins/lib3ds/material.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/material.cpp	Fri Jan 24 15:12:53 2003
++++ ./src/osgPlugins/lib3ds/material.cpp	Tue Feb  8 01:28:25 2005
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include "config.h"
+ #ifdef WITH_DMALLOC
+-#include <dmalloc.h>
++#include <dstdlib.h>
+ #endif
+ 
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/mesh.cpp ./src/osgPlugins/lib3ds/mesh.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/mesh.cpp	Fri Jan 24 15:12:53 2003
++++ ./src/osgPlugins/lib3ds/mesh.cpp	Tue Feb  8 01:28:25 2005
+@@ -30,7 +30,7 @@
+ #include <math.h>
+ #include "config.h"
+ #ifdef WITH_DMALLOC
+-#include <dmalloc.h>
++#include <dstdlib.h>
+ #endif
+ 
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/node.cpp ./src/osgPlugins/lib3ds/node.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/node.cpp	Fri Jan 24 15:12:54 2003
++++ ./src/osgPlugins/lib3ds/node.cpp	Tue Feb  8 01:28:25 2005
+@@ -30,7 +30,7 @@
+ #include <math.h>
+ #include "config.h"
+ #ifdef WITH_DMALLOC
+-#include <dmalloc.h>
++#include <dstdlib.h>
+ #endif
+ 
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/tracks.cpp ./src/osgPlugins/lib3ds/tracks.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/tracks.cpp	Thu Aug  5 13:41:52 2004
++++ ./src/osgPlugins/lib3ds/tracks.cpp	Tue Feb  8 01:28:25 2005
+@@ -31,7 +31,7 @@
+ #include <math.h>
+ #include "config.h"
+ #ifdef WITH_DMALLOC
+-#include <dmalloc.h>
++#include <dstdlib.h>
+ #endif
+ 
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/Converter.cpp ./src/osgPlugins/lwo/Converter.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lwo/Converter.cpp	Mon Nov 22 23:54:44 2004
++++ ./src/osgPlugins/lwo/Converter.cpp	Tue Feb  8 01:28:23 2005
+@@ -246,7 +246,7 @@
+ 	std::string file = osgDB::findDataFile(filename, options);
+ 	if (file.empty()) return 0;
+ 
+-	std::ifstream ifs(file.c_str(), std::ios_base::in | std::ios_base::binary);
++	std::ifstream ifs(file.c_str(), std::ios::in | std::ios::binary);
+ 	if (!ifs.is_open()) return 0;
+ 
+ 	std::vector<char> buffer;
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/Object.cpp ./src/osgPlugins/lwo/Object.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lwo/Object.cpp	Mon Jun 28 14:18:48 2004
++++ ./src/osgPlugins/lwo/Object.cpp	Tue Feb  8 01:28:23 2005
+@@ -135,7 +135,7 @@
+ 				}
+ 				VertexMap *new_map = current_layer.units().back().weight_maps()->getOrCreate(vmap->name);
+ 				for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) {
+-					(*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), 0, 0, 0);
++					(*new_map)[i->vert.index] = osg::Vec4(i->value[0], 0, 0, 0);
+ 				}
+ 			}
+ 			if (type == "MNVW") {
+@@ -145,7 +145,7 @@
+ 				}
+ 				VertexMap *new_map = current_layer.units().back().subpatch_weight_maps()->getOrCreate(vmap->name);
+ 				for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) {
+-					(*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), 0, 0, 0);
++					(*new_map)[i->vert.index] = osg::Vec4(i->value[0], 0, 0, 0);
+ 				}
+ 			}
+ 			if (type == "TXUV") {
+@@ -155,7 +155,7 @@
+ 				}
+ 				VertexMap *new_map = current_layer.units().back().texture_maps()->getOrCreate(vmap->name);
+ 				for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) {
+-					(*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), 0, 0);
++					(*new_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], 0, 0);
+ 				}
+ 			}
+ 			if (type == "RGB ") {
+@@ -165,7 +165,7 @@
+ 				}
+ 				VertexMap *new_map = current_layer.units().back().rgb_maps()->getOrCreate(vmap->name);
+ 				for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) {
+-					(*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), 1);
++					(*new_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], 1);
+ 				}
+ 			}
+ 			if (type == "RGBA") {
+@@ -175,7 +175,7 @@
+ 				}
+ 				VertexMap *new_map = current_layer.units().back().rgba_maps()->getOrCreate(vmap->name);
+ 				for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) {
+-					(*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), i->value.at(3));
++					(*new_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], i->value[3]);
+ 				}
+ 			}
+ 			if (type == "MORF") {
+@@ -185,7 +185,7 @@
+ 				}
+ 				VertexMap *new_map = current_layer.units().back().displacement_maps()->getOrCreate(vmap->name);
+ 				for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) {
+-					(*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), 0);
++					(*new_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], 0);
+ 				}
+ 			}
+ 			if (type == "SPOT") {
+@@ -195,7 +195,7 @@
+ 				}
+ 				VertexMap *new_map = current_layer.units().back().spot_maps()->getOrCreate(vmap->name);
+ 				for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) {
+-					(*new_map)[i->vert.index] = osg::Vec4(csf_->fix_point(osg::Vec3(i->value.at(0), i->value.at(1), i->value.at(2))), 0);
++					(*new_map)[i->vert.index] = osg::Vec4(csf_->fix_point(osg::Vec3(i->value[0], i->value[1], i->value[2])), 0);
+ 				}
+ 			}
+ 		}
+@@ -223,15 +223,15 @@
+ 
+ 				if (must_invert_winding) {
+ 					for (unsigned j=0; j<i->numvert; ++j) {
+-						int index = i->vert.at((i->numvert-j)%i->numvert).index;
++						int index = i->vert[(i->numvert-j)%i->numvert].index;
+ 						polygon.indices().push_back(index);
+-						current_layer.units().back().shares().at(index).push_back(current_layer.units().back().polygons().size());
++						current_layer.units().back().shares()[index].push_back(current_layer.units().back().polygons().size());
+ 					}
+ 				} else {
+ 					for (unsigned j=0; j<i->numvert; ++j) {
+-						int index = i->vert.at(j).index;
++						int index = i->vert[j].index;
+ 						polygon.indices().push_back(index);
+-						current_layer.units().back().shares().at(index).push_back(current_layer.units().back().polygons().size());
++						current_layer.units().back().shares()[index].push_back(current_layer.units().back().polygons().size());
+ 					}
+ 				}
+ 				current_layer.units().back().polygons().push_back(polygon);
+@@ -248,17 +248,17 @@
+ 			std::string type(ptag->type.id, 4);
+ 			if (type == "SURF") {
+ 				for (lwo2::FORM::PTAG::Mapping_list::const_iterator i=ptag->mapping.begin(); i!=ptag->mapping.end(); ++i) {
+-					current_layer.units().back().polygons().at(i->poly.index).set_surface(&surfaces_[tag_strings.at(i->tag)]);
++					current_layer.units().back().polygons()[i->poly.index].set_surface(&surfaces_[tag_strings[i->tag]]);
+ 				}
+ 			}
+ 			if (type == "PART") {
+ 				for (lwo2::FORM::PTAG::Mapping_list::const_iterator i=ptag->mapping.begin(); i!=ptag->mapping.end(); ++i) {
+-					current_layer.units().back().polygons().at(i->poly.index).set_part_name(tag_strings.at(i->tag));
++					current_layer.units().back().polygons()[i->poly.index].set_part_name(tag_strings[i->tag]);
+ 				}
+ 			}
+ 			if (type == "SMGP") {
+ 				for (lwo2::FORM::PTAG::Mapping_list::const_iterator i=ptag->mapping.begin(); i!=ptag->mapping.end(); ++i) {
+-					current_layer.units().back().polygons().at(i->poly.index).set_smoothing_group(tag_strings.at(i->tag));
++					current_layer.units().back().polygons()[i->poly.index].set_smoothing_group(tag_strings[i->tag]);
+ 				}
+ 			}
+ 		}
+@@ -272,8 +272,8 @@
+ 					continue;
+ 				}
+ 				for (lwo2::FORM::VMAD::Mapping_list::const_iterator i=vmad->mapping.begin(); i!=vmad->mapping.end(); ++i) {
+-					VertexMap *this_map = current_layer.units().back().polygons().at(i->poly.index).weight_maps()->getOrCreate(vmad->name);
+-					(*this_map)[i->vert.index] = osg::Vec4(i->value.at(0), 0, 0, 0);
++					VertexMap *this_map = current_layer.units().back().polygons()[i->poly.index].weight_maps()->getOrCreate(vmad->name);
++					(*this_map)[i->vert.index] = osg::Vec4(i->value[0], 0, 0, 0);
+ 				}				
+ 			}
+ 			if (type == "TXUV") {
+@@ -282,8 +282,8 @@
+ 					continue;
+ 				}
+ 				for (lwo2::FORM::VMAD::Mapping_list::const_iterator i=vmad->mapping.begin(); i!=vmad->mapping.end(); ++i) {
+-					VertexMap *this_map = current_layer.units().back().polygons().at(i->poly.index).texture_maps()->getOrCreate(vmad->name);
+-					(*this_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), 0, 0);
++					VertexMap *this_map = current_layer.units().back().polygons()[i->poly.index].texture_maps()->getOrCreate(vmad->name);
++					(*this_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], 0, 0);
+ 				}				
+ 			}
+ 			if (type == "RGB ") {
+@@ -292,8 +292,8 @@
+ 					continue;
+ 				}
+ 				for (lwo2::FORM::VMAD::Mapping_list::const_iterator i=vmad->mapping.begin(); i!=vmad->mapping.end(); ++i) {
+-					VertexMap *this_map = current_layer.units().back().polygons().at(i->poly.index).rgb_maps()->getOrCreate(vmad->name);
+-					(*this_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), 1);
++					VertexMap *this_map = current_layer.units().back().polygons()[i->poly.index].rgb_maps()->getOrCreate(vmad->name);
++					(*this_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], 1);
+ 				}				
+ 			}
+ 			if (type == "RGBA") {
+@@ -302,8 +302,8 @@
+ 					continue;
+ 				}
+ 				for (lwo2::FORM::VMAD::Mapping_list::const_iterator i=vmad->mapping.begin(); i!=vmad->mapping.end(); ++i) {
+-					VertexMap *this_map = current_layer.units().back().polygons().at(i->poly.index).rgba_maps()->getOrCreate(vmad->name);
+-					(*this_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), i->value.at(3));
++					VertexMap *this_map = current_layer.units().back().polygons()[i->poly.index].rgba_maps()->getOrCreate(vmad->name);
++					(*this_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], i->value[3]);
+ 				}				
+ 			}
+ 		}
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/Polygon.h ./src/osgPlugins/lwo/Polygon.h
+--- ../OpenSceneGraph.orig/src/osgPlugins/lwo/Polygon.h	Sat Jan  3 15:20:32 2004
++++ ./src/osgPlugins/lwo/Polygon.h	Tue Feb  8 01:28:23 2005
+@@ -95,9 +95,9 @@
+ 		if (last_used_points_ != points) {
+ 			normal_.set(0, 0, 0);
+ 			if (indices_.size() >= 3) {
+-				const osg::Vec3 &A = points->at(indices_.front());
+-				const osg::Vec3 &B = points->at(indices_[1]);
+-				const osg::Vec3 &C = points->at(indices_.back());
++				const osg::Vec3 &A = (*points)[indices_.front()];
++				const osg::Vec3 &B = (*points)[indices_[1]];
++				const osg::Vec3 &C = (*points)[indices_.back()];
+ 				if (invert_normal_) {
+ 					normal_ = (C - A) ^ (B - A);
+ 				} else {
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/ReaderWriterLWO.cpp ./src/osgPlugins/lwo/ReaderWriterLWO.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lwo/ReaderWriterLWO.cpp	Tue Nov 23 15:29:51 2004
++++ ./src/osgPlugins/lwo/ReaderWriterLWO.cpp	Tue Feb  8 01:28:23 2005
+@@ -18,6 +18,7 @@
+ #include <string>
+ #include <sstream>
+ #include <algorithm>
++#include <memory>
+ 
+ #include <osg/Notify>
+ #include <osg/Node>
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/Unit.cpp ./src/osgPlugins/lwo/Unit.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lwo/Unit.cpp	Sat Jan  3 15:20:32 2004
++++ ./src/osgPlugins/lwo/Unit.cpp	Tue Feb  8 01:28:23 2005
+@@ -75,11 +75,11 @@
+ 			osg::Vec4 N(poly.face_normal(points_.get()), 0);
+ 			unsigned num_smoothed = 1;
+ 
+-			const Index_list &shared_polys = shares_.at(*j);
++			const Index_list &shared_polys = shares_[*j];
+ 
+ 			for (unsigned k=0; k<shared_polys.size(); ++k) {
+ 				if (shared_polys[k] != pn) {
+-					const Polygon &shared_poly = polygons_.at(shared_polys[k]);
++					const Polygon &shared_poly = polygons_[shared_polys[k]];
+ 					float angle = angle_between_polygons(poly, shared_poly);
+ 					if (angle <= max_smoothing_angle && (poly.get_smoothing_group() == shared_poly.get_smoothing_group())) {
+ 						N += osg::Vec4(shared_poly.face_normal(points_.get()), 0);
+@@ -157,7 +157,7 @@
+ 			if (poly.dup_vertices()[j] == 0) {
+ 
+ 				// duplicate point
+-				points_->push_back(points_->at(*i));
++				points_->push_back((*points_)[*i]);
+ 
+ 				int new_index = static_cast<int>(points_->size())-1;
+ 
+@@ -165,7 +165,7 @@
+ 				(*normals_.get())[new_index] = (*normals_.get())[*i];
+ 
+ 				// duplicate share
+-				shares_.push_back(shares_.at(*i));
++				shares_.push_back(shares_[*i]);
+ 
+ 				VertexMap_map::iterator vm;
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/VertexMap.cpp ./src/osgPlugins/lwo/VertexMap.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/lwo/VertexMap.cpp	Sat Jan  3 15:20:32 2004
++++ ./src/osgPlugins/lwo/VertexMap.cpp	Tue Feb  8 01:28:23 2005
+@@ -21,7 +21,7 @@
+ 		value.y() *= modulator.y();
+ 		value.z() *= modulator.z();
+ 		value.w() *= modulator.w();
+-		array->at(i->first) = value;
++		(*array)[i->first] = value;
+ 	}
+ 	return array.take();
+ }
+@@ -34,7 +34,7 @@
+ 		osg::Vec4 value = i->second;
+ 		value.x() *= modulator.x();
+ 		value.y() *= modulator.y();
+-		array->at(i->first) = osg::Vec2(value.x(), value.y());
++		(*array)[i->first] = osg::Vec2(value.x(), value.y());
+ 	}
+ 	return array.take();
+ }
+@@ -48,7 +48,7 @@
+ 		value.x() *= modulator.x();
+ 		value.y() *= modulator.y();
+ 		value.z() *= modulator.z();
+-		array->at(i->first) = osg::Vec3(value.x(), value.y(), value.z());
++		(*array)[i->first] = osg::Vec3(value.x(), value.y(), value.z());
+ 	}
+ 	return array.take();
+ }
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/iffparser.h ./src/osgPlugins/lwo/iffparser.h
+--- ../OpenSceneGraph.orig/src/osgPlugins/lwo/iffparser.h	Wed Jun  9 16:28:51 2004
++++ ./src/osgPlugins/lwo/iffparser.h	Tue Feb  8 01:28:23 2005
+@@ -10,6 +10,7 @@
+ 
+ #include <vector>
+ #include <iostream>
++#include <string>
+ 
+ namespace iff
+ {
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/obj/obj.cpp ./src/osgPlugins/obj/obj.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/obj/obj.cpp	Mon Nov 22 23:54:45 2004
++++ ./src/osgPlugins/obj/obj.cpp	Tue Feb  8 01:28:23 2005
+@@ -15,6 +15,8 @@
+ 
+ #include "obj.h"
+ 
++#include <cstdio>
++
+ #include <osg/Notify>
+ 
+ #include <osgDB/FileUtils>
+@@ -75,7 +77,7 @@
+             // need to keep return;
+             skipNewline = true;   
+         }
+-        else if (c!=std::ifstream::traits_type::eof()) // don't copy eof.
++        else if (c!=EOF) // don't copy eof.
+         {
+             skipNewline = false;
+ 
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/obj/obj.h ./src/osgPlugins/obj/obj.h
+--- ../OpenSceneGraph.orig/src/osgPlugins/obj/obj.h	Mon Nov 22 23:54:45 2004
++++ ./src/osgPlugins/obj/obj.h	Tue Feb  8 01:28:24 2005
+@@ -17,7 +17,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
+-#include <istream>
++#include <istream.h>
+ 
+ #include <osg/ref_ptr>
+ #include <osg/Referenced>
+diff -urN ../OpenSceneGraph.orig/src/osgPlugins/osga/OSGA_Archive.cpp ./src/osgPlugins/osga/OSGA_Archive.cpp
+--- ../OpenSceneGraph.orig/src/osgPlugins/osga/OSGA_Archive.cpp	Tue Nov 23 15:29:52 2004
++++ ./src/osgPlugins/osga/OSGA_Archive.cpp	Tue Feb  8 01:28:23 2005
+@@ -235,7 +235,7 @@
+     if (status==READ)
+     {
+         _status = status;
+-        _input.open(filename.c_str(), std::ios_base::binary | std::ios_base::in);
++        _input.open(filename.c_str(), std::ios::binary | std::ios::in);
+ 
+         return _open(_input);
+     }
+@@ -246,7 +246,7 @@
+             _input.close();
+             _status = WRITE;
+ 
+-            _output.open(filename.c_str(), std::ios_base::binary | std::ios_base::in | std::ios_base::out);
++            _output.open(filename.c_str(), std::ios::binary | std::ios::in | std::ios::out);
+             
+             osg::notify(osg::INFO)<<"File position after open = "<<(int)_output.tellp()<<" is_open "<<_output.is_open()<<std::endl;
+ 
+@@ -264,7 +264,7 @@
+             osg::notify(osg::INFO)<<"OSGA_Archive::open("<<filename<<"), archive being created."<<std::endl;
+ 
+             _status = WRITE;
+-            _output.open(filename.c_str(), std::ios_base::out | std::ios_base::binary | std::ios_base::trunc);
++            _output.open(filename.c_str(), std::ios::out | std::ios::binary | std::ios::trunc);
+             _output<<"osga";
+             _output.write(reinterpret_cast<const char*>(&ENDIAN_TEST_NUMBER),4);
+             _output.write(reinterpret_cast<char*>(&s_currentSupportedVersion),sizeof(float));
+@@ -475,6 +475,7 @@
+ class proxy_streambuf : public std::streambuf
+ {
+    public:
++      typedef int int_type;
+    
+       proxy_streambuf(std::streambuf* streambuf, unsigned int numChars):
+         _streambuf(streambuf),
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list