3 files changed, 60 insertions, 34 deletions

diff --git a/graphics/osg/files/patch-aa b/graphics/osg/files/patch-aa
index d23aa1eadbe5..9dac500d4727 100644
--- a/graphics/osg/files/patch-aa
+++ b/graphics/osg/files/patch-aa
@@ -1,27 +1,48 @@
---- Make/makedefs.freebsd.orig	Wed Jan 16 04:08:27 2002
-+++ Make/makedefs.freebsd	Tue May  7 18:34:36 2002
-@@ -6,20 +6,20 @@
- DEPFILES = $(OBJS:.o=.d)
+--- Make/makedefs.orig	Thu Apr 25 18:09:27 2002
++++ Make/makedefs	Sat May 25 09:00:40 2002
+@@ -38,10 +38,10 @@
+ INST_PLUGINS       = $(INST_SYS_PREFIX)/lib$(ARCH)/osgPlugins
+ INST_INCLUDE       = $(INST_SYS_PREFIX)/include
+ INST_SHARE_PREFIX  = /usr/share
+-INST_DEMOS         = $(INST_SHARE_PREFIX)/OpenSceneGraph/bin
+-INST_SRC           = $(INST_SHARE_PREFIX)/OpenSceneGraph/src
+-INST_DOC           = $(INST_SHARE_PREFIX)/OpenSceneGraph/doc
+-INST_DATA          = $(INST_SHARE_PREFIX)/OpenSceneGraph/data
++INST_DEMOS         = $(INST_SHARE_PREFIX)/osg/bin
++INST_SRC           = $(INST_SHARE_PREFIX)/osg/src
++INST_DOC           = $(INST_SHARE_PREFIX)/osg/doc
++INST_DATA          = $(INST_SHARE_PREFIX)/osg/data
+ INST_DEMO_SRC      = $(INST_SRC)/demos
  
+ LINK               = ln -sf
+@@ -185,7 +185,7 @@
  
--C++ = g++
-+C++ = ${CXX}
- YFLAGS = -d
- LCINCS += -I/usr/local/include -I/usr/X11R6/include
- LC++INCS += ${LCINCS}
--CFLAGS   = -O2 -W -Wall $(LCINCS)
-+CFLAGS   += -W -Wall $(LCINCS)
- C++FLAGS = ${CFLAGS}
- CPPFLAGS = ${CFLAGS}
+ #### FreeBSD specific definitions
+ ifeq ($(OS),FreeBSD)
+-  C++               = g++
++  C++               = ${CXX}
+   DEPARG            = -MM
+   INC               +=  -I/usr/local/include -I/usr/X11R6/include
+   DEF               += -W -Wall
+@@ -193,7 +193,7 @@
+   DBGF              = -g
+   SHARED            = -shared
+   ARCHARGS          = 
+-  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
++  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -rpath /usr/X11R6/lib
+   DYNAMICLIBRARYLIB = 
+   OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
+   FREETYPE_LIB      = -lfreetype
+@@ -203,8 +203,10 @@
+   SOCKET_LIBS       = 
+   OTHER_LIBS        = 
  
- SO_EXT = so
- DL_EXT = so
+-  INST_SYS_PREFIX   = /opt/X11R6
+-  INST_SHARE_PREFIX = /usr/share/OpenSceneGraph
++  INST_SYS_PREFIX   = /usr/X11R6
++  INST_SHARE_PREFIX = /usr/X11R6/share
++  INST_LIBS         = $(INST_SYS_PREFIX)/lib
++  INST_PLUGINS      = $(INST_SYS_PREFIX)/lib/osgPlugins
  
--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
+ endif
  
--LDFLAGS = -O2 -W -Wall -pthread -L/usr/local/lib -L/usr/X11R6/lib
-+LDFLAGS = -W -Wall -pthread $(FREEBSD_LOCALLIBS)
- 
- DYNAMICLIBRARYLIB = 
- PFLIBS = 
diff --git a/graphics/osg/files/patch-ab b/graphics/osg/files/patch-ab
index 54278acbe095..5517990cb61f 100644
--- a/graphics/osg/files/patch-ab
+++ b/graphics/osg/files/patch-ab
@@ -1,6 +1,6 @@
---- ./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 @@
+--- src/osgDB/ORIG/FileUtils_Unix.cpp	Wed Apr 24 10:52:53 2002
++++ src/osgDB/FileUtils_Unix.cpp	Fri May 24 19:19:14 2002
+@@ -30,7 +30,7 @@
  #if defined(__CYGWIN__)
  static const char *s_default_dso_path = "/usr/lib/:/usr/local/lib/:";
  #else
diff --git a/graphics/osg/files/patch-ac b/graphics/osg/files/patch-ac
index 0073bf6df503..f8676ea569a0 100644
--- a/graphics/osg/files/patch-ac
+++ b/graphics/osg/files/patch-ac
@@ -1,14 +1,19 @@
---- ./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;
+--- src/osgPlugins/txp/ORIG/trpage_sys.h	Thu Apr 25 17:31:16 2002
++++ src/osgPlugins/txp/trpage_sys.h	Fri May 24 19:24:39 2002
+@@ -58,9 +58,16 @@
+ // Delete a file
+ #define TRPGDELETEFILE(file) remove((file))
  
-+#elif defined(__FreeBSD__)
-+#include <sys/inttypes.h>
++#  if defined(__FreeBSD__)
++#    include <sys/inttypes.h>
 +typedef int64_t  int64;
-+//typedef long long int int64;
++#  else
 +
- #elif defined(__ghs__) && defined(__LL_Is_64)
+ #ifndef int64
  typedef long long int64;
+ #endif
++
++#  endif
+ 
+ #endif