From nobody Wed Jan 15 22:02:12 2025 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 4YYKjK2KSbz5kjbn; Wed, 15 Jan 2025 22:02:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYKjK0q9Zz3lSN; Wed, 15 Jan 2025 22:02:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736978533; 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=s+QuBPBa6jD2frKFepqusQDymA+ZXJxndXCTnmQUQn8=; b=yU+BWFNhmUwln4+6q4uKkFG8ys7v2ctYfa8bUeylKn+eOP76jpbZoRhXzegIZzNozF+JW0 FEtzSlc2k607HaD2c0u19QwMOIqgJPjXWuyaXiJYWc0md/0Gk0xIdj05gG067fqQofRZja 8m4bwLa400twFvMPuCrtZko5EkJW+GG8fOsllgpRxxyT3yHif3FECrddS8WYyDeRY9z3ve Mb2FWvLpGa5vhKAWCbzHjSeCNkAl9ErGw/x7OdocajaeyLA9cttUnTQIGLgfw/wUNrfjTc cUKHLhk4r+QNDG95Atw7uAmKGSfIl2qr0I6RF0exeEmeujRKliHTO0Tf28g5xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736978533; 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=s+QuBPBa6jD2frKFepqusQDymA+ZXJxndXCTnmQUQn8=; b=R0EzcUgXFHGn1JfPpAKbxaxWz/kW5M/fo1wOaR4EI/qZgMRzUkw/3D25keJCIJPeXqKQB+ bHEoqIWVagkfAUZMLMt3oWIk4hoT66L91aKXrcXDyZf2b/c+HxrpAKbk9GKb4gXv4NoeWy G1FGHxc/HsvgGcMv/SpHnUEompA+bW+AMD2zHWVzIJjCaNN4gmYhgWvhYG8LFMYOpoyyky UqEu5oj+2SYEsv0mhOJ1RHp2SbGW/o6zeP6VdpZguk2TkHdfue8CUgVX63x8LewtxAvcjk RJTXY3QPfyCs+ViZU4Oaj7hiB58A2xkONDxdOgo/NssaycDd0SZ50IgmzgHZkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736978533; a=rsa-sha256; cv=none; b=oIuVPyCqo0e0/VSb17+pFyde27hbA0DyXshFZ57P3B79HS5Pbb45wX0Yb0CsqOgLR4vt44 N3MGxF4rXdAr3Ay63yiUI3qMkmQryZMlyrq/+3Jg9GMrlmRo9dvYqP/x7MyqGSWDcQJghl Tuvwz2/ZfM+eR0DobxSMjsG5afabhSLGAPsKh3KW+h9m7pD9mUrJp3LvQ5w7IojYntG2dG faTvwr91pEG0LW622UQ9uLrvW1vXjKM38Jr/UwjIDha1rBM6rQvgYJ3/lcfsrLmB4pGcoG KBIWuOFRJyOvRdbru62RnrmpSuQfKcTs7WnlORnjyOg+HpC7Y2eTBnNyE7kL6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YYKjJ6st7z147X; Wed, 15 Jan 2025 22:02:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50FM2CZg039315; Wed, 15 Jan 2025 22:02:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50FM2CTG039312; Wed, 15 Jan 2025 22:02:12 GMT (envelope-from git) Date: Wed, 15 Jan 2025 22:02:12 GMT Message-Id: <202501152202.50FM2CTG039312@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: eb55fbb66e4f - main - science/yoda: update 1.9.8 =?utf-8?Q?=E2=86=92?= 2.0.2 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: eb55fbb66e4fafddf5c5c994bb43e7a123bd37c3 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb55fbb66e4fafddf5c5c994bb43e7a123bd37c3 commit eb55fbb66e4fafddf5c5c994bb43e7a123bd37c3 Author: Yuri Victorovich AuthorDate: 2025-01-15 15:41:04 +0000 Commit: Yuri Victorovich CommitDate: 2025-01-15 22:02:09 +0000 science/yoda: update 1.9.8 → 2.0.2 --- science/yoda/Makefile | 15 ++++++-- science/yoda/distinfo | 6 +-- science/yoda/pkg-plist | 99 +++++++++++++++++++++++++++++++++++--------------- 3 files changed, 83 insertions(+), 37 deletions(-) diff --git a/science/yoda/Makefile b/science/yoda/Makefile index 128438cd3dc9..5e1c0e4dba01 100644 --- a/science/yoda/Makefile +++ b/science/yoda/Makefile @@ -1,5 +1,5 @@ PORTNAME= yoda -DISTVERSION= 1.9.8 +DISTVERSION= 2.0.2 CATEGORIES= science MASTER_SITES= https://yoda.hepforge.org/downloads/ DISTNAME= ${PORTNAME:tu}-${DISTVERSION} @@ -15,7 +15,7 @@ TEST_DEPENDS= bash:shells/bash \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} -USES= compiler:c++11-lang gettext-runtime gmake libtool python:test shebangfix +USES= compiler:c++11-lang gettext-runtime gmake libtool shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -29,14 +29,21 @@ OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes -PYTHON_USES= python:run +PYTHON_USES= python PYTHON_USE= PYTHON=cython PYTHON_CONFIGURE_ENABLE= pyext PYTHON_MAKE_ENV= PYTHON_VERSION=${PYTHON_VER} PYTHON=${PYTHON_CMD} -PYTHON_VARS= SHEBANG_FILES="bin/${PORTNAME}* bin/aida2yoda bin/aida2flat bin/flat2yoda" +PYTHON_VARS= SHEBANG_FILES="bin/${PORTNAME}*" \ + BINARY_ALIAS="python=${PYTHON_CMD}" TEST_ENV= ${MAKE_ENV} PATH=${STAGEDIR}${PREFIX}/bin:${PATH} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +.include + +.if !${PORT_OPTIONS:MPYTHON} +USES+= python:test +.endif + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libYODA.so diff --git a/science/yoda/distinfo b/science/yoda/distinfo index c40c0eae0394..551629871c5c 100644 --- a/science/yoda/distinfo +++ b/science/yoda/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690168957 -SHA256 (YODA-1.9.8.tar.gz) = c7d5e8b35027d607ddc2ce132fe5032f764e3e39b81e81a9d79ecdee2278ebe5 -SIZE (YODA-1.9.8.tar.gz) = 1518109 +TIMESTAMP = 1736965160 +SHA256 (YODA-2.0.2.tar.gz) = caa1301372ab8d911c8a9e5b2f9dfa31b12fddd39cfb56237499e5705020bede +SIZE (YODA-2.0.2.tar.gz) = 2705314 diff --git a/science/yoda/pkg-plist b/science/yoda/pkg-plist index b7c14dba6015..de6382cf9742 100644 --- a/science/yoda/pkg-plist +++ b/science/yoda/pkg-plist @@ -1,55 +1,42 @@ -%%PYTHON%%bin/aida2flat -%%PYTHON%%bin/aida2yoda -%%PYTHON%%bin/flat2yoda bin/yoda-config -%%PYTHON%%bin/yoda2aida -%%PYTHON%%bin/yoda2flat %%PYTHON%%bin/yoda2yoda -%%PYTHON%%bin/yodacmp %%PYTHON%%bin/yodacnv %%PYTHON%%bin/yodadiff -%%PYTHON%%bin/yodahist +%%PYTHON%%bin/yodaenvelope %%PYTHON%%bin/yodals %%PYTHON%%bin/yodamerge %%PYTHON%%bin/yodaplot %%PYTHON%%bin/yodascale %%PYTHON%%bin/yodastack -etc/bash_completion.d/yoda-completion +%%PYTHON%%etc/bash_completion.d/yoda-completion include/YODA/AnalysisObject.h -include/YODA/Axis1D.h -include/YODA/Axis2D.h include/YODA/Bin.h -include/YODA/Bin1D.h -include/YODA/Bin2D.h -include/YODA/Binned.h +include/YODA/BinnedAxis.h +include/YODA/BinnedDbn.h +include/YODA/BinnedEstimate.h +include/YODA/BinnedStorage.h +include/YODA/Binning.h include/YODA/Config/BuildConfig.h include/YODA/Config/YodaConfig.h include/YODA/Counter.h -include/YODA/Dbn0D.h -include/YODA/Dbn1D.h -include/YODA/Dbn2D.h -include/YODA/Dbn3D.h -include/YODA/ErrorND.h +include/YODA/Dbn.h +include/YODA/Estimate.h +include/YODA/Estimate0D.h include/YODA/Exceptions.h include/YODA/Fillable.h +include/YODA/FillableStorage.h +include/YODA/Histo.h include/YODA/Histo1D.h include/YODA/Histo2D.h -include/YODA/HistoBin1D.h -include/YODA/HistoBin2D.h include/YODA/IO.h -include/YODA/Index.h include/YODA/Point.h include/YODA/Point1D.h include/YODA/Point2D.h include/YODA/Point3D.h -include/YODA/PointND.h +include/YODA/Profile.h include/YODA/Profile1D.h include/YODA/Profile2D.h -include/YODA/ProfileBin1D.h -include/YODA/ProfileBin2D.h -include/YODA/ROOTCnv.h include/YODA/Reader.h -include/YODA/ReaderAIDA.h include/YODA/ReaderFLAT.h include/YODA/ReaderMethods.icc include/YODA/ReaderYODA.h @@ -57,13 +44,21 @@ include/YODA/Scatter.h include/YODA/Scatter1D.h include/YODA/Scatter2D.h include/YODA/Scatter3D.h -include/YODA/ScatterND.h -include/YODA/Utils/BinSearcher.h +include/YODA/Transformation.h +include/YODA/Utils/BinEstimators.h +include/YODA/Utils/BinUtils.h +include/YODA/Utils/BinnedUtils.h +include/YODA/Utils/BinningUtils.h +include/YODA/Utils/DbnUtils.h include/YODA/Utils/Formatting.h include/YODA/Utils/MathUtils.h +include/YODA/Utils/MetaUtils.h include/YODA/Utils/Paths.h +include/YODA/Utils/PointUtils.h include/YODA/Utils/Predicates.h +include/YODA/Utils/ReaderUtils.h include/YODA/Utils/StringUtils.h +include/YODA/Utils/TestHelpers.h include/YODA/Utils/Traits.h include/YODA/Utils/cachedvector.h include/YODA/Utils/fastlog.h @@ -73,21 +68,65 @@ include/YODA/Utils/ndarray.h include/YODA/Utils/sortedvector.h include/YODA/Weights.h include/YODA/Writer.h -include/YODA/WriterAIDA.h include/YODA/WriterFLAT.h include/YODA/WriterMethods.icc include/YODA/WriterYODA.h +include/YODA/WriterYODA1.h include/YODA/YODA.h lib/libYODA.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/core.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/plotting/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/plotting/fetch_data.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/plotting/mlp_preprocessor.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/plotting/script_generator.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/plotting/utils.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/root.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/rootcnv.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/script_helpers.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/search.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/util.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda1/__init__.py libdata/pkgconfig/yoda.pc %%PYTHON%%share/YODA/plotting/default.mplstyle +%%PYTHON%%share/YODA/texmf/cnf/texmf.cnf +%%PYTHON%%share/YODA/texmf/dvips/pstricks-add/pstricks-add.pro +%%PYTHON%%share/YODA/texmf/dvips/pstricks/pst-algparser.pro +%%PYTHON%%share/YODA/texmf/dvips/pstricks/pst-dots.pro +%%PYTHON%%share/YODA/texmf/dvips/pstricks/pst-node.pro +%%PYTHON%%share/YODA/texmf/dvips/pstricks/pstricks.pro +%%PYTHON%%share/YODA/texmf/tex/generic/pst-3d/pst-3d.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pst-coil/pst-coil.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pst-eps/pst-eps.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pst-fill/pst-fill.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pst-grad/pst-grad.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pst-text/pst-text.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pstricks-add/pstricks-add.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pstricks/pst-node.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pstricks/pst-plot.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pstricks/pst-tree.tex +%%PYTHON%%share/YODA/texmf/tex/generic/pstricks/pstricks.tex +%%PYTHON%%share/YODA/texmf/tex/generic/xkeyval/keyval.tex +%%PYTHON%%share/YODA/texmf/tex/generic/xkeyval/pst-xkey.tex +%%PYTHON%%share/YODA/texmf/tex/generic/xkeyval/xkeyval.tex +%%PYTHON%%share/YODA/texmf/tex/latex/SIunits/SIunits.sty +%%PYTHON%%share/YODA/texmf/tex/latex/config/color.cfg +%%PYTHON%%share/YODA/texmf/tex/latex/mathastext/mathastext.sty +%%PYTHON%%share/YODA/texmf/tex/latex/misc/underscore.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pst-3d/pst-3d.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pst-coil/pst-coil.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pst-eps/pst-eps.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pst-fill/pst-fill.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pst-grad/pst-grad.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pst-text/pst-text.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pstricks-add/pstricks-add.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pstricks/pst-all.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pstricks/pst-node.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pstricks/pst-plot.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pstricks/pst-tree.sty +%%PYTHON%%share/YODA/texmf/tex/latex/pstricks/pstricks.sty +%%PYTHON%%share/YODA/texmf/tex/latex/relsize/relsize.sty +%%PYTHON%%share/YODA/texmf/tex/latex/sansmath/sansmath.sty +%%PYTHON%%share/YODA/texmf/tex/latex/sfmath/sfmath.sty +%%PYTHON%%share/YODA/texmf/tex/latex/xcolor/xcolor.sty +%%PYTHON%%share/YODA/texmf/tex/latex/xkeyval/xkeyval.sty +%%PYTHON%%share/YODA/yoda-completion