diff --git a/biology/libnuml/Makefile b/biology/libnuml/Makefile index 617d791e588c..56062ab85d87 100644 --- a/biology/libnuml/Makefile +++ b/biology/libnuml/Makefile @@ -1,27 +1,29 @@ PORTNAME= libnuml DISTVERSIONPREFIX= v -DISTVERSION= 1.1.4 -PORTREVISION= 1 +DISTVERSION= 1.1.5 CATEGORIES= biology devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library for Numerical Markup Language 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 6d10a1bca0ea..7d529a2e56e3 100644 --- a/biology/libnuml/distinfo +++ b/biology/libnuml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632027367 -SHA256 (NuML-NuML-v1.1.4_GH0.tar.gz) = 18e8f6d9b0c261f34123bc2e1bd601730993d63fb53f7434b5901b1059aa9109 -SIZE (NuML-NuML-v1.1.4_GH0.tar.gz) = 3419841 +TIMESTAMP = 1649355866 +SHA256 (NuML-NuML-v1.1.5_GH0.tar.gz) = ae67c85d9323f855856a17685ed3e542e90350f25df1c7d727009ee998fe63e2 +SIZE (NuML-NuML-v1.1.5_GH0.tar.gz) = 3424995 diff --git a/biology/libnuml/pkg-plist b/biology/libnuml/pkg-plist index 44b188050119..89899b1c7f36 100644 --- a/biology/libnuml/pkg-plist +++ b/biology/libnuml/pkg-plist @@ -1,44 +1,44 @@ 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/libnuml-static.a lib/libnuml.so lib/libnuml.so.1 -lib/libnuml.so.1.1.4 +lib/libnuml.so.1.1.5 diff --git a/biology/py-libnuml/Makefile b/biology/py-libnuml/Makefile index 8c84750f95e5..8aabbe9f3b4b 100644 --- a/biology/py-libnuml/Makefile +++ b/biology/py-libnuml/Makefile @@ -1,31 +1,31 @@ PORTNAME= libnuml DISTVERSIONPREFIX= v -DISTVERSION= 1.1.4 +DISTVERSION= 1.1.5 CATEGORIES= biology devel PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Numerical Markup Language for Python 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 6d10a1bca0ea..a88df120ea47 100644 --- a/biology/py-libnuml/distinfo +++ b/biology/py-libnuml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632027367 -SHA256 (NuML-NuML-v1.1.4_GH0.tar.gz) = 18e8f6d9b0c261f34123bc2e1bd601730993d63fb53f7434b5901b1059aa9109 -SIZE (NuML-NuML-v1.1.4_GH0.tar.gz) = 3419841 +TIMESTAMP = 1649356300 +SHA256 (NuML-NuML-v1.1.5_GH0.tar.gz) = ae67c85d9323f855856a17685ed3e542e90350f25df1c7d727009ee998fe63e2 +SIZE (NuML-NuML-v1.1.5_GH0.tar.gz) = 3424995 diff --git a/biology/py-libnuml/files/patch-CMakeLists.txt b/biology/py-libnuml/files/patch-CMakeLists.txt index 4c2147149b24..e5cecbcf8ec9 100644 --- a/biology/py-libnuml/files/patch-CMakeLists.txt +++ b/biology/py-libnuml/files/patch-CMakeLists.txt @@ -1,31 +1,22 @@ ---- CMakeLists.txt.orig 2021-04-29 08:24:05 UTC +--- CMakeLists.txt.orig 2022-04-06 09:17:15 UTC +++ CMakeLists.txt @@ -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_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() -@@ -153,7 +154,7 @@ endif() - # - set(PYTHON_PACKAGE_INSTALL_DIR) - if (UNIX OR CYGWIN) -- execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys;import platform; sys.stdout.write(platform.python_version()[:3])" -+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys;import platform; sys.stdout.write(platform.python_version().rsplit('.', 1)[0])" - OUTPUT_VARIABLE PYTHON_VERSION) - set(PYTHON_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages) - else()