- Upgraded to 4.0

- Take maintainership

math/freemat/Makefile

@@ -6,21 +6,24 @@
 #
 
 PORTNAME=		FreeMat
-PORTVERSION=		3.6
+PORTVERSION=		4.0
-PORTREVISION=		6
+DISTVERSIONSUFFIX=	-Source
 CATEGORIES=		math science
 MASTER_SITES=		SF
+MASTER_SITE_SUBDIR=	freemat/FreeMat4
 .ifdef WITH_MPI
 PKGNAMESUFFIX=		-mpi
 .endif
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		glarkin@FreeBSD.org
 COMMENT=		An environment for rapid engineering and scientific processing
 
 LIB_DEPENDS=		lapack.4:${PORTSDIR}/math/lapack	\
 			pcre.0:${PORTSDIR}/devel/pcre
 BUILD_DEPENDS=		pkg-config:${PORTSDIR}/devel/pkg-config
 
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}.1${DISTVERSIONSUFFIX}
+
 .ifdef WITH_MPI
 IGNORE=			no MPI support at the moment
 .endif
@@ -30,13 +33,10 @@ FFLAGS+=		-O2
 
 USE_GL=			yes
 USE_QT_VER=		4
-USE_GCC=		4.3+
+USE_CMAKE=		yes
-USE_GMAKE=		yes
+QT_COMPONENTS=		gui network opengl moc_build rcc_build uic_build \
-QT_COMPONENTS=		gui network opengl moc_build rcc_build uic_build xml svg
+			qmake_build xml svg
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-blas="${BLAS}" --without-llvm
 CPPFLAGS=		${CXXFLAGS} -I${LOCALBASE}/include  ${AMDINC}
-CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 SLAVEDIRS=	math/freemat-mpi
 
@@ -94,7 +94,7 @@ pre-everything::
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e 's| == x| = x|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	${RM} ${WRKSRC}/CMakeCache.txt
 
 post-configure:
 	# Avoid conflict with QT3

math/freemat/distinfo

@@ -1,3 +1,3 @@
-MD5 (FreeMat-3.6.tar.gz) = 85df162d519014c92197f334e9c3eeeb
+MD5 (FreeMat-4.0-Source.tar.gz) = adb58b9f2c508d9ae5b6041da2f75baf
-SHA256 (FreeMat-3.6.tar.gz) = 2cbc8b4435add159df11b734fd2736029b80f6c9712e53e5aa156eac1aac5951
+SHA256 (FreeMat-4.0-Source.tar.gz) = 6df1707c1f9e08b34e15eca8fa58bf3cf0ec8c121f64f58ca1d34a6eafd1066b
-SIZE (FreeMat-3.6.tar.gz) = 7843736
+SIZE (FreeMat-4.0-Source.tar.gz) = 38038903

math/freemat/files/patch-CMakeLists.txt

@@ -0,0 +1,20 @@
+--- ./CMakeLists.txt.orig	2009-11-13 18:28:43.000000000 -0500
++++ ./CMakeLists.txt	2009-11-13 19:28:04.000000000 -0500
+@@ -217,7 +217,7 @@
+   INCLUDE_DIRECTORIES(${PORTAUDIO_SYS_INCLUDE_DIR})
+   SET (PORTAUDIO_LIBRARY ${PORTAUDIO_SYS_LIBRARY})
+ ENDIF (FORCE_BUNDLED_PORTAUDIO OR NOT SYSTEM_PORTAUDIO_AVAILABLE)
+-ADD_DEFINITIONS( -DHAVE_PORTAUDIO19)
++ADD_DEFINITIONS( -DHAVE_PORTAUDIO18)
+ SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${PORTAUDIO_LIBRARY})
+ IF (APPLE)
+    FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio)
+@@ -245,7 +245,7 @@
+ ######################################################################
+ # LLVM Support
+ ######################################################################
+-OPTION(USE_LLVM "Build with LLVM support?" ON)
++OPTION(USE_LLVM "Build with LLVM support?" OFF)
+ 
+ IF( USE_LLVM )
+   set(LLVM_FOUND FALSE)

math/freemat/files/patch-configure

@@ -1,11 +0,0 @@
---- configure.orig	Mon Mar 26 00:30:19 2007
-+++ configure	Sun Apr 15 23:57:15 2007
-@@ -5442,7 +5442,7 @@
-       fi
-    fi
-    is_win32="false"
--   platform="--linux"
-+   platform="--freebsd"
- 
- # Check whether --with-ncurses or --without-ncurses was given.
- if test "${with_ncurses+set}" = set; then

