svn commit: r447844 - in head/math/dynare: . files

[Kurt Jaeger]

Author: pi
Date: Sat Aug 12 17:22:56 2017
New Revision: 447844
URL: https://svnweb.freebsd.org/changeset/ports/447844

Log:
  math/dynare: added patches I missed in last commit
  
  PR:		221316
  Submitted by:	Fernando Apesteguia <fernando.apesteguia at gmail.com> (maintainer)

Added:
  head/math/dynare/files/patch-dynare++_kord_journal.cweb   (contents, props changed)
  head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h   (contents, props changed)
  head/math/dynare/files/patch-mex_build_octave_configure   (contents, props changed)
Modified:
  head/math/dynare/Makefile

Modified: head/math/dynare/Makefile
==============================================================================
--- head/math/dynare/Makefile	Sat Aug 12 17:21:42 2017	(r447843)
+++ head/math/dynare/Makefile	Sat Aug 12 17:22:56 2017	(r447844)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dynare
 PORTVERSION=	4.4.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math
 MASTER_SITES=	http://www.dynare.org/release/source/
 

Added: head/math/dynare/files/patch-dynare++_kord_journal.cweb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/dynare/files/patch-dynare++_kord_journal.cweb	Sat Aug 12 17:22:56 2017	(r447844)
@@ -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;
+ }
+ 
+ @ 

Added: head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/dynare/files/patch-dynare++_parser_cc_parser__exception.h	Sat Aug 12 17:22:56 2017	(r447844)
@@ -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;

Added: head/math/dynare/files/patch-mex_build_octave_configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/dynare/files/patch-mex_build_octave_configure	Sat Aug 12 17:22:56 2017	(r447844)
@@ -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.  */
+