--- math/dynare/Makefile 2017-05-02 08:48:10.000000000 +0200 +++ math/dynare/Makefile 2017-08-07 16:27:43.393513000 +0200 @@ -3,17 +3,29 @@ PORTNAME= dynare PORTVERSION= 4.4.3 -PORTREVISION= 9 +PORTREVISION= 10 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 + 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 --- math/dynare/files/patch-Makefile.in 2014-10-05 14:16:10.000000000 +0200 +++ math/dynare/files/patch-Makefile.in 2017-08-06 20:18:07.770093000 +0200 @@ -1,6 +1,6 @@ --- Makefile.in.orig 2014-07-31 12:30:46 UTC +++ Makefile.in -@@ -827,9 +827,9 @@ +@@ -827,9 +827,9 @@ dist-hook: install-exec-local: $(MKDIR_P) $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode cp -r examples $(DESTDIR)$(pkglibdir) --- math/dynare/files/patch-configure 2014-01-19 13:29:37.000000000 +0100 +++ math/dynare/files/patch-configure 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- mex/build/octave/configure.orig 2014-01-10 20:33:42.000000000 +0100 -+++ mex/build/octave/configure 2014-01-10 20:34:24.000000000 +0100 -@@ -6769,7 +6769,7 @@ - $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. */ - --- math/dynare/files/patch-dynare++_kord_journal.cweb 1970-01-01 01:00:00.000000000 +0100 +++ math/dynare/files/patch-dynare++_kord_journal.cweb 2017-08-06 20:18:07.771791000 +0200 @@ -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; + } + + @ --- math/dynare/files/patch-dynare++_parser_cc_parser__exception.h 1970-01-01 01:00:00.000000000 +0100 +++ math/dynare/files/patch-dynare++_parser_cc_parser__exception.h 2017-08-06 20:18:07.773592000 +0200 @@ -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; --- math/dynare/files/patch-journal.cweb 2014-01-22 18:40:44.000000000 +0100 +++ math/dynare/files/patch-journal.cweb 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ ---- dynare++/kord/journal.cweb.orig 2011-08-21 20:56:09.000000000 +0200 -+++ dynare++/kord/journal.cweb 2011-08-21 23:02:31.000000000 +0200 -@@ -5,6 +5,8 @@ - @c - #include "journal.h" - #include "kord_exception.h" -+#include -+#include - - #if !defined(__MINGW32__) - # include -@@ -72,7 +74,16 @@ - @<|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 @@ - 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 @@ - 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; - } - - @ --- math/dynare/files/patch-mex_build_octave_configure 1970-01-01 01:00:00.000000000 +0100 +++ math/dynare/files/patch-mex_build_octave_configure 2017-08-06 20:18:07.775207000 +0200 @@ -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. */ + --- math/dynare/files/patch-parser-exception.h 2014-01-22 18:40:44.000000000 +0100 +++ math/dynare/files/patch-parser-exception.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- dynare++/parser/cc/parser_exception.h.orig 2011-08-21 19:10:51.000000000 +0200 -+++ dynare++/parser/cc/parser_exception.h 2011-08-21 19:31:06.000000000 +0200 -@@ -6,6 +6,7 @@ - #define OG_FORMULA_PARSER_H - - #include -+#include - - namespace ogp { - using std::string;