Index: head/math/dynare/Makefile =================================================================== --- head/math/dynare/Makefile (revision 447843) +++ head/math/dynare/Makefile (revision 447844) @@ -1,63 +1,63 @@ # Created by: Fernando Apesteguia # $FreeBSD$ PORTNAME= dynare PORTVERSION= 4.4.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= math MASTER_SITES= http://www.dynare.org/release/source/ MAINTAINER= fernando.apesteguia@gmail.com COMMENT= Software platform for handling a wide class of economic models LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/unordered_set.hpp:devel/boost-libs \ ctangle:devel/cweb LIB_DEPENDS= libumfpack.so:math/suitesparse \ libmatio.so:math/matio \ libhdf5.so:science/hdf5 \ libopenblas.so:math/openblas \ libopenblasp.so:math/openblas \ libfftw3_threads.so:math/fftw3 \ libfftw3.so:math/fftw3 \ libfftw3f_threads.so:math/fftw3-float \ libfftw3f.so:math/fftw3-float \ liblapack.so:math/lapack \ libblas.so:math/blas WRKSRC= ${WRKDIR}/${DISTNAME} GNU_CONFIGURE= yes USES= fortran gmake pkgconfig tar:xz INFO= dynare OPTIONS_DEFINE= OCTAVE MATLAB OCTAVE_DESC= Enable compilation of MEX files for Octave MATLAB_DESC= Enable compilation of MEX files for MATLAB OPTIONS_DEFAULT= OCTAVE MATLAB_CONFIGURE_ENABLE= matlab OCTAVE_CONFIGURE_ENABLE= octave OCTAVE_BUILD_DEPENDS= octave:math/octave CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib pre-configure: # fix matio detection ${REINPLACE_CMD} 's,-lmatio .*$$LIBS,`pkgconf --libs matio`,' \ ${WRKSRC}/configure ${WRKSRC}/mex/build/octave/configure post-configure: @${ECHO_MSG} "" @${ECHO_MSG} "" @${ECHO_MSG} "*******************************************************************************" @${ECHO_MSG} "Follow instructions at http://www.freebsd.org/doc/handbook/linuxemu-matlab.html" @${ECHO_MSG} "on how to install MATLAB on FreeBSD" @${ECHO_MSG} "*******************************************************************************" @${ECHO_MSG} "" @${ECHO_MSG} "" .include Index: head/math/dynare/files/patch-dynare++_kord_journal.cweb =================================================================== --- head/math/dynare/files/patch-dynare++_kord_journal.cweb (nonexistent) +++ head/math/dynare/files/patch-dynare++_kord_journal.cweb (revision 447844) @@ -0,0 +1,53 @@ +--- dynare++/kord/journal.cweb.orig 2013-11-08 16:37:59 UTC ++++ dynare++/kord/journal.cweb +@@ -5,6 +5,8 @@ + @c + #include "journal.h" + #include "kord_exception.h" ++#include ++#include + + #if !defined(__MINGW32__) + # include +@@ -72,7 +74,16 @@ long int SystemResources::onlineProcesso + @<|SystemResources::availableMemory| code@>= + long int SystemResources::availableMemory() + { +- return pageSize()*sysconf(_SC_AVPHYS_PAGES); ++ long value; ++ size_t len; ++ char *path = "vm.stats.vm.v_free_count"; ++ ++ if (sysctlbyname(path, &value, &len, NULL, 0) == -1) { ++ return (-1); ++ } ++ ++ ++ return pageSize() * value; + } + + @ Here we read the current values of resource usage. For MinGW, we +@@ -84,6 +95,10 @@ void SystemResources::getRUS(double& loa + long int& idrss, long int& majflt) + { + struct timeval now; ++ long value; ++ size_t len; ++ char *path = "vm.stats.vm.v_free_count"; ++ + gettimeofday(&now, NULL); + elapsed = now.tv_sec-start.tv_sec + (now.tv_usec-start.tv_usec)*1.0e-6; + +@@ -107,7 +122,11 @@ void SystemResources::getRUS(double& loa + load_avg = -1.0; + #endif + +- pg_avail = sysconf(_SC_AVPHYS_PAGES); ++ if (sysctlbyname(path, &value, &len, NULL, 0) == -1) { ++ pg_avail = -1; ++ } ++ ++ pg_avail = value; + } + + @ Property changes on: head/math/dynare/files/patch-dynare++_kord_journal.cweb ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h =================================================================== --- head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h (nonexistent) +++ head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h (revision 447844) @@ -0,0 +1,10 @@ +--- dynare++/parser/cc/parser_exception.h.orig 2013-11-08 16:37:59 UTC ++++ dynare++/parser/cc/parser_exception.h +@@ -6,6 +6,7 @@ + #define OG_FORMULA_PARSER_H + + #include ++#include + + namespace ogp { + using std::string; Property changes on: head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/dynare/files/patch-mex_build_octave_configure =================================================================== --- head/math/dynare/files/patch-mex_build_octave_configure (nonexistent) +++ head/math/dynare/files/patch-mex_build_octave_configure (revision 447844) @@ -0,0 +1,11 @@ +--- mex/build/octave/configure.orig 2014-07-31 12:31:10 UTC ++++ mex/build/octave/configure +@@ -7076,7 +7076,7 @@ if ${ac_cv_lib_umfpack_umfpack_dl_defaul + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lumfpack $LIBS" ++LIBS="-lumfpack -llapack -lblas -lsuitesparseconfig -lcholmod -lcolamd -lamd $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + Property changes on: head/math/dynare/files/patch-mex_build_octave_configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property