Date: Sat, 12 Aug 2017 18:12:39 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r447846 - in branches/2017Q3/math/dynare: . files Message-ID: <201708121812.v7CICdlq009245@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sat Aug 12 18:12:38 2017 New Revision: 447846 URL: https://svnweb.freebsd.org/changeset/ports/447846 Log: MFH: r447843 r447844 math/dynare: Add missing dependencies - Regenerated patches with "make makepatch" to avoid portlint warnings - Added LICENSE - Added missing library dependencies PR: 221316 Submitted by: Fernando Apesteguia <fernando.apesteguia@gmail.com> (maintainer) Approved by: portmgr (fix dependencies blanket) Added: branches/2017Q3/math/dynare/files/patch-dynare++_kord_journal.cweb - copied unchanged from r447844, head/math/dynare/files/patch-dynare++_kord_journal.cweb branches/2017Q3/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h - copied unchanged from r447844, head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h branches/2017Q3/math/dynare/files/patch-mex_build_octave_configure - copied unchanged from r447844, head/math/dynare/files/patch-mex_build_octave_configure Deleted: branches/2017Q3/math/dynare/files/patch-configure branches/2017Q3/math/dynare/files/patch-journal.cweb branches/2017Q3/math/dynare/files/patch-parser-exception.h Modified: branches/2017Q3/math/dynare/Makefile branches/2017Q3/math/dynare/files/patch-Makefile.in Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/math/dynare/Makefile ============================================================================== --- branches/2017Q3/math/dynare/Makefile Sat Aug 12 18:05:42 2017 (r447845) +++ branches/2017Q3/math/dynare/Makefile Sat Aug 12 18:12:38 2017 (r447846) @@ -3,17 +3,29 @@ PORTNAME= dynare PORTVERSION= 4.4.3 -PORTREVISION= 9 +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 + 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 Modified: branches/2017Q3/math/dynare/files/patch-Makefile.in ============================================================================== --- branches/2017Q3/math/dynare/files/patch-Makefile.in Sat Aug 12 18:05:42 2017 (r447845) +++ branches/2017Q3/math/dynare/files/patch-Makefile.in Sat Aug 12 18:12:38 2017 (r447846) @@ -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) Copied: branches/2017Q3/math/dynare/files/patch-dynare++_kord_journal.cweb (from r447844, head/math/dynare/files/patch-dynare++_kord_journal.cweb) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/math/dynare/files/patch-dynare++_kord_journal.cweb Sat Aug 12 18:12:38 2017 (r447846, copy of r447844, head/math/dynare/files/patch-dynare++_kord_journal.cweb) @@ -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 <sys/types.h> ++#include <sys/sysctl.h> + + #if !defined(__MINGW32__) + # include <sys/resource.h> +@@ -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; + } + + @ Copied: branches/2017Q3/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h (from r447844, head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h Sat Aug 12 18:12:38 2017 (r447846, copy of r447844, head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h) @@ -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 <string> ++#include <stdio.h> + + namespace ogp { + using std::string; Copied: branches/2017Q3/math/dynare/files/patch-mex_build_octave_configure (from r447844, head/math/dynare/files/patch-mex_build_octave_configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/math/dynare/files/patch-mex_build_octave_configure Sat Aug 12 18:12:38 2017 (r447846, copy of r447844, head/math/dynare/files/patch-mex_build_octave_configure) @@ -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. */ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708121812.v7CICdlq009245>