Add DragonFly support. Make pthread linkage more portable.

5 files changed, 37 insertions, 15 deletions

diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index 814c4d0f838..5cd24064a94 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.20 2006/02/12 21:52:18 joerg Exp $
+$NetBSD: distinfo,v 1.21 2006/02/23 20:15:21 joerg Exp $
 
 SHA1 (blender-2.41.tar.gz) = 839dfece3b6efbf10694ac535d88e3745c3253ec
 RMD160 (blender-2.41.tar.gz) = 7857eac2acda18ee24db4bb147bcf780025e2c12
 Size (blender-2.41.tar.gz) = 9464385 bytes
 SHA1 (patch-aa) = 21dd95ff4ab51bb9b1084f28e4e080ca38421bce
-SHA1 (patch-ab) = 3c8b57b1aac2aba141d8392ce8e9c7759febd68f
+SHA1 (patch-ab) = 7f5b4966bd08333f5d726cf9b6d7c2300e62d711
 SHA1 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2
-SHA1 (patch-ae) = 4d9fdef4141445534e0fb476d9e14b42fcaf29d7
-SHA1 (patch-af) = 9c4d6b2f0c6fcbc097e54c6c1883ca422f29226d
-SHA1 (patch-ag) = 72fd964fd80932dde366a67a794c6aff2800dfe1
+SHA1 (patch-ae) = 9f8c84495eaa793dd04182f1ad871975083d1bb2
+SHA1 (patch-af) = d8fad42c6b304651d36ac20e69f3cbe66f018a86
+SHA1 (patch-ag) = cfbd34b0f9c01c044808e3fb6c07de76abbefccb
diff --git a/graphics/blender/patches/patch-ab b/graphics/blender/patches/patch-ab
index 0c2d6df08f5..f24cf01a135 100644
--- a/graphics/blender/patches/patch-ab
+++ b/graphics/blender/patches/patch-ab
@@ -1,12 +1,34 @@
-$NetBSD: patch-ab,v 1.5 2005/09/06 08:10:58 abs Exp $
+$NetBSD: patch-ab,v 1.6 2006/02/23 20:15:21 joerg Exp $
 
 --- source/blender/blenlib/intern/storage.c.orig	2005-04-30 09:57:35.000000000 +0000
 +++ source/blender/blenlib/intern/storage.c
+@@ -50,6 +50,10 @@
+ #include <time.h>
+ #include <sys/stat.h>
+ 
++#if defined(__DragonFly__)
++#include <sys/statvfs.h>
++#endif
++
+ #if !defined(linux) && (defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__))
+ #include <sys/statfs.h>
+ #endif
+@@ -89,10 +93,6 @@ struct statfs {
+ #include <pwd.h>
+ #endif
+ 
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
+-#include <malloc.h>
+-#endif
+-
+ /* lib includes */
+ #include "MEM_guardedalloc.h"
+ 
 @@ -177,7 +177,11 @@ double BLI_diskfree(char *dir)
  
  	return (double) (freec*bytesps*sectorspc);
  #else
-+#if defined (__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */
++#if defined(__DragonFly__) || (defined (__NetBSD__) && __NetBSD_Version__ >= 299000900) /* 2.99.9 */
 +	struct statvfs disk;
 +#else
  	struct statfs disk;
@@ -19,7 +41,7 @@ $NetBSD: patch-ab,v 1.5 2005/09/06 08:10:58 abs Exp $
  	} else strcpy(name,"/");
  
 -#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || defined (__APPLE__) 
-+#if defined (__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */
++#if defined(__DragonFly__) || (defined (__NetBSD__) && __NetBSD_Version__ >= 299000900) /* 2.99.9 */
 +	if (statvfs(name, &disk)) return(-1);
 +#elif defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || \
 +      defined (__APPLE__) || defined (__NetBSD__)
diff --git a/graphics/blender/patches/patch-ae b/graphics/blender/patches/patch-ae
index f1b3ec15156..210292c9bfd 100644
--- a/graphics/blender/patches/patch-ae
+++ b/graphics/blender/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2006/02/10 20:34:25 adam Exp $
+$NetBSD: patch-ae,v 1.5 2006/02/23 20:15:22 joerg Exp $
 
 --- SConstruct.orig	2006-01-22 23:46:29.000000000 +0100
 +++ SConstruct
@@ -42,9 +42,9 @@ $NetBSD: patch-ae,v 1.4 2006/02/10 20:34:25 adam Exp $
 +	defines = []
 +	warn_flags = ['-Wall','-W']
 +	window_system = 'X11'
-+	platform_libs = ['m', 'stdc++', 'pthread', 'util']
++	platform_libs = ['m', 'stdc++', 'util']
 +	platform_libpath = []
-+	platform_linkflags = []
++	platform_linkflags = string.split(os.environ['PTHREAD_LDFLAGS']) + string.split(os.environ['PTHREAD_LIBS'])
 +	extra_includes = []
 +	z_lib = ['z']
 +	z_libpath = []
diff --git a/graphics/blender/patches/patch-af b/graphics/blender/patches/patch-af
index 34e0d8bef8b..53be24fddaf 100644
--- a/graphics/blender/patches/patch-af
+++ b/graphics/blender/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2006/02/10 20:34:25 adam Exp $
+$NetBSD: patch-af,v 1.4 2006/02/23 20:15:22 joerg Exp $
 
 --- extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp.orig	2006-02-10 20:35:26.000000000 +0100
 +++ extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.3 2006/02/10 20:34:25 adam Exp $
  #include <malloc.h>
  #else
 -#if defined (__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
  #include <stdlib.h>
  #else
  #include <alloca.h>
diff --git a/graphics/blender/patches/patch-ag b/graphics/blender/patches/patch-ag
index e3964a10b9f..396351b2fb1 100644
--- a/graphics/blender/patches/patch-ag
+++ b/graphics/blender/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2006/02/10 20:34:25 adam Exp $
+$NetBSD: patch-ag,v 1.4 2006/02/23 20:15:22 joerg Exp $
 
 --- extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp.orig	2006-02-10 20:42:45.000000000 +0100
 +++ extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.3 2006/02/10 20:34:25 adam Exp $
  #include <malloc.h>
  #else
 -#if defined (__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
  #include <stdlib.h>
  #else
  #include <alloca.h>