Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F165523582
D52657.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
8 KB
Referenced Files
None
Subscribers
None
D52657.diff
View Options
diff --git a/science/salome-configuration/Makefile b/science/salome-configuration/Makefile
--- a/science/salome-configuration/Makefile
+++ b/science/salome-configuration/Makefile
@@ -1,40 +1,28 @@
PORTNAME= salome-configuration
DISTVERSIONPREFIX= V
-DISTVERSION= 9_11_0
+DISTVERSION= 9_15_0
CATEGORIES= science # physics
MAINTAINER= yuri@FreeBSD.org
COMMENT= Salome Project: Multi-physics simulations: Configuration
-WWW= https://www.salome-platform.org/
+WWW= https://www.salome-platform.org/ \
+ https://github.com/SalomePlatform/configuration/
-BROKEN= Unfetchable
-DEPRECATED= Fails to fetch
-EXPIRATION_DATE=2025-06-30
+LICENSE= LGPL21+
+LICENSE_FILE= ${WRKSRC}/COPYING
-FETCH_DEPENDS= git:devel/git
-
-GIT_URL= https://git.salome-platform.org/gitpub/tools/configuration.git # all Salome repositories: https://git.salome-platform.org/gitweb/
+USE_GITHUB= yes
+GH_ACCOUNT= SalomePlatform
+GH_PROJECT= configuration
DATADIR= ${PREFIX}/share/salome
-
-NO_BUILD= yes
NO_ARCH= yes
-
-do-fetch:
- @if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
- ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
- cd ${DISTDIR}/${DIST_SUBDIR} && \
- git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
- (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${DISTVERSIONFULL} && ${RM} -r .git) && \
- ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
- ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
- ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
- ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
- fi
+NO_BUILD= yes
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}/configuration
- cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/configuration
+ cd ${WRKSRC} && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/configuration
${RM} ${STAGEDIR}${DATADIR}/configuration/.gitignore
.include <bsd.port.mk>
diff --git a/science/salome-configuration/distinfo b/science/salome-configuration/distinfo
--- a/science/salome-configuration/distinfo
+++ b/science/salome-configuration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688414005
-SHA256 (salome-configuration-V9_11_0.tar.gz) = 5f19f22ea595e7f7e5cffc97386dc89ad8c0ed597e86c94f03924386a56815e4
-SIZE (salome-configuration-V9_11_0.tar.gz) = 90716
+TIMESTAMP = 1758452949
+SHA256 (SalomePlatform-configuration-V9_15_0_GH0.tar.gz) = 01dd367a167383fbc03ca8de47e127c87f4a9d4c826c68768ac3a2bfd5f998f7
+SIZE (SalomePlatform-configuration-V9_15_0_GH0.tar.gz) = 101578
diff --git a/science/salome-configuration/pkg-plist b/science/salome-configuration/pkg-plist
--- a/science/salome-configuration/pkg-plist
+++ b/science/salome-configuration/pkg-plist
@@ -1,3 +1,4 @@
+%%DATADIR%%/configuration/COPYING
%%DATADIR%%/configuration/autotools/m4/ac_check_sizeof_fortran.m4
%%DATADIR%%/configuration/autotools/m4/ac_cxx_depend_flag.m4
%%DATADIR%%/configuration/autotools/m4/ac_cxx_have_sstream.m4
@@ -70,11 +71,14 @@
%%DATADIR%%/configuration/cmake/FindSIP.cmake
%%DATADIR%%/configuration/cmake/FindSMESH.cmake
%%DATADIR%%/configuration/cmake/FindSalomeBLSURFPLUGIN.cmake
+%%DATADIR%%/configuration/cmake/FindSalomeBasicIterativeStatistics.cmake
%%DATADIR%%/configuration/cmake/FindSalomeBoost.cmake
+%%DATADIR%%/configuration/cmake/FindSalomeBootstrap.cmake
%%DATADIR%%/configuration/cmake/FindSalomeCALCULATOR.cmake
%%DATADIR%%/configuration/cmake/FindSalomeCAS.cmake
%%DATADIR%%/configuration/cmake/FindSalomeCGNS.cmake
%%DATADIR%%/configuration/cmake/FindSalomeCOMPONENT.cmake
+%%DATADIR%%/configuration/cmake/FindSalomeCommonGeomLib.cmake
%%DATADIR%%/configuration/cmake/FindSalomeCppUnit.cmake
%%DATADIR%%/configuration/cmake/FindSalomeDoxygen.cmake
%%DATADIR%%/configuration/cmake/FindSalomeFIELDS.cmake
@@ -97,6 +101,7 @@
%%DATADIR%%/configuration/cmake/FindSalomeLibXml2.cmake
%%DATADIR%%/configuration/cmake/FindSalomeMEDCoupling.cmake
%%DATADIR%%/configuration/cmake/FindSalomeMEDFile.cmake
+%%DATADIR%%/configuration/cmake/FindSalomeMEDFileWindows.cmake
%%DATADIR%%/configuration/cmake/FindSalomeMESHGEMS.cmake
%%DATADIR%%/configuration/cmake/FindSalomeMPI.cmake
%%DATADIR%%/configuration/cmake/FindSalomeMetis.cmake
@@ -157,3 +162,4 @@
%%DATADIR%%/configuration/copyright/modules.info
%%DATADIR%%/configuration/tests/ListOfSalomeTestLabelsToBeOK
%%DATADIR%%/configuration/tests/README.txt
+%%DATADIR%%/configuration/tests/sod_test_config.json
diff --git a/science/salome-kernel/Makefile b/science/salome-kernel/Makefile
--- a/science/salome-kernel/Makefile
+++ b/science/salome-kernel/Makefile
@@ -1,64 +1,49 @@
PORTNAME= salome-kernel
DISTVERSIONPREFIX= V
DISTVERSION= 9_11_0
-PORTREVISION= 4
-CATEGORIES= science
+PORTREVISION= 5
+CATEGORIES= science # physics
MAINTAINER= yuri@FreeBSD.org
COMMENT= Salome Project: Multi-physics simulations: Kernel
-WWW= https://www.salome-platform.org/
+WWW= https://www.salome-platform.org/ \
+ https://github.com/SalomePlatform/kernel/
-LICENSE= LGPL21
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= Depends on expired science/salome-configuration
-EXPIRATION_DATE=2025-09-30
-
-FETCH_DEPENDS= git:devel/git
PY_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}omniorb>0:devel/py-omniorb \
${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
-BUILD_DEPENDS= salome-configuration>0:science/salome-configuration \
- swig:devel/swig \
- ${PY_DEPENDS}
+BUILD_DEPENDS= ${PY_DEPENDS} \
+ salome-configuration>0:science/salome-configuration \
+ swig:devel/swig
LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
libhdf5.so:science/hdf5 \
libomniORB4.so:devel/omniORB
-RUN_DEPENDS= bash:shells/bash \
- ${PY_DEPENDS}
+RUN_DEPENDS= ${PY_DEPENDS} \
+ bash:shells/bash
USES= cmake compiler:c++11-lang gnome python shebangfix
+USE_GITHUB= yes
+GH_ACCOUNT= SalomePlatform
+GH_PROJECT= kernel
USE_GNOME= libxml2
USE_LDCONFIG= yes
+SHEBANG_FILES= bin/appliskel/.bashrc bin/appliskel/.salome_run \
+ bin/appliskel/salome bin/appliskel/salome_mesa
SHEBANG_GLOB= *.py *.sh
-SHEBANG_FILES= bin/appliskel/salome \
- bin/appliskel/salome_mesa \
- bin/appliskel/.salome_run \
- bin/appliskel/.bashrc
-
-GIT_URL= https://git.salome-platform.org/gitpub/modules/kernel # all Salome repositories: https://git.salome-platform.org/gitweb/
CMAKE_ARGS= -DCONFIGURATION_ROOT_DIR=${LOCALBASE}/share/salome/configuration \
-DOMNIORBPY_ROOT_DIR=${LOCALBASE} \
-DPython_EXECUTABLE=${PYTHON_CMD}
-CMAKE_OFF= SALOME_BUILD_TESTS SALOME_BUILD_DOC
+CMAKE_OFF= SALOME_BUILD_DOC SALOME_BUILD_TESTS
+
CFLAGS+= -DSIZEOF_INT=4 -DSIZEOF_LONG=4
LDFLAGS+= -lexecinfo
DATADIR= ${PREFIX}/share/salome
-do-fetch:
- @if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
- ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
- cd ${DISTDIR}/${DIST_SUBDIR} && \
- git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
- (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${DISTVERSIONFULL} && ${RM} -r .git) && \
- ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
- ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
- ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
- ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
- fi
-
.include <bsd.port.mk>
diff --git a/science/salome-kernel/distinfo b/science/salome-kernel/distinfo
--- a/science/salome-kernel/distinfo
+++ b/science/salome-kernel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688418727
-SHA256 (salome-kernel-V9_11_0.tar.gz) = ab1ba2be6f48adc97497266f2b6db3b6878aceb8ce8732e496130bc4924ccb3d
-SIZE (salome-kernel-V9_11_0.tar.gz) = 3435113
+TIMESTAMP = 1758456327
+SHA256 (SalomePlatform-kernel-V9_11_0_GH0.tar.gz) = cdbc752b1dc093f3a9d9509e68fe70437bb195baf37f9653f0e33a21ce75b935
+SIZE (SalomePlatform-kernel-V9_11_0_GH0.tar.gz) = 3437694
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Aug 9, 1:20 PM (13 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36327285
Default Alt Text
D52657.diff (8 KB)
Attached To
Mode
D52657: science/salome-{configuration, kernel}: Fix fetch, improve, undeprecate
Attached
Detach File
Event Timeline
Log In to Comment