From nobody Wed Oct 26 17:58:30 2022 X-Original-To: dev-commits-ports-main@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 4MyGkv1dxsz4gpCg; Wed, 26 Oct 2022 17:58:31 +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 4MyGkv178tz3mHw; Wed, 26 Oct 2022 17:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666807111; 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=PPw/iy510+fYoC1Mjwzaln84OJx2FIK1SqgWPnu7ovo=; b=EjgMpyLzjZI1AQnaxacEYXAlmKcQVvAeTFHB763zziM+9+hcYdsNKSrn0dbrIMDF2cKhfP LW9gBKfKs6efZ3EF5uTodbKGDYl6yHoc0Serb2gqkE21TDZ/DQb+7MKaSyrFV0H42f6yq0 H+PfmDYTcmW0ep18AXuxv0WaupEfk7jHsrYjTkxGHwy0No83d6yz5zyfcp1cYqOPQyaGhA DLgD68rpe2DjZet3+L3Xlhloz4Bg9tjplPT85VcV7Cb2v4U76ZUHrZAIzW8DdOPzWougNZ jeztFnSdSGH8+yCBKLEcKyd7VfWxsp1rkj1b+KtNyLcQNh+JZ9Sw1ho31yZmcw== 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 4MyGkv0BhXzRc6; Wed, 26 Oct 2022 17:58:31 +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 29QHwUVf083095; Wed, 26 Oct 2022 17:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29QHwUrl083094; Wed, 26 Oct 2022 17:58:30 GMT (envelope-from git) Date: Wed, 26 Oct 2022 17:58:30 GMT Message-Id: <202210261758.29QHwUrl083094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 33f3c23490c3 - main - science/abinit: fix with libXC 6.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33f3c23490c31d982bf5c7d9a4c381e14510f5a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666807111; 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=PPw/iy510+fYoC1Mjwzaln84OJx2FIK1SqgWPnu7ovo=; b=p9sl4EWjgqEhcGxJB8K1KERqmfFa57p/RL6hgn0DMTmVT9xAlPE64zEVN63mCUwIfiOipB zCVDNsfLFnP468c6ozgSgF6D1E57uerD3qt96lfDgWN1ilu+Tg0rCL8mK2yLBcYu8wyOIw X4c8yJG3BdYV/xe6rai3KDzXScwxYFVfsZDqfYmkv5JUhGnxvSCX1EeNYQWC3YeGLy/hNy MLBSmasbclGWymSuMC3L2ojOJtVLxt6mM3jxjblWjaynMQC8lLQDMF+YRkD/BaeN/16UMf +64mI5vj3EZX8GRv8nPj5NRi/vvyoMbAVsKwmdJMGJXhzcpEUxpAj7dHO2PliA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666807111; a=rsa-sha256; cv=none; b=lTLlEFrN5pchDFjTcQAAxMOHuocjR4wVppG875X2bASLFMcnPgupaxRV5ywRBUtnP17jeA RauBzBN8p9NXYnrdeFnjbWOiM/8/HTVAj+YPSA9pDtAainMj7xrEJugkSYL8eyv/AlEGCC 1LpHc7Mj/NTFjEIIeTC1tXDHoEbcW0GrYUg7RbfSfKUwqfXg+0+iZRsyptEIf0okyHFYtq f+v4hnFOjE3VZqzs/BMQ4LLwb6G0Ebkp/6ygtQ16ZH5DEAxsn93OnqsGek8AhJ/gvqI8ku /oiJXuFMminfwbRd035iqZ2+bwuCkRVX9eLF+v1IgsYFlzuqGimBhcf2yAD7sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=33f3c23490c31d982bf5c7d9a4c381e14510f5a1 commit 33f3c23490c31d982bf5c7d9a4c381e14510f5a1 Author: Thierry Thomas AuthorDate: 2022-10-24 17:01:55 +0000 Commit: Thierry Thomas CommitDate: 2022-10-26 17:58:25 +0000 science/abinit: fix with libXC 6.0.0 See . Note: this is fixed in soon-to-come ABINITv9.8. This patch is just in case libXC is committed before. PR: 267357 Approved by: yuri (maintainer) --- science/abinit/Makefile | 1 + ...ared_common_src_33__xc__lowlevel_libxc__tools.c | 35 ++++++++++++++++++++++ .../files/patch-shared_libpaw_src_libpaw__libxc.c | 35 ++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/science/abinit/Makefile b/science/abinit/Makefile index ee08d0408c99..451d43bd23ae 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -1,5 +1,6 @@ PORTNAME= abinit DISTVERSION= 9.6.2 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/abinit/files/patch-shared_common_src_33__xc__lowlevel_libxc__tools.c b/science/abinit/files/patch-shared_common_src_33__xc__lowlevel_libxc__tools.c new file mode 100644 index 000000000000..a8a5148e399e --- /dev/null +++ b/science/abinit/files/patch-shared_common_src_33__xc__lowlevel_libxc__tools.c @@ -0,0 +1,35 @@ +--- shared/common/src/33_xc_lowlevel/libxc_tools.c.orig 2021-11-09 07:25:16 UTC ++++ shared/common/src/33_xc_lowlevel/libxc_tools.c +@@ -70,8 +70,8 @@ void xc_get_family_constants(int *xc_cst_family_unknow + *xc_cst_family_mgga = XC_FAMILY_MGGA; + *xc_cst_family_lca = XC_FAMILY_LCA; + *xc_cst_family_oep = XC_FAMILY_OEP; +-#if ( XC_MAJOR_VERSION > 5 ) +-/* ==== libXC v6.0 and later ==== */ ++#if ( XC_MAJOR_VERSION > 6 ) ++/* ==== After libXC v6.0 ==== */ + *xc_cst_family_hyb_gga = -11; + *xc_cst_family_hyb_mgga = -11; + #else +@@ -137,8 +137,8 @@ void xc_get_hybrid_constants(int *xc_cst_hyb_none, + int *xc_cst_hyb_double_hybrid, + int *xc_cst_hyb_mixture) + { +-#if ( XC_MAJOR_VERSION > 5 ) +-/* ==== libXC v6.0 and later ==== */ ++#if ( XC_MAJOR_VERSION > 6 ) ++/* ==== After libXC v6.0 ==== */ + *xc_cst_hyb_none = XC_HYB_NONE; + *xc_cst_hyb_fock = XC_HYB_FOCK; + *xc_cst_hyb_pt2 = XC_HYB_PT2; +@@ -348,8 +348,8 @@ void xc_func_set_density_threshold(XC(func_type) *xc_f + * =============================================================== + */ + int xc_func_is_hybrid_from_id(int func_id) +-#if ( XC_MAJOR_VERSION > 5 ) +-/* ==== libXC v6.0 and later ==== */ ++#if ( XC_MAJOR_VERSION > 6 ) ++/* ==== After libXC v6.0 ==== */ + {xc_func_type func; int result=0; + if(xc_func_init(&func,func_id,XC_UNPOLARIZED)==0) + {if (func.hyb_number_terms>0) diff --git a/science/abinit/files/patch-shared_libpaw_src_libpaw__libxc.c b/science/abinit/files/patch-shared_libpaw_src_libpaw__libxc.c new file mode 100644 index 000000000000..f92ef919d312 --- /dev/null +++ b/science/abinit/files/patch-shared_libpaw_src_libpaw__libxc.c @@ -0,0 +1,35 @@ +--- shared/libpaw/src/libpaw_libxc.c.orig 2021-11-09 07:25:16 UTC ++++ shared/libpaw/src/libpaw_libxc.c +@@ -67,8 +67,8 @@ void libpaw_xc_get_family_constants(int *xc_cst_family + *xc_cst_family_mgga = XC_FAMILY_MGGA; + *xc_cst_family_lca = XC_FAMILY_LCA; + *xc_cst_family_oep = XC_FAMILY_OEP; +-#if ( XC_MAJOR_VERSION > 5 ) +-/* ==== libXC v6.0 and later ==== */ ++#if ( XC_MAJOR_VERSION > 6 ) ++/* ==== After libXC v6.0 ==== */ + *xc_cst_family_hyb_gga = -11; + *xc_cst_family_hyb_mgga = -11; + #else +@@ -134,8 +134,8 @@ void libpaw_xc_get_hybrid_constants(int *xc_cst_hyb_no + int *xc_cst_hyb_double_hybrid, + int *xc_cst_hyb_mixture) + { +-#if ( XC_MAJOR_VERSION > 5 ) +-/* ==== libXC v6.0 and later ==== */ ++#if ( XC_MAJOR_VERSION > 6 ) ++/* ==== After libXC v6.0 ==== */ + *xc_cst_hyb_none = XC_HYB_NONE; + *xc_cst_hyb_fock = XC_HYB_FOCK; + *xc_cst_hyb_pt2 = XC_HYB_PT2; +@@ -345,8 +345,8 @@ void libpaw_xc_func_set_density_threshold(XC(func_type + * =============================================================== + */ + int libpaw_xc_func_is_hybrid_from_id(int func_id) +-#if ( XC_MAJOR_VERSION > 5 ) +-/* ==== libXC v6.0 and later ==== */ ++#if ( XC_MAJOR_VERSION > 6 ) ++/* ==== After libXC v6.0 ==== */ + {xc_func_type func; int result=0; + if(xc_func_init(&func,func_id,XC_UNPOLARIZED)==0) + {if (func.hyb_number_terms>0)