diff --git a/biology/libnuml/Makefile b/biology/libnuml/Makefile index 67dd0f9f954d..b978d8f8bc4d 100644 --- a/biology/libnuml/Makefile +++ b/biology/libnuml/Makefile @@ -1,30 +1,30 @@ PORTNAME= libnuml DISTVERSIONPREFIX= v -DISTVERSION= 1.1.6 +DISTVERSION= 1.1.7 CATEGORIES= biology devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library for Numerical Markup Language WWW= https://github.com/NuML/NuML LICENSE= LGPL21 LIB_DEPENDS= libsbml.so:biology/libsbml USES= cmake gnome USE_GNOME= libxml2 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= NuML GH_PROJECT= NuML WRKSRC_SUBDIR= ${PORTNAME} post-install: # no need to install LICENSE, README, VERSION @${RM} -r ${STAGEDIR}${DATADIR} # workaround for https://github.com/NuML/NuML/issues/26 ${RM} -r ${STAGEDIR}${PREFIX}/share/cmake .include diff --git a/biology/libnuml/distinfo b/biology/libnuml/distinfo index d0f2a6d8ab88..cdbf18b2647d 100644 --- a/biology/libnuml/distinfo +++ b/biology/libnuml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650763295 -SHA256 (NuML-NuML-v1.1.6_GH0.tar.gz) = 1b51cd51bfe7e9c4e0bcd69f86d8199a23ebe9ea931d4f112b3f6e1666e4f2c8 -SIZE (NuML-NuML-v1.1.6_GH0.tar.gz) = 3425639 +TIMESTAMP = 1743154013 +SHA256 (NuML-NuML-v1.1.7_GH0.tar.gz) = 820d854355d80a3fe6dbe6c5428c45d42542541213cf0c3b3aee705f8ba1399f +SIZE (NuML-NuML-v1.1.7_GH0.tar.gz) = 3427204 diff --git a/biology/libnuml/files/patch-CMakeLists.txt b/biology/libnuml/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..a640f0e1dbe4 --- /dev/null +++ b/biology/libnuml/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +- https://github.com/NuML/NuML/issues/31 + +--- CMakeLists.txt.orig 2025-03-28 09:30:46 UTC ++++ CMakeLists.txt +@@ -48,7 +48,7 @@ project(libnuml VERSION "${LIBNUML_VERSION_MAJOR}.${LI + endif() + + project(libnuml VERSION "${LIBNUML_VERSION_MAJOR}.${LIBNUML_VERSION_MINOR}.${LIBNUML_VERSION_PATCH}" +- LANGUAGES CXX) ++ LANGUAGES CXX C) + + include (CMakeTestCXXCompiler) + include (CheckCSourceCompiles) +@@ -757,4 +757,4 @@ message(STATUS " + endif() + + message(STATUS " +-----------------------------------------------------------------------") +\ No newline at end of file ++----------------------------------------------------------------------") diff --git a/biology/libnuml/pkg-plist b/biology/libnuml/pkg-plist index ffd50b651e2a..b0945d0ea32f 100644 --- a/biology/libnuml/pkg-plist +++ b/biology/libnuml/pkg-plist @@ -1,44 +1,46 @@ include/numl/AtomicDescription.h include/numl/AtomicValue.h include/numl/CompositeDescription.h include/numl/CompositeValue.h include/numl/Dimension.h include/numl/DimensionDescription.h include/numl/NMBase.h include/numl/NUMLDocument.h include/numl/NUMLError.h include/numl/NUMLErrorLog.h include/numl/NUMLErrorTable.h include/numl/NUMLList.h include/numl/NUMLNamespaces.h include/numl/NUMLReader.h include/numl/NUMLSimpleTester.h include/numl/NUMLTypeCodes.h include/numl/NUMLTypes.h include/numl/NUMLVisitor.h include/numl/NUMLWriter.h include/numl/OntologyTerm.h include/numl/ResultComponent.h include/numl/Tuple.h include/numl/TupleDescription.h include/numl/common/common.h include/numl/common/extern.h include/numl/common/libnuml-config-common.h include/numl/common/libnuml-config-unix.h include/numl/common/libnuml-config-win.h include/numl/common/libnuml-config.h include/numl/common/libnuml-namespace.h include/numl/common/libnuml-package.h include/numl/common/libnuml-version.h include/numl/common/numlfwd.h include/numl/common/operationReturnValues.h -lib/cmake/numl-config-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/numl-config-version.cmake lib/cmake/numl-config.cmake -lib/cmake/numl-static-config-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/numl-static-config-version.cmake lib/cmake/numl-static-config.cmake +lib/cmake/numl-static-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/numl-static-targets.cmake +lib/cmake/numl-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/numl-targets.cmake lib/libnuml-static.a lib/libnuml.so lib/libnuml.so.1 -lib/libnuml.so.1.1.6 +lib/libnuml.so.1.1.7 diff --git a/biology/py-libnuml/Makefile b/biology/py-libnuml/Makefile index 6a4099d85b9d..2fdbfbff139b 100644 --- a/biology/py-libnuml/Makefile +++ b/biology/py-libnuml/Makefile @@ -1,32 +1,32 @@ PORTNAME= libnuml DISTVERSIONPREFIX= v -DISTVERSION= 1.1.6 +DISTVERSION= 1.1.7 CATEGORIES= biology devel PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Numerical Markup Language for Python WWW= https://github.com/NuML/NuML LICENSE= LGPL21 BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libnuml.so:biology/libnuml USES= cmake localbase:ldflags python USE_PYTHON= flavors USE_GITHUB= yes GH_ACCOUNT= NuML GH_PROJECT= NuML WRKSRC_SUBDIR= ${PORTNAME}/src/bindings/python CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR=lib LDFLAGS+= -lnuml # otherwise it builds a broken shared object, see https://github.com/NuML/NuML/issues/21 post-extract: @${RLN} ${WRKSRC}/../../../VERSION.txt ${WRKSRC}/VERSION.txt .include diff --git a/biology/py-libnuml/distinfo b/biology/py-libnuml/distinfo index 61a6a4501c0a..634cc0d9e6ae 100644 --- a/biology/py-libnuml/distinfo +++ b/biology/py-libnuml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650763370 -SHA256 (NuML-NuML-v1.1.6_GH0.tar.gz) = 1b51cd51bfe7e9c4e0bcd69f86d8199a23ebe9ea931d4f112b3f6e1666e4f2c8 -SIZE (NuML-NuML-v1.1.6_GH0.tar.gz) = 3425639 +TIMESTAMP = 1743153975 +SHA256 (NuML-NuML-v1.1.7_GH0.tar.gz) = 820d854355d80a3fe6dbe6c5428c45d42542541213cf0c3b3aee705f8ba1399f +SIZE (NuML-NuML-v1.1.7_GH0.tar.gz) = 3427204 diff --git a/biology/py-libnuml/files/patch-CMakeLists.txt b/biology/py-libnuml/files/patch-CMakeLists.txt index 7cd3ba0fcbb4..6d3a58e0a9a4 100644 --- a/biology/py-libnuml/files/patch-CMakeLists.txt +++ b/biology/py-libnuml/files/patch-CMakeLists.txt @@ -1,31 +1,22 @@ ---- CMakeLists.txt.orig 2022-04-19 08:09:02 UTC +--- CMakeLists.txt.orig 2025-03-28 09:49:26 UTC +++ CMakeLists.txt -@@ -53,7 +53,7 @@ if (LIBNUML_REMOVE_WRAPPERS) - endif(LIBNUML_REMOVE_WRAPPERS) - - --set(SWIG_EXTRA_FLAGS -DSWIGEXPORT -DLIBSBML_CPP_NAMESPACE_BEGIN -DLIBSBML_CPP_NAMESPACE_END -DLIBSBML_CPP_NAMESPACE_QUALIFIER -DLIBSBML_CPP_NAMESPACE_USE) -+set(SWIG_EXTRA_FLAGS -DSWIGEXPORT -DLIBSBML_CPP_NAMESPACE_BEGIN= -DLIBSBML_CPP_NAMESPACE_END= -DLIBSBML_CPP_NAMESPACE_QUALIFIER= -DLIBSBML_CPP_NAMESPACE_USE=) - if(NOT UNIX) - set(SWIG_EXTRA_FLAGS ${SWIG_EXTRA_FLAGS} -DSWIGWIN -DSWIG_CSHARP_NO_WSTRING_HELPER ) - endif() @@ -62,6 +62,7 @@ ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libnuml_wrap.cpp COMMAND "${SWIG_EXECUTABLE}" ARGS -I${CMAKE_CURRENT_SOURCE_DIR}/../swig/ -+ -I${CMAKE_INSTALL_PREFIX}/include ++ -I${CMAKE_INSTALL_PREFIX}/include -I${CMAKE_SOURCE_DIR}/ -I${CMAKE_BINARY_DIR}/ -I${CMAKE_BINARY_DIR}/src @@ -142,9 +143,9 @@ if (PYTHON_USE_DYNAMIC_LOOKUP) if (APPLE) set_target_properties (binding_python_lib PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif() - target_link_libraries(binding_python_lib ${LIBNUML_LIBRARY}-static) + target_link_libraries(binding_python_lib ${LIBNUML_LIBRARY}) else() - target_link_libraries(binding_python_lib ${LIBNUML_LIBRARY}-static ${PYTHON_LIBRARIES}) + target_link_libraries(binding_python_lib ${LIBNUML_LIBRARY} ${PYTHON_LIBRARIES}) endif()