diff --git a/science/yoda/Makefile b/science/yoda/Makefile
index 61ab26ea3aa0..128438cd3dc9 100644
--- a/science/yoda/Makefile
+++ b/science/yoda/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	yoda
-DISTVERSION=	1.9.6
+DISTVERSION=	1.9.8
 CATEGORIES=	science
 MASTER_SITES=	https://yoda.hepforge.org/downloads/
 DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Particle physics package with classes for data analysis, histogramming
 WWW=		https://yoda.hepforge.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	bash:shells/bash \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
-USES=		compiler:c++11-lang gmake libtool python:test shebangfix
+USES=		compiler:c++11-lang gettext-runtime gmake libtool python:test shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.py *.sh
 
 TEST_TARGET=	check # doesn't report summary in the end, see https://gitlab.com/hepcedar/yoda/-/issues/49
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=		PYTHON
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
-PYTHON_USES=			python
+PYTHON_USES=			python:run
 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"
 
 TEST_ENV=	${MAKE_ENV} PATH=${STAGEDIR}${PREFIX}/bin:${PATH} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libYODA.so
 
 post-install-PYTHON-on:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/*.so
 
 post-install-PYTHON-off:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/${PORTNAME:tu}
 
 .include <bsd.port.mk>
diff --git a/science/yoda/distinfo b/science/yoda/distinfo
index 109e1aa1916e..c40c0eae0394 100644
--- a/science/yoda/distinfo
+++ b/science/yoda/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659252103
-SHA256 (YODA-1.9.6.tar.gz) = 5c57914eb8d8068844560e3a3e545f68d89ca49796dcc0932cdd42ee62064955
-SIZE (YODA-1.9.6.tar.gz) = 1484221
+TIMESTAMP = 1690168957
+SHA256 (YODA-1.9.8.tar.gz) = c7d5e8b35027d607ddc2ce132fe5032f764e3e39b81e81a9d79ecdee2278ebe5
+SIZE (YODA-1.9.8.tar.gz) = 1518109
diff --git a/science/yoda/pkg-plist b/science/yoda/pkg-plist
index c6cca163a887..b7c14dba6015 100644
--- a/science/yoda/pkg-plist
+++ b/science/yoda/pkg-plist
@@ -1,99 +1,93 @@
 %%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/yodals
 %%PYTHON%%bin/yodamerge
 %%PYTHON%%bin/yodaplot
 %%PYTHON%%bin/yodascale
 %%PYTHON%%bin/yodastack
 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/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/Exceptions.h
 include/YODA/Fillable.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/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
 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/Utils/Formatting.h
 include/YODA/Utils/MathUtils.h
+include/YODA/Utils/Paths.h
 include/YODA/Utils/Predicates.h
 include/YODA/Utils/StringUtils.h
 include/YODA/Utils/Traits.h
 include/YODA/Utils/cachedvector.h
 include/YODA/Utils/fastlog.h
 include/YODA/Utils/getline.h
 include/YODA/Utils/indexedset.h
 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/YODA.h
 lib/libYODA.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda-%%VERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda-%%VERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda-%%VERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda-%%VERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/plotting%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/root%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/script_helpers%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/search%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/core%%PYTHON_EXT_SUFFIX%%.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/plotting.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/core.so
+%%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/root.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/script_helpers.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/search.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/util%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/util.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda1/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda1/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 libdata/pkgconfig/yoda.pc
+%%PYTHON%%share/YODA/plotting/default.mplstyle