update to 4.0

switch to cmake

from Alexandr Shadchin
This commit is contained in:
steven 2010-10-24 19:28:50 +00:00
parent 226aba2ff8
commit 6ef50da6e9
8 changed files with 1264 additions and 276 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.23 2010/10/23 15:09:57 steven Exp $
# $OpenBSD: Makefile,v 1.24 2010/10/24 19:28:50 steven Exp $
COMMENT= environment for rapid engineering and scientific processing
V= 3.6
DISTNAME= FreeMat-${V}
V= 4.0
DISTNAME= FreeMat-${V}-Source
PKGNAME= freemat-${V}
REVISION= 4
CATEGORIES= graphics math
@ -17,44 +16,38 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= GL GLU amd c curses m pthread stdc++ z \
${MODFORTRAN_WANTLIB} \
avcall arpack.>=1 blas.>=1 fftw3.>=4 fftw3f.>=4 lapack.>=1 \
pcre portaudio umfpack QtGui QtNetwork QtOpenGL QtSvg QtXml
WANTLIB += GL GLU ICE SM X11 Xext c m ncurses pcre pthread stdc++
WANTLIB += z amd fftw3 fftw3f portaudio umfpack
WANTLIB += QtGui QtNetwork QtOpenGL QtSvg QtXml
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freemat/}
MODULES= x11/qt4 devel/gettext fortran
MODFORTRAN_COMPILER = g77
MODULES= x11/qt4 devel/cmake
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS= ::devel/ffcall \
LIB_DEPENDS= ::audio/portaudio-svn \
::devel/pcre \
::math/amd \
::math/arpack \
::math/blas \
::math/fftw3,double \
::math/fftw3,float \
::math/lapack \
::devel/pcre \
::audio/portaudio-svn \
::math/umfpack \
::x11/qt4 \
${MODFORTRAN_LIB_DEPENDS}
::x11/qt4
USE_X11= Yes
USE_LIBTOOL= Yes
USE_GMAKE= Yes
AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf no-autoheader
CONFIGURE_ENV= F77=${FC} \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/amd -I${LOCALBASE}/include/umfpack -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
PKG_CONFIG_LIBDIR="${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4" \
ac_cv_path_LLVM_CONFIG=
NO_REGRESS= Yes
SUBST_VARS= V
CONFIGURE_ARGS= -DUSE_LLVM:BOOL=FALSE
WRKDIST= ${WRKDIR}/FreeMat-${V}.1-Source
post-extract:
@cd ${WRKSRC} && find . -name \*.moc.cpp | xargs rm
pre-configure:
@rm ${WRKSRC}/CMakeCache.txt
post-install:
@mv ${PREFIX}/bin/FreeMat ${PREFIX}/bin/freemat

View File

