Attachment #249644 for bug #278110




PORTNAME=	root
DISTVERSION=	6.30.04
PORTREVISION=	1
CATEGORIES=	devel science math parallel python
MASTER_SITES=	https://root.cern/download/
DISTFILES=	${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}

		gnome iconv shebangfix ssl
USE_GNOME=	libxml2

SHEBANG_FILES=	main/python/rootbrowse.py \
		main/python/rootcp.py \
		main/python/rootdrawtree.py \
		main/python/rooteventselector.py \
		main/python/rootls.py \
		main/python/rootmkdir.py \
		main/python/rootmv.py \
		main/python/rootprint.py \
		main/python/rootrm.py \
		main/python/rootslimtree.py \
		config/rootssh \
		etc/dictpch/makepch.py \
		etc/proof/utils/circle.sh \
		etc/proof/utils/crypt \
		etc/proof/utils/pps \
		etc/proof/utils/proofctl.sh \
		etc/proof/utils/proofinstall.sh \
		etc/pdg_table_update.py
# add a port-specific shebang to be replaced
python_OLD_CMD+=	"/usr/bin/env @python@"

# Flags and environment variables for building
CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17


# Option: MYSQL
MYSQL_DESC=		Enable MySQL bindings
MYSQL_LIB_DEPENDS=	libunwind.so:devel/libunwind
MYSQL_USES=		mysql
MYSQL_CMAKE_BOOL=	mysql


		SHLIB_VER="${DISTVERSION}"

# Some .modulemap, .pcm and .idx files are not installed on aarch64, a few .pcm files are exclusive to aarch64 and files LIBRARY.pcm are renamed libLIBRARY_rdict.pcm on aarch64
.if ${OPSYS} == FreeBSD && ${ARCH} == "aarch64"
PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" AARCH64_PCM_PREFIX="lib" AARCH64_PCM_SUFFIX="_rdict"
.else
PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""
.endif

# TXNet/NetX not installed on FreeBSD 14, std_config.pcm exclusive to FreeBSD 14
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000
PLIST_SUB+=	NOT_INSTALLED_ON_FBSD14="@comment " ONLY_INSTALLED_ON_FBSD14=""
.else
PLIST_SUB+=	NOT_INSTALLED_ON_FBSD14="" ONLY_INSTALLED_ON_FBSD14="@comment "
.endif

# The following two files should not be staged. This happens even when PYROOT option is OFF.
post-install:
	${RM} ${STAGEDIR}${PREFIX}/lib/root/__pycache__/cmdLineUtils.cpython-39.pyc

Lines 1-3 Link Here

(-)b/devel/root/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1702064317	1	TIMESTAMP = 1711984351
2	SHA256 (root_v6.30.02.source.tar.gz) = 7965a456d1ad1ee0d5fe4769bf5a8fec291af684ed93db0f3080a9c362435183	2	SHA256 (root_v6.30.04.source.tar.gz) = 2b4180b698f39cc65d91084d833a884515b325bc5f673c8e39abe818b025d8cc
3	SIZE (root_v6.30.02.source.tar.gz) = 184758362	3	SIZE (root_v6.30.04.source.tar.gz) = 184768143

Lines 1-13 Link Here

(-)b/devel/root/files/patch-interpreter_llvm-project_clang_lib_Serialization_ASTWriter.cpp (-4 / +11 lines)
1	--- interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp.orig 2024-01-11 19:51:52 UTC	1	--- interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp.orig 2024-04-01 14:40:54 UTC
2	+++ interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp	2	+++ interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp
3	@@ -2498,8 +2498,10 @@ unsigned ASTWriter::getSubmoduleID(Module *Mod) {	3	@@ -2498,8 +2498,15 @@ unsigned ASTWriter::getSubmoduleID(Module *Mod) {
4	// did not result in us loading a module file for that submodule. For	4	// did not result in us loading a module file for that submodule. For
5	// instance, a cross-top-level-module 'conflict' declaration will hit this.	5	// instance, a cross-top-level-module 'conflict' declaration will hit this.
6	unsigned ID = getLocalOrImportedSubmoduleID(Mod);	6	unsigned ID = getLocalOrImportedSubmoduleID(Mod);
		7	- assert((ID \|\| !Mod) &&
		8	- "asked for module ID for non-local, non-imported module");
		9	+
7	+ /*	10	+ /*
8	assert((ID \|\| !Mod) &&	11	+ * FreeBSD port maintainer note: CMake option 'asserts' is enabled, when building ROOT with debug symbols.
9	"asked for module ID for non-local, non-imported module");	12	+ * Building then fails on this one assertion. We hack out the assertion, building
		13	+ * succeeds once again, and we pray that everything will be fine.
10	+ */	14	+ */
		15	+
		16	+ //assert((ID \|\| !Mod) &&
		17	+ // "asked for module ID for non-local, non-imported module");
11	return ID;	18	return ID;
12	}	19	}
13		20




