diff --git a/misc/ignition-fuel-tools/Makefile b/misc/ignition-fuel-tools/Makefile index 8d45c394f176..a77f3d376936 100644 --- a/misc/ignition-fuel-tools/Makefile +++ b/misc/ignition-fuel-tools/Makefile @@ -1,43 +1,43 @@ PORTNAME= ignition-fuel-tools DISTVERSION= 1.2.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= misc MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ MAINTAINER= yuri@FreeBSD.org COMMENT= Classes and tools for interacting with Ignition Fuel WWW= https://ignitionrobotics.org/home LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake +BUILD_DEPENDS= ignition-cmake>=2:devel/ignition-cmake LIB_DEPENDS= libcurl.so:ftp/curl \ libignition-common3.so:devel/ignition-common \ libjsoncpp.so:devel/jsoncpp \ libuuid.so:misc/libuuid \ libyaml.so:textproc/libyaml \ libzip.so:archivers/libzip USES= cmake compiler:c++17-lang pkgconfig USE_LDCONFIG= yes CMAKE_OFF= BUILD_TESTING BB_ACCOUNT= ignitionrobotics BB_PROJECT= ign-fuel-tools BB_COMMIT= 0ffbf3a2c836 WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} PLIST_SUB+= FUEL_TOOLS_IGN_VER=fuel_tools${DISTVERSION:R:R} TESTING_UNSAFE= 4 tests are known to fail: https://bitbucket.org/ignitionrobotics/ign-fuel-tools/issues/48/4-unit-tests-fail-unit_fuelclient_test do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt b/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt index bb88454abe59..c17aba61f671 100644 --- a/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt +++ b/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt @@ -1,11 +1,25 @@ ---- src/CMakeLists.txt.orig 2018-11-20 20:11:32 UTC +-- Replace deprecated ign_add_library() with ign_create_core_library() +-- because ignition-cmake2 now treats ign_add_library() as a hard error. +-- No upstream issue reference found. +--- src/CMakeLists.txt.orig 2026-05-18 05:23:45 UTC +++ src/CMakeLists.txt -@@ -61,7 +61,7 @@ ign_install_library() +@@ -35,10 +35,9 @@ endif() + endif() + + # Create the library target. +-ign_add_library(${PROJECT_LIBRARY_TARGET_NAME} ${sources}) ++ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11) + + # Turn on C++11 support for the library. +-ign_set_project_public_cxx_standard(11) + + # Link the libraries that we always need. + target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} +@@ -56,7 +55,6 @@ ign_target_interface_include_directories(${PROJECT_LIB + + # Create installation instructions for the library target. This must be called + # in the same scope that the target is created. +-ign_install_library() + # Build the unit tests. ign_build_tests(TYPE UNIT - SOURCES ${gtest_sources} -- LIB_DEPS ignition-common1::ignition-common1 -+ LIB_DEPS ignition-common3::ignition-common3 - ) - - # Command line support.