Attachment #72792 for bug #105729

View | Details | Raw Unified | Return to bug 105729
Collapse All | Expand All




#

PORTNAME=	openthreads
PORTVERSION=	1.5
CATEGORIES=	devel
MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/
#
# the following master distribution contains the version of OpenThreads
# as described above by PORTVERSION and PORTREVISION.
DISTNAME=	OSG_OP_OT-1.0

MAINTAINER=	jylefort@FreeBSD.org
COMMENT=	A library which provides a C++ object-oriented thread interface

USE_ZIP=	yes
USE_GMAKE=	yes
USE_LDCONFIG=	yes

MAKEFILE=	GNUmakefile
WRKSRC=		${WRKDIR}/${DISTNAME}/OpenThreads
MAKE_ENV+=	FREEBSD_ARCH="${ARCH}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}"

# Optimisation/Debug flags:
#   opt = optimised ($OPTF added)
#   debug = debug ($DBGF added)
# opt is default
#
ALL_TARGET=	opt

.include "${.CURDIR}/../../graphics/osg/bsd.osg.mk"
.include <bsd.port.mk>

Lines 1-3 Link Here

(-)openthreads/distinfo (-3 lines)
1	MD5 (OSG_OP_OT-1.0.zip) = dfb3eca46b32625602dabe9aa46c6b6f
2	SHA256 (OSG_OP_OT-1.0.zip) = c39572c72d9ed7b7a34a36779bcf56180ba2917926f6f658b5af1824eeb3b6a6
3	SIZE (OSG_OP_OT-1.0.zip) = 5036053




--- Make/makedefs.orig	Sat Dec 10 09:49:24 2005
+++ Make/makedefs	Wed Sep 27 19:05:17 2006
@@ -264,15 +264,22 @@
       CXX               = g++
     endif
   DEPARG            = -MM
-  INC               +=  -I/usr/local/include -I/usr/X11R6/include
-  DEF               += -W -Wall
+  INC               +=  -I${LOCALBASE}/include -I${X11BASE}/include
+  DEF               += -W -Wall ${PTHREAD_CFLAGS}
   OPTF              = -O2 
   DBGF              = -g 
   SHARED            = -shared
   ARCH              = 32
   ARCHARGS          = 
-  INST_LOCATION   = /usr/local
-  INST_SHARE = /usr/share/OpenThreads
+  INST_SYS_PREFIX   = $(PREFIX)
+  INST_SHARE_PREFIX = $(DATADIR)
+  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib ${PTHREAD_LIBS}
+  INST_LOCATION     = $(INST_SYS_PREFIX)
+  INST_SHARE        = $(INST_SHARE_PREFIX)
+  INST_DEMOS        = $(EXAMPLESDIR)/bin
+  INST_SRC          = $(EXAMPLESDIR)/src
+  INST_DOC          = $(DOCSDIR)
+  INST_DATA         = $(DATADIR)
 endif
 
 #### MacOS X specific definitions




--- Make/makerules.orig	Thu Oct 16 19:39:35 2003
+++ Make/makerules	Thu Oct 16 19:40:50 2003
@@ -89,7 +89,7 @@
 $(EXEC:=.opt) :
 	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
 	@cd $(OPTDIR); \
-      $(MAKE) -f ../GNUmakefile DOF=$(OPTF)  TOPDIR=../${TOPDIR} \
+      $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)"  TOPDIR=../${TOPDIR} \
           THISDIR=../$(THISDIR)\
           MAKEDEPEND=Makedepend $(EXEC)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
@@ -98,7 +98,7 @@
 $(LIB:=.opt) : 
 	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
 	@cd $(OPTDIR);\
-	  $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \
+	  $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
 	        THISDIR=../$(THISDIR)\
 	        MAKEDEPEND=Makedepend $(LIB)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB).$(LIB_EXT) __link




--- Make/instrules.orig	Thu Dec  8 22:28:18 2005
+++ Make/instrules	Mon Sep 25 19:17:55 2006
@@ -28,13 +28,13 @@
 
 __inst_headers:
 	@[ -d $(INST_INCLUDE)/OpenThreads ] || mkdir -p $(INST_INCLUDE)/OpenThreads
