Date: Sat, 7 Nov 2020 08:19:42 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554348 - in head/science/tfel: . files Message-ID: <202011070819.0A78Jg1u073491@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sat Nov 7 08:19:42 2020 New Revision: 554348 URL: https://svnweb.freebsd.org/changeset/ports/554348 Log: - Fix libraries installation see <https://sourceforge.net/p/tfel/tickets/254/>; - Enable Python and Fortran interfaces - Let it honor CFLAGS. Approved by: pfg (maintainer) Added: head/science/tfel/files/ head/science/tfel/files/patch-cmake_modules_tfel.cmake (contents, props changed) Modified: head/science/tfel/Makefile head/science/tfel/pkg-plist Modified: head/science/tfel/Makefile ============================================================================== --- head/science/tfel/Makefile Sat Nov 7 08:15:03 2020 (r554347) +++ head/science/tfel/Makefile Sat Nov 7 08:19:42 2020 (r554348) @@ -3,6 +3,7 @@ PORTNAME= tfel PORTVERSION= 3.3.0 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= SF/${PORTNAME}/ PKGNAMESUFFIX= -mfront @@ -15,18 +16,22 @@ LICENSE= GPLv3 BUILD_DEPENDS= gnuplot:math/gnuplot RUN_DEPENDS= gnuplot:math/gnuplot -USES= cmake compiler:c++0x tar:bzip2 +USES= cmake compiler:c++0x fortran tar:bzip2 -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS PYTHON +OPTIONS_DEFAULT= DOCS PYTHON OPTIONS_SUB= yes -#PYTHON_USES= localbase python -#PYTHON_BUILD_DEPENDS= ${LOCALBASE}/include/boost/python.hpp:devel/boost-libs -#PYTHON_LIB_DEPENDS= ${PY_BOOST} -#PYTHON_CMAKE_ON= enable-python enable-python-bindings +PYTHON_USES= localbase python +PYTHON_BUILD_DEPENDS= ${PYNUMPY} +PYTHON_LIB_DEPENDS= ${PY_BOOST} \ + libboost_thread.so:devel/boost-libs +PYTHON_RUN_DEPENDS= ${PYNUMPY} +PYTHON_CMAKE_BOOL= enable-python enable-python-bindings -CMAKE_ON= enable-aster enable-calculix +CMAKE_ON= enable-aster enable-calculix enable-fortran +CMAKE_ARGS+= -DCOMPILER_CXXFLAGS="${CXXFLAGS}" -DCOMPILER_FLAGS="${CFLAGS}" USE_LDCONFIG= yes .ifdef PACKAGE_BUILDING Added: head/science/tfel/files/patch-cmake_modules_tfel.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/tfel/files/patch-cmake_modules_tfel.cmake Sat Nov 7 08:19:42 2020 (r554348) @@ -0,0 +1,35 @@ +--- cmake/modules/tfel.cmake.orig 2019-12-16 14:46:35 UTC ++++ cmake/modules/tfel.cmake +@@ -21,7 +21,7 @@ macro(tfel_project tfel_version_major tfel_version_min + set(TFEL_VERSION "${VERSION}") + endif(TFEL_VERSION_FLAVOUR) + add_definitions("-DVERSION=\\\"\"${TFEL_VERSION}\"\\\"") +- ++ + if(TFEL_APPEND_VERSION) + set(TFEL_SUFFIX "${TFEL_VERSION}") + add_definitions("-DTFEL_SUFFIX=\\\"\"${TFEL_SUFFIX}\"\\\"") +@@ -36,7 +36,7 @@ macro(tfel_project tfel_version_major tfel_version_min + string(REPLACE "." "_" TFEL_SUFFIX_FOR_PYTHON_MODULES "${TFEL_SUFFIX}") + string(REPLACE "-" "_" TFEL_SUFFIX_FOR_PYTHON_MODULES "${TFEL_SUFFIX_FOR_PYTHON_MODULES}") + endif(TFEL_SUFFIX) +- ++ + if(LIB_SUFFIX) + add_definitions("-DLIB_SUFFIX=\\\"\"${LIB_SUFFIX}\"\\\"") + endif(LIB_SUFFIX) +@@ -145,8 +145,14 @@ macro(tfel_library_internal name component) + endif(${ARGC} LESS 2) + add_library(${name} SHARED ${ARGN}) + if(TFEL_APPEND_SUFFIX) ++ set(export_install_path "share/tfel-${TFEL_SUFFIX}/cmake") ++ else(TFEL_APPEND_SUFFIX) ++ set(export_install_path "share/tfel/cmake") ++ endif(TFEL_APPEND_SUFFIX) ++ if(TFEL_APPEND_SUFFIX) + set_target_properties(${name} PROPERTIES OUTPUT_NAME "${name}-${TFEL_SUFFIX}") + endif(TFEL_APPEND_SUFFIX) ++ set_target_properties(${name} PROPERTIES VERSION ${TFEL_VERSION} SOVERSION ${TFEL_VERSION_MAJOR}) + if(WIN32) + install(TARGETS ${name} DESTINATION bin + COMPONENT ${component}) Modified: head/science/tfel/pkg-plist ============================================================================== --- head/science/tfel/pkg-plist Sat Nov 7 08:15:03 2020 (r554347) +++ head/science/tfel/pkg-plist Sat Nov 7 08:19:42 2020 (r554348) @@ -859,6 +859,7 @@ include/TFEL/System/stream_traits.hxx include/TFEL/System/wfstream.hxx include/TFEL/System/wstreamView.hxx include/TFEL/System/wstreamView.ixx +%%PYTHON%%include/TFEL/TFELPHYSICALCONSTANTS.INC include/TFEL/Tests/MultipleTestOutputs.hxx include/TFEL/Tests/StdStreamTestOutput.hxx include/TFEL/Tests/Test.hxx @@ -919,28 +920,93 @@ include/TFEL/Utilities/TestDocParser.hxx include/TFEL/Utilities/TestDocumentation.hxx include/TFEL/Utilities/TextData.hxx include/TFEL/Utilities/Token.hxx +%%PYTHON%%include/TFEL/tfel_physical_constants.mod lib/libAsterInterface.so +lib/libAsterInterface.so.3 +lib/libAsterInterface.so.3.3.0 lib/libCalculiXInterface.so +lib/libCalculiXInterface.so.3 +lib/libCalculiXInterface.so.3.3.0 lib/libMFMTestGenerator.so +lib/libMFMTestGenerator.so.3 +lib/libMFMTestGenerator.so.3.3.0 lib/libMFrontLogStream.so +lib/libMFrontLogStream.so.3 +lib/libMFrontLogStream.so.3.3.0 lib/libMFrontProfiling.so +lib/libMFrontProfiling.so.3 +lib/libMFrontProfiling.so.3.3.0 lib/libMTestFileGenerator.so +lib/libMTestFileGenerator.so.3 +lib/libMTestFileGenerator.so.3.3.0 lib/libTFELConfig.so +lib/libTFELConfig.so.3 +lib/libTFELConfig.so.3.3.0 lib/libTFELException.so +lib/libTFELException.so.3 +lib/libTFELException.so.3.3.0 lib/libTFELGlossary.so +lib/libTFELGlossary.so.3 +lib/libTFELGlossary.so.3.3.0 lib/libTFELMFront.so +lib/libTFELMFront.so.3 +lib/libTFELMFront.so.3.3.0 lib/libTFELMTest.so +lib/libTFELMTest.so.3 +lib/libTFELMTest.so.3.3.0 lib/libTFELMaterial.so +lib/libTFELMaterial.so.3 +lib/libTFELMaterial.so.3.3.0 lib/libTFELMath.so +lib/libTFELMath.so.3 +lib/libTFELMath.so.3.3.0 lib/libTFELMathCubicSpline.so +lib/libTFELMathCubicSpline.so.3 +lib/libTFELMathCubicSpline.so.3.3.0 lib/libTFELMathKriging.so +lib/libTFELMathKriging.so.3 +lib/libTFELMathKriging.so.3.3.0 lib/libTFELMathParser.so +lib/libTFELMathParser.so.3 +lib/libTFELMathParser.so.3.3.0 lib/libTFELNUMODIS.so +lib/libTFELNUMODIS.so.3 +lib/libTFELNUMODIS.so.3.3.0 lib/libTFELPhysicalConstants.so +lib/libTFELPhysicalConstants.so.3 +lib/libTFELPhysicalConstants.so.3.3.0 lib/libTFELSystem.so +lib/libTFELSystem.so.3 +lib/libTFELSystem.so.3.3.0 lib/libTFELTests.so +lib/libTFELTests.so.3 +lib/libTFELTests.so.3.3.0 lib/libTFELUnicodeSupport.so +lib/libTFELUnicodeSupport.so.3 +lib/libTFELUnicodeSupport.so.3.3.0 lib/libTFELUtilities.so +lib/libTFELUtilities.so.3 +lib/libTFELUtilities.so.3.3.0 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mfront/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mfront/_mfront.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mfront/mtest/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mfront/umatxx/Behaviour.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mfront/umatxx/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mtest/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mtest/_mtest.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/std/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/std/_stl_map.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/std/_stl_pair.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/std/_stl_tuple.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/std/_stl_vector.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/tfel/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/tfel/_tfel.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/tfel/glossary.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/tfel/material.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/tfel/math.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/tfel/system.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/tfel/tests.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/tfel/utilities.so share/doc/mfront/AdditionalConvergenceChecks.md share/doc/mfront/Algorithm.md share/doc/mfront/Author.md
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011070819.0A78Jg1u073491>