include/root/TXMLParser.h
include/root/TXMLPlayer.h
include/root/TXMLSetup.h
%%NOT_INSTALLED_ON_FBSD14%%include/root/TXNetFile.h
%%NOT_INSTALLED_ON_FBSD14%%include/root/TXNetFileStager.h
%%NOT_INSTALLED_ON_FBSD14%%include/root/TXNetSystem.h
include/root/TXTRU.h
include/root/TZIPFile.h
include/root/ThreadLocalStorage.h

lib/root/%%AARCH64_PCM_PREFIX%%Minuit2%%AARCH64_PCM_SUFFIX%%.pcm
%%NOT_INSTALLED_ON_AARCH64%%lib/root/MultiProc.pcm
lib/root/%%AARCH64_PCM_PREFIX%%Net%%AARCH64_PCM_SUFFIX%%.pcm
%%NOT_INSTALLED_ON_FBSD14%%lib/root/%%AARCH64_PCM_PREFIX%%Netx%%AARCH64_PCM_SUFFIX%%.pcm
lib/root/%%AARCH64_PCM_PREFIX%%NetxNG%%AARCH64_PCM_SUFFIX%%.pcm
%%PGSQL%%lib/root/%%AARCH64_PCM_PREFIX%%PgSQL%%AARCH64_PCM_SUFFIX%%.pcm
lib/root/%%AARCH64_PCM_PREFIX%%Physics%%AARCH64_PCM_SUFFIX%%.pcm

lib/root/libNet.so.%%SHLIB_SHVER%%
lib/root/libNet.so.%%SHLIB_VER%%
%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetx.rootmap
%%NOT_INSTALLED_ON_FBSD14%%lib/root/libNetx.so
%%NOT_INSTALLED_ON_FBSD14%%lib/root/libNetx.so.%%SHLIB_SHVER%%
%%NOT_INSTALLED_ON_FBSD14%%lib/root/libNetx.so.%%SHLIB_VER%%
%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetxNG.rootmap
lib/root/libNetxNG.so
lib/root/libNetxNG.so.%%SHLIB_SHVER%%

lib/root/libvectorDict.so.%%SHLIB_VER%%
%%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx
%%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm
%%ONLY_INSTALLED_ON_FBSD14%%lib/root/std_config.pcm
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md
%%PORTDOCS%%%%DOCSDIR%%/INSTALL

Return to bug 278110

Lines 1-6 Link Here

