Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Nov 2024 20:23:32 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 0c113023829d - main - devel/root: Update to 6.32/08
Message-ID:  <202411212023.4ALKNWUe080029@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

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

commit 0c113023829d205a3d2cab833d7f73dd01db7691
Author:     Erik Jensen <erik@tenku.dk>
AuthorDate: 2024-11-21 20:20:02 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-11-21 20:23:03 +0000

    devel/root: Update to 6.32/08
    
    davix support is now added as a port option.
    This defaults to ON, mirroring the source's default build options.
    
    ChangeLog:      https://root.cern/doc/v632/release-notes.html#release-6.32.08
    PR:             282886
---
 devel/root/Makefile  | 38 +++++++++++++++++---------------------
 devel/root/distinfo  |  6 +++---
 devel/root/pkg-plist | 10 ++++++++--
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/devel/root/Makefile b/devel/root/Makefile
index f3c04be51953..f3774687b9b2 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	root
-DISTVERSION=	6.32.04
-PORTREVISION=	3
+DISTVERSION=	6.32.08
 CATEGORIES=	devel science math parallel python
 MASTER_SITES=	https://root.cern/download/
 DISTFILES=	${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
@@ -53,20 +52,19 @@ CMAKE_OFF=	arrow builtin_afterimage builtin_cfitsio builtin_cppzmq builtin_davix
 		builtin_gsl builtin_gtest builtin_lz4 builtin_lzma builtin_nlohmannjson \
 		builtin_openssl builtin_pcre builtin_tbb builtin_unuran builtin_vc builtin_vdt \
 		builtin_veccore builtin_xrootd builtin_xxhash builtin_zeromq builtin_zlib \
-		builtin_zstd cefweb clad cocoa cuda cudnn daos davix dcache fcgi fftw3 gviz \
-		libcxx llvm13_broken_tests macos_native memory_termination minuit2_mpi \
-		minuit2_omp mpi odbc proof pythia8 qt5web qt6web r roofit_multiprocess \
-		runtime_cxxmodules shadowpw test_distrdf_dask test_distrdf_pyspark tmva-gpu \
-		tmva-rmva tmva-sofie unfold unuran uring vc veccore vecgeom win_broken_tests \
-		winrtdebug
+		builtin_zstd cefweb clad cocoa cuda cudnn daos dcache fcgi fftw3 gviz libcxx \
+		llvm13_broken_tests macos_native memory_termination minuit2_mpi minuit2_omp \
+		mpi odbc proof pythia8 qt5web qt6web r roofit_multiprocess runtime_cxxmodules \
+		shadowpw test_distrdf_dask test_distrdf_pyspark tmva-gpu tmva-rmva tmva-sofie \
+		unfold unuran uring vc veccore vecgeom win_broken_tests winrtdebug
 
 # Port build options; DOCS also on by default
 # See https://root.cern/install/build_from_source/#all-build-options
-OPTIONS_DEFINE=	DOCS ASIMAGE DATAFRAME FITS FORTRAN GDML HTTP IMT MATHMORE MYSQL \
-		OPENGL PGSQL PYROOT ROOFIT ROOT7 SPECTRUM SQLITE SSL TMLP TMVAML VDT WEBGUI \
-		X11 XML XROOTD
-OPTIONS_DEFAULT=	ASIMAGE DATAFRAME FITS GDML HTTP IMT MATHMORE OPENGL PYROOT \
-		ROOFIT ROOT7 SPECTRUM SSL TMLP TMVAML VDT WEBGUI X11 XML XROOTD
+OPTIONS_DEFINE=	DOCS ASIMAGE DATAFRAME DAVIX FITS FORTRAN GDML HTTP IMT MATHMORE \
+		MYSQL OPENGL PGSQL PYROOT ROOFIT ROOT7 SPECTRUM SQLITE SSL TMLP TMVAML VDT \
+		WEBGUI X11 XML XROOTD
+OPTIONS_DEFAULT=	ASIMAGE DATAFRAME DAVIX FITS GDML HTTP IMT MATHMORE OPENGL \
+		PYROOT ROOFIT ROOT7 SPECTRUM SSL TMLP TMVAML VDT WEBGUI X11 XML XROOTD
 OPTIONS_SUB=	yes
 
 ASIMAGE_CMAKE_BOOL=	asimage
@@ -88,12 +86,10 @@ ASIMAGE_USE=	gnome=cairo,gdkpixbuf2,glib20,librsvg2
 DATAFRAME_CMAKE_BOOL=	dataframe
 DATAFRAME_DESC=			Enable ROOT RDataFrame
 
-# TODO: davix only comes with pkgconfig file on fbsd, while
-# ROOT's configure stage relies on find_package() -- patch
-#DAVIX_CMAKE_BOOL=	davix
-#DAVIX_DESC=		Enable support for Davix (HTTP/WebDAV access)
-#DAVIX_IMPLIES=	libuuid xml2 openssl
-#DAVIX_LIB_DEPENDS=	libdavix.so:www/davix
+DAVIX_CMAKE_BOOL=	davix
+DAVIX_DESC=		Enable support for Davix (HTTP/WebDAV access)
+DAVIX_LIB_DEPENDS=	libdavix.so:www/davix
+DAVIX_USES=	pkgconfig
 
 FITS_CMAKE_BOOL=	fitsio
 FITS_DESC=		Enable support for reading FITS images
@@ -201,14 +197,14 @@ PLIST_SUB+=	PYVER="${PYTHON_VER:S/./_/}" \
 		SHLIB_SHVER="${DISTVERSION:R}" \
 		SHLIB_VER="${DISTVERSION}"
 
-# Some .modulemap, .pcm and .idx files are not installed on aarch64, a few headers are only installed on aarch64
+# A few headers are only installed on aarch64
 .if ${OPSYS} == FreeBSD && ${ARCH} == "aarch64"
 PLIST_SUB+=	ONLY_INSTALLED_ON_AARCH64=""
 .else
 PLIST_SUB+=	ONLY_INSTALLED_ON_AARCH64="@comment "
 .endif
 
-# Files in lib/root/__pycache__ have links into WRKDIR and should not be staged. This happens even when PYROOT option is OFF.
+# Files in lib/root/__pycache__ have links into WRKDIR and should not be staged
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/root/__pycache__
 
diff --git a/devel/root/distinfo b/devel/root/distinfo
index 421ed297b908..3f055ae44391 100644
--- a/devel/root/distinfo
+++ b/devel/root/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1725449870
-SHA256 (root_v6.32.04.source.tar.gz) = 132f126aae7d30efbccd7dcd991b7ada1890ae57980ef300c16421f9d4d07ea8
-SIZE (root_v6.32.04.source.tar.gz) = 192915562
+TIMESTAMP = 1732100843
+SHA256 (root_v6.32.08.source.tar.gz) = 29ad4945a72dff1a009c326a65b6fa5ee2478498823251d3cef86a2cbeb77b27
+SIZE (root_v6.32.08.source.tar.gz) = 192930079
diff --git a/devel/root/pkg-plist b/devel/root/pkg-plist
index 70706048c891..ba41405b7a3f 100644
--- a/devel/root/pkg-plist
+++ b/devel/root/pkg-plist
@@ -1231,6 +1231,7 @@ include/root/ROOT/RNotFn.hxx
 %%ROOT7%%include/root/ROOT/RPaveText.hxx
 include/root/ROOT/RRangeCast.hxx
 include/root/ROOT/RRawFile.hxx
+%%DAVIX%%include/root/ROOT/RRawFileDavix.hxx
 %%XROOTD%%include/root/ROOT/RRawFileNetXNG.hxx
 include/root/ROOT/RRawFileTFile.hxx
 include/root/ROOT/RRawFileUnix.hxx
@@ -1797,6 +1798,8 @@ include/root/TDataMember.h
 include/root/TDataType.h
 include/root/TDatabasePDG.h
 include/root/TDatime.h
+%%DAVIX%%include/root/TDavixFile.h
+%%DAVIX%%include/root/TDavixSystem.h
 include/root/TDecayChannel.h
 include/root/TDecompBK.h
 include/root/TDecompBase.h
@@ -3760,6 +3763,11 @@ lib/root/libRCsg.so
 lib/root/libRCsg.so.%%SHLIB_SHVER%%
 lib/root/libRCsg.so.%%SHLIB_VER%%
 lib/root/libRCsg_rdict.pcm
+%%DAVIX%%lib/root/libRDAVIX.rootmap
+%%DAVIX%%lib/root/libRDAVIX.so
+%%DAVIX%%lib/root/libRDAVIX.so.%%SHLIB_SHVER%%
+%%DAVIX%%lib/root/libRDAVIX.so.%%SHLIB_VER%%
+%%DAVIX%%lib/root/libRDAVIX_rdict.pcm
 %%OPENGL%%lib/root/libRGL.rootmap
 %%OPENGL%%lib/root/libRGL.so
 %%OPENGL%%lib/root/libRGL.so.%%SHLIB_SHVER%%
@@ -3893,8 +3901,6 @@ lib/root/libRIO.so.%%SHLIB_VER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw7Provider.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw7Provider.so.%%SHLIB_VER%%
 %%PYROOT%%lib/root/libROOTPythonizations.so
-%%PYROOT%%lib/root/libROOTPythonizations.so.%%SHLIB_SHVER%%
-%%PYROOT%%lib/root/libROOTPythonizations.so.%%SHLIB_VER%%
 %%TMVAML%%lib/root/libROOTTMVASofie.rootmap
 %%TMVAML%%lib/root/libROOTTMVASofie.so
 %%TMVAML%%lib/root/libROOTTMVASofie.so.%%SHLIB_SHVER%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411212023.4ALKNWUe080029>