19 files changed, 337 insertions, 514 deletions

diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index bc35a579b9d8..ed79f0b383a5 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -6,53 +6,45 @@
 #
 
 PORTNAME=	osg
-PORTVERSION=	0.8.38
+PORTVERSION=	0.8.44
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.openscenegraph.org/download/snapshots/
-DISTNAME=	${PORTNAME}_src-0.8-38
 
 MAINTAINER=	aa8vb@nc.rr.com
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
-
-WRKSRC=		${WRKDIR}/OpenSceneGraph-0.8
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	CXX="${CXX}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-
+MAKE_ENV=	OSGHOME=${WRKSRC}
 ALL_TARGET=	freebsd
 
 pre-patch:
 	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/src/osgPlugins/flt/Input.cpp \
-		${WRKSRC}/src/osgPlugins/flt/Record.cpp
-
-post-patch:
-.for suf in defs rules
-	@${LN} -sf ${WRKSRC}/Make/make${suf}.linux \
-		${WRKSRC}/Make/make${suf}.freebsd
-.endfor
+		${WRKSRC}/src/osgPlugins/flt/Record.cpp \
+		${WRKSRC}/src/osgPlugins/obj/glm.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
-	${TAR} -C ${WRKSRC}/include -c -f - . | \
-		${TAR} -C ${PREFIX}/include --unlink -x -f -
-.for lib in osg osgUtil osgGLUT
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${lib}.so \
-		${PREFIX}/lib/lib${lib}.so.1
-	${LN} -sf lib${lib}.so.1 ${PREFIX}/lib/lib${lib}.so
-.endfor
-	${MKDIR} ${PREFIX}/lib/osgPlugins
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/osgPlugins/*.so \
-		${PREFIX}/lib/osgPlugins
-	${MKDIR} ${PREFIX}/share/doc/osg
-	${TAR} -C ${WRKSRC}/doc -c -f - . | \
-		${TAR} -C ${PREFIX}/share/doc/osg --unlink -x -f -
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/osgconv ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/sgv ${PREFIX}/bin
+	${FIND} ${WRKSRC}/include -name '*.orig' --delete
+	${CP} -r ${WRKSRC}/include/ ${PREFIX}/include/
+	${INSTALL_DATA} ${WRKSRC}/lib/libosg.so ${PREFIX}/lib/libosg.so.1
+	${INSTALL_DATA} ${WRKSRC}/lib/libosgDB.so ${PREFIX}/lib/libosgDB.so.1
+	${INSTALL_DATA} ${WRKSRC}/lib/libosgGLUT.so ${PREFIX}/lib/libosgGLUT.so.1
+	${INSTALL_DATA} ${WRKSRC}/lib/libosgText.so ${PREFIX}/lib/libosgText.so.1
+	${INSTALL_DATA} ${WRKSRC}/lib/libosgUtil.so ${PREFIX}/lib/libosgUtil.so.1
+	${LN} -sf ${PREFIX}/lib/libosg.so.1 ${PREFIX}/lib/libosg.so
+	${LN} -sf ${PREFIX}/lib/libosgDB.so.1 ${PREFIX}/lib/libosgDB.so
+	${LN} -sf ${PREFIX}/lib/libosgGLUT.so.1 ${PREFIX}/lib/libosgGLUT.so
+	${LN} -sf ${PREFIX}/lib/libosgText.so.1 ${PREFIX}/lib/libosgText.so
+	${LN} -sf ${PREFIX}/lib/libosgUtil.so.1 ${PREFIX}/lib/libosgUtil.so
+	@${MKDIR} ${PREFIX}/lib/osgPlugins
+	${CP} -p ${WRKSRC}/lib/osgPlugins/* ${PREFIX}/lib/osgPlugins
+	@${MKDIR} ${DOCSDIR}
+	${CP} -r ${WRKSRC}/doc/ ${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index fe8d9cf0f06b..cff3c7bb4e89 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1 +1 @@
-MD5 (osg_src-0.8-38.tar.gz) = e99ed48b6c36399a54cdd345319e8d89
+MD5 (osg-0.8.44.tar.gz) = d02db9daa918d1515d45f25c428e4e14
diff --git a/graphics/osg/files/patch-aa b/graphics/osg/files/patch-aa
index c4c74fb265c2..819bf0517f91 100644
--- a/graphics/osg/files/patch-aa
+++ b/graphics/osg/files/patch-aa
@@ -1,25 +1,14 @@
-
-$FreeBSD$
-
---- Make/makedefs.linux.orig	Sun Feb 11 23:38:32 2001
-+++ Make/makedefs.linux	Thu May 31 12:46:57 2001
-@@ -6,15 +6,15 @@
- DEPFILES = $(OBJS:.o=.d)
+--- ./Make/ORIG/makedefs.freebsd	Wed Jan 16 07:08:27 2002
++++ ./Make/makedefs.freebsd	Thu Mar 14 18:32:27 2002
+@@ -17,9 +17,9 @@
+ SO_EXT = so
+ DL_EXT = so
  
+-FREEBSD_LOCALLIBS = -L/usr/local/lib -rpath /usr/local/lib
++FREEBSD_LOCALLIBS = -L/usr/local/lib -rpath /usr/local/lib -L/usr/X11R6/lib -rpath /usr/X11R6/lib
  
--C++ = g++
-+C++ = $(CXX)
- YFLAGS = -d
--LCINCS   += -I/usr/X11R6/include
-+LCINCS   += -I$(LOCALBASE)/include -I$(X11BASE)/include
- LC++INCS += ${LCINCS}
--CFLAGS   = -O2 -W -Wall $(LCINCS)
-+CFLAGS   += -W -Wall $(LCINCS) $(PTHREAD_CFLAGS)
- C++FLAGS = ${CFLAGS}
- CPPFLAGS = ${CFLAGS}
- 
--LDFLAGS = -O2 -W -Wall
-+LDFLAGS = -L$(LOCALBASE)/lib -L$(X11BASE)/lib $(PTHREAD_LIBS)
- 
- PFLIBS = -lpfdu -lpfutil -lpf  -ldl
+-LDFLAGS = -O2 -W -Wall -pthread -L/usr/local/lib -L/usr/X11R6/lib
++LDFLAGS = -O2 -W -Wall -pthread $(FREEBSD_LOCALLIBS)
  
+ DYNAMICLIBRARYLIB = 
+ PFLIBS = 
diff --git a/graphics/osg/files/patch-ab b/graphics/osg/files/patch-ab
index 6cb9496aea29..54278acbe095 100644
--- a/graphics/osg/files/patch-ab
+++ b/graphics/osg/files/patch-ab
@@ -1,111 +1,11 @@
---- work/OpenSceneGraph-0.8/Makefile	Thu Jan 25 15:16:28 2001
-+++ Makefile	Thu Apr 26 20:46:54 2001
-@@ -6,10 +6,10 @@
- 
- 
- all : $(MAKE_PREP)
--	for f in $(DIRS) ; do cd $$f; make; cd ..; done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
- 
- docs :
--	cd src; make docs;
-+	cd src; $(MAKE) docs;
- 
- 
- Make/makedefs :
-@@ -34,65 +34,71 @@
- 	cd Make;\
- 	ln -sf makedefs.linux makedefs;\
- 	ln -sf makerules.linux makerules
--	make
-+	$(MAKE)
-+
-+freebsd:
-+	cd Make;\
-+	ln -sf makedefs.freebsd makedefs;\
-+	ln -sf makerules.freebsd makerules
-+	$(MAKE)
- 
- irix:
- 	cd Make;\
- 	ln -sf makedefs.irix.nonstd makedefs ;\
- 	ln -sf makerules.irix makerules 
--	make
-+	$(MAKE)
- 
- irix.std:
- 	cd Make;\
- 	ln -sf makedefs.irix.std makedefs ;\
- 	ln -sf makerules.irix makerules 
--	make
-+	$(MAKE)
- 
- help :
- 	@echo Usage : 
--	@echo \	make 
--	@echo \	make linux
--	@echo \	make irix.std
--	@echo \	make irix.nonstd
--	@echo \	make depend
--	@echo \	make clean
--	@echo \	make clobber
--	@echo \	make doc
--	@echo \	make snapshot
--	@echo \	make install
--	@echo \	make instlinks
--	@echo \	make instclean
-+	@echo \	$(MAKE) 
-+	@echo \	$(MAKE) linux
-+	@echo \	$(MAKE) irix.std
-+	@echo \	$(MAKE) irix.nonstd
-+	@echo \	$(MAKE) depend
-+	@echo \	$(MAKE) clean
-+	@echo \	$(MAKE) clobber
-+	@echo \	$(MAKE) doc
-+	@echo \	$(MAKE) snapshot
-+	@echo \	$(MAKE) install
-+	@echo \	$(MAKE) instlinks
-+	@echo \	$(MAKE) instclean
- 
- 
- clean : $(MAKE_PREP)
--	for f in $(DIRS) ; do cd $$f; make clean; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) clean; cd ..;  done
- 	find lib -type f -exec rm {} \;
- 	rm -f bin/*
- 
- clobber : $(MAKE_PREP) clean
--	for f in $(DIRS) ; do cd $$f; make clobber; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) clobber; cd ..;  done
- 	rm -f $(MAKE_PREP)
- 	
- depend : $(MAKE_PREP)
--	for f in $(DIRS) ; do cd $$f; make depend; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) depend; cd ..;  done
- 
- to_unix : 
- 	for f in $(DIRS) ; do cd $$f; to_unix Makefile Makefile; cd ..;  done
--	for f in $(DIRS) ; do cd $$f; make to_unix; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) to_unix; cd ..;  done
- 	cd include/OSG; for f in *.h ; do to_unix $$f $$f;  done
- 
- snapshot: 
--	make docs;
--	make clobber;
-+	$(MAKE) docs;
-+	$(MAKE) clobber;
- 	(cd ..; tar cvf - OpenSceneGraph-0.8 | gzip > osg_src-`date "+%Y%m%d"`.tar.gz)
- 
- 
- install :
--	for f in $(DIRS)  ; do cd $$f; make install; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) install; cd ..;  done
- 
- instlinks :
--	for f in $(DIRS)  ; do cd $$f; make instlinks; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) instlinks; cd ..;  done
- 
- instclean :
--	for f in $(DIRS)  ; do cd $$f; make instclean; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
- 
+--- ./src/osgDB/ORIG/FileUtils.cpp	Sat Feb  9 05:24:38 2002
++++ ./src/osgDB/FileUtils.cpp	Thu Mar 14 18:33:41 2002
+@@ -64,7 +64,7 @@
+ #if defined(__CYGWIN__)
+ static const char *s_default_dso_path = "/usr/lib/:/usr/local/lib/:";
+ #else
+-static const char *s_default_dso_path = "/usr/lib/:/usr/local/lib/:";
++static const char *s_default_dso_path = "/usr/lib/:/usr/X11R6/lib/:";
+ #endif // __CYGWIN__
+ static char *s_filePath = ".:";
+ #endif
diff --git a/graphics/osg/files/patch-ac b/graphics/osg/files/patch-ac
index 007d3ac9544b..0073bf6df503 100644
--- a/graphics/osg/files/patch-ac
+++ b/graphics/osg/files/patch-ac
@@ -1,11 +1,14 @@
---- work/OpenSceneGraph-0.8/include/osg/Timer	Wed Jan 24 09:42:44 2001
-+++ include/osg/Timer	Mon Apr 23 18:58:17 2001
-@@ -43,7 +43,7 @@
-         }
-         #pragma optimize("",on)
- #endif
--#ifdef __linux
-+#if defined(__linux) || defined(__FreeBSD__)
-         #define CLK(x)	  __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x))
- 	inline Timer_t tick( void ) {Timer_t x;CLK(x);return x;}
- #endif
+--- ./src/osgPlugins/txp/ORIG/trpage_sys.h	Sun Feb 10 05:42:55 2002
++++ ./src/osgPlugins/txp/trpage_sys.h	Thu Mar 14 19:35:15 2002
+@@ -82,6 +82,11 @@
+ typedef int64_t  int64;
+ //typedef long long int int64;
+ 
++#elif defined(__FreeBSD__)
++#include <sys/inttypes.h>
++typedef int64_t  int64;
++//typedef long long int int64;
++
+ #elif defined(__ghs__) && defined(__LL_Is_64)
+ typedef long long int64;
+ 
diff --git a/graphics/osg/files/patch-ad b/graphics/osg/files/patch-ad
deleted file mode 100644
index 1fdb2bf33578..000000000000
--- a/graphics/osg/files/patch-ad
+++ /dev/null
@@ -1,37 +0,0 @@
---- work/OpenSceneGraph-0.8/src/Demos/Makefile	Mon Feb 12 07:32:11 2001
-+++ src/Demos/Makefile	Mon Apr 23 19:14:55 2001
-@@ -4,26 +4,26 @@
- DIRS = sgv osgconv osgcube hangglide
- 
- all :
--	for f in $(DIRS) ; do cd $$f; make ; cd ..; done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
- 
- clean :
--	for f in $(DIRS) ; do cd $$f; make clean; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) clean; cd ..;  done
- 
- clobber : 
--	for f in $(DIRS) ; do cd $$f; make clobber; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) clobber; cd ..;  done
- 
- depend : 
--	for f in $(DIRS) ; do cd $$f; make depend; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) depend; cd ..;  done
- 
- to_unix : 
- 	for f in $(DIRS) ; do cd $$f; to_unix Makefile Makefile; cd ..;  done
--	for f in $(DIRS) ; do cd $$f; make to_unix; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) to_unix; cd ..;  done
- 
- install :
--	for f in $(DIRS)  ; do cd $$f; make install; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) install; cd ..;  done
- 
- instlinks :
--	for f in $(DIRS)  ; do cd $$f; make instlinks; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) instlinks; cd ..;  done
- 
- instclean :
--	for f in $(DIRS)  ; do cd $$f; make instclean; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
diff --git a/graphics/osg/files/patch-ae b/graphics/osg/files/patch-ae
deleted file mode 100644
index 7fbd21607bf4..000000000000
--- a/graphics/osg/files/patch-ae
+++ /dev/null
@@ -1,46 +0,0 @@
---- work/OpenSceneGraph-0.8/src/Makefile	Fri Jan  5 05:31:49 2001
-+++ src/Makefile	Mon Apr 23 19:13:58 2001
-@@ -5,32 +5,32 @@
- DIRS = osg osgUtil osgGLUT Demos osgPlugins
- 
- all :
--	for f in $(DIRS) ; do cd $$f; make ; cd ..; done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
- 
- clean :
--	for f in $(DIRS) ; do cd $$f; make clean; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) clean; cd ..;  done
- 
- clobber : 
--	for f in $(DIRS) ; do cd $$f; make clobber; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) clobber; cd ..;  done
- 
- depend : 
--	for f in $(DIRS) ; do cd $$f; make depend; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) depend; cd ..;  done
- 
- docs : 
--	(cd osg; make docs;) 
--	(cd osgUtil; make docs; )
--	(cd osgGLUT; make docs; )
-+	(cd osg; $(MAKE) docs;) 
-+	(cd osgUtil; $(MAKE) docs; )
-+	(cd osgGLUT; $(MAKE) docs; )
- 
- to_unix : 
- 	for f in $(DIRS) ; do cd $$f; to_unix Makefile Makefile; cd ..;  done
--	for f in $(DIRS) ; do cd $$f; make to_unix; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) to_unix; cd ..;  done
- 
- 
- install :
--	for f in $(DIRS)  ; do cd $$f; make install; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) install; cd ..;  done
- 
- instlinks :
--	for f in $(DIRS)  ; do cd $$f; make instlinks; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) instlinks; cd ..;  done
- 
- instclean :
--	for f in $(DIRS)  ; do cd $$f; make instclean; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
diff --git a/graphics/osg/files/patch-af b/graphics/osg/files/patch-af
deleted file mode 100644
index 572a4349190e..000000000000
--- a/graphics/osg/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osg/Makefile.orig	Sun Jan 21 17:25:46 2001
-+++ src/osg/Makefile	Thu Apr 26 21:44:14 2001
-@@ -140,7 +140,7 @@
- 	Images/white.rgb\
- 
- 
--LIBS    = -ldl
-+LIBS    = -lGLU -lGL -lm
- 
- LIB	= ../../lib/lib$(TARGET_BASENAME).so
- #LIB	= ../../lib/lib$(TARGET_BASENAME).a
diff --git a/graphics/osg/files/patch-ag b/graphics/osg/files/patch-ag
deleted file mode 100644
index f98f5c72fd26..000000000000
--- a/graphics/osg/files/patch-ag
+++ /dev/null
@@ -1,47 +0,0 @@
---- work/OpenSceneGraph-0.8/src/osg/Timer.cpp	Thu Dec  7 15:50:51 2000
-+++ src/osg/Timer.cpp	Mon Apr 23 19:04:58 2001
-@@ -59,15 +59,33 @@
- 
- #endif // ]
- 
--#ifdef __linux // [
--#include <unistd.h>
--#include <sys/mman.h>
-+#if defined(__linux) || defined(__FreeBSD__) // [
-+
-+#  include <unistd.h>
-+#  if defined(__linux)
-+#    include <sys/mman.h>
-+#  elif defined(__FreeBSD__)
-+#    include <sys/types.h>
-+#    include <sys/sysctl.h>
-+#  endif
- 
- int Timer::inited = 0;
- double Timer::cpu_mhz = 0.0;
- 
- void Timer::init( void )
- {
-+#  if defined(__FreeBSD__)
-+    int cpuspeed;
-+    size_t len;
-+  
-+    len = sizeof(cpuspeed);
-+    if (sysctlbyname("machdep.tsc_freq", &cpuspeed, &len, NULL, NULL) == -1) {
-+	perror("sysctlbyname(machdep.tsc_freq)");
-+        return;
-+    }
-+    cpu_mhz = cpuspeed / 1e6;
-+
-+#  elif defined(__linux)
-     char buff[128];
-     FILE *fp = fopen( "/proc/cpuinfo", "r" );
- 
-@@ -87,6 +105,7 @@
- 	}
-     }
-     fclose( fp );
-+#  endif
-     inited = 1;
- }
- 
diff --git a/graphics/osg/files/patch-ah b/graphics/osg/files/patch-ah
deleted file mode 100644
index 28b3d3b90548..000000000000
--- a/graphics/osg/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osgGLUT/Makefile.orig	Sat Jan  6 15:20:47 2001
-+++ src/osgGLUT/Makefile	Thu Apr 26 22:00:20 2001
-@@ -9,7 +9,7 @@
- TARGET_BASENAME = osgGLUT
- 
- 
--LIBS    = -ldl
-+LIBS    = -L../../lib -losgUtil -losg -lglut -lGLU -lGL -lm
- 
- LIB	= ../../lib/lib$(TARGET_BASENAME).so
- #LIB	= ../../lib/lib$(TARGET_BASENAME).a
diff --git a/graphics/osg/files/patch-ai b/graphics/osg/files/patch-ai
deleted file mode 100644
index de1b91fbdbbc..000000000000
--- a/graphics/osg/files/patch-ai
+++ /dev/null
@@ -1,42 +0,0 @@
---- work/OpenSceneGraph-0.8/src/osgPlugins/Makefile	Fri Feb 16 15:47:05 2001
-+++ src/osgPlugins/Makefile	Mon Apr 23 19:17:42 2001
-@@ -1,29 +1,30 @@
- #!smake
- SHELL=/bin/sh
- 
--DIRS = lib3ds flt pfb osgtgz tgz zip pic png jpeg tga tiff png gif
-+#DIRS = lib3ds flt pfb osgtgz tgz zip pic png jpeg tga tiff png gif
-+DIRS = lib3ds flt osgtgz tgz zip pic png jpeg tga tiff png gif
- 
- all :
--	for f in $(DIRS) ; do cd $$f; make ; cd ..; done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
- 
- clean :
--	for f in $(DIRS) ; do cd $$f; make clean; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) clean; cd ..;  done
- 
- clobber : 
--	for f in $(DIRS) ; do cd $$f; make clobber; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) clobber; cd ..;  done
- 
- depend : 
--	for f in $(DIRS) ; do cd $$f; make depend; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) depend; cd ..;  done
- 
- to_unix : 
- 	for f in $(DIRS) ; do cd $$f; to_unix Makefile Makefile; cd ..;  done
--	for f in $(DIRS) ; do cd $$f; make to_unix; cd ..;  done
-+	for f in $(DIRS) ; do cd $$f; $(MAKE) to_unix; cd ..;  done
- 
- install :
--	for f in $(DIRS)  ; do cd $$f; make install; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) install; cd ..;  done
- 
- instlinks :
--	for f in $(DIRS)  ; do cd $$f; make instlinks; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) instlinks; cd ..;  done
- 
- instclean :
--	for f in $(DIRS)  ; do cd $$f; make instclean; cd ..;  done
-+	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
diff --git a/graphics/osg/files/patch-aj b/graphics/osg/files/patch-aj
deleted file mode 100644
index 25a79ec5e994..000000000000
--- a/graphics/osg/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- work/OpenSceneGraph-0.8/src/osgPlugins/gif/Makefile	Wed Dec 20 17:11:05 2000
-+++ src/osgPlugins/gif/Makefile	Mon Apr 23 19:21:47 2001
-@@ -11,7 +11,7 @@
- LIBS = -lungif
- 
- C++FLAGS += -I. -I../../../include 
--LDFLAGS += -L../../../lib
-+LDFLAGS += -L../../../lib -L$(LOCALBASE)/lib -rpath $(LOCALBASE)/lib
- 
- include ../../../Make/makerules
- 
diff --git a/graphics/osg/files/patch-ak b/graphics/osg/files/patch-ak
deleted file mode 100644
index 8dc32ca3f993..000000000000
--- a/graphics/osg/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- work/OpenSceneGraph-0.8/src/osgPlugins/jpeg/Makefile	Wed Dec 20 17:36:16 2000
-+++ src/osgPlugins/jpeg/Makefile	Mon Apr 23 19:20:33 2001
-@@ -8,7 +8,7 @@
- 
- TARGET_LOADER_FILES = osgPlugins/osgdb_jpg.so
- 
--LIBS = -ljpeg
-+LIBS = -ljpeg -L$(LOCALBASE)/lib -rpath $(LOCALBASE)/lib
- C++FLAGS += -I. -I../../../include
- LDFLAGS += -L../../../lib
- 
diff --git a/graphics/osg/files/patch-al b/graphics/osg/files/patch-al
deleted file mode 100644
index e04592e71abe..000000000000
--- a/graphics/osg/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- work/OpenSceneGraph-0.8/src/osgPlugins/tiff/Makefile	Wed Dec 20 17:35:46 2000
-+++ src/osgPlugins/tiff/Makefile	Mon Apr 23 19:21:20 2001
-@@ -10,7 +10,7 @@
- 
- LIBS = -ltiff
- C++FLAGS += -I. -I../../../include
--LDFLAGS += -L../../../lib
-+LDFLAGS += -L../../../lib -L$(LOCALBASE)/lib -rpath $(LOCALBASE)/lib
- 
- include ../../../Make/makerules
- 
diff --git a/graphics/osg/files/patch-am b/graphics/osg/files/patch-am
deleted file mode 100644
index 61d898634df4..000000000000
--- a/graphics/osg/files/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osgUtil/Makefile.orig	Wed Jan 24 11:02:59 2001
-+++ src/osgUtil/Makefile	Thu Apr 26 21:59:12 2001
-@@ -17,7 +17,7 @@
- TARGET_BASENAME = osgUtil
- 
- 
--LIBS    = -ldl
-+LIBS    = -L../../lib -losg -lGLU -lGL -lm
- 
- LIB	= ../../lib/lib$(TARGET_BASENAME).so
- #LIB	= ../../lib/lib$(TARGET_BASENAME).a
diff --git a/graphics/osg/files/patch-an b/graphics/osg/files/patch-an
deleted file mode 100644
index a1555d7c9e14..000000000000
--- a/graphics/osg/files/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- Make/makerules.linux	2001/05/31 09:25:34	1.1
-+++ Make/makerules.linux	2001/05/31 09:26:08
-@@ -38,13 +38,13 @@
- 	echo $(TARGET_BASENAME) HTML documentation created in ../../doc/doc++/$(TARGET_BASENAME)
- 
- install : home
--	@ make __install
-+	@ $(MAKE) __install
- 
- instlinks : home
--	@ make __instlinks
-+	@ $(MAKE) __instlinks
- 
- instclean : home
--	@ make __instclean
-+	@ $(MAKE) __instclean
- 
- 
- home :
diff --git a/graphics/osg/pkg-comment b/graphics/osg/pkg-comment
index 508b732593a7..2ac528b76a5b 100644
--- a/graphics/osg/pkg-comment
+++ b/graphics/osg/pkg-comment
@@ -1 +1 @@
-A C++/OpenGL scene graph library for real-time rendering
+C++/OpenGL scene graph library for real-time rendering
diff --git a/graphics/osg/pkg-descr b/graphics/osg/pkg-descr
index b4438f7b9746..be398a3c167d 100644
--- a/graphics/osg/pkg-descr
+++ b/graphics/osg/pkg-descr
@@ -3,4 +3,4 @@ real-time, photo-realistic rendering of large 3D models. Uses range from
 visual simulation, to scientific modelling, to games, to whatever you can
 think of!
 
-WWW: http://www.openscenegraph.org/
+http://www.openscenegraph.org/
diff --git a/graphics/osg/pkg-plist b/graphics/osg/pkg-plist
index 4c1b911eecf9..cd1cff8b9195 100644
--- a/graphics/osg/pkg-plist
+++ b/graphics/osg/pkg-plist
@@ -1,204 +1,357 @@
-bin/hangglide
 bin/osgconv
-bin/osgcube
 bin/sgv
 include/osg/AlphaFunc
 include/osg/Billboard
 include/osg/BoundingBox
 include/osg/BoundingSphere
+include/osg/BoundsChecking
 include/osg/Camera
+include/osg/ClipPlane
+include/osg/ClippingVolume
+include/osg/ColorMask
+include/osg/ColorMatrix
+include/osg/CopyOp
 include/osg/CullFace
-include/osg/DCS
-include/osg/DynamicLibrary
+include/osg/Depth
+include/osg/DisplaySettings
+include/osg/Drawable
+include/osg/EarthSky
 include/osg/Export
-include/osg/Field
-include/osg/FieldReader
-include/osg/FieldReaderIterator
-include/osg/FileNameUtils
-include/osg/FileUtils
 include/osg/Fog
+include/osg/FrameStamp
+include/osg/FrontFace
 include/osg/GL
 include/osg/GLExtensions
+include/osg/GLU
 include/osg/GeoSet
-include/osg/GeoState
 include/osg/Geode
 include/osg/Group
 include/osg/Image
-include/osg/Input
+include/osg/Impostor
+include/osg/ImpostorSprite
 include/osg/LOD
 include/osg/Light
 include/osg/LightSource
-include/osg/Lighting
+include/osg/LineSegment
+include/osg/LineStipple
+include/osg/LineWidth
 include/osg/Material
+include/osg/Math
 include/osg/Matrix
 include/osg/MemoryAdapter
 include/osg/Node
+include/osg/NodeCallback
 include/osg/NodeVisitor
 include/osg/Notify
 include/osg/Object
-include/osg/Output
+include/osg/Plane
 include/osg/Point
+include/osg/PolygonMode
 include/osg/PolygonOffset
+include/osg/PositionAttitudeTransform
 include/osg/Quat
-include/osg/ReaderWriter
 include/osg/Referenced
-include/osg/Registry
-include/osg/Scene
-include/osg/Seg
-include/osg/Sequence
+include/osg/ShadeModel
 include/osg/State
+include/osg/StateAttribute
+include/osg/StateSet
+include/osg/Statistics
+include/osg/Stencil
 include/osg/Switch
 include/osg/TexEnv
 include/osg/TexGen
 include/osg/TexMat
 include/osg/Texture
 include/osg/Timer
-include/osg/Timer.orig
+include/osg/Transform
 include/osg/Transparency
 include/osg/Types
 include/osg/Vec2
 include/osg/Vec3
 include/osg/Vec4
 include/osg/Version
+include/osg/Viewport
 include/osg/mem_ptr
 include/osg/ref_ptr
+@dirrm include/osg
+include/osgDB/DotOsgWrapper
+include/osgDB/DynamicLibrary
+include/osgDB/Export
+include/osgDB/Field
+include/osgDB/FieldReader
+include/osgDB/FieldReaderIterator
+include/osgDB/FileNameUtils
+include/osgDB/FileUtils
+include/osgDB/Input
+include/osgDB/Output
+include/osgDB/ReadFile
+include/osgDB/ReaderWriter
+include/osgDB/Registry
+include/osgDB/Version
+include/osgDB/WriteFile
+@dirrm include/osgDB
 include/osgGLUT/Export
 include/osgGLUT/GLUTEventAdapter
 include/osgGLUT/Version
 include/osgGLUT/Viewer
+include/osgGLUT/Window
+include/osgGLUT/glut
+@dirrm include/osgGLUT
+include/osgText/Export
+include/osgText/Font
+include/osgText/Paragraph
+include/osgText/Text
+include/osgText/Version
+@dirrm include/osgText
+include/osgUtil/AppVisitor
 include/osgUtil/CameraManipulator
+include/osgUtil/CullViewState
+include/osgUtil/CullVisitor
+include/osgUtil/DepthSortedBin
 include/osgUtil/DisplayListVisitor
+include/osgUtil/DisplayRequirementsVisitor
 include/osgUtil/DriveManipulator
 include/osgUtil/Export
 include/osgUtil/FlightManipulator
 include/osgUtil/GUIActionAdapter
 include/osgUtil/GUIEventAdapter
+include/osgUtil/GUIEventHandler
+include/osgUtil/InsertImpostorsVisitor
 include/osgUtil/IntersectVisitor
-include/osgUtil/RenderVisitor
+include/osgUtil/Optimizer
+include/osgUtil/RenderBin
+include/osgUtil/RenderGraph
+include/osgUtil/RenderLeaf
+include/osgUtil/RenderStage
+include/osgUtil/RenderStageLighting
+include/osgUtil/RenderToTextureStage
 include/osgUtil/SceneView
+include/osgUtil/SceneViewManipulator
 include/osgUtil/SmoothingVisitor
+include/osgUtil/StateSetManipulator
+include/osgUtil/Tesselator
 include/osgUtil/TrackballManipulator
+include/osgUtil/TransformCallback
+include/osgUtil/TriStripVisitor
 include/osgUtil/Version
-lib/libosg.so
-lib/libosg.so.1
-lib/libosgGLUT.so
-lib/libosgGLUT.so.1
-lib/libosgUtil.so
-lib/libosgUtil.so.1
+@dirrm include/osgUtil
 lib/osgPlugins/osgdb_3ds.so
+lib/osgPlugins/osgdb_bmp.so
+lib/osgPlugins/osgdb_dw.so
+lib/osgPlugins/osgdb_dx.so
 lib/osgPlugins/osgdb_flt.so
 lib/osgPlugins/osgdb_gif.so
-lib/osgPlugins/osgdb_jpg.so
+lib/osgPlugins/osgdb_jpeg.so
+lib/osgPlugins/osgdb_lwo.so
+lib/osgPlugins/osgdb_obj.so
+lib/osgPlugins/osgdb_osg.so
 lib/osgPlugins/osgdb_osgtgz.so
 lib/osgPlugins/osgdb_pic.so
 lib/osgPlugins/osgdb_png.so
+lib/osgPlugins/osgdb_rgb.so
 lib/osgPlugins/osgdb_tga.so
 lib/osgPlugins/osgdb_tgz.so
-lib/osgPlugins/osgdb_tif.so
+lib/osgPlugins/osgdb_tiff.so
+lib/osgPlugins/osgdb_txp.so
 lib/osgPlugins/osgdb_zip.so
-share/doc/osg/Doxyfiles/Doxyfile_all
-share/doc/osg/Doxyfiles/Doxyfile_all_mainpage
-share/doc/osg/Doxyfiles/Doxyfile_footer
-share/doc/osg/MindMaps/DesignPatterns.mmp
+@dirrm lib/osgPlugins
+lib/libosg.so
+lib/libosg.so.1
+lib/libosgDB.so
+lib/libosgDB.so.1
+lib/libosgGLUT.so
+lib/libosgGLUT.so.1
+lib/libosgText.so
+lib/libosgText.so.1
+lib/libosgUtil.so
+lib/libosgUtil.so.1
+share/doc/osg/Doxyfiles/all_Doxyfile
+share/doc/osg/Doxyfiles/auto_Doxyfile
+share/doc/osg/Doxyfiles/auto_Mainpage
+share/doc/osg/Doxyfiles/core_Doxyfile
+share/doc/osg/Doxyfiles/custom_Footer.html
+@dirrm share/doc/osg/Doxyfiles
 share/doc/osg/MindMaps/DesignPatterns/DesignPatterns.gif
 share/doc/osg/MindMaps/DesignPatterns/DesignPatterns.html
-share/doc/osg/MindMaps/Mission.mmp
+@dirrm share/doc/osg/MindMaps/DesignPatterns
 share/doc/osg/MindMaps/Mission/Mission.gif
 share/doc/osg/MindMaps/Mission/Mission.html
+@dirrm share/doc/osg/MindMaps/Mission
+share/doc/osg/MindMaps/DesignPatterns.mmp
+share/doc/osg/MindMaps/Mission.mmp
+@dirrm share/doc/osg/MindMaps
 share/doc/osg/UML/osg.png
 share/doc/osg/UML/osgutils.png
+@dirrm share/doc/osg/UML
 share/doc/osg/doc++/osg/AlphaFunc.html
+share/doc/osg/doc++/osg/AttributeFunctor.html
 share/doc/osg/doc++/osg/Billboard.html
 share/doc/osg/doc++/osg/BoundingBox.html
 share/doc/osg/doc++/osg/BoundingSphere.html
+share/doc/osg/doc++/osg/COMPARE_StateAttribute_Parameter.html
+share/doc/osg/doc++/osg/COMPARE_StateAttribute_Types.html
 share/doc/osg/doc++/osg/Camera.html
 share/doc/osg/doc++/osg/ClassGraph.class
 share/doc/osg/doc++/osg/ClassGraphPanel.class
 share/doc/osg/doc++/osg/ClassLayout.class
-share/doc/osg/doc++/osg/CppMemoryAdapter.html
+share/doc/osg/doc++/osg/ClipPlane.html
+share/doc/osg/doc++/osg/ClippingVolume.html
+share/doc/osg/doc++/osg/ColorMask.html
+share/doc/osg/doc++/osg/ColorMatrix.html
+share/doc/osg/doc++/osg/CopyOp.html
 share/doc/osg/doc++/osg/CullFace.html
-share/doc/osg/doc++/osg/DCS.html
-share/doc/osg/doc++/osg/DirectoryContents.html
-share/doc/osg/doc++/osg/DynamicLibrary.html
-share/doc/osg/doc++/osg/Field.html
-share/doc/osg/doc++/osg/FieldReader.html
-share/doc/osg/doc++/osg/FieldReaderIterator.html
+share/doc/osg/doc++/osg/Depth.html
+share/doc/osg/doc++/osg/DisplaySettings.html
+share/doc/osg/doc++/osg/Drawable.html
+share/doc/osg/doc++/osg/EarthSky.html
 share/doc/osg/doc++/osg/Fog.html
+share/doc/osg/doc++/osg/FrameStamp.html
+share/doc/osg/doc++/osg/FrontFace.html
 share/doc/osg/doc++/osg/General.html
 share/doc/osg/doc++/osg/GeoSet.html
-share/doc/osg/doc++/osg/GeoState.html
 share/doc/osg/doc++/osg/Geode.html
 share/doc/osg/doc++/osg/Group.html
 share/doc/osg/doc++/osg/HIER.html
 share/doc/osg/doc++/osg/HIERjava.html
 share/doc/osg/doc++/osg/Image.html
-share/doc/osg/doc++/osg/Input.html
+share/doc/osg/doc++/osg/Impostor.html
+share/doc/osg/doc++/osg/ImpostorSprite.html
+share/doc/osg/doc++/osg/ImpostorSpriteManager.html
 share/doc/osg/doc++/osg/LOD.html
 share/doc/osg/doc++/osg/Light.html
 share/doc/osg/doc++/osg/LightSource.html
-share/doc/osg/doc++/osg/Lighting.html
+share/doc/osg/doc++/osg/LineSegment.html
+share/doc/osg/doc++/osg/LineStipple.html
+share/doc/osg/doc++/osg/LineWidth.html
+share/doc/osg/doc++/osg/METANODE.html
+share/doc/osg/doc++/osg/METAOBJ.html
+share/doc/osg/doc++/osg/META_Node.html
+share/doc/osg/doc++/osg/META_Object.html
+share/doc/osg/doc++/osg/META_StateAttribute.html
 share/doc/osg/doc++/osg/Material.html
 share/doc/osg/doc++/osg/Matrix.html
-share/doc/osg/doc++/osg/Matrixoperator.html
+share/doc/osg/doc++/osg/MatrixMode.html
+share/doc/osg/doc++/osg/MatrixNew.html
+share/doc/osg/doc++/osg/MatrixNewProduct.html
+share/doc/osg/doc++/osg/MatrixOld.html
+share/doc/osg/doc++/osg/MatrixProduct.html
 share/doc/osg/doc++/osg/MemoryAdapter.html
 share/doc/osg/doc++/osg/NavigatorButton.class
-share/doc/osg/doc++/osg/NewMemoryAdapter.html
 share/doc/osg/doc++/osg/Node.html
 share/doc/osg/doc++/osg/NodeAcceptOp.html
+share/doc/osg/doc++/osg/NodeCallback.html
 share/doc/osg/doc++/osg/NodePath.html
 share/doc/osg/doc++/osg/NodeVisitor.html
 share/doc/osg/doc++/osg/NotifySeverity.html
+share/doc/osg/doc++/osg/OSG_GL_DEBUG.html
+share/doc/osg/doc++/osg/OSG_NODECALLBACK.html
 share/doc/osg/doc++/osg/Object.html
-share/doc/osg/doc++/osg/Output.html
+share/doc/osg/doc++/osg/Plane.html
 share/doc/osg/doc++/osg/Point.html
+share/doc/osg/doc++/osg/PolygonMode.html
 share/doc/osg/doc++/osg/PolygonOffset.html
+share/doc/osg/doc++/osg/PositionAttitudeTransform.html
 share/doc/osg/doc++/osg/Quat.html
-share/doc/osg/doc++/osg/ReaderWriter.html
 share/doc/osg/doc++/osg/Referenced.html
-share/doc/osg/doc++/osg/RegisterObjectProxy.html
-share/doc/osg/doc++/osg/RegisterReaderWriterProxy.html
-share/doc/osg/doc++/osg/Registry.html
-share/doc/osg/doc++/osg/Scene.html
-share/doc/osg/doc++/osg/Seg.html
-share/doc/osg/doc++/osg/Sequence.html
+share/doc/osg/doc++/osg/ShadeModel.html
 share/doc/osg/doc++/osg/State.html
+share/doc/osg/doc++/osg/StateAttribute.html
+share/doc/osg/doc++/osg/StateSet.html
+share/doc/osg/doc++/osg/Statistics.html
+share/doc/osg/doc++/osg/Stencil.html
 share/doc/osg/doc++/osg/Switch.html
 share/doc/osg/doc++/osg/TexEnv.html
 share/doc/osg/doc++/osg/TexGen.html
 share/doc/osg/doc++/osg/TexMat.html
 share/doc/osg/doc++/osg/Texture.html
 share/doc/osg/doc++/osg/Timer.html
+share/doc/osg/doc++/osg/Transform.html
 share/doc/osg/doc++/osg/Transparency.html
 share/doc/osg/doc++/osg/Vec2.html
 share/doc/osg/doc++/osg/Vec3.html
 share/doc/osg/doc++/osg/Vec4.html
+share/doc/osg/doc++/osg/Viewport.html
+share/doc/osg/doc++/osg/clampArray3BetweenRange.html
+share/doc/osg/doc++/osg/clampArray3GEQUAL.html
+share/doc/osg/doc++/osg/clampArray3LEQUAL.html
+share/doc/osg/doc++/osg/clampArray4BetweenRange.html
+share/doc/osg/doc++/osg/clampArray4GEQUAL.html
+share/doc/osg/doc++/osg/clampArray4LEQUAL.html
+share/doc/osg/doc++/osg/clampArrayElementBetweenRange.html
+share/doc/osg/doc++/osg/clampArrayElementGEQUAL.html
+share/doc/osg/doc++/osg/clampArrayElementLEQUAL.html
+share/doc/osg/doc++/osg/clampArrayElementsBetweenRange.html
+share/doc/osg/doc++/osg/clampArrayElementsGEQUAL.html
+share/doc/osg/doc++/osg/clampArrayElementsLEQUAL.html
+share/doc/osg/doc++/osg/clampBetweenRange.html
+share/doc/osg/doc++/osg/clampGEQUAL.html
+share/doc/osg/doc++/osg/clampLEQUAL.html
 share/doc/osg/doc++/osg/createGeodeForImage.2.html
 share/doc/osg/doc++/osg/createGeodeForImage.html
-share/doc/osg/doc++/osg/findDSO.html
-share/doc/osg/doc++/osg/findFile.html
-share/doc/osg/doc++/osg/findFileInDirectory.html
 share/doc/osg/doc++/osg/for_each_triangle.html
+share/doc/osg/doc++/osg/g_NotifyInit.html
 share/doc/osg/doc++/osg/g_NotifyLevel.html
-share/doc/osg/doc++/osg/getDirectoryContents.html
-share/doc/osg/doc++/osg/getFilePath.html
+share/doc/osg/doc++/osg/g_NotifyNulStream.html
 share/doc/osg/doc++/osg/getGLExtensionFuncPtr.html
 share/doc/osg/doc++/osg/getNotifyLevel.html
 share/doc/osg/doc++/osg/icon1.gif
 share/doc/osg/doc++/osg/icon2.gif
 share/doc/osg/doc++/osg/index.html
-share/doc/osg/doc++/osg/initFilePath.html
 share/doc/osg/doc++/osg/initNotifyLevel.html
 share/doc/osg/doc++/osg/isGLExtensionSupported.html
 share/doc/osg/doc++/osg/mem_ptr.html
-share/doc/osg/doc++/osg/newMemoryAdapter.2.html
 share/doc/osg/doc++/osg/notify.html
-share/doc/osg/doc++/osg/operator.html
 share/doc/osg/doc++/osg/osg.html
 share/doc/osg/doc++/osg/osgGetLibraryName.html
 share/doc/osg/doc++/osg/osgGetVersion.html
 share/doc/osg/doc++/osg/ref_ptr.html
-share/doc/osg/doc++/osg/setFilePath.html
 share/doc/osg/doc++/osg/setNotifyLevel.html
+@dirrm share/doc/osg/doc++/osg
+share/doc/osg/doc++/osgDB/ClassGraph.class
+share/doc/osg/doc++/osgDB/ClassGraphPanel.class
+share/doc/osg/doc++/osgDB/ClassLayout.class
+share/doc/osg/doc++/osgDB/DirectoryContents.html
+share/doc/osg/doc++/osgDB/DotOsgWrapper.html
+share/doc/osg/doc++/osgDB/DynamicLibrary.html
+share/doc/osg/doc++/osgDB/Field.html
+share/doc/osg/doc++/osgDB/FieldReader.html
+share/doc/osg/doc++/osgDB/FieldReaderIterator.html
+share/doc/osg/doc++/osgDB/General.html
+share/doc/osg/doc++/osgDB/HIER.html
+share/doc/osg/doc++/osgDB/HIERjava.html
+share/doc/osg/doc++/osgDB/Input.html
+share/doc/osg/doc++/osgDB/NavigatorButton.class
+share/doc/osg/doc++/osgDB/Options.html
+share/doc/osg/doc++/osgDB/Output.html
+share/doc/osg/doc++/osgDB/ReadResult.html
+share/doc/osg/doc++/osgDB/ReaderWriter.html
+share/doc/osg/doc++/osgDB/RegisterDotOsgWrapperProxy.html
+share/doc/osg/doc++/osgDB/RegisterReaderWriterProxy.html
+share/doc/osg/doc++/osgDB/Registry.html
+share/doc/osg/doc++/osgDB/WriteResult.html
+share/doc/osg/doc++/osgDB/findDSO.html
+share/doc/osg/doc++/osgDB/findFile.html
+share/doc/osg/doc++/osgDB/findFileInDirectory.html
+share/doc/osg/doc++/osgDB/findFileInPath.html
+share/doc/osg/doc++/osgDB/getDirectoryContents.html
+share/doc/osg/doc++/osgDB/getFilePath.html
+share/doc/osg/doc++/osgDB/icon1.gif
+share/doc/osg/doc++/osgDB/icon2.gif
+share/doc/osg/doc++/osgDB/index.html
+share/doc/osg/doc++/osgDB/initFilePath.html
+share/doc/osg/doc++/osgDB/osgDB.html
+share/doc/osg/doc++/osgDB/osgDBGetLibraryName.html
+share/doc/osg/doc++/osgDB/osgDBGetVersion.html
+share/doc/osg/doc++/osgDB/readCommandLine.html
+share/doc/osg/doc++/osgDB/readImageFile.html
+share/doc/osg/doc++/osgDB/readNodeFile.html
+share/doc/osg/doc++/osgDB/readNodeFiles.html
+share/doc/osg/doc++/osgDB/readObjectFile.html
+share/doc/osg/doc++/osgDB/setFilePath.html
+share/doc/osg/doc++/osgDB/writeImageFile.html
+share/doc/osg/doc++/osgDB/writeNodeFile.html
+share/doc/osg/doc++/osgDB/writeObjectFile.html
+@dirrm share/doc/osg/doc++/osgDB
 share/doc/osg/doc++/osgGLUT/ClassGraph.class
 share/doc/osg/doc++/osgGLUT/ClassGraphPanel.class
 share/doc/osg/doc++/osgGLUT/ClassLayout.class
@@ -208,51 +361,97 @@ share/doc/osg/doc++/osgGLUT/HIER.html
 share/doc/osg/doc++/osgGLUT/HIERjava.html
 share/doc/osg/doc++/osgGLUT/NavigatorButton.class
 share/doc/osg/doc++/osgGLUT/Viewer.html
+share/doc/osg/doc++/osgGLUT/Window.html
 share/doc/osg/doc++/osgGLUT/icon1.gif
 share/doc/osg/doc++/osgGLUT/icon2.gif
 share/doc/osg/doc++/osgGLUT/index.html
 share/doc/osg/doc++/osgGLUT/osgGLUT.html
 share/doc/osg/doc++/osgGLUT/osgGLUTGetLibraryName.html
 share/doc/osg/doc++/osgGLUT/osgGLUTGetVersion.html
+@dirrm share/doc/osg/doc++/osgGLUT
+share/doc/osg/doc++/osgText/BitmapFont.html
+share/doc/osg/doc++/osgText/ClassGraph.class
+share/doc/osg/doc++/osgText/ClassGraphPanel.class
+share/doc/osg/doc++/osgText/ClassLayout.class
+share/doc/osg/doc++/osgText/Font.html
+share/doc/osg/doc++/osgText/General.html
+share/doc/osg/doc++/osgText/HIER.html
+share/doc/osg/doc++/osgText/HIERjava.html
+share/doc/osg/doc++/osgText/META_Font.html
+share/doc/osg/doc++/osgText/NavigatorButton.class
+share/doc/osg/doc++/osgText/OutlineFont.html
+share/doc/osg/doc++/osgText/Paragraph.html
+share/doc/osg/doc++/osgText/PixmapFont.html
+share/doc/osg/doc++/osgText/PolygonFont.html
+share/doc/osg/doc++/osgText/RasterFont.html
+share/doc/osg/doc++/osgText/Text.html
+share/doc/osg/doc++/osgText/TextureFont.html
+share/doc/osg/doc++/osgText/VectorFont.html
+share/doc/osg/doc++/osgText/icon1.gif
+share/doc/osg/doc++/osgText/icon2.gif
+share/doc/osg/doc++/osgText/index.html
+share/doc/osg/doc++/osgText/osgText.html
+share/doc/osg/doc++/osgText/osgTextGetLibraryName.html
+share/doc/osg/doc++/osgText/osgTextGetVersion.html
+@dirrm share/doc/osg/doc++/osgText
+share/doc/osg/doc++/osgUtil/AppVisitor.html
+share/doc/osg/doc++/osgUtil/BufferRequirementsVisitor.html
 share/doc/osg/doc++/osgUtil/CameraManipulator.html
 share/doc/osg/doc++/osgUtil/ClassGraph.class
 share/doc/osg/doc++/osgUtil/ClassGraphPanel.class
 share/doc/osg/doc++/osgUtil/ClassLayout.class
+share/doc/osg/doc++/osgUtil/CombineLODsVisitor.html
+share/doc/osg/doc++/osgUtil/CullViewState.html
+share/doc/osg/doc++/osgUtil/CullVisitor.html
+share/doc/osg/doc++/osgUtil/DepthSortedBin.html
 share/doc/osg/doc++/osgUtil/DisplayListVisitor.html
+share/doc/osg/doc++/osgUtil/DisplayRequirementsVisitor.html
 share/doc/osg/doc++/osgUtil/DriveManipulator.html
+share/doc/osg/doc++/osgUtil/FlattenStaticTransformsVisitor.html
 share/doc/osg/doc++/osgUtil/FlightManipulator.html
 share/doc/osg/doc++/osgUtil/GUIActionAdapter.html
 share/doc/osg/doc++/osgUtil/GUIEventAdapter.html
+share/doc/osg/doc++/osgUtil/GUIEventHandler.html
 share/doc/osg/doc++/osgUtil/General.html
 share/doc/osg/doc++/osgUtil/HIER.html
 share/doc/osg/doc++/osgUtil/HIERjava.html
 share/doc/osg/doc++/osgUtil/Hit.html
+share/doc/osg/doc++/osgUtil/InsertImpostorsVisitor.html
 share/doc/osg/doc++/osgUtil/IntersectState.html
 share/doc/osg/doc++/osgUtil/IntersectVisitor.html
 share/doc/osg/doc++/osgUtil/NavigatorButton.class
-share/doc/osg/doc++/osgUtil/RenderVisitor.html
+share/doc/osg/doc++/osgUtil/OptimizeStateVisitor.html
+share/doc/osg/doc++/osgUtil/OptimizeVisitor.html
+share/doc/osg/doc++/osgUtil/Optimizer.html
+share/doc/osg/doc++/osgUtil/RegisterRenderBinProxy.html
+share/doc/osg/doc++/osgUtil/RemoveRedundentNodesVisitor.html
+share/doc/osg/doc++/osgUtil/RenderBin.html
+share/doc/osg/doc++/osgUtil/RenderGraph.html
+share/doc/osg/doc++/osgUtil/RenderLeaf.html
+share/doc/osg/doc++/osgUtil/RenderStage.html
+share/doc/osg/doc++/osgUtil/RenderStageLighting.html
+share/doc/osg/doc++/osgUtil/RenderToTextureStage.html
 share/doc/osg/doc++/osgUtil/SceneView.html
+share/doc/osg/doc++/osgUtil/SceneViewManipulator.html
 share/doc/osg/doc++/osgUtil/SmoothingVisitor.html
+share/doc/osg/doc++/osgUtil/StateSetManipulator.html
+share/doc/osg/doc++/osgUtil/StateVisitor.html
+share/doc/osg/doc++/osgUtil/Statistics.html
+share/doc/osg/doc++/osgUtil/Tesselator.html
 share/doc/osg/doc++/osgUtil/TrackballManipulator.html
-share/doc/osg/doc++/osgUtil/ViewState.html
+share/doc/osg/doc++/osgUtil/TransformCallback.html
+share/doc/osg/doc++/osgUtil/TriStripVisitor.html
+share/doc/osg/doc++/osgUtil/VisualsRequirementsVisitor.html
 share/doc/osg/doc++/osgUtil/icon1.gif
 share/doc/osg/doc++/osgUtil/icon2.gif
 share/doc/osg/doc++/osgUtil/index.html
 share/doc/osg/doc++/osgUtil/osgUtil.html
 share/doc/osg/doc++/osgUtil/osgUtilGetLibraryName.html
 share/doc/osg/doc++/osgUtil/osgUtilGetVersion.html
-share/doc/osg/index.html
 @dirrm share/doc/osg/doc++/osgUtil
-@dirrm share/doc/osg/doc++/osgGLUT
-@dirrm share/doc/osg/doc++/osg
 @dirrm share/doc/osg/doc++
-@dirrm share/doc/osg/UML
-@dirrm share/doc/osg/MindMaps/Mission
-@dirrm share/doc/osg/MindMaps/DesignPatterns
-@dirrm share/doc/osg/MindMaps
-@dirrm share/doc/osg/Doxyfiles
+share/doc/osg/index.html
+share/doc/osg/sgv.html
+share/doc/osg/stereo.html
+share/doc/osg/OpenSceneGraphBanner_Distribution.jpg
 @dirrm share/doc/osg
-@dirrm lib/osgPlugins
-@dirrm include/osgUtil
-@dirrm include/osgGLUT
-@dirrm include/osg