Index: head/math/dynare/Makefile =================================================================== --- head/math/dynare/Makefile (revision 447842) +++ head/math/dynare/Makefile (revision 447843) @@ -1,51 +1,63 @@ # Created by: Fernando Apesteguia # $FreeBSD$ 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 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-configure =================================================================== --- head/math/dynare/files/patch-configure (revision 447842) +++ head/math/dynare/files/patch-configure (nonexistent) @@ -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. */ - Property changes on: head/math/dynare/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/dynare/files/patch-journal.cweb =================================================================== --- head/math/dynare/files/patch-journal.cweb (revision 447842) +++ head/math/dynare/files/patch-journal.cweb (nonexistent) @@ -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; - } - - @ Property changes on: head/math/dynare/files/patch-journal.cweb ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/dynare/files/patch-parser-exception.h =================================================================== --- head/math/dynare/files/patch-parser-exception.h (revision 447842) +++ head/math/dynare/files/patch-parser-exception.h (nonexistent) @@ -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; Property changes on: head/math/dynare/files/patch-parser-exception.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/dynare/files/patch-Makefile.in =================================================================== --- head/math/dynare/files/patch-Makefile.in (revision 447842) +++ head/math/dynare/files/patch-Makefile.in (revision 447843) @@ -1,14 +1,14 @@ --- 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) - cp -r matlab $(DESTDIR)$(pkglibdir) rm -f $(DESTDIR)$(pkglibdir)/matlab/dynare_m - cp preprocessor/dynare_m $(DESTDIR)$(pkglibdir)/matlab + cp -r matlab $(DESTDIR)$(pkglibdir) + $(INSTALL_PROGRAM) preprocessor/dynare_m $(DESTDIR)$(pkglibdir)/matlab cp -r contrib/ms-sbvar/TZcode/MatlabFiles $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode uninstall-local: