diff --git a/science/ncrystal/Makefile b/science/ncrystal/Makefile index 384fc157daea..2a6af9d0e061 100644 --- a/science/ncrystal/Makefile +++ b/science/ncrystal/Makefile @@ -1,28 +1,28 @@ PORTNAME= ncrystal DISTVERSIONPREFIX= v -DISTVERSION= 4.0.2 +DISTVERSION= 4.1.2 CATEGORIES= science # physics MAINTAINER= yuri@FreeBSD.org COMMENT= Library for thermal neutron transport in crystals and other materials WWW= https://github.com/mctools/ncrystal LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake:testing python shebangfix +USES= cmake:testing python:build shebangfix USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= mctools SHEBANG_FILES= tests/scripts/* CMAKE_TESTING_ON= NCRYSTAL_ENABLE_TESTING post-install: # workaround for https://github.com/mctools/ncrystal/issues/150 @${RM} ${STAGEDIR}${PREFIX}/*.sh -# tests as of 4.0.2: 50% tests passed, 41 tests failed out of 82, see https://github.com/mctools/ncrystal/issues/231 +# tests as of 4.1.2: 53% tests passed, 37 tests failed out of 79, see https://github.com/mctools/ncrystal/issues/231 .include diff --git a/science/ncrystal/distinfo b/science/ncrystal/distinfo index 9e5196f88787..a09e34dc2b04 100644 --- a/science/ncrystal/distinfo +++ b/science/ncrystal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740386898 -SHA256 (mctools-ncrystal-v4.0.2_GH0.tar.gz) = ed12b23c30858a5b7c2f1b9eb9a928242c3e36fb73286aa437f5c89b562dfad8 -SIZE (mctools-ncrystal-v4.0.2_GH0.tar.gz) = 2708641 +TIMESTAMP = 1740707854 +SHA256 (mctools-ncrystal-v4.1.2_GH0.tar.gz) = fd099589f1d757e18555864c749aaa41445ea3d3764dec369b4aa90913a09f38 +SIZE (mctools-ncrystal-v4.1.2_GH0.tar.gz) = 2719728 diff --git a/science/ncrystal/files/patch-ncrystal__core_src_utils_NCCFileUtils.cc b/science/ncrystal/files/patch-ncrystal__core_src_utils_NCCFileUtils.cc deleted file mode 100644 index 1f7198b30626..000000000000 --- a/science/ncrystal/files/patch-ncrystal__core_src_utils_NCCFileUtils.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- ncrystal_core/src/utils/NCCFileUtils.cc.orig 2025-02-24 09:02:29 UTC -+++ ncrystal_core/src/utils/NCCFileUtils.cc -@@ -24,12 +24,6 @@ - # define MC_IS_WINDOWS - #endif - #ifndef MC_IS_WINDOWS --# ifndef _POSIX_C_SOURCE --# define _POSIX_C_SOURCE 200809L --# endif --# ifndef _XOPEN_SOURCE --# define _XOPEN_SOURCE 500 --# endif - # include - # include - # include diff --git a/science/ncrystal/pkg-plist b/science/ncrystal/pkg-plist index 618b002ecc51..0d8e0031f90a 100644 --- a/science/ncrystal/pkg-plist +++ b/science/ncrystal/pkg-plist @@ -1,126 +1,128 @@ bin/ncrystal-config include/NCrystal/NCPluginBoilerplate.hh include/NCrystal/NCRNG.hh include/NCrystal/NCrystal.hh include/NCrystal/cinterface/ncrystal.h include/NCrystal/core/NCDefs.hh include/NCrystal/core/NCException.hh include/NCrystal/core/NCFmt.hh include/NCrystal/core/NCImmutBuf.hh include/NCrystal/core/NCMem.hh include/NCrystal/core/NCSmallVector.hh include/NCrystal/core/NCTypes.hh include/NCrystal/core/NCVariant.hh include/NCrystal/dump/NCDump.hh include/NCrystal/factories/NCDataSources.hh include/NCrystal/factories/NCFact.hh include/NCrystal/factories/NCFactImpl.hh include/NCrystal/factories/NCFactRequests.hh include/NCrystal/factories/NCFactRequestsImpl.hh include/NCrystal/factories/NCFactTypes.hh include/NCrystal/factories/NCMatCfg.hh include/NCrystal/interfaces/NCAtomData.hh include/NCrystal/interfaces/NCInfo.hh include/NCrystal/interfaces/NCInfoTypes.hh include/NCrystal/interfaces/NCProc.hh include/NCrystal/interfaces/NCProcImpl.hh include/NCrystal/interfaces/NCRNG.hh include/NCrystal/interfaces/NCSABData.hh include/NCrystal/interfaces/NCSCOrientation.hh include/NCrystal/interfaces/NCVersion.hh include/NCrystal/internal/absoov/NCAbsOOV.hh include/NCrystal/internal/atomdb/NCAtomDB.hh include/NCrystal/internal/atomdb/NCAtomDBExtender.hh include/NCrystal/internal/bkgdextcurve/NCBkgdExtCurve.hh include/NCrystal/internal/cfgutils/NCCfgManip.hh include/NCrystal/internal/cfgutils/NCCfgTypes.hh include/NCrystal/internal/cfgutils/NCCfgVars.hh include/NCrystal/internal/dyninfoutils/NCDynInfoUtils.hh include/NCrystal/internal/elincscatter/NCElIncScatter.hh include/NCrystal/internal/extd_utils/NCABIUtils.hh include/NCrystal/internal/extd_utils/NCFillHKL.hh include/NCrystal/internal/extd_utils/NCLCRefModels.hh include/NCrystal/internal/extd_utils/NCLCUtils.hh include/NCrystal/internal/extd_utils/NCOrientUtils.hh include/NCrystal/internal/extd_utils/NCPlaneProvider.hh include/NCrystal/internal/extd_utils/NCProcCompBldr.hh include/NCrystal/internal/extd_utils/NCSANSUtils.hh include/NCrystal/internal/fact_utils/NCFactoryJobs.hh include/NCrystal/internal/fact_utils/NCFactoryUtils.hh include/NCrystal/internal/freegas/NCFreeGas.hh include/NCrystal/internal/gasmix/NCGasMixUtils.hh include/NCrystal/internal/infobld/NCInfoBuilder.hh include/NCrystal/internal/lcbragg/NCLCBragg.hh include/NCrystal/internal/minimc/NCMMC_Basket.hh include/NCrystal/internal/minimc/NCMMC_BasketMgr.hh include/NCrystal/internal/minimc/NCMMC_BasketSrcFiller.hh include/NCrystal/internal/minimc/NCMMC_Defs.hh include/NCrystal/internal/minimc/NCMMC_Geom.hh include/NCrystal/internal/minimc/NCMMC_RunSim.hh include/NCrystal/internal/minimc/NCMMC_SimMgrMT.hh include/NCrystal/internal/minimc/NCMMC_Source.hh include/NCrystal/internal/minimc/NCMMC_StdEngine.hh include/NCrystal/internal/minimc/NCMMC_StdTallies.hh include/NCrystal/internal/minimc/NCMMC_Tally.hh include/NCrystal/internal/minimc/NCMMC_Utils.hh include/NCrystal/internal/ncmat/NCLoadNCMAT.hh include/NCrystal/internal/ncmat/NCNCMATData.hh include/NCrystal/internal/ncmat/NCParseNCMAT.hh include/NCrystal/internal/phys_utils/NCDebyeMSD.hh include/NCrystal/internal/phys_utils/NCElIncXS.hh include/NCrystal/internal/phys_utils/NCEqRefl.hh include/NCrystal/internal/phys_utils/NCFreeGasUtils.hh include/NCrystal/internal/phys_utils/NCGaussMos.hh include/NCrystal/internal/phys_utils/NCGaussOnSphere.hh include/NCrystal/internal/phys_utils/NCIofQHelper.hh include/NCrystal/internal/phys_utils/NCKinUtils.hh include/NCrystal/internal/powderbragg/NCPowderBragg.hh include/NCrystal/internal/sab/NCSABEval.hh include/NCrystal/internal/sab/NCSABExtender.hh include/NCrystal/internal/sab/NCSABFactory.hh include/NCrystal/internal/sab/NCSABIntegrator.hh include/NCrystal/internal/sab/NCSABSampler.hh include/NCrystal/internal/sab/NCSABSamplerModels.hh include/NCrystal/internal/sab/NCSABScatterHelper.hh include/NCrystal/internal/sab/NCSABUCN.hh include/NCrystal/internal/sab/NCSABUtils.hh include/NCrystal/internal/sab/NCSABXSProvider.hh include/NCrystal/internal/sab/NCScatKnlData.hh include/NCrystal/internal/sabscatter/NCSABScatter.hh include/NCrystal/internal/sanshardsphere/NCSANSSphScat.hh include/NCrystal/internal/scbragg/NCSCBragg.hh include/NCrystal/internal/utils/NCAtomUtils.hh include/NCrystal/internal/utils/NCCFileUtils.hh include/NCrystal/internal/utils/NCDynLoader.hh include/NCrystal/internal/utils/NCFastConvolve.hh include/NCrystal/internal/utils/NCFileUtils.hh include/NCrystal/internal/utils/NCHists.hh include/NCrystal/internal/utils/NCIter.hh include/NCrystal/internal/utils/NCLatticeUtils.hh include/NCrystal/internal/utils/NCMath.hh include/NCrystal/internal/utils/NCMatrix.hh include/NCrystal/internal/utils/NCMsg.hh include/NCrystal/internal/utils/NCPointwiseDist.hh include/NCrystal/internal/utils/NCRandUtils.hh include/NCrystal/internal/utils/NCRomberg.hh include/NCrystal/internal/utils/NCRotMatrix.hh include/NCrystal/internal/utils/NCSpan.hh include/NCrystal/internal/utils/NCSpline.hh include/NCrystal/internal/utils/NCStrView.hh include/NCrystal/internal/utils/NCString.hh include/NCrystal/internal/utils/NCVector.hh include/NCrystal/internal/vdos/NCVDOSEval.hh include/NCrystal/internal/vdos/NCVDOSGn.hh include/NCrystal/internal/vdos/NCVDOSToScatKnl.hh include/NCrystal/misc/NCCompositionUtils.hh include/NCrystal/misc/NCMsgCtrl.hh include/NCrystal/ncapi.h include/NCrystal/ncrystal.h include/NCrystal/plugins/NCPluginMgmt.hh include/NCrystal/text/NCTextData.hh include/NCrystal/threads/NCFactThreads.hh +include/NCrystal/virtualapi/NCVirtAPIFactory.hh +include/NCrystal/virtualapi/NCVirtAPI_Type1_v1.hh lib/cmake/NCrystal/NCrystalConfig.cmake lib/cmake/NCrystal/NCrystalConfigVersion.cmake lib/cmake/NCrystal/NCrystalTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/NCrystal/NCrystalTargets.cmake lib/libNCrystal.so diff --git a/science/py-ncrystal/Makefile b/science/py-ncrystal/Makefile index b46f8667eca2..43f070aff5f9 100644 --- a/science/py-ncrystal/Makefile +++ b/science/py-ncrystal/Makefile @@ -1,37 +1,37 @@ PORTNAME= ncrystal DISTVERSIONPREFIX= v -DISTVERSION= 4.0.2 +DISTVERSION= 4.1.2 CATEGORIES= science # physics PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Library for thermal neutron transport in crystals and other materials WWW= https://mctools.github.io/ncrystal/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ cmake:devel/cmake-core RUN_DEPENDS= ${PYNUMPY} USES= python USE_PYTHON= pep517 autoplist USE_GITHUB= yes GH_ACCOUNT= mctools POST_PLIST= fix-plist post-install: # delete scripts (they are installed by science/ncrystal) @${RM} ${STAGEDIR}${PREFIX}/bin/* # strip binary #@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/NCrystal/ncrystal_pyinst_data/lib/libNCrystal.so fix-plist: # see post-install @${REINPLACE_CMD} -e "s|^bin/.*$$||" ${TMPPLIST} .include diff --git a/science/py-ncrystal/distinfo b/science/py-ncrystal/distinfo index b6a3566f68be..a72196a58eac 100644 --- a/science/py-ncrystal/distinfo +++ b/science/py-ncrystal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740389786 -SHA256 (mctools-ncrystal-v4.0.2_GH0.tar.gz) = ed12b23c30858a5b7c2f1b9eb9a928242c3e36fb73286aa437f5c89b562dfad8 -SIZE (mctools-ncrystal-v4.0.2_GH0.tar.gz) = 2708641 +TIMESTAMP = 1740713840 +SHA256 (mctools-ncrystal-v4.1.2_GH0.tar.gz) = fd099589f1d757e18555864c749aaa41445ea3d3764dec369b4aa90913a09f38 +SIZE (mctools-ncrystal-v4.1.2_GH0.tar.gz) = 2719728 diff --git a/science/py-ncrystal/files/patch-ncrystal__core_src_utils_NCCFileUtils.cc b/science/py-ncrystal/files/patch-ncrystal__core_src_utils_NCCFileUtils.cc deleted file mode 100644 index 1f7198b30626..000000000000 --- a/science/py-ncrystal/files/patch-ncrystal__core_src_utils_NCCFileUtils.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- ncrystal_core/src/utils/NCCFileUtils.cc.orig 2025-02-24 09:02:29 UTC -+++ ncrystal_core/src/utils/NCCFileUtils.cc -@@ -24,12 +24,6 @@ - # define MC_IS_WINDOWS - #endif - #ifndef MC_IS_WINDOWS --# ifndef _POSIX_C_SOURCE --# define _POSIX_C_SOURCE 200809L --# endif --# ifndef _XOPEN_SOURCE --# define _XOPEN_SOURCE 500 --# endif - # include - # include - # include