From nobody Tue Jun 13 00:41:24 2023 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 4Qg8r43cyVz4d87N; Tue, 13 Jun 2023 00:41:24 +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 4Qg8r438Rrz3lqX; Tue, 13 Jun 2023 00:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686616884; 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=ND9PYzdJwS8q0j1yFHnJeymHskiy5OuXyWRo0jJVS/4=; b=rlC7uX7lEZ4Zsh+1Xe2O6YTrX8ePNLc5rioU+2MJB5He4pai1WyXjsNyqCVAiT8ZTsh9R3 CiBy8MQDT7kQI21yYNbTjfXOfn3vnXO7wFHTdomh55buF8SiX3gD6vo/xT+fIGg+XDkkYh 63S1t8E3cLl7gp4wLpSO3NFrnygZ8gzYaYAzsj1ZJHCE+UWveoZduPUW33DseX4uDkgXw6 Lcs+4P2xOvJ18XlbI0L2nqNtrUlh1Wfs6zfvhSg9OvhWP1IF5ZeG+oK+HDExvylEp33k5k JsuR5HdgBpMtnNOO4y8QXJSx463OQURSaM6NHHFcmik7r6FSe1aihkuXQFyBjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686616884; 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=ND9PYzdJwS8q0j1yFHnJeymHskiy5OuXyWRo0jJVS/4=; b=cyxTNINk11w3wEuDdAZxmDjVbZpKlMy0HX7nlBMEvEJrTxgf8mXbPqKQFTBRPupuINapH+ Jhgh69ipHGLkcvZ26adVcXcqviLdgvW/+cNHFJCNOhSOQhlVbGfDEH7rdTO9aA7L+iLrLV 6qLBfrribOYZSBWu1Mmvkpo7A/RUHE94Zoib9ahit1bFKJpG8JlacCASNjRCPfG3aEtJbV CuxUinaDpwISRh+j0oRz+tTrmSPLDKxsFkjDruGEaGDC4sOTnAWLuKaHjgbVEYaAjyT6UM 4kuuNqRWwbY6ubFRzEExIAp4+y6DMiKljvXd2v2g2dobhMMHrCJKxZWy8yRTUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686616884; a=rsa-sha256; cv=none; b=eySOOvU63rU1aCgIqR4r2Nh6inal6RCu0vyjw3oDE/ARNEFTnEhbqOiPhTYgpV0rpiICkH 057Gwzk98tfI0yT9fgnhOi07Yw5x46m2gh8Cb7iUYftIXl+LkQRrTBFuOULLo3dJ0hai/V MIUt0tZRbhcYRT6rN5sa8AI7RykQOAKhhC0qS89Az9F9Hic6zSBKETdOBfrkkxYVYDfO/w 6pV+dmEXior4IxmnRnAmmUWHSyGEAfOM+QCJJFrfZhjbwP6uHjR7+bdtt2WVp6Cw4EZRFy qOOvWdlC2u4OsyuWoTpNIh3p6cFFREuf0CFrrvhK7seE88coHcEo1To05vAjPQ== 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 4Qg8r425Z6z11wZ; Tue, 13 Jun 2023 00:41:24 +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 35D0fOpu061890; Tue, 13 Jun 2023 00:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35D0fOZw061889; Tue, 13 Jun 2023 00:41:24 GMT (envelope-from git) Date: Tue, 13 Jun 2023 00:41:24 GMT Message-Id: <202306130041.35D0fOZw061889@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: d4ca0a7ed8cb - main - =?utf-8?Q?science/abinit:=20Update=209.6.2=20=E2=86=92=209.8.4?= 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4ca0a7ed8cb430f70861857ce2445038b330e6a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4ca0a7ed8cb430f70861857ce2445038b330e6a commit d4ca0a7ed8cb430f70861857ce2445038b330e6a Author: Yuri Victorovich AuthorDate: 2023-06-12 21:18:08 +0000 Commit: Yuri Victorovich CommitDate: 2023-06-13 00:41:20 +0000 science/abinit: Update 9.6.2 → 9.8.4 Reported by: portscout --- science/abinit/Makefile | 7 ++-- science/abinit/distinfo | 6 +-- ...ared_common_src_33__xc__lowlevel_libxc__tools.c | 47 ++++++++-------------- .../files/patch-shared_libpaw_src_libpaw__libxc.c | 45 +++++++-------------- 4 files changed, 37 insertions(+), 68 deletions(-) diff --git a/science/abinit/Makefile b/science/abinit/Makefile index 26f3e310280b..32b7beba5155 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -1,6 +1,5 @@ PORTNAME= abinit -DISTVERSION= 9.6.2 -PORTREVISION= 3 +DISTVERSION= 9.8.4 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -36,7 +35,7 @@ USES= autoreconf:build blaslapack:netlib fortran gmake gnome localbase:ldflags python:3.7+ shebangfix USE_GITHUB= yes USE_GNOME= libxml2 -SHEBANG_FILES= config/scripts/* doc/tutorial/paral_gspw_assets/abinit.sub.* +SHEBANG_FILES= config/scripts/* doc/tutorial/paral_bandpw_assets/abinit.sub.* SHEBANG_GLOB= *.py GNU_CONFIGURE= yes CONFIGURE_ENV= CC_LDFLAGS="${LDFLAGS}" CXX_LDFLAGS="${LDFLAGS}" FC_LDFLAGS="${LDFLAGS}" \ @@ -51,7 +50,7 @@ CONFIGURE_ENV= CC_LDFLAGS="${LDFLAGS}" CXX_LDFLAGS="${LDFLAGS}" FC_LDFLAGS="${LD CONFIGURE_ARGS= --with-fft --with-libxc --with-libxml2 --with-netcdf \ --with-netcdf-fortran --with-wannier90 --with-xmlf90 FCFLAGS+= -ffree-line-length-none -TEST_TARGET= tests_abirules tests_buildsys +TEST_TARGET= tests_abirules tests_buildsys # Many tests print RuntimeError, https://github.com/abinit/abinit/issues/64 TEST_WRKSRC= ${WRKSRC}/abichecks PORTDOCS= * diff --git a/science/abinit/distinfo b/science/abinit/distinfo index 2a6ff478e59d..cab8c15bb51f 100644 --- a/science/abinit/distinfo +++ b/science/abinit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659120938 -SHA256 (abinit-abinit-9.6.2_GH0.tar.gz) = 5fba537bac99f53ae02781f1f374247503241b80ce329dc51fe2e986b13198f0 -SIZE (abinit-abinit-9.6.2_GH0.tar.gz) = 109189300 +TIMESTAMP = 1686597792 +SHA256 (abinit-abinit-9.8.4_GH0.tar.gz) = 1b981140cb837c22f037a5dc8ec9769c007517e972ba667396ee300e006f543d +SIZE (abinit-abinit-9.8.4_GH0.tar.gz) = 128443869 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 index a8a5148e399e..cc74d5aac0e3 100644 --- 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 @@ -1,35 +1,20 @@ ---- 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.orig 2023-04-24 13:01:07 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; +@@ -73,7 +73,7 @@ void xc_get_family_constants(int *xc_cst_family_unknow *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; + *xc_cst_family_hyb_gga = XC_FAMILY_HYB_GGA; + *xc_cst_family_hyb_mgga = XC_FAMILY_HYB_MGGA; +-#if ( XC_MAJOR_VERSION > 5 ) ++#if ( XC_MAJOR_VERSION > 6 ) + /* ==== libXC v6.0 and later ==== */ + *xc_cst_family_hyb_lda = XC_FAMILY_HYB_LDA; #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 - * =============================================================== - */ +@@ -364,7 +364,7 @@ void xc_func_set_grad_sig_threshold(XC(func_type) *xc_ 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) + /* ==== Before libXC v6.0 ==== */ + {int family; family=xc_family_from_id(func_id, NULL, NULL); +-#if ( XC_MAJOR_VERSION > 5 ) ++#if ( XC_MAJOR_VERSION > 6 ) + /* ==== libXC v6.0 and later ==== */ + if (family==XC_FAMILY_HYB_GGA || family==XC_FAMILY_HYB_MGGA || family==XC_FAMILY_HYB_LDA) + {return 1;} diff --git a/science/abinit/files/patch-shared_libpaw_src_libpaw__libxc.c b/science/abinit/files/patch-shared_libpaw_src_libpaw__libxc.c index f92ef919d312..a68cb06767cd 100644 --- a/science/abinit/files/patch-shared_libpaw_src_libpaw__libxc.c +++ b/science/abinit/files/patch-shared_libpaw_src_libpaw__libxc.c @@ -1,35 +1,20 @@ ---- shared/libpaw/src/libpaw_libxc.c.orig 2021-11-09 07:25:16 UTC +--- shared/libpaw/src/libpaw_libxc.c.orig 2023-04-24 13:01:07 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; +@@ -70,7 +70,7 @@ void libpaw_xc_get_family_constants(int *xc_cst_family *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; + *xc_cst_family_hyb_gga = XC_FAMILY_HYB_GGA; + *xc_cst_family_hyb_mgga = XC_FAMILY_HYB_MGGA; +-#if ( XC_MAJOR_VERSION > 5 ) ++#if ( XC_MAJOR_VERSION > 6 ) + /* ==== libXC v6.0 and later ==== */ + *xc_cst_family_hyb_lda = XC_FAMILY_HYB_LDA; #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 - * =============================================================== +@@ -312,7 +312,7 @@ void libpaw_xc_func_set_sig_threshold(XC(func_type) *x */ 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) + {int family; family=xc_family_from_id(func_id, NULL, NULL); +-#if ( XC_MAJOR_VERSION > 5 ) ++#if ( XC_MAJOR_VERSION > 6 ) + /* ==== libXC v6.0 and later ==== */ + if (family==XC_FAMILY_HYB_GGA || family==XC_FAMILY_HYB_MGGA || family==XC_FAMILY_HYB_LDA) + {return 1;}