diff --git a/science/geant4/Makefile b/science/geant4/Makefile index a85665cc7264a..f0c517c0dc974 100644 --- a/science/geant4/Makefile +++ b/science/geant4/Makefile @@ -1,7 +1,6 @@ PORTNAME= geant4 DISTVERSIONPREFIX= v -DISTVERSION= 11.1.2 -PORTREVISION= 2 +DISTVERSION= 11.2.0 CATEGORIES= science parallel devel cad MASTER_SITES= https://cern.ch/geant4-data/releases/ \ https://cern.ch/geant4-data/datasets/:data @@ -54,10 +53,10 @@ CMAKE_ON= GEANT4_BUILD_MULTITHREADED \ GEANT4_USE_TBB \ GEANT4_USE_XM -G4ABLA_VERSION= 3.1 -G4EMLOW_VERSION= 8.2 +G4ABLA_VERSION= 3.3 +G4EMLOW_VERSION= 8.5 G4ENSDFSTATE_VERSION= 2.3 -G4INCL_VERSION= 1.0 +G4INCL_VERSION= 1.2 G4NDL_VERSION= 4.7 G4PARTICLEXS_VERSION= 4.0 G4PhotonEvaporation_VERSION= 5.7 diff --git a/science/geant4/distinfo b/science/geant4/distinfo index a7d231f9001c1..16503fdbc7221 100644 --- a/science/geant4/distinfo +++ b/science/geant4/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1689694144 -SHA256 (geant4/geant4-v11.1.2.tar.gz) = 7b782d93e0749fb9c498e98d4ba32a76cb0c04d3490e9f07d8400c87b9c647d5 -SIZE (geant4/geant4-v11.1.2.tar.gz) = 36423840 -SHA256 (geant4/G4ABLA.3.1.tar.gz) = 7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed -SIZE (geant4/G4ABLA.3.1.tar.gz) = 107286 -SHA256 (geant4/G4EMLOW.8.2.tar.gz) = 3d7768264ff5a53bcb96087604bbe11c60b7fea90aaac8f7d1252183e1a8e427 -SIZE (geant4/G4EMLOW.8.2.tar.gz) = 329428359 +TIMESTAMP = 1702216811 +SHA256 (geant4/geant4-v11.2.0.tar.gz) = 46ad7fab3c5cb4bd0bdd77dd6d3e2283184819235bcbc01b2d117d81b35596a6 +SIZE (geant4/geant4-v11.2.0.tar.gz) = 36652313 +SHA256 (geant4/G4ABLA.3.3.tar.gz) = 1e041b3252ee9cef886d624f753e693303aa32d7e5ef3bba87b34f36d92ea2b1 +SIZE (geant4/G4ABLA.3.3.tar.gz) = 170253 +SHA256 (geant4/G4EMLOW.8.5.tar.gz) = 66baca49ac5d45e2ac10c125b4fb266225e511803e66981909ce9cd3e9bcef73 +SIZE (geant4/G4EMLOW.8.5.tar.gz) = 340782306 SHA256 (geant4/G4ENSDFSTATE.2.3.tar.gz) = 9444c5e0820791abd3ccaace105b0e47790fadce286e11149834e79c4a8e9203 SIZE (geant4/G4ENSDFSTATE.2.3.tar.gz) = 290745 -SHA256 (geant4/G4INCL.1.0.tar.gz) = 716161821ae9f3d0565fbf3c2cf34f4e02e3e519eb419a82236eef22c2c4367d -SIZE (geant4/G4INCL.1.0.tar.gz) = 95840 +SHA256 (geant4/G4INCL.1.2.tar.gz) = f880b16073ee0a92d7494f3276a6d52d4de1d3677a0d4c7c58700396ed0e1a7e +SIZE (geant4/G4INCL.1.2.tar.gz) = 98438 SHA256 (geant4/G4NDL.4.7.tar.gz) = 7e7d3d2621102dc614f753ad928730a290d19660eed96304a9d24b453d670309 SIZE (geant4/G4NDL.4.7.tar.gz) = 1114928821 SHA256 (geant4/G4PARTICLEXS.4.0.tar.gz) = 9381039703c3f2b0fd36ab4999362a2c8b4ff9080c322f90b4e319281133ca95 diff --git a/science/geant4/files/patch-CMakeLists.txt b/science/geant4/files/patch-CMakeLists.txt index a1bbf4aec2740..854db2dae20a3 100644 --- a/science/geant4/files/patch-CMakeLists.txt +++ b/science/geant4/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2023-07-18 11:39:33 UTC +--- CMakeLists.txt.orig 2023-12-10 14:44:52 UTC +++ CMakeLists.txt @@ -48,3 +48,5 @@ set(CMAKE_MODULE_PATH # diff --git a/science/geant4/files/patch-cmake_Modules_G4OptionalComponents.cmake b/science/geant4/files/patch-cmake_Modules_G4OptionalComponents.cmake index eb924da5a530c..615c90aaac564 100644 --- a/science/geant4/files/patch-cmake_Modules_G4OptionalComponents.cmake +++ b/science/geant4/files/patch-cmake_Modules_G4OptionalComponents.cmake @@ -1,4 +1,4 @@ ---- cmake/Modules/G4OptionalComponents.cmake.orig 2023-03-31 14:13:37 UTC +--- cmake/Modules/G4OptionalComponents.cmake.orig 2023-12-10 17:01:37 UTC +++ cmake/Modules/G4OptionalComponents.cmake @@ -38,8 +38,31 @@ endif() @@ -28,7 +28,7 @@ if(GEANT4_USE_SYSTEM_CLHEP) - find_package(CLHEP 2.4.6.0 REQUIRED CONFIG) + find_package(CLHEP 2.4.6.0 REQUIRED CONFIG -+ PATHS ${_paths}) ++ PATHS ${_paths}) # PATHS added by port maintainer + unset(_paths) geant4_save_package_variables(CLHEP CLHEP_DIR) else() diff --git a/science/geant4/files/patch-source_global_management_include_G4Backtrace.hh b/science/geant4/files/patch-source_global_management_include_G4Backtrace.hh index 48972b5288f31..1ef5004487711 100644 --- a/science/geant4/files/patch-source_global_management_include_G4Backtrace.hh +++ b/science/geant4/files/patch-source_global_management_include_G4Backtrace.hh @@ -1,4 +1,4 @@ ---- source/global/management/include/G4Backtrace.hh.orig 2022-09-16 07:46:17 UTC +--- source/global/management/include/G4Backtrace.hh.orig 2023-12-10 14:41:01 UTC +++ source/global/management/include/G4Backtrace.hh @@ -114,7 +114,7 @@ using G4ResultOf_t = std::invoke_result_t