git: eb55fbb66e4f - main - science/yoda: update 1.9.8 → 2.0.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Wed, 15 Jan 2025 22:02:12 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eb55fbb66e4fafddf5c5c994bb43e7a123bd37c3

commit eb55fbb66e4fafddf5c5c994bb43e7a123bd37c3
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-01-15 15:41:04 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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 <bsd.port.options.mk>
+
+.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