@ -1,5 +1,5 @@
MD5 (FreeMat-3.6.tar.gz) = hd8WLVGQFMkhl/M06cPu6w==
RMD160 (FreeMat-3.6.tar.gz) = WvMTMvQqr+lSxklbFs7uXOSrXRw=
SHA1 (FreeMat-3.6.tar.gz) = L/qsAV+HBAnOsH6uA177lKsdlcs=
SHA256 (FreeMat-3.6.tar.gz) = LLyLRDWt0VnfEbc0/Sc2ApuA9slxLlPlqhVurBqsWVE=
SIZE (FreeMat-3.6.tar.gz) = 7843736
MD5 (FreeMat-4.0-Source.tar.gz) = rbWLnyxQjZrltgQdovdbrw==
RMD160 (FreeMat-4.0-Source.tar.gz) = aXiJCg5LVbtIFb7pzFwCe22jweI=
SHA1 (FreeMat-4.0-Source.tar.gz) = REavfzk7wz1+YBf3jP9L9oDEEac=
SHA256 (FreeMat-4.0-Source.tar.gz) = bfFwfB+eCLNOFeyo+li/PPDsjBIfZPWModNKbq/RBms=
SIZE (FreeMat-4.0-Source.tar.gz) = 38038903

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2010/10/24 19:28:50 steven Exp $
--- CMakeLists.txt.orig Fri Oct 9 08:24:39 2009
+++ CMakeLists.txt Sun Oct 24 14:32:58 2010
@@ -25,7 +25,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/module
SET( RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/share/FreeMat-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}" )
#SET( CMAKE_VERBOSE_MAKEFILE TRUE )
-SET( LOCAL_PATH ${PROJECT_SOURCE_DIR}/dependencies/bin ${PROJECT_BINARY_DIR} /mingw/lib INTERNAL )
+SET( LOCAL_PATH ${PROJECT_SOURCE_DIR}/dependencies/bin ${PROJECT_BINARY_DIR} /mingw/lib ${OPENBSD_LOCALBASE}/include/amd ${OPENBSD_LOCALBASE}/include/umfpack INTERNAL )
IF( MSVC )
ADD_DEFINITIONS( /Dsnprintf=_snprintf /DNOMINMAX /DVERSION="${VERSION}" /DRESOURCEDIR="${RESOURCEDIR}")
@@ -59,6 +59,8 @@ MACRO (QT4_GENERATE_UI infile outfile )
ENDMACRO (QT4_GENERATE_UI)
SET(OPTIONAL_LIBS "")
+
+INCLUDE_DIRECTORIES(${OPENBSD_X11BASE}/include)
######################################################################
# PCRE Package

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-configure_in,v 1.4 2010/03/26 12:00:17 espie Exp $
XXX workaround until qt4 pkg-config can be fixed.
--- configure.in.orig Fri Mar 14 16:43:34 2008
+++ configure.in Fri Mar 26 12:25:39 2010
@@ -63,7 +63,7 @@ if (test "$cross_compiling" = "no") && (test "$is_mac"
is_win32="false"
platform="--linux"
MP_WITH_CURSES
- LIBS="$LIBS $CURSES_LIB $FLIBS $QT_LIBS"
+ LIBS="$LIBS $CURSES_LIB $FLIBS $QT_LIBS -lGLU -pthread"
fi
if (test "$cross_compiling" = "yes"); then

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-libs_libCore_Makefile_in,v 1.4 2010/03/26 12:00:17 espie Exp $
--- libs/libCore/Makefile.in.orig Fri Mar 14 16:48:05 2008
+++ libs/libCore/Makefile.in Fri Mar 26 12:00:26 2010
@@ -316,12 +316,14 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpwidget.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpwidget.moc.Po@am__quote@
+CXXFLAGS_Analyze.cpp = -O1
+
.cpp.o:
-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) $(CXXFLAGS_$<) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) $(CXXFLAGS_$<) -c -o $@ $<
.cpp.obj:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-libs_libFreeMat_Print_cpp,v 1.4 2007/09/07 15:55:25 steven Exp $
--- libs/libFreeMat/Print.cpp.orig Fri Sep 7 11:09:49 2007
+++ libs/libFreeMat/Print.cpp Fri Sep 7 11:10:16 2007
@@ -180,13 +180,13 @@ void ComputeScaleFactor(const T* array, int count, Arr
}
if (!finiteElementFound) return;
if (max_amplitude >= 100)
- format.scalefact = pow(10.0,floor(log10(max_amplitude)));
+ format.scalefact = pow(10.0,floor(log10((double)max_amplitude)));
else if (max_amplitude <= -100)
- format.scalefact = pow(10.0,floor(log10(-max_amplitude)));
+ format.scalefact = pow(10.0,floor(log10((double)-max_amplitude)));
else if ((max_amplitude <= .1) && (max_amplitude>0))
- format.scalefact = pow(10.0,floor(log10(max_amplitude)));
+ format.scalefact = pow(10.0,floor(log10((double)max_amplitude)));
else if ((max_amplitude >= -.1) && (max_amplitude<0))
- format.scalefact = pow(10.0,floor(log10(-max_amplitude)));
+ format.scalefact = pow(10.0,floor(log10((double)-max_amplitude)));
else
format.scalefact = 1.0;
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libs_libXP_Editor_cpp,v 1.1 2008/06/11 21:09:07 martynas Exp $
--- libs/libXP/Editor.cpp.orig Sun Mar 16 21:33:55 2008
+++ libs/libXP/Editor.cpp Thu Mar 20 14:25:22 2008
@@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
+#include <unistd.h>
#include "Editor.hpp"
#include "Interpreter.hpp"
#include "highlighter.hpp"

File diff suppressed because it is too large Load Diff