-	for f in include/OpenThreads/* ; do\
-	if [ ! -d $$f ];\
-	then\
+	for f in include/OpenThreads/* ; do \
+	if [ ! -d $$f ]; \
+	then \
 		[ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-"  ] && \
 			echo $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \
 			     $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \
-	fi;\
+	fi; \
 	done
 
 

Lines 5-9 Link Here

(-)openthreads/pkg-descr (-2 lines)
5	a shared object library.	5	a shared object library.
6		6
7	WWW: http://openthreads.sourceforge.net/	7	WWW: http://openthreads.sourceforge.net/
8
9	Maintainer: "Ying-Chieh Chen" <yinjieh@csie.nctu.edu.tw>




#

PORTNAME=	openproducer
PORTVERSION=	1.1
CATEGORIES=	graphics
MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/
#
# the following master distribution contains the version of OpenProducer
# as described above by PORTVERSION and PORTREVISION.
DISTNAME=	OSG_OP_OT-1.0

MAINTAINER=	jylefort@FreeBSD.org
COMMENT=	A cross-platform C++/OpenGL library focused on camera control

BUILD_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads
RUN_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads

USE_ZIP=	yes
USE_X_PREFIX=	yes
USE_GL=		yes
USE_GMAKE=	yes
USE_LDCONFIG=	yes

WRKSRC=		${WRKDIR}/${DISTNAME}/Producer
MAKEFILE=	GNUmakefile
MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}

# Optimisation/Debug flags:
#   opt = optimized ($OPTF added)
#   debug = debug ($DBGF added)
# opt is default
#
ALL_TARGET=	opt

.include "${.CURDIR}/../../graphics/osg/bsd.osg.mk"
.include <bsd.port.mk>

Lines 1-3 Link Here

(-)openproducer/distinfo (-3 lines)
1	MD5 (OSG_OP_OT-1.0.zip) = dfb3eca46b32625602dabe9aa46c6b6f
2	SHA256 (OSG_OP_OT-1.0.zip) = c39572c72d9ed7b7a34a36779bcf56180ba2917926f6f658b5af1824eeb3b6a6
3	SIZE (OSG_OP_OT-1.0.zip) = 5036053




--- Make/makedefs.orig	Fri Dec  9 23:51:33 2005
+++ Make/makedefs	Sun Nov 19 19:33:13 2006
@@ -55,7 +55,7 @@
 DEF        = -DPRODUCER_VERSION=\"$(VERSION)\"\
              -DPRODUCER_VERSION_REVISION="$(VERSION_REVISION)"
 
-INC        = -I$(TOPDIR)/include 
+INC	   +=  -I${LOCALBASE}/include -I${X11BASE}/include
 
 CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
 LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
@@ -64,20 +64,20 @@
 	     	 $(YACCFILES:.y=.o)\
 	     	 $(LEXFILES:.l=.o)	    
 
-DOF        = $(OPTF)
+OPTF	   = ${CXXFLAGS}
 DEBUGDIR   = $(OS)$(ARCH).Debug
 OPTDIR     = $(OS)$(ARCH).Opt
 BININST    = bin
 LIBINST    = lib
 
-INST_LOCATION      ?= /usr/local
+INST_LOCATION      = $(PREFIX)
 INST_LIBS          = $(INST_LOCATION)/lib$(ARCH_EXT)
 INST_INCLUDE       = $(INST_LOCATION)/include
 INST_SHARE         = $(INST_LOCATION)/share/Producer
-INST_DEMOS         = $(INST_SHARE)/bin
-INST_SRC           = $(INST_SHARE)/src
-INST_DOC           = $(INST_SHARE)/doc
-INST_DATA          = $(INST_SHARE)/data
+INST_DEMOS         = $(EXAMPLESDIR)/bin
+INST_SRC           = $(EXAMPLESDIR)/src
+INST_DOC           = $(DOCSDIR)
+INST_DATA          = $(DATADIR)
 INST_DEMO_SRC      = $(INST_SRC)/demos
 
 LINK               = ln -sf
@@ -294,7 +294,7 @@
     endif
   DEPARG            = -MM
   INC               +=  -I/usr/local/include -I/usr/X11R6/include
-  DEF               += -W -Wall
+  DEF               += -fPIC -W -Wall
   OPTF              = -O2 
   DBGF              = -g 
   SHARED            = -shared
@@ -305,7 +305,7 @@
 
   GL_LIBS           = -lGL
   X_LIBS            = -lXmu -lX11
-  OPEN_THREAD_LIB   = -lOpenThreads -lpthread
+  OPEN_THREAD_LIB   = -lOpenThreads $(PTHREAD_LIBS)
 
 endif
 




diff -urN ../Producer.orig/Make/makerules ./Make/makerules
--- ../Producer.orig/Make/makerules	Wed Jul 28 04:02:15 2004
+++ ./Make/makerules	Tue Jan 25 21:36:58 2005
@@ -83,7 +83,7 @@
 $(EXEC:=.opt) :
 	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
 	@cd $(OPTDIR); \
-	  $(MAKE) -f ../GNUmakefile DOF=$(OPTF)  TOPDIR=../${TOPDIR} \
+	  $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)"  TOPDIR=../${TOPDIR} \
 	      THISDIR=../$(THISDIR)\
 	      MAKEDEPEND=Makedepend $(EXEC)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
@@ -92,7 +92,7 @@
 $(LIB:=.opt) : 
 	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
 	@cd $(OPTDIR);\
-	  $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \
+	  $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
 	        THISDIR=../$(THISDIR)\
 	        MAKEDEPEND=Makedepend $(LIB)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB).$(LIB_EXT) __link

Lines 13-17 Link Here

(-)openproducer/pkg-descr (-2 lines)
13	systems.	13	systems.
14		14
15	WWW: http://www.andesengineering.com/Producer/	15	WWW: http://www.andesengineering.com/Producer/
16
17	Maintainer: "Ying-Chieh Chen" <yinjieh@csie.nctu.edu.tw>




include/Producer/Keyboard
include/Producer/KeyboardMouse
include/Producer/Math
include/Producer/PipeTimer
include/Producer/RefOpenThreads
include/Producer/Referenced
include/Producer/RenderSurface
include/Producer/System
include/Producer/Timer
include/Producer/Trackball
include/Producer/Types
include/Producer/Utils
include/Producer/Version
include/Producer/VisualChooser
include/Producer/Window3D




#

PORTNAME=	osg
PORTVERSION=	1.2
CATEGORIES=	graphics
MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/
DISTNAME=	OSG_OP_OT-${PORTVERSION}-2

MAINTAINER=	jylefort@FreeBSD.org
COMMENT=	C++ OpenGL scene graph library for real-time rendering

BROKEN=		fails to install
DEPRECATED=	${BROKEN}
EXPIRATION_DATE=2006-12-01

BUILD_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \
		${LOCALBASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer
RUN_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \
		${LOCALBASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer
LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
		jpeg.9:${PORTSDIR}/graphics/jpeg \
		ungif.5:${PORTSDIR}/graphics/libungif \
		tiff.4:${PORTSDIR}/graphics/tiff \
		freetype.9:${PORTSDIR}/print/freetype2
		xml2.5:${PORTSDIR}/textproc/libxml2

USE_ZIP=	yes
USE_X_PREFIX=	yes
USE_GL=		yes
INSTALLS_SHLIB=	yes
USE_GMAKE=	yes
MAKE_ENV=	OSGHOME="${WRKSRC}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}" \
		EXAMPLESDIR="${EXAMPLESDIR}" \
		DOCSDIR="${DOCSDIR}" \
		DATADIR="${DATADIR}" \
		OPTF="${CXXFLAGS}"
MAKEFILE=	GNUmakefile
WRKSRC=		${WRKDIR}/${DISTNAME}/OpenSceneGraph

.include "${.CURDIR}/bsd.osg.mk"
.include <bsd.port.mk>

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500035
EXTRA_PATCHES=	${FILESDIR}/freebsd4-osg-patches
.endif

.if !defined(NOPORTDOCS)

BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen	\
		dot:${PORTSDIR}/graphics/graphviz
PORTDOCS=	html

pre-patch:
	${REINPLACE_CMD} -e 's,[[:cntrl:]]*$$,,' \
		${WRKSRC}/examples/osgtesselate/osgtesselate.cpp

post-build:
	cd ${WRKSRC}/doc/Doxyfiles && OSGHOME=${WRKSRC} doxygen all_Doxyfile

pre-install:
	${FIND} ${WRKSRC} -name '*.orig' -delete

post-install:
	@${MKDIR} ${DOCSDIR}
	${CP} -r ${WRKSRC}/doc/doxygen/ ${DOCSDIR}

.endif

.include <bsd.port.post.mk>




# $Id$

MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/
DISTNAME=	OSG_OP_OT-1.2

MD5_FILE=	${.CURDIR}/../../graphics/osg/distinfo
USE_ZIP=	yes
USE_GMAKE=	yes
USE_LDCONFIG=	yes

MAKEFILE=	GNUmakefile
MAKE_ARGS=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}" \
		CXX="${CXX}" \
		INST_LOCATION="${PREFIX}" \
		INST_EXAMPLES="${EXAMPLESDIR}/bin" \
		INST_SRC="${EXAMPLESDIR}/src" \
		INST_EXAMPLE_SRC="${EXAMPLESDIR}/src" \
		INSTBINCMD="${INSTALL_PROGRAM}" \
		INSTXCMD="${INSTALL_PROGRAM}" \
		INSTDEVCMD="${INSTALL_DATA}" \
		INSTRCMD="${INSTALL_DATA}"
ALL_TARGET=	opt

post-patch: osg-post-patch

osg-post-patch:
	@${REINPLACE_CMD} -Ee 's|-O2|${CXXFLAGS}|; \
		s|(-I\|-L\|-rpath )/usr/local|\1${LOCALBASE}|; \
		s|(-I\|-L\|-rpath )/usr/X11R6|\1${X11BASE}|' \
		${WRKSRC}/Make/makedefs
	@${REINPLACE_CMD} -e 's|DOF=$$(OPTF)|DOF="$$(OPTF)"|' \
		${WRKSRC}/Make/makerules

Lines 1-3 Link Here

(-)osg/distinfo (-3 / +3 lines)
1	MD5 (OSG_OP_OT-0.9.8-2.zip) = 4c3fe8b7701e5a5932a4268075b60cda	1	MD5 (OSG_OP_OT-1.2.zip) = e08e0ef1f250dfc17122926ef00b1559
2	SHA256 (OSG_OP_OT-0.9.8-2.zip) = 72a13ad9ca473660eef155041892fd8ba3ca570beaa6220f3375746143bad5f1	2	SHA256 (OSG_OP_OT-1.2.zip) = 3ccd899c83140a542313f9a659698af36ea30bb7cfddcd8962e25cf0fe7e1fb5
3	SIZE (OSG_OP_OT-0.9.8-2.zip) = 3805142	3	SIZE (OSG_OP_OT-1.2.zip) = 5286887




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),




--- 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)
-  C++               = g++
+  C++               = ${CXX}
   DEPARG            = -MM
-  INC               +=  -I/usr/local/include -I/usr/X11R6/include
+  INC               +=  -I${LOCALBASE}/include -I${X11BASE}/include
   DEF               += -W -Wall
-  OPTF              = -O2 
+  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 -pthread
+  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib -pthread
  DYNAMICLIBRARYLIB = 
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lGLU -lGL 
   X_INC             = -I/usr/X11R6/include
   X_LIBS            = -lXmu -lX11
   SOCKET_LIBS       = 
-  OTHER_LIBS        = -lOpenThreads
+  OTHER_LIBS        = -lOpenThreads ${PTHREAD_LIBS}
+  # PREFIX, EXAMPLESDIR, DOCSDIR, and DATADIR are defined by the port
+  INST_LOCATION     = ${PREFIX}
+  INST_SHARE        = ${PREFIX}/share
+  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
   PNG_LIBS          = -lpng
   JPEG_LIBS         = -ljpeg
   TIFF_LIB          = -ltiff




--- Make/makedirdefs.orig	Tue Jul 22 21:12:55 2003
+++ Make/makedirdefs	Tue Jul 22 21:13:50 2003
@@ -58,9 +58,11 @@
 ifneq ($(OS),Darwin)
 ifneq ($(OS),SunOS)
 ifneq ($(OS),IRIX)
+ifneq ($(OS),FreeBSD)
 
   PLUGIN_DIRS += geo
 
+endif
 endif
 endif
 endif




--- Make/makerules.orig	Fri Aug  8 22:41:37 2003
+++ Make/makerules	Sat Oct 18 01:42:58 2003
@@ -110,7 +110,7 @@
 $(EXEC:=.opt) : 
 	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
 	@cd $(OPTDIR); \
-	  $(MAKE) -f ../GNUmakefile DOF=$(OPTF)  TOPDIR=../${TOPDIR} \
+	  $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)"  TOPDIR=../${TOPDIR} \
 	      THISDIR=../$(THISDIR)\
 	      MAKEDEPEND=Makedepend $(EXEC)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
@@ -119,7 +119,7 @@
 $(LIB:=.opt) : 
 	@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
 	@cd $(OPTDIR);\
-	  $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
+	  $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
 	        THISDIR=../$(THISDIR)\
 	        MAKEDEPEND=Makedepend $(LIB)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB) __link
@@ -127,7 +127,7 @@
 $(PLUGIN:=.opt) : 
 	@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
 	@cd $(OPTDIR); \
-	  $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
+	  $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
 	    THISDIR=../$(THISDIR)\
 	               MAKEDEPEND=Makedepend $(PLUGIN)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link

Line 0 Link Here

(-)osg/files/patch-Make_makedefs (+11 lines)
	1	--- Make/makedefs.orig Tue Sep 12 21:15:04 2006
	2	+++ Make/makedefs Tue Nov 21 17:02:38 2006
	3	@@ -459,7 +459,7 @@
	4	X_INC = -I/usr/X11R6/include
	5	X_LIBS = -lXmu -lX11
	6	SOCKET_LIBS =
	7	- OTHER_LIBS = -lOpenThreads
	8	+ OTHER_LIBS = -lOpenThreads $(PTHREAD_LIBS)
	9	PNG_LIBS = -lpng
	10	JPEG_LIBS = -ljpeg
	11	TIFF_LIB = -ltiff




include/osg/AutoTransform
include/osg/Billboard
include/osg/BlendColor
include/osg/BlendEquation
include/osg/BlendFunc
include/osg/BoundingBox
include/osg/BoundingSphere
include/osg/BoundsChecking
include/osg/BufferObject
include/osg/CameraNode
include/osg/CameraView
include/osg/ClampColor
include/osg/ClearNode
include/osg/ClipNode
include/osg/ClipPlane

include/osg/Export
include/osg/Fog
include/osg/FragmentProgram
include/osg/FrameBufferObject
include/osg/FrameStamp
include/osg/FrontFace
include/osg/GL
include/osg/GL2Extensions
include/osg/GLExtensions
include/osg/GLU
include/osg/Geode
include/osg/Geometry
include/osg/GraphicsContext
include/osg/GraphicsThread
include/osg/Group
include/osg/Image
include/osg/ImageStream
include/osg/Impostor
include/osg/ImpostorSprite
include/osg/LOD
include/osg/Light
include/osg/LightModel

include/osg/LineSegment
include/osg/LineStipple
include/osg/LineWidth
include/osg/LogicOp
include/osg/Material
include/osg/Math
include/osg/Matrix

include/osg/Multisample
include/osg/Node
include/osg/NodeCallback
include/osg/NodeTrackerCallback
include/osg/NodeVisitor
include/osg/Notify
include/osg/Object

include/osg/Polytope
include/osg/PositionAttitudeTransform
include/osg/PrimitiveSet
include/osg/Program
include/osg/Projection
include/osg/ProxyNode
include/osg/Quat
include/osg/RefNodePath
include/osg/Referenced
include/osg/Scissor
include/osg/Sequence
include/osg/ShadeModel
include/osg/Shader
include/osg/ShadowVolumeOccluder
include/osg/Shape
include/osg/ShapeDrawable

include/osg/Transform
include/osg/TriangleFunctor
include/osg/TriangleIndexFunctor
include/osg/Uniform
include/osg/UnitTestFramework
include/osg/Vec2
include/osg/Vec2b
include/osg/Vec2d
include/osg/Vec2f
include/osg/Vec2s
include/osg/Vec3
include/osg/Vec3b
include/osg/Vec3d
include/osg/Vec3f
include/osg/Vec3s
include/osg/Vec4
include/osg/Vec4b
include/osg/Vec4d
include/osg/Vec4f
include/osg/Vec4s
include/osg/Vec4ub
include/osg/Version
include/osg/VertexProgram
include/osg/Viewport
include/osg/buffered_value
include/osg/fast_back_stack
include/osg/io_utils
include/osg/observer_ptr
include/osg/ref_ptr
include/osgDB/Archive
include/osgDB/DatabasePager

include/osgFX/Cartoon
include/osgFX/Effect
include/osgFX/Export
include/osgFX/MultiTextureControl
include/osgFX/Registry
include/osgFX/Scribe
include/osgFX/SpecularHighlights

include/osgFX/Validator
include/osgGA/AnimationPathManipulator
include/osgGA/DriveManipulator
include/osgGA/EventQueue
include/osgGA/EventVisitor
include/osgGA/Export
include/osgGA/FlightManipulator
include/osgGA/GUIActionAdapter

include/osgGA/StateSetManipulator
include/osgGA/TerrainManipulator
include/osgGA/TrackballManipulator
include/osgGA/UFOManipulator
include/osgGA/Version
include/osgIntrospection/Attributes
include/osgIntrospection/Comparator
include/osgIntrospection/ConstructorInfo
include/osgIntrospection/Converter
include/osgIntrospection/ConverterProxy
include/osgIntrospection/CustomAttribute
include/osgIntrospection/CustomAttributeProvider
include/osgIntrospection/Exceptions
include/osgIntrospection/Export
include/osgIntrospection/InstanceCreator
include/osgIntrospection/MethodInfo
include/osgIntrospection/ParameterInfo
include/osgIntrospection/PropertyInfo
include/osgIntrospection/PublicMemberAccessor
include/osgIntrospection/ReaderWriter
include/osgIntrospection/Reflection
include/osgIntrospection/ReflectionMacros
include/osgIntrospection/Reflector
include/osgIntrospection/StaticMethodInfo
include/osgIntrospection/Type
include/osgIntrospection/TypeNameAliasProxy
include/osgIntrospection/TypedConstructorInfo
include/osgIntrospection/TypedMethodInfo
include/osgIntrospection/Utility
include/osgIntrospection/Value
include/osgIntrospection/variant_cast
include/osgParticle/AccelOperator
include/osgParticle/AngularAccelOperator
include/osgParticle/BoxPlacer
include/osgParticle/CenteredPlacer
include/osgParticle/ConnectedParticleSystem
include/osgParticle/ConstantRateCounter
include/osgParticle/Counter
include/osgParticle/Emitter
include/osgParticle/ExplosionDebrisEffect
include/osgParticle/ExplosionEffect
include/osgParticle/Export
include/osgParticle/FireEffect
include/osgParticle/FluidFrictionOperator
include/osgParticle/FluidProgram
include/osgParticle/ForceOperator
include/osgParticle/Interpolator
include/osgParticle/LinearInterpolator

include/osgParticle/ParticleSystemUpdater
include/osgParticle/Placer
include/osgParticle/PointPlacer
include/osgParticle/PrecipitationEffect
include/osgParticle/Program
include/osgParticle/RadialShooter
include/osgParticle/RandomRateCounter

include/osgParticle/SegmentPlacer
include/osgParticle/Shooter
include/osgParticle/SmokeEffect
include/osgParticle/SmokeTrailEffect
include/osgParticle/VariableRateCounter
include/osgParticle/Version
include/osgParticle/range
include/osgProducer/EventAdapter
include/osgProducer/Export
include/osgProducer/GraphicsContextImplementation
include/osgProducer/KeyboardMouseCallback
include/osgProducer/OsgCameraGroup
include/osgProducer/OsgSceneHandler

include/osgSim/DOFTransform
include/osgSim/Export
include/osgSim/GeographicLocation
include/osgSim/Impostor
include/osgSim/ImpostorSprite
include/osgSim/InsertImpostorsVisitor
include/osgSim/LightPoint
include/osgSim/LightPointNode
include/osgSim/LightPointSystem
include/osgSim/MultiSwitch
include/osgSim/OpenFlightOptimizer
include/osgSim/OverlayNode
include/osgSim/ScalarBar
include/osgSim/ScalarsToColors
include/osgSim/Sector

include/osgUtil/GLObjectsVisitor
include/osgUtil/HalfWayMapGenerator
include/osgUtil/HighlightMapGenerator
include/osgUtil/InsertImpostorsVisitor
include/osgUtil/IntersectVisitor
include/osgUtil/Optimizer
include/osgUtil/PositionalStateContainer
include/osgUtil/ReflectionMapGenerator
include/osgUtil/RenderBin
include/osgUtil/RenderGraph
include/osgUtil/RenderLeaf
include/osgUtil/RenderStage
include/osgUtil/RenderStageLighting
include/osgUtil/RenderToTextureStage
include/osgUtil/SceneView
include/osgUtil/Simplifier
include/osgUtil/SmoothingVisitor
include/osgUtil/StateGraph
include/osgUtil/Statistics
include/osgUtil/TangentSpaceGenerator
include/osgUtil/Tesselator

lib/libosgDB.so
lib/libosgFX.so
lib/libosgGA.so
lib/libosgGL2.so
lib/libosgParticle.so
lib/libosgProducer.so
lib/libosgSim.so

lib/libosgUtil.so
lib/osgPlugins/osgdb_3dc.so
lib/osgPlugins/osgdb_3ds.so
lib/osgPlugins/osgdb_OpenFlight.so
lib/osgPlugins/osgdb_ac.so
lib/osgPlugins/osgdb_bmp.so
lib/osgPlugins/osgdb_bsp.so
lib/osgPlugins/osgdb_dds.so
lib/osgPlugins/osgdb_dw.so
lib/osgPlugins/osgdb_dxf.so
lib/osgPlugins/osgdb_flt.so
lib/osgPlugins/osgdb_freetype.so
lib/osgPlugins/osgdb_geo.so
lib/osgPlugins/osgdb_gif.so
lib/osgPlugins/osgdb_hdr.so
lib/osgPlugins/osgdb_ive.so
lib/osgPlugins/osgdb_jpeg.so
lib/osgPlugins/osgdb_logo.so

lib/osgPlugins/osgdb_lws.so
lib/osgPlugins/osgdb_md2.so
lib/osgPlugins/osgdb_net.so
lib/osgPlugins/osgdb_normals.so
lib/osgPlugins/osgdb_obj.so
lib/osgPlugins/osgdb_osg.so
lib/osgPlugins/osgdb_osgFX.so

lib/osgPlugins/osgdb_rgb.so
lib/osgPlugins/osgdb_rot.so
lib/osgPlugins/osgdb_scale.so
lib/osgPlugins/osgdb_shp.so
lib/osgPlugins/osgdb_stl.so
lib/osgPlugins/osgdb_tga.so
lib/osgPlugins/osgdb_tgz.so

lib/osgPlugins/osgdb_txp.so
lib/osgPlugins/osgdb_x.so
lib/osgPlugins/osgdb_zip.so
@dirrm include/osg
@dirrm include/osgDB
@dirrm include/osgFX
@dirrm include/osgGA
@dirrm include/osgGL2
@dirrm include/osgParticle
@dirrm include/osgProducer
@dirrm include/osgSim
@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
%%EXAMPLESDIR%%/bin/osgcameragroup
%%EXAMPLESDIR%%/bin/osgclip
%%EXAMPLESDIR%%/bin/osgcluster
%%EXAMPLESDIR%%/bin/osgconv
%%EXAMPLESDIR%%/bin/osgcopy
%%EXAMPLESDIR%%/bin/osgcubemap
%%EXAMPLESDIR%%/bin/osgdepthshadow
%%EXAMPLESDIR%%/bin/osgdistortion
%%EXAMPLESDIR%%/bin/osgforest
%%EXAMPLESDIR%%/bin/osgfxbrowser
%%EXAMPLESDIR%%/bin/osggeodemo
%%EXAMPLESDIR%%/bin/osggeometry
%%EXAMPLESDIR%%/bin/osghangglide
%%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
%%EXAMPLESDIR%%/bin/osgscalarbar
%%EXAMPLESDIR%%/bin/osgscribe
%%EXAMPLESDIR%%/bin/osgsequence
%%EXAMPLESDIR%%/bin/osgshaders
%%EXAMPLESDIR%%/bin/osgshadowtexture
%%EXAMPLESDIR%%/bin/osgshape
%%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
%%EXAMPLESDIR%%/bin/osgtexture3D
%%EXAMPLESDIR%%/bin/osgtexturerectangle
%%EXAMPLESDIR%%/bin/osgunittests
%%EXAMPLESDIR%%/bin/osgversion
%%EXAMPLESDIR%%/bin/osgvertexprogram
%%EXAMPLESDIR%%/bin/osgviewer
%%EXAMPLESDIR%%/bin/osgvolume
%%EXAMPLESDIR%%/bin/osgwindows
%%EXAMPLESDIR%%/src/Make/makedefs
%%EXAMPLESDIR%%/src/Make/makerules
%%EXAMPLESDIR%%/src/osgGLUTkeyboardmouse/GNUmakefile
%%EXAMPLESDIR%%/src/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp
%%EXAMPLESDIR%%/src/osgGLUTsimple/GNUmakefile
%%EXAMPLESDIR%%/src/osgGLUTsimple/osgGLUTsimple.cpp
%%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/osgblendequation/GNUmakefile
%%EXAMPLESDIR%%/src/osgblendequation/osgblendequation.cpp
%%EXAMPLESDIR%%/src/osgbluemarble/GNUmakefile
%%EXAMPLESDIR%%/src/osgbluemarble/osgbluemarble.cpp
%%EXAMPLESDIR%%/src/osgcallback/GNUmakefile
%%EXAMPLESDIR%%/src/osgcallback/osgcallback.cpp
%%EXAMPLESDIR%%/src/osgcamera/GNUmakefile
%%EXAMPLESDIR%%/src/osgcamera/osgcamera.cpp
%%EXAMPLESDIR%%/src/osgcameragroup/GNUmakefile
%%EXAMPLESDIR%%/src/osgcameragroup/osgcameragroup.cpp
%%EXAMPLESDIR%%/src/osgcatch/GNUmakefile
%%EXAMPLESDIR%%/src/osgcatch/osgcatch.cpp
%%EXAMPLESDIR%%/src/osgcegui/GNUmakefile
%%EXAMPLESDIR%%/src/osgcegui/osgcegui.cpp
%%EXAMPLESDIR%%/src/osgclip/GNUmakefile
%%EXAMPLESDIR%%/src/osgclip/osgclip.cpp
%%EXAMPLESDIR%%/src/osgcluster/GNUmakefile

%%EXAMPLESDIR%%/src/osgcluster/osgcluster.cpp
%%EXAMPLESDIR%%/src/osgcluster/receiver.cpp
%%EXAMPLESDIR%%/src/osgcluster/receiver.h
%%EXAMPLESDIR%%/src/osgconv/GNUmakefile
%%EXAMPLESDIR%%/src/osgconv/GeoSet.cpp
%%EXAMPLESDIR%%/src/osgconv/IO_GeoSet.cpp
%%EXAMPLESDIR%%/src/osgconv/OrientationConverter.cpp
%%EXAMPLESDIR%%/src/osgconv/OrientationConverter.h
%%EXAMPLESDIR%%/src/osgconv/osgconv.cpp
%%EXAMPLESDIR%%/src/osgcopy/GNUmakefile
%%EXAMPLESDIR%%/src/osgcopy/osgcopy.cpp
%%EXAMPLESDIR%%/src/osgcubemap/GNUmakefile
%%EXAMPLESDIR%%/src/osgcubemap/osgcubemap.cpp
%%EXAMPLESDIR%%/src/osgdelaunay/GNUmakefile
%%EXAMPLESDIR%%/src/osgdelaunay/osgdelaunay.cpp
%%EXAMPLESDIR%%/src/osgdepthpartition/DepthPartitionNode.cpp
%%EXAMPLESDIR%%/src/osgdepthpartition/DistanceAccumulator.cpp
%%EXAMPLESDIR%%/src/osgdepthpartition/GNUmakefile
%%EXAMPLESDIR%%/src/osgdepthpartition/osgdepthpartition.cpp
%%EXAMPLESDIR%%/src/osgdepthshadow/GNUmakefile
%%EXAMPLESDIR%%/src/osgdepthshadow/osgdepthshadow.cpp
%%EXAMPLESDIR%%/src/osgdistortion/GNUmakefile

%%EXAMPLESDIR%%/src/osgimpostor/GNUmakefile
%%EXAMPLESDIR%%/src/osgimpostor/TestManipulator.cpp
%%EXAMPLESDIR%%/src/osgimpostor/osgimpostor.cpp
%%EXAMPLESDIR%%/src/osgintrospection/GNUmakefile
%%EXAMPLESDIR%%/src/osgintrospection/osgintrospection.cpp
%%EXAMPLESDIR%%/src/osgkeyboard/GNUmakefile
%%EXAMPLESDIR%%/src/osgkeyboard/osgkeyboard.cpp
%%EXAMPLESDIR%%/src/osgkeyboardmouse/GNUmakefile

%%EXAMPLESDIR%%/src/osglight/osglight.cpp
%%EXAMPLESDIR%%/src/osglightpoint/GNUmakefile
%%EXAMPLESDIR%%/src/osglightpoint/osglightpoint.cpp
%%EXAMPLESDIR%%/src/osglogicop/GNUmakefile
%%EXAMPLESDIR%%/src/osglogicop/osglogicop.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/osgmultiplecameras/GNUmakefile
%%EXAMPLESDIR%%/src/osgmultiplecameras/osgmultiplecameras.cpp
%%EXAMPLESDIR%%/src/osgmultitexture/GNUmakefile
%%EXAMPLESDIR%%/src/osgmultitexture/osgmultitexture.cpp
%%EXAMPLESDIR%%/src/osgoccluder/GNUmakefile
%%EXAMPLESDIR%%/src/osgoccluder/osgoccluder.cpp
%%EXAMPLESDIR%%/src/osgpagedlod/GNUmakefile
%%EXAMPLESDIR%%/src/osgpagedlod/osgpagedlod.cpp
%%EXAMPLESDIR%%/src/osgparametric/GNUmakefile
%%EXAMPLESDIR%%/src/osgparametric/osgparametric.cpp
%%EXAMPLESDIR%%/src/osgparticle/GNUmakefile
%%EXAMPLESDIR%%/src/osgparticle/osgparticle.cpp
%%EXAMPLESDIR%%/src/osgparticleeffects/GNUmakefile
%%EXAMPLESDIR%%/src/osgparticleeffects/osgparticleeffects.cpp
%%EXAMPLESDIR%%/src/osgphotoalbum/GNUmakefile
%%EXAMPLESDIR%%/src/osgphotoalbum/ImageReaderWriter.cpp
%%EXAMPLESDIR%%/src/osgphotoalbum/PhotoArchive.cpp

%%EXAMPLESDIR%%/src/osgpoints/osgpoints.cpp
%%EXAMPLESDIR%%/src/osgpointsprite/GNUmakefile
%%EXAMPLESDIR%%/src/osgpointsprite/osgpointsprite.cpp
%%EXAMPLESDIR%%/src/osgprecipitation/GNUmakefile
%%EXAMPLESDIR%%/src/osgprecipitation/osgprecipitation.cpp
%%EXAMPLESDIR%%/src/osgprerender/GNUmakefile
%%EXAMPLESDIR%%/src/osgprerender/osgprerender.cpp
%%EXAMPLESDIR%%/src/osgprerendercubemap/GNUmakefile

%%EXAMPLESDIR%%/src/osgshaders/GNUmakefile
%%EXAMPLESDIR%%/src/osgshaders/Noise.cpp
%%EXAMPLESDIR%%/src/osgshaders/osgshaders.cpp
%%EXAMPLESDIR%%/src/osgshaderterrain/GNUmakefile
%%EXAMPLESDIR%%/src/osgshaderterrain/osgshaderterrain.cpp
%%EXAMPLESDIR%%/src/osgshadowtexture/CreateShadowedScene.cpp
%%EXAMPLESDIR%%/src/osgshadowtexture/GNUmakefile
%%EXAMPLESDIR%%/src/osgshadowtexture/osgshadowtexture.cpp

%%EXAMPLESDIR%%/src/osgsimplifier/osgsimplifier.cpp
%%EXAMPLESDIR%%/src/osgsimulation/GNUmakefile
%%EXAMPLESDIR%%/src/osgsimulation/osgsimulation.cpp
%%EXAMPLESDIR%%/src/osgslice/GNUmakefile
%%EXAMPLESDIR%%/src/osgslice/osgslice.cpp
%%EXAMPLESDIR%%/src/osgspacewarp/GNUmakefile
%%EXAMPLESDIR%%/src/osgspacewarp/osgspacewarp.cpp
%%EXAMPLESDIR%%/src/osgspheresegment/GNUmakefile

%%EXAMPLESDIR%%/src/osgtexturerectangle/osgtexturerectangle.cpp
%%EXAMPLESDIR%%/src/osgunittests/GNUmakefile
%%EXAMPLESDIR%%/src/osgunittests/osgunittests.cpp
%%EXAMPLESDIR%%/src/osgunittests/performance.cpp
%%EXAMPLESDIR%%/src/osgversion/osgversion.cpp
%%EXAMPLESDIR%%/src/osgvertexprogram/GNUmakefile
%%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
@dirrm %%EXAMPLESDIR%%/bin
@dirrm %%EXAMPLESDIR%%/src/Make
@dirrm %%EXAMPLESDIR%%/src/osgGLUTkeyboardmouse
@dirrm %%EXAMPLESDIR%%/src/osgGLUTsimple
@dirrm %%EXAMPLESDIR%%/src/osganimate
@dirrm %%EXAMPLESDIR%%/src/osgarchive
@dirrm %%EXAMPLESDIR%%/src/osgautotransform
@dirrm %%EXAMPLESDIR%%/src/osgbillboard
@dirrm %%EXAMPLESDIR%%/src/osgblendequation
@dirrm %%EXAMPLESDIR%%/src/osgbluemarble
@dirrm %%EXAMPLESDIR%%/src/osgcallback
@dirrm %%EXAMPLESDIR%%/src/osgcamera
@dirrm %%EXAMPLESDIR%%/src/osgcameragroup
@dirrm %%EXAMPLESDIR%%/src/osgcatch
@dirrm %%EXAMPLESDIR%%/src/osgcegui
@dirrm %%EXAMPLESDIR%%/src/osgclip
@dirrm %%EXAMPLESDIR%%/src/osgcluster
@dirrm %%EXAMPLESDIR%%/src/osgconv
@dirrm %%EXAMPLESDIR%%/src/osgcopy
@dirrm %%EXAMPLESDIR%%/src/osgcubemap
@dirrm %%EXAMPLESDIR%%/src/osgdelaunay
@dirrm %%EXAMPLESDIR%%/src/osgdepthpartition
@dirrm %%EXAMPLESDIR%%/src/osgdepthshadow
@dirrm %%EXAMPLESDIR%%/src/osgdistortion
@dirrm %%EXAMPLESDIR%%/src/osgforest

@dirrm %%EXAMPLESDIR%%/src/osghangglide
@dirrm %%EXAMPLESDIR%%/src/osghud
@dirrm %%EXAMPLESDIR%%/src/osgimpostor
@dirrm %%EXAMPLESDIR%%/src/osgintrospection
@dirrm %%EXAMPLESDIR%%/src/osgkeyboard
@dirrm %%EXAMPLESDIR%%/src/osgkeyboardmouse
@dirrm %%EXAMPLESDIR%%/src/osglauncher
@dirrm %%EXAMPLESDIR%%/src/osglight
@dirrm %%EXAMPLESDIR%%/src/osglightpoint
@dirrm %%EXAMPLESDIR%%/src/osglogicop
@dirrm %%EXAMPLESDIR%%/src/osglogo
@dirrm %%EXAMPLESDIR%%/src/osgmotionblur
@dirrm %%EXAMPLESDIR%%/src/osgmovie
@dirrm %%EXAMPLESDIR%%/src/osgmultiplecameras
@dirrm %%EXAMPLESDIR%%/src/osgmultitexture
@dirrm %%EXAMPLESDIR%%/src/osgoccluder
@dirrm %%EXAMPLESDIR%%/src/osgpagedlod
@dirrm %%EXAMPLESDIR%%/src/osgparametric
@dirrm %%EXAMPLESDIR%%/src/osgparticle
@dirrm %%EXAMPLESDIR%%/src/osgparticleeffects
@dirrm %%EXAMPLESDIR%%/src/osgphotoalbum
@dirrm %%EXAMPLESDIR%%/src/osgpick
@dirrm %%EXAMPLESDIR%%/src/osgplanets
@dirrm %%EXAMPLESDIR%%/src/osgpoints
@dirrm %%EXAMPLESDIR%%/src/osgpointsprite
@dirrm %%EXAMPLESDIR%%/src/osgprecipitation
@dirrm %%EXAMPLESDIR%%/src/osgprerender
@dirrm %%EXAMPLESDIR%%/src/osgprerendercubemap
@dirrm %%EXAMPLESDIR%%/src/osgreflect

@dirrm %%EXAMPLESDIR%%/src/osgscribe
@dirrm %%EXAMPLESDIR%%/src/osgsequence
@dirrm %%EXAMPLESDIR%%/src/osgshaders
@dirrm %%EXAMPLESDIR%%/src/osgshaderterrain
@dirrm %%EXAMPLESDIR%%/src/osgshadowtexture
@dirrm %%EXAMPLESDIR%%/src/osgshape
@dirrm %%EXAMPLESDIR%%/src/osgsimple
@dirrm %%EXAMPLESDIR%%/src/osgsimplepager
@dirrm %%EXAMPLESDIR%%/src/osgsimplifier
@dirrm %%EXAMPLESDIR%%/src/osgsimulation
@dirrm %%EXAMPLESDIR%%/src/osgslice
@dirrm %%EXAMPLESDIR%%/src/osgspacewarp
@dirrm %%EXAMPLESDIR%%/src/osgspheresegment
@dirrm %%EXAMPLESDIR%%/src/osgspotlight

@dirrm %%EXAMPLESDIR%%/src/osgtexture3D
@dirrm %%EXAMPLESDIR%%/src/osgtexturerectangle
@dirrm %%EXAMPLESDIR%%/src/osgunittests
@dirrm %%EXAMPLESDIR%%/src/osgversion
@dirrm %%EXAMPLESDIR%%/src/osgvertexprogram
@dirrm %%EXAMPLESDIR%%/src/osgviewer
@dirrm %%EXAMPLESDIR%%/src/osgvolume
@dirrm %%EXAMPLESDIR%%/src/osgwindows
@dirrm %%EXAMPLESDIR%%/src
@dirrm %%EXAMPLESDIR%%
@dirrm lib/osgPlugins
@dirrm include/osg
@dirrm include/osgDB
@dirrm include/osgFX
@dirrm include/osgGA
@dirrm include/osgIntrospection
@dirrm include/osgParticle
@dirrm include/osgProducer
@dirrm include/osgSim
@dirrm include/osgTerrain
@dirrm include/osgText
@dirrm include/osgUtil

Return to bug 105729

Lines 6-36 Link Here

(-)openthreads/Makefile (-22 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= openthreads	8	PORTNAME= openthreads
9	PORTVERSION= 1.4.2	9	PORTVERSION= 1.5
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/
12	#
13	# the following master distribution contains the version of OpenThreads
14	# as described above by PORTVERSION and PORTREVISION.
15	DISTNAME= OSG_OP_OT-1.0
16		11
17	MAINTAINER= yinjieh@csie.nctu.edu.tw	12	MAINTAINER= jylefort@FreeBSD.org
18	COMMENT= A library which provides OO thread interface for C++ programmers	13	COMMENT= A library which provides a C++ object-oriented thread interface
19		14
20	USE_ZIP= yes
21	USE_GMAKE= yes
22	USE_LDCONFIG= yes
23
24	MAKEFILE= GNUmakefile
25	WRKSRC= ${WRKDIR}/${DISTNAME}/OpenThreads	15	WRKSRC= ${WRKDIR}/${DISTNAME}/OpenThreads
26	MAKE_ENV+= FREEBSD_ARCH="${ARCH}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
27	PTHREAD_LIBS="${PTHREAD_LIBS}"
28
29	# Optimisation/Debug flags:
30	# opt = optimised ($OPTF added)
31	# debug = debug ($DBGF added)
32	# opt is default
33	#
34	ALL_TARGET= opt
35		16
		17	.include "${.CURDIR}/../../graphics/osg/bsd.osg.mk"
36	.include <bsd.port.mk>	18	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)openthreads/files/patch-Make::makedefs (-29 lines)
1	--- Make/makedefs.orig Sat Dec 10 09:49:24 2005
2	+++ Make/makedefs Wed Sep 27 19:05:17 2006
3	@@ -264,15 +264,22 @@
4	CXX = g++
5	endif
6	DEPARG = -MM
7	- INC += -I/usr/local/include -I/usr/X11R6/include
8	- DEF += -W -Wall
9	+ INC += -I${LOCALBASE}/include -I${X11BASE}/include
10	+ DEF += -W -Wall ${PTHREAD_CFLAGS}
11	OPTF = -O2
12	DBGF = -g
13	SHARED = -shared
14	ARCH = 32
15	ARCHARGS =
16	- INST_LOCATION = /usr/local
17	- INST_SHARE = /usr/share/OpenThreads
18	+ INST_SYS_PREFIX = $(PREFIX)
19	+ INST_SHARE_PREFIX = $(DATADIR)
20	+ LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib ${PTHREAD_LIBS}
21	+ INST_LOCATION = $(INST_SYS_PREFIX)
22	+ INST_SHARE = $(INST_SHARE_PREFIX)
23	+ INST_DEMOS = $(EXAMPLESDIR)/bin
24	+ INST_SRC = $(EXAMPLESDIR)/src
25	+ INST_DOC = $(DOCSDIR)
26	+ INST_DATA = $(DATADIR)
27	endif
28
29	#### MacOS X specific definitions

Lines 1-20 Link Here

(-)openthreads/files/patch-Make::makerules (-20 lines)
1	--- Make/makerules.orig Thu Oct 16 19:39:35 2003
2	+++ Make/makerules Thu Oct 16 19:40:50 2003
3	@@ -89,7 +89,7 @@
4	$(EXEC:=.opt) :
5	@[ -d $(OPTDIR) ] \|\| mkdir $(OPTDIR)
6	@cd $(OPTDIR); \
7	- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
8	+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
9	THISDIR=../$(THISDIR)\
10	MAKEDEPEND=Makedepend $(EXEC)
11	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
12	@@ -98,7 +98,7 @@
13	$(LIB:=.opt) :
14	@[ -d $(OPTDIR) ] \|\| mkdir $(OPTDIR)
15	@cd $(OPTDIR);\
16	- $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \
17	+ $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
18	THISDIR=../$(THISDIR)\
19	MAKEDEPEND=Makedepend $(LIB)
20	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB).$(LIB_EXT) __link

Lines 1-20 Link Here

(-)openthreads/files/patch-Make_instrules (-20 lines)
1	--- Make/instrules.orig Thu Dec 8 22:28:18 2005
2	+++ Make/instrules Mon Sep 25 19:17:55 2006
3	@@ -28,13 +28,13 @@
4
5	__inst_headers:
6	@[ -d $(INST_INCLUDE)/OpenThreads ] \|\| mkdir -p $(INST_INCLUDE)/OpenThreads
7	- for f in include/OpenThreads/* ; do\
8	- if [ ! -d $$f ];\
9	- then\
10	+ for f in include/OpenThreads/* ; do \
11	+ if [ ! -d $$f ]; \
12	+ then \
13	[ "`head -1 $$f \| cut -c 1-12`" = "/* --c++--" ] && \
14	echo $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \
15	$(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \
16	- fi;\
17	+ fi; \
18	done
19
20

Lines 6-39 Link Here

(-)openproducer/Makefile (-21 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= openproducer	8	PORTNAME= openproducer
9	PORTVERSION= 1.0.1	9	PORTVERSION= 1.1
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/
12	#
13	# the following master distribution contains the version of OpenProducer
14	# as described above by PORTVERSION and PORTREVISION.
15	DISTNAME= OSG_OP_OT-1.0
16		11
17	MAINTAINER= lawrance@FreeBSD.org	12	MAINTAINER= jylefort@FreeBSD.org
18	COMMENT= A cross-platform C++/OpenGL library focused on camera control	13	COMMENT= A cross-platform C++/OpenGL library focused on camera control
19		14
20	BUILD_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads	15	BUILD_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads
		16	RUN_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads
21		17
22	USE_ZIP= yes
23	USE_X_PREFIX= yes
24	USE_GL= yes	18	USE_GL= yes
25	USE_GMAKE= yes
26	USE_LDCONFIG= yes
27
28	WRKSRC= ${WRKDIR}/${DISTNAME}/Producer	19	WRKSRC= ${WRKDIR}/${DISTNAME}/Producer
29	MAKEFILE= GNUmakefile
30	MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
31
32	# Optimisation/Debug flags:
33	# opt = optimized ($OPTF added)
34	# debug = debug ($DBGF added)
35	# opt is default
36	#
37	ALL_TARGET= opt
38		20
		21	.include "${.CURDIR}/../../graphics/osg/bsd.osg.mk"
39	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Lines 1-56 Link Here

(-)openproducer/files/patch-Make::makedefs (-56 lines)
1	--- Make/makedefs.orig Fri Dec 9 23:51:33 2005
2	+++ Make/makedefs Sun Nov 19 19:33:13 2006
3	@@ -55,7 +55,7 @@
4	DEF = -DPRODUCER_VERSION=\"$(VERSION)\"\
5	-DPRODUCER_VERSION_REVISION="$(VERSION_REVISION)"
6
7	-INC = -I$(TOPDIR)/include
8	+INC += -I${LOCALBASE}/include -I${X11BASE}/include
9
10	CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC)
11	LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH)
12	@@ -64,20 +64,20 @@
13	$(YACCFILES:.y=.o)\
14	$(LEXFILES:.l=.o)
15
16	-DOF = $(OPTF)
17	+OPTF = ${CXXFLAGS}
18	DEBUGDIR = $(OS)$(ARCH).Debug
19	OPTDIR = $(OS)$(ARCH).Opt
20	BININST = bin
21	LIBINST = lib
22
23	-INST_LOCATION ?= /usr/local
24	+INST_LOCATION = $(PREFIX)
25	INST_LIBS = $(INST_LOCATION)/lib$(ARCH_EXT)
26	INST_INCLUDE = $(INST_LOCATION)/include
27	INST_SHARE = $(INST_LOCATION)/share/Producer
28	-INST_DEMOS = $(INST_SHARE)/bin
29	-INST_SRC = $(INST_SHARE)/src
30	-INST_DOC = $(INST_SHARE)/doc
31	-INST_DATA = $(INST_SHARE)/data
32	+INST_DEMOS = $(EXAMPLESDIR)/bin
33	+INST_SRC = $(EXAMPLESDIR)/src
34	+INST_DOC = $(DOCSDIR)
35	+INST_DATA = $(DATADIR)
36	INST_DEMO_SRC = $(INST_SRC)/demos
37
38	LINK = ln -sf
39	@@ -294,7 +294,7 @@
40	endif
41	DEPARG = -MM
42	INC += -I/usr/local/include -I/usr/X11R6/include
43	- DEF += -W -Wall
44	+ DEF += -fPIC -W -Wall
45	OPTF = -O2
46	DBGF = -g
47	SHARED = -shared
48	@@ -305,7 +305,7 @@
49
50	GL_LIBS = -lGL
51	X_LIBS = -lXmu -lX11
52	- OPEN_THREAD_LIB = -lOpenThreads -lpthread
53	+ OPEN_THREAD_LIB = -lOpenThreads $(PTHREAD_LIBS)
54
55	endif
56

Lines 1-21 Link Here

(-)openproducer/files/patch-Make::makerules (-21 lines)
1	diff -urN ../Producer.orig/Make/makerules ./Make/makerules
2	--- ../Producer.orig/Make/makerules Wed Jul 28 04:02:15 2004
3	+++ ./Make/makerules Tue Jan 25 21:36:58 2005
4	@@ -83,7 +83,7 @@
5	$(EXEC:=.opt) :
6	@[ -d $(OPTDIR) ] \|\| mkdir $(OPTDIR)
7	@cd $(OPTDIR); \
8	- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
9	+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
10	THISDIR=../$(THISDIR)\
11	MAKEDEPEND=Makedepend $(EXEC)
12	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
13	@@ -92,7 +92,7 @@
14	$(LIB:=.opt) :
15	@[ -d $(OPTDIR) ] \|\| mkdir $(OPTDIR)
16	@cd $(OPTDIR);\
17	- $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \
18	+ $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
19	THISDIR=../$(THISDIR)\
20	MAKEDEPEND=Makedepend $(LIB)
21	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB).$(LIB_EXT) __link

Lines 9-20 Link Here

(-)openproducer/pkg-plist (+3 lines)
9	include/Producer/Keyboard	9	include/Producer/Keyboard
10	include/Producer/KeyboardMouse	10	include/Producer/KeyboardMouse
11	include/Producer/Math	11	include/Producer/Math
		12	include/Producer/PipeTimer
12	include/Producer/RefOpenThreads	13	include/Producer/RefOpenThreads
13	include/Producer/Referenced	14	include/Producer/Referenced
14	include/Producer/RenderSurface	15	include/Producer/RenderSurface
		16	include/Producer/System
15	include/Producer/Timer	17	include/Producer/Timer
16	include/Producer/Trackball	18	include/Producer/Trackball
17	include/Producer/Types	19	include/Producer/Types
		20	include/Producer/Utils
18	include/Producer/Version	21	include/Producer/Version
19	include/Producer/VisualChooser	22	include/Producer/VisualChooser
20	include/Producer/Window3D	23	include/Producer/Window3D

Lines 6-77 Link Here

(-)osg/Makefile (-55 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= osg	8	PORTNAME= osg
9	PORTVERSION= 0.9.8	9	PORTVERSION= 1.2
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/
12	DISTNAME= OSG_OP_OT-${PORTVERSION}-2
13		11
14	MAINTAINER= rrghphar@bigpond.net.au	12	MAINTAINER= jylefort@FreeBSD.org
15	COMMENT= C++ OpenGL scene graph library for real-time rendering	13	COMMENT= C++ OpenGL scene graph library for real-time rendering
16		14
17	BROKEN= fails to install
18	DEPRECATED= ${BROKEN}
19	EXPIRATION_DATE=2006-12-01
20
21	BUILD_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \	15	BUILD_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \
22	${X11BASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer	16	${LOCALBASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer
23	RUN_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \	17	RUN_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \
24	${X11BASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer	18	${LOCALBASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer
25	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \	19	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
26	jpeg.9:${PORTSDIR}/graphics/jpeg \	20	jpeg.9:${PORTSDIR}/graphics/jpeg \
27	ungif.5:${PORTSDIR}/graphics/libungif \	21	ungif.5:${PORTSDIR}/graphics/libungif \
28	tiff.4:${PORTSDIR}/graphics/tiff \	22	tiff.4:${PORTSDIR}/graphics/tiff \
29	freetype.9:${PORTSDIR}/print/freetype2 \	23	freetype.9:${PORTSDIR}/print/freetype2
30	xml2.5:${PORTSDIR}/textproc/libxml2
31		24
32	USE_ZIP= yes
33	USE_X_PREFIX= yes
34	USE_GL= yes	25	USE_GL= yes
35	INSTALLS_SHLIB= yes
36	USE_GMAKE= yes
37	MAKE_ENV= OSGHOME="${WRKSRC}" \
38	PTHREAD_LIBS="${PTHREAD_LIBS}" \
39	EXAMPLESDIR="${EXAMPLESDIR}" \
40	DOCSDIR="${DOCSDIR}" \
41	DATADIR="${DATADIR}" \
42	OPTF="${CXXFLAGS}"
43	MAKEFILE= GNUmakefile
44	WRKSRC= ${WRKDIR}/${DISTNAME}/OpenSceneGraph	26	WRKSRC= ${WRKDIR}/${DISTNAME}/OpenSceneGraph
45		27
46	# opt = optimized ($OPTF added); debug = debug ($DBGF added); opt is default	28	.include "${.CURDIR}/bsd.osg.mk"
47	ALL_TARGET= opt	29	.include <bsd.port.mk>
48
49	.include <bsd.port.pre.mk>
50
51	.if ${OSVERSION} < 500035
52	EXTRA_PATCHES= ${FILESDIR}/freebsd4-osg-patches
53	.endif
54
55	.if !defined(NOPORTDOCS)
56
57	BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \
58	dot:${PORTSDIR}/graphics/graphviz
59	PORTDOCS= html
60
61	pre-patch:
62	${REINPLACE_CMD} -e 's,[[:cntrl:]]*$$,,' \
63	${WRKSRC}/examples/osgtesselate/osgtesselate.cpp
64
65	post-build:
66	cd ${WRKSRC}/doc/Doxyfiles && OSGHOME=${WRKSRC} doxygen all_Doxyfile
67
68	pre-install:
69	${FIND} ${WRKSRC} -name '*.orig' -delete
70
71	post-install:
72	@${MKDIR} ${DOCSDIR}
73	${CP} -r ${WRKSRC}/doc/doxygen/ ${DOCSDIR}
74
75	.endif
76
77	.include <bsd.port.post.mk>

Line 0 Link Here

(-)osg/bsd.osg.mk (+33 lines)
	1	# $Id$
	2
	3	MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/
	4	DISTNAME= OSG_OP_OT-1.2
	5
	6	MD5_FILE= ${.CURDIR}/../../graphics/osg/distinfo
	7	USE_ZIP= yes
	8	USE_GMAKE= yes
	9	USE_LDCONFIG= yes
	10
	11	MAKEFILE= GNUmakefile
	12	MAKE_ARGS= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
	13	PTHREAD_LIBS="${PTHREAD_LIBS}" \
	14	CXX="${CXX}" \
	15	INST_LOCATION="${PREFIX}" \
	16	INST_EXAMPLES="${EXAMPLESDIR}/bin" \
	17	INST_SRC="${EXAMPLESDIR}/src" \
	18	INST_EXAMPLE_SRC="${EXAMPLESDIR}/src" \
	19	INSTBINCMD="${INSTALL_PROGRAM}" \
	20	INSTXCMD="${INSTALL_PROGRAM}" \
	21	INSTDEVCMD="${INSTALL_DATA}" \
	22	INSTRCMD="${INSTALL_DATA}"
	23	ALL_TARGET= opt
	24
	25	post-patch: osg-post-patch
	26
	27	osg-post-patch:
	28	@${REINPLACE_CMD} -Ee 's\|-O2\|${CXXFLAGS}\|; \
	29	s\|(-I\\|-L\\|-rpath )/usr/local\|\1${LOCALBASE}\|; \
	30	s\|(-I\\|-L\\|-rpath )/usr/X11R6\|\1${X11BASE}\|' \
	31	${WRKSRC}/Make/makedefs
	32	@${REINPLACE_CMD} -e 's\|DOF=$$(OPTF)\|DOF="$$(OPTF)"\|' \
	33	${WRKSRC}/Make/makerules

Lines 1-43 Link Here

(-)osg/files/patch-Make::makedefs (-43 lines)
1	--- Make/makedefs.orig Sun Dec 5 11:03:43 2004
2	+++ Make/makedefs Mon Feb 7 10:59:22 2005
3	@@ -402,24 +402,35 @@
4
5	#### FreeBSD specific definitions
6	ifeq ($(OS),FreeBSD)
7	- C++ = g++
8	+ C++ = ${CXX}
9	DEPARG = -MM
10	- INC += -I/usr/local/include -I/usr/X11R6/include
11	+ INC += -I${LOCALBASE}/include -I${X11BASE}/include
12	DEF += -W -Wall
13	- OPTF = -O2
14	+ OPTF ?= -O2
15	DBGF = -g -DOSG_COMPILE_UNIT_TESTS
16	SHARED = -shared
17	ARCH =
18	ARCHINST =
19	ARCHARGS =
20	- LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -pthread
21	+ LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib -pthread
22	DYNAMICLIBRARYLIB =
23	OSG_LIBS = -losgGA -losgDB -losgUtil -losg
24	GL_LIBS = -lGLU -lGL
25	X_INC = -I/usr/X11R6/include
26	X_LIBS = -lXmu -lX11
27	SOCKET_LIBS =
28	- OTHER_LIBS = -lOpenThreads
29	+ OTHER_LIBS = -lOpenThreads ${PTHREAD_LIBS}
30	+ # PREFIX, EXAMPLESDIR, DOCSDIR, and DATADIR are defined by the port
31	+ INST_LOCATION = ${PREFIX}
32	+ INST_SHARE = ${PREFIX}/share
33	+ INST_EXAMPLES = ${EXAMPLESDIR}/bin
34	+ INST_EXAMPLE_SRC = ${EXAMPLESDIR}/src
35	+ INST_DOC = ${DOCSDIR}
36	+ INST_SRC = ${EXAMPLESDIR}/src
37	+ INST_DATA = ${DATADIR}
38	+ INSTBINCMD = ${BSD_INSTALL_PROGRAM}
39	+ INSTDEVCMD = ${BSD_INSTALL_DATA}
40	+ LIBXML2_INCLUDE = -I${LOCALBASE}/include/libxml2
41	PNG_LIBS = -lpng
42	JPEG_LIBS = -ljpeg
43	TIFF_LIB = -ltiff

Lines 1-14 Link Here

(-)osg/files/patch-Make::makedirdefs (-14 lines)
1	--- Make/makedirdefs.orig Tue Jul 22 21:12:55 2003
2	+++ Make/makedirdefs Tue Jul 22 21:13:50 2003
3	@@ -58,9 +58,11 @@
4	ifneq ($(OS),Darwin)
5	ifneq ($(OS),SunOS)
6	ifneq ($(OS),IRIX)
7	+ifneq ($(OS),FreeBSD)
8
9	PLUGIN_DIRS += geo
10
11	+endif
12	endif
13	endif
14	endif

Lines 1-29 Link Here

(-)osg/files/patch-Make::makerules (-29 lines)
1	--- Make/makerules.orig Fri Aug 8 22:41:37 2003
2	+++ Make/makerules Sat Oct 18 01:42:58 2003
3	@@ -110,7 +110,7 @@
4	$(EXEC:=.opt) :
5	@[ -d $(OPTDIR) ] \|\| mkdir $(OPTDIR)
6	@cd $(OPTDIR); \
7	- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
8	+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
9	THISDIR=../$(THISDIR)\
10	MAKEDEPEND=Makedepend $(EXEC)
11	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
12	@@ -119,7 +119,7 @@
13	$(LIB:=.opt) :
14	@[ -d $(OPTDIR) ] \|\| mkdir -p $(OPTDIR)
15	@cd $(OPTDIR);\
16	- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
17	+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
18	THISDIR=../$(THISDIR)\
19	MAKEDEPEND=Makedepend $(LIB)
20	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB) __link
21	@@ -127,7 +127,7 @@
22	$(PLUGIN:=.opt) :
23	@[ -d $(OPTDIR) ] \|\| mkdir -p $(OPTDIR)
24	@cd $(OPTDIR); \
25	- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
26	+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
27	THISDIR=../$(THISDIR)\
28	MAKEDEPEND=Makedepend $(PLUGIN)
29	@$(MAKE) LNSRC=$(OPTDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link