Diff
Deleted: trunk/dports/math/octave/files/patch-configure-no_x11.diff (70854 => 70855)
--- trunk/dports/math/octave/files/patch-configure-no_x11.diff 2010-08-23 18:37:53 UTC (rev 70854)
+++ trunk/dports/math/octave/files/patch-configure-no_x11.diff 2010-08-23 18:38:34 UTC (rev 70855)
@@ -1,11 +0,0 @@
---- configure.orig 2010-01-19 06:47:17.000000000 -0600
-+++ configure 2010-05-01 03:27:01.000000000 -0500
-@@ -6848,7 +6848,7 @@
- $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
- fi
-
--if test "$have_x"; then
-+if test "$have_x" == yes; then
-
- $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h
-
Added: trunk/dports/math/octave/files/patch-configure.diff (0 => 70855)
--- trunk/dports/math/octave/files/patch-configure.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-configure.diff 2010-08-23 18:38:34 UTC (rev 70855)
@@ -0,0 +1,33 @@
+--- configure_orig 2010-08-01 12:16:40.000000000 -0400
++++ configure 2010-08-16 22:45:16.000000000 -0400
+@@ -30759,11 +30759,29 @@
+ else
+ FLTK_CFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --cflags`"
+ FLTK_LDFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags`"
+-
+ case "$canonical_host_type" in
+ *-*-mingw*)
+ FLTK_LDFLAGS="`echo $FLTK_LDFLAGS | sed -e 's/-mwindows//g'`"
+ ;;
++ *-apple-darwin*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&6; }
++ # see if computer version is 'apple' or not
++ case `$CXX --version` in
++ *apple*|*Apple*) ;;
++ *)
++ # not apple; remove '-arch' flag(s) from FLTK FLAGS
++ FLTK_CFLAGS=`echo $FLTK_CLFAGS | sed -e 's@-arch [^ ]*@@'`
++ FLTK_LDFLAGS=`echo $FLTK_LDFLAGS | sed -e 's@-arch [^ ]*@@'`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&6; }
++ ;;
++ esac
++ ;;
+ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL support in FLTK" >&5
Deleted: trunk/dports/math/octave/files/patch-lo-specfun.cc.diff (70854 => 70855)
--- trunk/dports/math/octave/files/patch-lo-specfun.cc.diff 2010-08-23 18:37:53 UTC (rev 70854)
+++ trunk/dports/math/octave/files/patch-lo-specfun.cc.diff 2010-08-23 18:38:34 UTC (rev 70855)
@@ -1,15 +0,0 @@
---- liboctave/lo-specfun.cc
-+++ liboctave/lo-specfun.cc
-@@ -25,6 +25,12 @@
- #include <config.h>
- #endif
-
-+#if !defined (_REENTRANT)
-+#define _REENTRANT
-+#endif
-+#include <cmath>
-+#undef _REENTRANT
-+
- #include "Range.h"
- #include "CColVector.h"
- #include "CMatrix.h"