(-)b/devel/root/Makefile (-6 / +29 lines)
1	PORTNAME= root	1	PORTNAME= root
2	DISTVERSION= 6.30.02	2	DISTVERSION= 6.30.04
3	PORTREVISION= 1
4	CATEGORIES= devel science math parallel python	3	CATEGORIES= devel science math parallel python
5	MASTER_SITES= https://root.cern/download/	4	MASTER_SITES= https://root.cern/download/
6	DISTFILES= ${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}	5	DISTFILES= ${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
Lines 33-42 USES= cmake compiler:c++17-lang desktop-file-utils \ Link Here
33	gnome iconv shebangfix ssl	32	gnome iconv shebangfix ssl
34	USE_GNOME= libxml2	33	USE_GNOME= libxml2
35		34
36	SHEBANG_FILES= config/rootssh etc/dictpch/makepch.py etc/proof/utils/circle.sh \	35	SHEBANG_FILES= main/python/rootbrowse.py \
37	etc/proof/utils/crypt etc/proof/utils/pps \	36	main/python/rootcp.py \
38	etc/proof/utils/proofctl.sh etc/proof/utils/proofinstall.sh \	37	main/python/rootdrawtree.py \
		38	main/python/rooteventselector.py \
		39	main/python/rootls.py \
		40	main/python/rootmkdir.py \
		41	main/python/rootmv.py \
		42	main/python/rootprint.py \
		43	main/python/rootrm.py \
		44	main/python/rootslimtree.py \
		45	config/rootssh \
		46	etc/dictpch/makepch.py \
		47	etc/proof/utils/circle.sh \
		48	etc/proof/utils/crypt \
		49	etc/proof/utils/pps \
		50	etc/proof/utils/proofctl.sh \
		51	etc/proof/utils/proofinstall.sh \
39	etc/pdg_table_update.py	52	etc/pdg_table_update.py
		53	# add a port-specific shebang to be replaced
		54	python_OLD_CMD+= "/usr/bin/env @python@"
40		55
41	# Flags and environment variables for building	56	# Flags and environment variables for building
42	CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17	57	CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17
Lines 52-57 OPTIONS_SUB= yes Link Here
52		67
53	# Option: MYSQL	68	# Option: MYSQL
54	MYSQL_DESC= Enable MySQL bindings	69	MYSQL_DESC= Enable MySQL bindings
		70	MYSQL_LIB_DEPENDS= libunwind.so:devel/libunwind
55	MYSQL_USES= mysql	71	MYSQL_USES= mysql
56	MYSQL_CMAKE_BOOL= mysql	72	MYSQL_CMAKE_BOOL= mysql
57		73
Lines 95-106 PLIST_SUB+= SHLIB_SHVER="${DISTVERSION:R}" \ Link Here
95	SHLIB_VER="${DISTVERSION}"	111	SHLIB_VER="${DISTVERSION}"
96		112
97	# Some .modulemap, .pcm and .idx files are not installed on aarch64, a few .pcm files are exclusive to aarch64 and files LIBRARY.pcm are renamed libLIBRARY_rdict.pcm on aarch64	113	# Some .modulemap, .pcm and .idx files are not installed on aarch64, a few .pcm files are exclusive to aarch64 and files LIBRARY.pcm are renamed libLIBRARY_rdict.pcm on aarch64
98	.if ${ARCH} == "aarch64"	114	.if ${OPSYS} == FreeBSD && ${ARCH} == "aarch64"
99	PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" AARCH64_PCM_PREFIX="lib" AARCH64_PCM_SUFFIX="_rdict"	115	PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" AARCH64_PCM_PREFIX="lib" AARCH64_PCM_SUFFIX="_rdict"
100	.else	116	.else
101	PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""	117	PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""
102	.endif	118	.endif
103		119
		120	# TXNet/NetX not installed on FreeBSD 14, std_config.pcm exclusive to FreeBSD 14
		121	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000
		122	PLIST_SUB+= NOT_INSTALLED_ON_FBSD14="@comment " ONLY_INSTALLED_ON_FBSD14=""
		123	.else
		124	PLIST_SUB+= NOT_INSTALLED_ON_FBSD14="" ONLY_INSTALLED_ON_FBSD14="@comment "
		125	.endif
		126
104	# The following two files should not be staged. This happens even when PYROOT option is OFF.	127	# The following two files should not be staged. This happens even when PYROOT option is OFF.
105	post-install:	128	post-install:
106	${RM} ${STAGEDIR}${PREFIX}/lib/root/__pycache__/cmdLineUtils.cpython-39.pyc	129	${RM} ${STAGEDIR}${PREFIX}/lib/root/__pycache__/cmdLineUtils.cpython-39.pyc

Lines 3147-3155 include/root/TXMLNode.h Link Here

(-)b/devel/root/pkg-plist (-7 / +8 lines)
3147	include/root/TXMLParser.h	3147	include/root/TXMLParser.h
3148	include/root/TXMLPlayer.h	3148	include/root/TXMLPlayer.h
3149	include/root/TXMLSetup.h	3149	include/root/TXMLSetup.h
3150	include/root/TXNetFile.h	3150	%%NOT_INSTALLED_ON_FBSD14%%include/root/TXNetFile.h
3151	include/root/TXNetFileStager.h	3151	%%NOT_INSTALLED_ON_FBSD14%%include/root/TXNetFileStager.h
3152	include/root/TXNetSystem.h	3152	%%NOT_INSTALLED_ON_FBSD14%%include/root/TXNetSystem.h
3153	include/root/TXTRU.h	3153	include/root/TXTRU.h
3154	include/root/TZIPFile.h	3154	include/root/TZIPFile.h
3155	include/root/ThreadLocalStorage.h	3155	include/root/ThreadLocalStorage.h
Lines 3322-3328 lib/root/%%AARCH64_PCM_PREFIX%%Minuit%%AARCH64_PCM_SUFFIX%%.pcm Link Here
3322	lib/root/%%AARCH64_PCM_PREFIX%%Minuit2%%AARCH64_PCM_SUFFIX%%.pcm	3322	lib/root/%%AARCH64_PCM_PREFIX%%Minuit2%%AARCH64_PCM_SUFFIX%%.pcm
3323	%%NOT_INSTALLED_ON_AARCH64%%lib/root/MultiProc.pcm	3323	%%NOT_INSTALLED_ON_AARCH64%%lib/root/MultiProc.pcm
3324	lib/root/%%AARCH64_PCM_PREFIX%%Net%%AARCH64_PCM_SUFFIX%%.pcm	3324	lib/root/%%AARCH64_PCM_PREFIX%%Net%%AARCH64_PCM_SUFFIX%%.pcm
3325	lib/root/%%AARCH64_PCM_PREFIX%%Netx%%AARCH64_PCM_SUFFIX%%.pcm	3325	%%NOT_INSTALLED_ON_FBSD14%%lib/root/%%AARCH64_PCM_PREFIX%%Netx%%AARCH64_PCM_SUFFIX%%.pcm
3326	lib/root/%%AARCH64_PCM_PREFIX%%NetxNG%%AARCH64_PCM_SUFFIX%%.pcm	3326	lib/root/%%AARCH64_PCM_PREFIX%%NetxNG%%AARCH64_PCM_SUFFIX%%.pcm
3327	%%PGSQL%%lib/root/%%AARCH64_PCM_PREFIX%%PgSQL%%AARCH64_PCM_SUFFIX%%.pcm	3327	%%PGSQL%%lib/root/%%AARCH64_PCM_PREFIX%%PgSQL%%AARCH64_PCM_SUFFIX%%.pcm
3328	lib/root/%%AARCH64_PCM_PREFIX%%Physics%%AARCH64_PCM_SUFFIX%%.pcm	3328	lib/root/%%AARCH64_PCM_PREFIX%%Physics%%AARCH64_PCM_SUFFIX%%.pcm
Lines 3832-3840 lib/root/libNet.so Link Here
3832	lib/root/libNet.so.%%SHLIB_SHVER%%	3832	lib/root/libNet.so.%%SHLIB_SHVER%%
3833	lib/root/libNet.so.%%SHLIB_VER%%	3833	lib/root/libNet.so.%%SHLIB_VER%%
3834	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetx.rootmap	3834	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetx.rootmap
3835	lib/root/libNetx.so	3835	%%NOT_INSTALLED_ON_FBSD14%%lib/root/libNetx.so
3836	lib/root/libNetx.so.%%SHLIB_SHVER%%	3836	%%NOT_INSTALLED_ON_FBSD14%%lib/root/libNetx.so.%%SHLIB_SHVER%%
3837	lib/root/libNetx.so.%%SHLIB_VER%%	3837	%%NOT_INSTALLED_ON_FBSD14%%lib/root/libNetx.so.%%SHLIB_VER%%
3838	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetxNG.rootmap	3838	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetxNG.rootmap
3839	lib/root/libNetxNG.so	3839	lib/root/libNetxNG.so
3840	lib/root/libNetxNG.so.%%SHLIB_SHVER%%	3840	lib/root/libNetxNG.so.%%SHLIB_SHVER%%
Lines 4217-4222 lib/root/libvectorDict.so.%%SHLIB_SHVER%% Link Here
4217	lib/root/libvectorDict.so.%%SHLIB_VER%%	4217	lib/root/libvectorDict.so.%%SHLIB_VER%%
4218	%%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx	4218	%%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx
4219	%%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm	4219	%%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm
		4220	%%ONLY_INSTALLED_ON_FBSD14%%lib/root/std_config.pcm
4220	%%PORTDOCS%%%%DOCSDIR%%/CREDITS	4221	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
4221	%%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md	4222	%%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md
4222	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	4223	%%PORTDOCS%%%%DOCSDIR%%/INSTALL