From nobody Sat Apr 23 16:45:07 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AC4AE199D89D; Sat, 23 Apr 2022 16:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Klxw34SFbz3QlF; Sat, 23 Apr 2022 16:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650732307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sl76pDNJDwVmpICSNvmkm3YkQSvd8bA8UEEbGvpJmtU=; b=Rpt/I7fG6R7rNfUEWkYidVceAoJwh5WRx3jaQ+PcOheh3FvSUyl8L1ba93wnIlaDpubX5G JH2jxywpdXobvI/ADAvppiIWuS5F1Wg9/fRcQT6xcGzGb8KvNYkMW7Rq8STvfWCSExZ0j9 5f3Q6TIUuOLzgV+NPQ3T1wgJafFPzI7l82A1WSAW9ZG7bWFRwdJeco7Ci4Wl2PPZ6NpHgf 61VALrX7MExdyvkjoJ0wKQ/xxHpos5HMfpgpQsR9ZxNGcW6GRCREZa3mk+1g5+lfx4j9uy GjuCWAphV1A8giLV5ONajOhOhGi8X15x22GzEqkmvQy0G3P7VuItQIIeHsUuVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74D97156F6; Sat, 23 Apr 2022 16:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23NGj7Qo037430; Sat, 23 Apr 2022 16:45:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23NGj7i1037429; Sat, 23 Apr 2022 16:45:07 GMT (envelope-from git) Date: Sat, 23 Apr 2022 16:45:07 GMT Message-Id: <202204231645.23NGj7i1037429@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e3402d3770fa - main - science/dynare: Update 5.0 -> 5.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3402d3770fa02acb66d9fb71391b56825a4c5fa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650732307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sl76pDNJDwVmpICSNvmkm3YkQSvd8bA8UEEbGvpJmtU=; b=cjWTAO6rGzqC2/a+TMFD07FkPBvicYpcunTO0tkhUYC3YWurbsPig2zLvfXmoNaaPfQJwt ugJbat9nWO9wlHbpe6zysSf7unmfgwfnQOXvfgUXj7n1g2XtMBhnNxA+k9mjv52Pnuv9Eb mKJ2/oAsBsGc8GvbhG2Ks6J5e+6qGE7wy3qunRUUtcyPfHOpGZP5RjJ8p2Qb8N5R3r/xom pOxR0JCSeaIVdfbVMOnpSs2Q4x+z9wXjwyR+1XHDUHpNxICiRhK4fdKarO3odoWBbAdmmS UtiNTI0LdD0VrB5Y7qEw+y3nECdNRGRwq04MbSuO5eQbpOj0jVPtwtXh/3yQEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650732307; a=rsa-sha256; cv=none; b=OzoEZLPw3A1Qakxi+OtRB8MjiaOcQfnfYlnLaiZMqCcEolfeRxSVxXcKzSn9HXUgpWsqtc 6XA+gKHxFB8LAFYMsLd+aI2gzrejYdHiTfKjZ3IDSI9EJOuPnciY7VZd1QXxhe+fh0jrzZ noC3Qmkc7TUfeoEtw32NopF4z9ZPM10o6Icd4TNXr1TJWLtibH272zPpRhCB8UaUErV7wp O6XPT9yNDZQnxUyfR+ITWEtLPKRkGLBLkRu+Oz6snCxAU9za2ry1ARUK2L/9/a090xxDU6 AtSRJpk2jKYJtj+2L/jz52zmVKBVPdA5nBzX8Vq8daO2Xta6GLlqfDfLzciGPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3402d3770fa02acb66d9fb71391b56825a4c5fa commit e3402d3770fa02acb66d9fb71391b56825a4c5fa Author: Yuri Victorovich AuthorDate: 2022-04-23 16:40:29 +0000 Commit: Yuri Victorovich CommitDate: 2022-04-23 16:45:04 +0000 science/dynare: Update 5.0 -> 5.1 --- science/dynare/Makefile | 5 +- science/dynare/distinfo | 6 +- .../dynare/files/patch-mex_build_octave_configure | 88 ++++++++++++++++++++++ .../files/patch-preprocessor_src_EquationTags.cc | 12 --- 4 files changed, 94 insertions(+), 17 deletions(-) diff --git a/science/dynare/Makefile b/science/dynare/Makefile index abbb4eeac311..59e21deada34 100644 --- a/science/dynare/Makefile +++ b/science/dynare/Makefile @@ -1,6 +1,5 @@ PORTNAME= dynare -DISTVERSION= 5.0 -PORTREVISION= 1 +DISTVERSION= 5.1 CATEGORIES= science # economics MASTER_SITES= https://www.dynare.org/release/source/ @@ -31,6 +30,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-matlab \ --disable-doc +FCFLAGS+= -fPIC # required because configure tests with -shared + SUB_FILES= pkg-message OPTIONS_DEFINE= OCTAVE diff --git a/science/dynare/distinfo b/science/dynare/distinfo index 116f66c866c2..e3cf82deeed3 100644 --- a/science/dynare/distinfo +++ b/science/dynare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641668510 -SHA256 (dynare-5.0.tar.xz) = 557bc7d8d7bbbf7d4746dd1e015b273eeeb0b53dc66b9d4004d2efef8f4fe16e -SIZE (dynare-5.0.tar.xz) = 17863188 +TIMESTAMP = 1650690087 +SHA256 (dynare-5.1.tar.xz) = 269b2b52d9e7af0bf06041b48e730dd5c2fb89577bed24ad5e4b51e0dca9dbbe +SIZE (dynare-5.1.tar.xz) = 18000696 diff --git a/science/dynare/files/patch-mex_build_octave_configure b/science/dynare/files/patch-mex_build_octave_configure new file mode 100644 index 000000000000..774083adc441 --- /dev/null +++ b/science/dynare/files/patch-mex_build_octave_configure @@ -0,0 +1,88 @@ +- remove fortran-related crashing section when fortran compiler is checked for cross-compilation +- it's unclear why the fortran-built executable crashes + +--- mex/build/octave/configure.orig 2022-04-23 05:48:46 UTC ++++ mex/build/octave/configure +@@ -3332,44 +3332,44 @@ _ACEOF + ac_clean_files="$ac_clean_files conftest.out" + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-if test "$cross_compiling" != yes; then +- { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +- if { ac_try='./conftest$ac_cv_exeext' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run Fortran compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details" "$LINENO" 5; } +- fi +- fi +-fi ++#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++#$as_echo_n "checking whether we are cross compiling... " >&6; } ++#if test "$cross_compiling" != yes; then ++# { { ac_try="$ac_link" ++#case "(($ac_try" in ++# *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++# *) ac_try_echo=$ac_try;; ++#esac ++#eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++#$as_echo "$ac_try_echo"; } >&5 ++# (eval "$ac_link") 2>&5 ++# ac_status=$? ++# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++# test $ac_status = 0; } ++# if { ac_try='./conftest$ac_cv_exeext' ++# { { case "(($ac_try" in ++# *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++# *) ac_try_echo=$ac_try;; ++#esac ++#eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++#$as_echo "$ac_try_echo"; } >&5 ++# (eval "$ac_try") 2>&5 ++# ac_status=0 ++# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++# test $ac_status = 0; }; }; then ++# cross_compiling=no ++# else ++# if test "$cross_compiling" = maybe; then ++# cross_compiling=yes ++# else ++# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++#as_fn_error $? "cannot run Fortran compiled programs. ++#If you meant to cross compile, use \`--host'. ++#See \`config.log' for more details" "$LINENO" 5; } ++# fi ++# fi ++#fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 + $as_echo "$cross_compiling" >&6; } + diff --git a/science/dynare/files/patch-preprocessor_src_EquationTags.cc b/science/dynare/files/patch-preprocessor_src_EquationTags.cc deleted file mode 100644 index 01f3951c5975..000000000000 --- a/science/dynare/files/patch-preprocessor_src_EquationTags.cc +++ /dev/null @@ -1,12 +0,0 @@ -- backport of fix: https://git.dynare.org/Dynare/preprocessor/-/commit/8c528f4f9a15baf73c014e1c3e55bc13583ca09d - ---- preprocessor/src/EquationTags.cc.orig 2022-01-10 23:30:53 UTC -+++ preprocessor/src/EquationTags.cc -@@ -20,6 +20,7 @@ - #include "EquationTags.hh" - - #include -+#include - - set - EquationTags::getEqnsByKey(const string &key) const