Attachment #242282 for bug #271514

View | Details | Raw Unified | Return to bug 271514
Collapse All | Expand All




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

		libpng.so:graphics/png \
		libtbb.so:devel/onetbb \
		libtiff.so:graphics/tiff \
		libunwind.so:devel/libunwind \
		libvdt.so:math/vdt \
		libxkbcommon.so:x11/libxkbcommon \
		libXrdCl.so:databases/xrootd \

		libzstd.so:archivers/zstd

USES=		blaslapack:openblas cmake compiler:c++17-lang desktop-file-utils \
		gettext-runtime gl gnome iconv jpeg mysql pgsql:13+ python:3.9+ \
		shebangfix sqlite ssl xorg
USE_GL=		glew glu opengl
USE_GNOME=	cairo gdkpixbuf2 glib20 librsvg2 libxml2

Lines 1-3 Link Here

(-)b/devel/root/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1679508411	1	TIMESTAMP = 1684486312
2	SHA256 (root_v6.28.02.source.tar.gz) = 6643c07710e68972b00227c68b20b1016fec16f3fba5f44a571fa1ce5bb42faa	2	SHA256 (root_v6.28.04.source.tar.gz) = 70f7f86a0cd5e3f2a0befdc59942dd50140d990ab264e8e56c7f17f6bfe9c965
3	SIZE (root_v6.28.02.source.tar.gz) = 185323243	3	SIZE (root_v6.28.04.source.tar.gz) = 185345719




--- main/CMakeLists.txt.orig	2023-05-19 13:45:40 UTC
+++ main/CMakeLists.txt
@@ -75,8 +75,8 @@ if(IS_ABSOLUTE ${runtimedir})
 else()

 configure_file(python/cmdLineUtils.py ${localruntimedir}/cmdLineUtils.py @ONLY)
 
 
@@ -117,8 +117,8 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CL
                          "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcint;${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/genreflex")
 
 if(CMAKE_HOST_UNIX)
