aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2009-12-08 13:34:02 +0000
committerPav Lucistnik <pav@FreeBSD.org>2009-12-08 13:34:02 +0000
commit45545356e8ba2e4b1de6bb916d3be82b89f5e56a (patch)
tree6d6714737d4303cb52b70e685d55c869a628abc8
parent8a918b586b3011650943b22099a24ee69ae29d82 (diff)
downloadports-45545356e8ba2e4b1de6bb916d3be82b89f5e56a.tar.gz
ports-45545356e8ba2e4b1de6bb916d3be82b89f5e56a.zip
- Unbreak
PR: ports/139444 Submitted by: Stas Timokhin <stast@bsdportal.ru>
Notes
Notes: svn path=/head/; revision=245410
-rw-r--r--math/freemat/Makefile5
-rw-r--r--math/freemat/files/patch-libs_libCore_MatIO.hpp10
-rw-r--r--math/freemat/files/patch-libs_libFreeMat_Array.cpp11
-rw-r--r--math/freemat/files/patch-libs_libFreeMat_IEEEFP.cpp10
-rw-r--r--math/freemat/files/patch-libs_libFreeMat_Malloc.cpp10
-rw-r--r--math/freemat/files/patch-libs_libFreeMat_Scanner.cpp10
-rw-r--r--math/freemat/files/patch-libs_libFreeMat_Scope.hpp10
-rw-r--r--math/freemat/files/patch-libs_libFreeMat_Token.cpp10
8 files changed, 73 insertions, 3 deletions
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 3e71f4686b95..d87a3b2f07e8 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= FreeMat
PORTVERSION= 3.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math science
MASTER_SITES= SF
.ifdef WITH_MPI
@@ -21,8 +21,6 @@ LIB_DEPENDS= lapack.4:${PORTSDIR}/math/lapack \
pcre.0:${PORTSDIR}/devel/pcre
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-BROKEN= does not compile
-
.ifdef WITH_MPI
IGNORE= no MPI support at the moment
.endif
@@ -32,6 +30,7 @@ FFLAGS+= -O2
USE_GL= yes
USE_QT_VER= 4
+USE_GCC= 4.3+
USE_GMAKE= yes
QT_COMPONENTS= gui network opengl moc_build rcc_build uic_build xml svg
GNU_CONFIGURE= yes
diff --git a/math/freemat/files/patch-libs_libCore_MatIO.hpp b/math/freemat/files/patch-libs_libCore_MatIO.hpp
new file mode 100644
index 000000000000..c16283c7e2cb
--- /dev/null
+++ b/math/freemat/files/patch-libs_libCore_MatIO.hpp
@@ -0,0 +1,10 @@
+--- libs/libCore/MatIO.hpp.orig 2009-10-08 10:01:46.000000000 +0700
++++ libs/libCore/MatIO.hpp 2009-10-08 10:20:30.000000000 +0700
+@@ -4,6 +4,7 @@
+ #include "Array.hpp"
+ #include <string>
+ #include <zlib.h>
++#include <stdio.h>
+
+ using namespace std;
+
diff --git a/math/freemat/files/patch-libs_libFreeMat_Array.cpp b/math/freemat/files/patch-libs_libFreeMat_Array.cpp
new file mode 100644
index 000000000000..646d2666d355
--- /dev/null
+++ b/math/freemat/files/patch-libs_libFreeMat_Array.cpp
@@ -0,0 +1,11 @@
+--- libs/libFreeMat/Array.cpp.orig 2009-10-08 09:37:54.000000000 +0700
++++ libs/libFreeMat/Array.cpp 2009-10-08 09:38:20.000000000 +0700
+@@ -27,6 +27,8 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <set>
++#include <algorithm>
++#include <functional>
+
+ #include "FunctionDef.hpp"
+ #include "NumericArray.hpp"
diff --git a/math/freemat/files/patch-libs_libFreeMat_IEEEFP.cpp b/math/freemat/files/patch-libs_libFreeMat_IEEEFP.cpp
new file mode 100644
index 000000000000..124c091ebec1
--- /dev/null
+++ b/math/freemat/files/patch-libs_libFreeMat_IEEEFP.cpp
@@ -0,0 +1,10 @@
+--- libs/libFreeMat/IEEEFP.cpp.orig 2009-10-08 09:42:00.000000000 +0700
++++ libs/libFreeMat/IEEEFP.cpp 2009-10-08 09:43:46.000000000 +0700
+@@ -17,6 +17,7 @@
+ *
+ */
+ #include "IEEEFP.hpp"
++#include <stdio.h>
+
+ static bool endianDetected = false;
+ static bool bigEndian = false;
diff --git a/math/freemat/files/patch-libs_libFreeMat_Malloc.cpp b/math/freemat/files/patch-libs_libFreeMat_Malloc.cpp
new file mode 100644
index 000000000000..4f0b098d2a8c
--- /dev/null
+++ b/math/freemat/files/patch-libs_libFreeMat_Malloc.cpp
@@ -0,0 +1,10 @@
+--- libs/libFreeMat/Malloc.cpp.orig 2009-10-08 09:45:59.000000000 +0700
++++ libs/libFreeMat/Malloc.cpp 2009-10-08 09:47:56.000000000 +0700
+@@ -21,6 +21,7 @@
+ #include "Exception.hpp"
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <cstring>
+
+
+ void* Malloc(int count) {
diff --git a/math/freemat/files/patch-libs_libFreeMat_Scanner.cpp b/math/freemat/files/patch-libs_libFreeMat_Scanner.cpp
new file mode 100644
index 000000000000..6fb554ad4b13
--- /dev/null
+++ b/math/freemat/files/patch-libs_libFreeMat_Scanner.cpp
@@ -0,0 +1,10 @@
+--- libs/libFreeMat/Scanner.cpp.orig 2009-10-08 09:51:15.000000000 +0700
++++ libs/libFreeMat/Scanner.cpp 2009-10-08 09:51:25.000000000 +0700
+@@ -4,6 +4,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include "Exception.hpp"
++#include <algorithm>
+
+ extern string fm_reserved[];
+ extern int fm_reserved_count;
diff --git a/math/freemat/files/patch-libs_libFreeMat_Scope.hpp b/math/freemat/files/patch-libs_libFreeMat_Scope.hpp
new file mode 100644
index 000000000000..53e2a1019211
--- /dev/null
+++ b/math/freemat/files/patch-libs_libFreeMat_Scope.hpp
@@ -0,0 +1,10 @@
+--- libs/libFreeMat/Scope.hpp.orig 2009-10-08 09:40:36.000000000 +0700
++++ libs/libFreeMat/Scope.hpp 2009-10-08 09:40:55.000000000 +0700
+@@ -25,6 +25,7 @@
+ */
+ #include <string>
+ #include <QMutex>
++#include <algorithm>
+
+ #include "Array.hpp"
+ #include "SymbolTable.hpp"
diff --git a/math/freemat/files/patch-libs_libFreeMat_Token.cpp b/math/freemat/files/patch-libs_libFreeMat_Token.cpp
new file mode 100644
index 000000000000..ccde44cf1aeb
--- /dev/null
+++ b/math/freemat/files/patch-libs_libFreeMat_Token.cpp
@@ -0,0 +1,10 @@
+--- libs/libFreeMat/Token.cpp.orig 2009-10-08 09:49:12.000000000 +0700
++++ libs/libFreeMat/Token.cpp 2009-10-08 09:50:12.000000000 +0700
+@@ -2,6 +2,7 @@
+ #include "Serialize.hpp"
+ #include <iostream>
+ #include <errno.h>
++#include <climits>
+
+ // These must appear as sequential token numbers
+ string fm_reserved[22] = {