math/freemat/files/patch-libs__libFN__CMakeLists.txt

@@ -0,0 +1,15 @@
+--- ./libs/libFN/CMakeLists.txt.orig	2009-11-13 20:28:30.000000000 -0500
++++ ./libs/libFN/CMakeLists.txt	2009-11-13 22:38:43.000000000 -0500
+@@ -13,6 +13,12 @@
+ 	 mathfunc4.cpp
+   )
+ ENDIF( MSVC )
++
++IF (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
++  SET(LIBM_FILES
++	mathfunc4.cpp
++  )
++ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ 
+ ADD_LIBRARY( FN
+ FNFun.cpp 

math/freemat/files/patch-libs__libFN__FNFun.cpp

@@ -0,0 +1,17 @@
+--- ./libs/libFN/FNFun.cpp.orig	2009-11-14 18:51:06.000000000 -0500
++++ ./libs/libFN/FNFun.cpp	2009-11-14 20:26:43.000000000 -0500
+@@ -35,6 +35,14 @@
+ 	double trunc( double x );
+ 	float truncf( float x );
+ #endif 
++#if defined(__FreeBSD__)
++#ifdef __cplusplus
++extern "C" {
++    float lgammaf(float x);
++    float tgammaf(float x);
++}
++#endif
++#endif
+ 
+ //!
+ //@Module ERFC Complimentary Error Function

math/freemat/files/patch-libs__libFN__fdlibm.h

@@ -0,0 +1,17 @@
+--- ./libs/libFN/fdlibm.h.orig	2009-11-14 19:26:54.000000000 -0500
++++ ./libs/libFN/fdlibm.h	2009-11-14 19:27:53.000000000 -0500
+@@ -11,13 +11,11 @@
+  */
+ 
+ /* REDHAT LOCAL: Include files.  */
++#include <stdarg.h>
+ #include <math.h>
+ //#include <sys/types.h>
+ //#include <machine/ieeefp.h>
+ 
+-typedef  __int32 __int32_t;
+-typedef  unsigned __int32 __uint32_t;
+-
+ #define __IEEE_LITTLE_ENDIAN
+ 
+ /* REDHAT LOCAL: Default to XOPEN_MODE.  */

math/freemat/files/patch-libs_libCore_MatIO.hpp

@@ -1,10 +0,0 @@
---- 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;
- 

math/freemat/files/patch-libs_libFN_FNFun.cpp

@@ -1,18 +0,0 @@
---- ./libs/libFN/FNFun.cpp.orig	2008-03-14 16:43:05.000000000 +0100
-+++ ./libs/libFN/FNFun.cpp	2008-03-18 22:05:39.000000000 +0100
-@@ -23,6 +23,15 @@
- #include "Malloc.hpp"
- #include <math.h>
- 
-+#if defined(__FreeBSD__) && __FreeBSD_version < 800022
-+float
-+tgammaf(float x)
-+{
-+
-+	return (tgamma(x));
-+}
-+#endif
-+
- //!
- //@Module ERFC Complimentary Error Function
- //@@Section MATHFUNCTIONS

math/freemat/files/patch-libs_libFreeMat_Array.cpp

@@ -1,11 +0,0 @@
---- 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"

math/freemat/files/patch-libs_libFreeMat_IEEEFP.cpp

@@ -1,10 +0,0 @@
---- 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;

math/freemat/files/patch-libs_libFreeMat_Malloc.cpp

@@ -1,10 +0,0 @@
---- 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) {

math/freemat/files/patch-libs_libFreeMat_Scanner.cpp

@@ -1,10 +0,0 @@
---- 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;

math/freemat/files/patch-libs_libFreeMat_Scope.hpp

@@ -1,10 +0,0 @@
---- 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"

math/freemat/files/patch-libs_libFreeMat_Token.cpp

@@ -1,10 +0,0 @@
---- 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] = {

math/freemat/files/patch-libs_libGraphics_HandleAxis.cpp

@@ -1,13 +0,0 @@
---- ./libs/libGraphics/HandleAxis.cpp.orig	Thu Dec 28 15:02:22 2006
-+++ ./libs/libGraphics/HandleAxis.cpp	Sat Feb 10 00:07:46 2007
-@@ -28,6 +28,10 @@
- #include "HandleCommands.hpp"
- #include <qgl.h>
- 
-+#ifdef __FreeBSD__
-+#define log2(x) log(x)/log(2)
-+#endif
-+
- // Property list & status
- //    activepositionproperty
- //    alim