-  install(CODE "execute_process(COMMAND ln -f rootcling rootcint WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
-  install(CODE "execute_process(COMMAND ln -f rootcling genreflex WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
+  install(CODE "execute_process(COMMAND ln -f rootcling rootcint WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
+  install(CODE "execute_process(COMMAND ln -f rootcling genreflex WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
 else()
   if(MSVC)
     install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcling.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)

Lines 1-4 Link Here

(-)b/devel/root/pkg-plist (-3 / +3 lines)
1	bin/genreflex
2	bin/hadd	1	bin/hadd
3	bin/hist2workspace	2	bin/hist2workspace
4	bin/prepareHistFactory	3	bin/prepareHistFactory
Lines 9-15 bin/root Link Here
9	bin/root-config	8	bin/root-config
10	bin/root.exe	9	bin/root.exe
11	bin/rootbrowse	10	bin/rootbrowse
12	bin/rootcint
13	bin/rootcling	11	bin/rootcling
14	bin/rootcp	12	bin/rootcp
15	bin/rootdrawtree	13	bin/rootdrawtree
Lines 1135-1141 include/root/RooMultiGenFunction.h Link Here
1135	include/root/RooMultiVarGaussian.h	1133	include/root/RooMultiVarGaussian.h
1136	include/root/RooNDKeysPdf.h	1134	include/root/RooNDKeysPdf.h
1137	include/root/RooNLLVar.h	1135	include/root/RooNLLVar.h
1138	include/root/RooNaNPacker.h
1139	include/root/RooNameReg.h	1136	include/root/RooNameReg.h
1140	include/root/RooNonCPEigenDecay.h	1137	include/root/RooNonCPEigenDecay.h
1141	include/root/RooNonCentralChiSquare.h	1138	include/root/RooNonCentralChiSquare.h
Lines 7121-7123 lib/root/libRooFitXRooFit.so.%%SHLIB_VER%% Link Here
7121	%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/arrow_up.png	7118	%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/arrow_up.png
7122	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/%%AARCH64_PCM_PREFIX%%GenVector_G__GenVector32%%AARCH64_PCM_SUFFIX%%.pcm	7119	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/%%AARCH64_PCM_PREFIX%%GenVector_G__GenVector32%%AARCH64_PCM_SUFFIX%%.pcm
7123	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/%%AARCH64_PCM_PREFIX%%Smatrix_G__Smatrix32%%AARCH64_PCM_SUFFIX%%.pcm	7120	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/%%AARCH64_PCM_PREFIX%%Smatrix_G__Smatrix32%%AARCH64_PCM_SUFFIX%%.pcm
		7121	include/root/RooFit/Config.h
		7122	include/root/RooFit/ModelConfig.h
		7123	include/root/RooStats/HistFactory/Detail/HistFactoryImpl.h

Return to bug 271514

Lines 1-6 Link Here

(-)b/devel/root/Makefile (-3 / +3 lines)
1	PORTNAME= root	1	PORTNAME= root
2	DISTVERSION= 6.28.02	2	DISTVERSION= 6.28.04
3	PORTREVISION= 2
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 29-34 LIB_DEPENDS= libAfterImage.so:graphics/libafterimage \ Link Here
29	libpng.so:graphics/png \	28	libpng.so:graphics/png \
30	libtbb.so:devel/onetbb \	29	libtbb.so:devel/onetbb \
31	libtiff.so:graphics/tiff \	30	libtiff.so:graphics/tiff \
		31	libunwind.so:devel/libunwind \
32	libvdt.so:math/vdt \	32	libvdt.so:math/vdt \
33	libxkbcommon.so:x11/libxkbcommon \	33	libxkbcommon.so:x11/libxkbcommon \
34	libXrdCl.so:databases/xrootd \	34	libXrdCl.so:databases/xrootd \
Lines 36-42 LIB_DEPENDS= libAfterImage.so:graphics/libafterimage \ Link Here
36	libzstd.so:archivers/zstd	36	libzstd.so:archivers/zstd
37		37
38	USES= blaslapack:openblas cmake compiler:c++17-lang desktop-file-utils \	38	USES= blaslapack:openblas cmake compiler:c++17-lang desktop-file-utils \
39	gettext-runtime gl gnome iconv jpeg mysql:57 pgsql:13+ python:3.9+ \	39	gettext-runtime gl gnome iconv jpeg mysql pgsql:13+ python:3.9+ \
40	shebangfix sqlite ssl xorg	40	shebangfix sqlite ssl xorg
41	USE_GL= glew glu opengl	41	USE_GL= glew glu opengl
42	USE_GNOME= cairo gdkpixbuf2 glib20 librsvg2 libxml2	42	USE_GNOME= cairo gdkpixbuf2 glib20 librsvg2 libxml2

Lines 1-4 Link Here

(-)b/devel/root/files/patch-main_CMakeLists.txt (-1 / +12 lines)
1	--- main/CMakeLists.txt.orig 2023-02-13 15:21:06 UTC	1	--- main/CMakeLists.txt.orig 2023-05-19 13:45:40 UTC
2	+++ main/CMakeLists.txt	2	+++ main/CMakeLists.txt
3	@@ -75,8 +75,8 @@ if(IS_ABSOLUTE ${runtimedir})	3	@@ -75,8 +75,8 @@ if(IS_ABSOLUTE ${runtimedir})
4	else()	4	else()
Lines 11-13 Link Here
11	configure_file(python/cmdLineUtils.py ${localruntimedir}/cmdLineUtils.py @ONLY)	11	configure_file(python/cmdLineUtils.py ${localruntimedir}/cmdLineUtils.py @ONLY)
12		12
13		13
		14	@@ -117,8 +117,8 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CL
		15	"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcint;${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/genreflex")
		16
		17	if(CMAKE_HOST_UNIX)
		18	- install(CODE "execute_process(COMMAND ln -f rootcling rootcint WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
		19	- install(CODE "execute_process(COMMAND ln -f rootcling genreflex WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
		20	+ install(CODE "execute_process(COMMAND ln -f rootcling rootcint WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
		21	+ install(CODE "execute_process(COMMAND ln -f rootcling genreflex WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
		22	else()
		23	if(MSVC)
		24	install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcling.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)