diff --git a/misc/ignition-fuel-tools/Makefile b/misc/ignition-fuel-tools/Makefile index a77f3d376936..c2dbde67d326 100644 --- a/misc/ignition-fuel-tools/Makefile +++ b/misc/ignition-fuel-tools/Makefile @@ -1,43 +1,48 @@ PORTNAME= ignition-fuel-tools -DISTVERSION= 1.2.0 -PORTREVISION= 10 +DISTVERSIONPREFIX= gz-fuel-tools11_ +DISTVERSION= 11.0.0 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 +WWW= https://ignitionrobotics.org/home \ + https://gazebosim.org/libs/fuel_tools/ \ + https://github.com/gazebosim/gz-fuel-tools LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ignition-cmake>=2:devel/ignition-cmake +BUILD_DEPENDS= ignition-cmake>=5:devel/ignition-cmake LIB_DEPENDS= libcurl.so:ftp/curl \ - libignition-common3.so:devel/ignition-common \ + libgz-common.so:devel/ignition-common \ + libgz-math.so:math/ignition-math \ + libgz-msgs.so:devel/ignition-msgs \ libjsoncpp.so:devel/jsoncpp \ + libprotobuf.so:devel/protobuf \ + libtinyxml2.so:textproc/tinyxml2 \ libuuid.so:misc/libuuid \ libyaml.so:textproc/libyaml \ libzip.so:archivers/libzip USES= cmake compiler:c++17-lang pkgconfig + +LDFLAGS+= -Wl,--as-needed 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} +USE_GITHUB= yes +GH_ACCOUNT= gazebosim +GH_PROJECT= gz-fuel-tools 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/distinfo b/misc/ignition-fuel-tools/distinfo index 35010c100c1a..e3fb1b34f2a9 100644 --- a/misc/ignition-fuel-tools/distinfo +++ b/misc/ignition-fuel-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542743820 -SHA256 (ignition-fuel-tools-1.2.0.tar.gz) = 9b423a23112c4f7014830fdedb8060b6ca7417f5f230c9bdec534cb173b8ee49 -SIZE (ignition-fuel-tools-1.2.0.tar.gz) = 401253 +TIMESTAMP = 1784513842 +SHA256 (gazebosim-gz-fuel-tools-gz-fuel-tools11_11.0.0_GH0.tar.gz) = 508ee5f0c8e9ab43effa6ce307736f146914bb22580cd154d7e09b67e4838c54 +SIZE (gazebosim-gz-fuel-tools-gz-fuel-tools11_11.0.0_GH0.tar.gz) = 349482 diff --git a/misc/ignition-fuel-tools/files/patch-CMakeLists.txt b/misc/ignition-fuel-tools/files/patch-CMakeLists.txt deleted file mode 100644 index 9014a5fa1200..000000000000 --- a/misc/ignition-fuel-tools/files/patch-CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- CMakeLists.txt.orig 2018-05-30 22:18:39 UTC -+++ CMakeLists.txt -@@ -9,7 +9,7 @@ project(ignition-fuel_tools1 VERSION 1.2 - # Find ignition-cmake - #============================================================================ - # If you get an error at this line, you need to install ignition-cmake --find_package(ignition-cmake0 REQUIRED) -+find_package(ignition-cmake2 REQUIRED) - - #============================================================================ - # Configure the project -@@ -44,8 +44,8 @@ ign_find_package(ZIP REQUIRED PRIVATE) - - #-------------------------------------- - # Find ignition-common --set(IGN_COMMON_MAJOR_VER 1) --ign_find_package(ignition-common${IGN_COMMON_MAJOR_VER} VERSION 1.1.0 REQUIRED PRIVATE) -+set(IGN_COMMON_MAJOR_VER 3) -+ign_find_package(ignition-common${IGN_COMMON_MAJOR_VER} REQUIRED PRIVATE) - - #-------------------------------------- - # Find ignition-tools diff --git a/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt b/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt deleted file mode 100644 index c17aba61f671..000000000000 --- a/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ --- 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 -@@ -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 diff --git a/misc/ignition-fuel-tools/pkg-plist b/misc/ignition-fuel-tools/pkg-plist index 9b3186736d20..145a7986153e 100644 --- a/misc/ignition-fuel-tools/pkg-plist +++ b/misc/ignition-fuel-tools/pkg-plist @@ -1,33 +1,35 @@ -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ClientConfig.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Export.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/FuelClient.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Helpers.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/JSONParser.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/LocalCache.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Model.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ModelIdentifier.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ModelIter.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ModelIterPrivate.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ModelPrivate.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/REST.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Result.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Zip.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/config.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/detail/Export.hh -include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ign.hh -lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%-all/ignition-%%FUEL_TOOLS_IGN_VER%%-all-config-version.cmake -lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%-all/ignition-%%FUEL_TOOLS_IGN_VER%%-all-config.cmake -lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%-all/ignition-%%FUEL_TOOLS_IGN_VER%%-all-targets.cmake -lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%/ignition-%%FUEL_TOOLS_IGN_VER%%-config-version.cmake -lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%/ignition-%%FUEL_TOOLS_IGN_VER%%-config.cmake -lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%/ignition-%%FUEL_TOOLS_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%/ignition-%%FUEL_TOOLS_IGN_VER%%-targets.cmake -lib/libignition-%%FUEL_TOOLS_IGN_VER%%.so -lib/libignition-%%FUEL_TOOLS_IGN_VER%%.so.1 -lib/libignition-%%FUEL_TOOLS_IGN_VER%%.so.1.2.0 -lib/ruby/ignition/cmdfuel1.rb -libdata/pkgconfig/ignition-%%FUEL_TOOLS_IGN_VER%%.pc -share/ignition/fuel1.yaml -share/ignition/fuel_tools/config.yaml -share/ignition/%%FUEL_TOOLS_IGN_VER%%/config.yaml +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/ClientConfig.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/CollectionIdentifier.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/Export.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/FuelClient.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/Helpers.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/HttpMethod.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/Interface.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/JSONParser.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/Model.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/ModelIdentifier.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/ModelIter.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/RestClient.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/Result.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/ResultType.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/ServerConfig.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/WorldIdentifier.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/WorldIter.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/Zip.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/config.hh +include/gz/%%FUEL_TOOLS_IGN_VER%%/gz/fuel_tools/detail/Export.hh +lib/cmake/gz-fuel_tools-all/gz-fuel_tools-all-config-version.cmake +lib/cmake/gz-fuel_tools-all/gz-fuel_tools-all-config.cmake +lib/cmake/gz-fuel_tools-all/gz-fuel_tools-all-targets.cmake +lib/cmake/gz-fuel_tools/gz-fuel_tools-config-version.cmake +lib/cmake/gz-fuel_tools/gz-fuel_tools-config.cmake +lib/cmake/gz-fuel_tools/gz-fuel_tools-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/gz-fuel_tools/gz-fuel_tools-targets.cmake +lib/libgz-fuel_tools.so +lib/libgz-fuel_tools.so.11 +lib/libgz-fuel_tools.so.11.0.0 +lib/ruby/gz/cmdfuel11.rb +libdata/pkgconfig/gz-fuel_tools.pc +share/gz/fuel11.yaml +share/gz/gz2.completion.d/fuel11.bash_completion.sh