From 8c219f55dd4425a6e966e5ac7df69a41e5655b97 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Mon, 1 Apr 2002 04:52:41 +0000 Subject: upgrade to 0.8.44 PR: 35099 Submitted by: maintainer --- graphics/osg/files/patch-aa | 33 ++++-------- graphics/osg/files/patch-ab | 122 ++++---------------------------------------- graphics/osg/files/patch-ac | 25 +++++---- graphics/osg/files/patch-ad | 37 -------------- graphics/osg/files/patch-ae | 46 ----------------- graphics/osg/files/patch-af | 11 ---- graphics/osg/files/patch-ag | 47 ----------------- graphics/osg/files/patch-ah | 11 ---- graphics/osg/files/patch-ai | 42 --------------- graphics/osg/files/patch-aj | 11 ---- graphics/osg/files/patch-ak | 11 ---- graphics/osg/files/patch-al | 11 ---- graphics/osg/files/patch-am | 11 ---- graphics/osg/files/patch-an | 22 -------- 14 files changed, 36 insertions(+), 404 deletions(-) delete mode 100644 graphics/osg/files/patch-ad delete mode 100644 graphics/osg/files/patch-ae delete mode 100644 graphics/osg/files/patch-af delete mode 100644 graphics/osg/files/patch-ag delete mode 100644 graphics/osg/files/patch-ah delete mode 100644 graphics/osg/files/patch-ai delete mode 100644 graphics/osg/files/patch-aj delete mode 100644 graphics/osg/files/patch-ak delete mode 100644 graphics/osg/files/patch-al delete mode 100644 graphics/osg/files/patch-am delete mode 100644 graphics/osg/files/patch-an (limited to 'graphics/osg/files') 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 ++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 --#include -+#if defined(__linux) || defined(__FreeBSD__) // [ -+ -+# include -+# if defined(__linux) -+# include -+# elif defined(__FreeBSD__) -+# include -+# include -+# 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 : -- cgit v1.2.3