Handle DragonFly as FreeBSD for now. Fix build on both.

4 files changed, 52 insertions, 10 deletions

diff --git a/math/scilab/distinfo b/math/scilab/distinfo
index b900d0b65fb..30ea646c16e 100644
--- a/math/scilab/distinfo
+++ b/math/scilab/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.24 2007/03/23 22:08:56 dmcmahill Exp $
+$NetBSD: distinfo,v 1.25 2007/04/10 15:53:16 joerg Exp $
 
 SHA1 (scilab-4.1-src.tar.gz) = 7a8381a9a69ce280ae718ee59f4c14001b61f4b7
 RMD160 (scilab-4.1-src.tar.gz) = 6ed27ce7dcfb9231b5f3042cb7b830015d102df7
 Size (scilab-4.1-src.tar.gz) = 13164450 bytes
-SHA1 (patch-aa) = aa7e9f32317019484df4163d00ee5ac3b07850cb
-SHA1 (patch-ab) = b6eaf04f8aa457f79b62df8db2902909ae1bffc4
+SHA1 (patch-aa) = 03e21592345377e3a5ee64baf9243f81f71fb7b2
+SHA1 (patch-ab) = a1b37d38c36c99046ca828c4342597658d561820
 SHA1 (patch-ac) = ea7545614680738f36c4fb12f8375eb3bddadb29
 SHA1 (patch-ad) = e2e052d07001c5ffebd6a2ed4c68b4759ffdd5ca
 SHA1 (patch-af) = 7417733f8720432773e9c5c0f68c3b2b7a935527
 SHA1 (patch-ag) = 3937d13ac249f18f45a5d50b6b86b03454d3c685
 SHA1 (patch-ah) = 1bad4520a47006ff14248dc765c5f284f55071be
 SHA1 (patch-ai) = a85828e131cc0907f2ba0d047f3d80e9a4547221
-SHA1 (patch-aj) = 8b8ffdc59c2244b2ee72fc931fdb3e92ab2ffb1f
+SHA1 (patch-aj) = 90cf2ae9fa4d30b21c6489862f7bcc6595b3d8a6
 SHA1 (patch-al) = 9696a74797e3cc177c0a53ea7715f181ab781d4a
 SHA1 (patch-am) = 14f3a449dc7bfcb6540fb1cb20d2ca49b0e492b4
 SHA1 (patch-an) = a1ab5aa1057d2d85f446fe06ffb03b818dbc05a8
diff --git a/math/scilab/patches/patch-aa b/math/scilab/patches/patch-aa
index 0431a56bf8d..5bfc4fcc489 100644
--- a/math/scilab/patches/patch-aa
+++ b/math/scilab/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2007/03/23 22:08:56 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.13 2007/04/10 15:53:16 joerg Exp $
 
 --- configure.in.orig	2006-11-03 15:06:57.000000000 +0000
 +++ configure.in
@@ -129,6 +129,27 @@ $NetBSD: patch-aa,v 1.12 2007/03/23 22:08:56 dmcmahill Exp $
  		LD=ld
  		LD_LDFLAGS=$LIEEELIB
  	fi
+@@ -1283,17 +1266,17 @@ i*86-*-linux-gnu | *-linux-gnu )
+     MAKEFILE_TARGET=Makefile.mingwin32
+     ;;
+ # FreeBSD  systems (not supported by INRIA)
+-  *-*-freebsd*)
++  *-*-freebsd* | *-*-dragonfly*)
+      GCC=yes
+      CC=$CC
+      CC_OPTIONS="${CFLAGS} -Dfreebsd"
+-     CC_LDFLAGS=-lm
++     CC_LDFLAGS="-lm ${LDFLAGS} -Wl,-R${X11BASE}/lib"
+      CC_PICFLAGS='-fPIC'
+      # script shell f77 have bugs, get ours
+      FC=$F77
+      FC_OPTIONS="${CFLAGS} -Dfreebsd"	
+      FC_OPTIONS_O0='-Dfreebsd'
+-     FC_LDFLAGS='-lm -Wl,--export-dynamic'
++     FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib -lm -Wl,--export-dynamic"
+      FC_PICFLAGS='-fPIC'
+      LD=ld
+      LD_LDFLAGS=-lm
 @@ -1337,8 +1320,8 @@ i*86-*-linux-gnu | *-linux-gnu )
     AC_F77_LIBRARY_LDFLAGS
     FC="$F77"
diff --git a/math/scilab/patches/patch-ab b/math/scilab/patches/patch-ab
index d01d767a3b8..ad6ed26ce18 100644
--- a/math/scilab/patches/patch-ab
+++ b/math/scilab/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.13 2007/03/23 22:08:56 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.14 2007/04/10 15:53:16 joerg Exp $
 
 --- configure.orig	2006-11-03 15:06:57.000000000 +0000
 +++ configure
@@ -3800,6 +3800,27 @@ $NetBSD: patch-ab,v 1.13 2007/03/23 22:08:56 dmcmahill Exp $
      ac_cv_prog_F77="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
+@@ -24317,17 +24312,17 @@ echo "$as_me: error: Unable to configure
+     MAKEFILE_TARGET=Makefile.mingwin32
+     ;;
+ # FreeBSD  systems (not supported by INRIA)
+-  *-*-freebsd*)
++  *-*-freebsd* | *-*-dragonfly*)
+      GCC=yes
+      CC=$CC
+      CC_OPTIONS="${CFLAGS} -Dfreebsd"
+-     CC_LDFLAGS=-lm
++     CC_LDFLAGS="-lm ${LDFLAGS} -Wl,-R${X11BASE}/lib"
+      CC_PICFLAGS='-fPIC'
+      # script shell f77 have bugs, get ours
+      FC=$F77
+      FC_OPTIONS="${CFLAGS} -Dfreebsd"
+      FC_OPTIONS_O0='-Dfreebsd'
+-     FC_LDFLAGS='-lm -Wl,--export-dynamic'
++     FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib -lm -Wl,--export-dynamic"
+      FC_PICFLAGS='-fPIC'
+      LD=ld
+      LD_LDFLAGS=-lm
 @@ -24372,7 +24367,7 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
diff --git a/math/scilab/patches/patch-aj b/math/scilab/patches/patch-aj
index 9d9e61ee8c0..3b480771c29 100644
--- a/math/scilab/patches/patch-aj
+++ b/math/scilab/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.8 2007/03/23 22:08:57 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.9 2007/04/10 15:53:16 joerg Exp $
 
 --- routines/os_specific/getmemory.c.orig	2006-02-01 20:50:55.000000000 +0000
 +++ routines/os_specific/getmemory.c
@@ -6,7 +6,7 @@ $NetBSD: patch-aj,v 1.8 2007/03/23 22:08:57 dmcmahill Exp $
  */
  #include "getmemory.h"
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
@@ -19,7 +19,7 @@ $NetBSD: patch-aj,v 1.8 2007/03/23 22:08:57 dmcmahill Exp $
     }
  #endif
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#define MEMOK 1
 +  { /* This works on *bsd and darwin.  */
 +    unsigned int usermem;
@@ -39,7 +39,7 @@ $NetBSD: patch-aj,v 1.8 2007/03/23 22:08:57 dmcmahill Exp $
     }
  #endif
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#define MEMOK 1
 +  { /* This works on *bsd and darwin.  */
 +    unsigned int physmem;