commit 77d3fd29a4a597b80aadf98ac56f55a9a6d7f153 Author: Trenton Schulz Date: Tue Nov 5 21:55:36 2019 +0100 Remove the duplicate ports. With this commit there should only be one copy of ROS console bridge, urdfdom, and urdfdom headers. diff --git a/misc/console-bridge/Makefile b/misc/console-bridge/Makefile deleted file mode 100644 index d5fdb7dbdc8a..000000000000 --- a/misc/console-bridge/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $FreeBSD$ - -PORTNAME= console-bridge -DISTVERSION= 0.4.3 -PORTREVISION= 1 -CATEGORIES= misc - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Package for logging that seamlessly pipes into rosconsole - -LICENSE= BSD3CLAUSE - -USES= cmake compiler:c++11-lang -USE_GITHUB= yes -GH_ACCOUNT= ros -GH_PROJECT= ${PORTNAME:S/-/_/} -USE_LDCONFIG= yes - -do-test: - @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDO_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/console-bridge/distinfo b/misc/console-bridge/distinfo deleted file mode 100644 index fb0b71ce9fcd..000000000000 --- a/misc/console-bridge/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1548480405 -SHA256 (ros-console_bridge-0.4.3_GH0.tar.gz) = 9f024a38f0947ed9fa67f58829980c2d90d84740e6de20d75cb00866f07a7a0b -SIZE (ros-console_bridge-0.4.3_GH0.tar.gz) = 254021 diff --git a/misc/console-bridge/files/patch-CMakeLists.txt b/misc/console-bridge/files/patch-CMakeLists.txt deleted file mode 100644 index 9a8d48449053..000000000000 --- a/misc/console-bridge/files/patch-CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- CMakeLists.txt.orig 2018-11-20 07:33:37 UTC -+++ CMakeLists.txt -@@ -116,5 +116,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES - ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge-config.cmake - ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge.pc) - --enable_testing() --add_subdirectory(test) -+if (DO_TESTING) -+ enable_testing() -+ add_subdirectory(test) -+endif() diff --git a/misc/console-bridge/pkg-descr b/misc/console-bridge/pkg-descr deleted file mode 100644 index 94bbbf84750e..000000000000 --- a/misc/console-bridge/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -A ROS-independent package for logging that seamlessly pipes into -rosconsole/rosout for ROS-dependent packages. - -WWW: https://github.com/ros/console_bridge diff --git a/misc/console-bridge/pkg-plist b/misc/console-bridge/pkg-plist deleted file mode 100644 index 4764389fefab..000000000000 --- a/misc/console-bridge/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -include/console_bridge/console.h -include/console_bridge_export.h -lib/console_bridge/cmake/console_bridge-config-version.cmake -lib/console_bridge/cmake/console_bridge-config.cmake -lib/console_bridge/cmake/console_bridge-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/console_bridge/cmake/console_bridge-targets.cmake -lib/libconsole_bridge.so -lib/libconsole_bridge.so.0.4 -libdata/pkgconfig/console_bridge.pc diff --git a/misc/urdfdom-headers/Makefile b/misc/urdfdom-headers/Makefile deleted file mode 100644 index 612830e160f9..000000000000 --- a/misc/urdfdom-headers/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $FreeBSD$ - -PORTNAME= urdfdom-headers -DISTVERSION= 1.0.4 -CATEGORIES= misc - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Unified Robot Description Format (URDF) parser headers - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES= cmake -USE_GITHUB= yes -GH_ACCOUNT= ros -GH_PROJECT= ${PORTNAME:S/-/_/} - -NO_ARCH= yes - -.include diff --git a/misc/urdfdom-headers/distinfo b/misc/urdfdom-headers/distinfo deleted file mode 100644 index 2310d4e585f7..000000000000 --- a/misc/urdfdom-headers/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1562453336 -SHA256 (ros-urdfdom_headers-1.0.4_GH0.tar.gz) = 2b3040a5f4d1e421b32d80540dd1d09fa0ef46c1d4152210ca8753c462b90e31 -SIZE (ros-urdfdom_headers-1.0.4_GH0.tar.gz) = 12470 diff --git a/misc/urdfdom-headers/pkg-descr b/misc/urdfdom-headers/pkg-descr deleted file mode 100644 index fc289a053c90..000000000000 --- a/misc/urdfdom-headers/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -The URDF (U-Robot Description Format) headers provides core data structure -headers for URDF. - -WWW: https://github.com/ros/urdfdom_headers diff --git a/misc/urdfdom-headers/pkg-plist b/misc/urdfdom-headers/pkg-plist deleted file mode 100644 index 794ebc82036b..000000000000 --- a/misc/urdfdom-headers/pkg-plist +++ /dev/null @@ -1,19 +0,0 @@ -include/urdf_exception/exception.h -include/urdf_model/color.h -include/urdf_model/joint.h -include/urdf_model/link.h -include/urdf_model/model.h -include/urdf_model/pose.h -include/urdf_model/twist.h -include/urdf_model/types.h -include/urdf_model/utils.h -include/urdf_model_state/model_state.h -include/urdf_model_state/twist.h -include/urdf_model_state/types.h -include/urdf_sensor/sensor.h -include/urdf_sensor/types.h -include/urdf_world/types.h -include/urdf_world/world.h -lib/urdfdom_headers/cmake/urdfdom_headers-config-version.cmake -lib/urdfdom_headers/cmake/urdfdom_headers-config.cmake -libdata/pkgconfig/urdfdom_headers.pc diff --git a/misc/urdfdom/Makefile b/misc/urdfdom/Makefile deleted file mode 100644 index 541ca40b2611..000000000000 --- a/misc/urdfdom/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $FreeBSD$ - -PORTNAME= urdfdom -DISTVERSION= 1.0.3 -PORTREVISION= 1 -CATEGORIES= misc - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Unified Robot Description Format (URDF) parser - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -BUILD_DEPENDS= urdfdom-headers>0:misc/urdfdom-headers -LIB_DEPENDS= libconsole_bridge.so:misc/console-bridge \ - libtinyxml.so:textproc/tinyxml -RUN_DEPENDS= urdfdom-headers>0:misc/urdfdom-headers - -USES= compiler:c++11-lang cmake -USE_GITHUB= yes -GH_ACCOUNT= ros -USE_LDCONFIG= yes - -do-test: # some tests are known to fail: https://github.com/ros/urdfdom/issues/118 - @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/urdfdom/distinfo b/misc/urdfdom/distinfo deleted file mode 100644 index 00152cc3d737..000000000000 --- a/misc/urdfdom/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1554003815 -SHA256 (ros-urdfdom-1.0.3_GH0.tar.gz) = 839d939fbd91d115f928a6e02334638829c58d9c8ea2f81bfa3faffd233c154c -SIZE (ros-urdfdom-1.0.3_GH0.tar.gz) = 275339 diff --git a/misc/urdfdom/files/patch-CMakeLists.txt b/misc/urdfdom/files/patch-CMakeLists.txt deleted file mode 100644 index b5b361bef441..000000000000 --- a/misc/urdfdom/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- CMakeLists.txt.orig 2018-11-20 07:38:15 UTC -+++ CMakeLists.txt -@@ -56,7 +56,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CM - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - --enable_testing() -+if (BUILD_TESTING) -+ enable_testing() -+endif() - - add_subdirectory(urdf_parser) - diff --git a/misc/urdfdom/files/patch-urdf__parser_CMakeLists.txt b/misc/urdfdom/files/patch-urdf__parser_CMakeLists.txt deleted file mode 100644 index d53215f61936..000000000000 --- a/misc/urdfdom/files/patch-urdf__parser_CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ ---- urdf_parser/CMakeLists.txt.orig 2018-11-14 01:51:13 UTC -+++ urdf_parser/CMakeLists.txt -@@ -25,17 +25,19 @@ add_executable(urdf_to_graphiz src/urdf_ - target_link_libraries(urdf_to_graphiz urdfdom_model) - - # urdf_mem_test is a binary for testing, not a unit test --add_executable(urdf_mem_test test/memtest.cpp) --target_link_libraries(urdf_mem_test urdfdom_model) -+if (BUILD_TESTING) -+ add_executable(urdf_mem_test test/memtest.cpp) -+ target_link_libraries(urdf_mem_test urdfdom_model) -+endif() - --include(CTest) - if(BUILD_TESTING) -+ include(CTest) - add_subdirectory(test) - endif() - - INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR}) - INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR}) --INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test -+INSTALL(TARGETS check_urdf urdf_to_graphiz - DESTINATION ${CMAKE_INSTALL_BINDIR}) - INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) - INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/misc/urdfdom/pkg-descr b/misc/urdfdom/pkg-descr deleted file mode 100644 index 3a46ce9b0740..000000000000 --- a/misc/urdfdom/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -urdf is a C++ parser for the Unified Robot Description Format (URDF), which is -an XML format for representing a robot model. - -WWW: https://wiki.ros.org/urdf diff --git a/misc/urdfdom/pkg-plist b/misc/urdfdom/pkg-plist deleted file mode 100644 index 828c0207755b..000000000000 --- a/misc/urdfdom/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -bin/check_urdf -bin/urdf_to_graphiz -include/urdf_parser/exportdecl.h -include/urdf_parser/urdf_parser.h -lib/liburdfdom_model.so -lib/liburdfdom_model.so.1.0 -lib/liburdfdom_model_state.so -lib/liburdfdom_model_state.so.1.0 -lib/liburdfdom_sensor.so -lib/liburdfdom_sensor.so.1.0 -lib/liburdfdom_world.so -lib/liburdfdom_world.so.1.0 -lib/urdfdom/cmake/urdfdom-config.cmake -libdata/pkgconfig/urdfdom.pc commit bfa5ea07e021c726d3a2f8f8c0ff783a846bc2d0 Author: Trenton Schulz Date: Sun Nov 3 09:08:58 2019 +0100 Update the URDF port to include Yuri's changes. diff --git a/devel/ros-urdfdom/Makefile b/devel/ros-urdfdom/Makefile index f7862ae1e152..7ab9429be6d7 100644 --- a/devel/ros-urdfdom/Makefile +++ b/devel/ros-urdfdom/Makefile @@ -2,23 +2,30 @@ PORTNAME= ros-urdfdom DISTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= trueos@norwegianrockcat.com -COMMENT= URDF parsers +COMMENT= Unified Robot Description Format (URDF) parsers LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${LOCALBASE}/lib/urdfdom_headers/cmake/urdfdom_headers-config.cmake:devel/ros-urdfdom_headers +BUILD_DEPENDS= ros-urdfdom_headers>0:devel/ros-urdfdom_headers LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libconsole_bridge.so:devel/ros-console_bridge +RUN_DEPENDS= ros-urdfdom_headers>0:devel/ros-urdfdom_headers USES= cmake compiler:c++11-lang USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= ros -GH_PROJECT= urdfdom -GH_TAGNAME= 1.0.3 +GH_PROJECT= ${PORTNAME:S/ros-//} + +do-test: # some tests are known to fail: https://github.com/ros/urdfdom/issues/118 + @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/devel/ros-urdfdom/files/patch-CMakeLists.txt b/devel/ros-urdfdom/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..b5b361bef441 --- /dev/null +++ b/devel/ros-urdfdom/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2018-11-20 07:38:15 UTC ++++ CMakeLists.txt +@@ -56,7 +56,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CM + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") + +-enable_testing() ++if (BUILD_TESTING) ++ enable_testing() ++endif() + + add_subdirectory(urdf_parser) + diff --git a/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt b/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt new file mode 100644 index 000000000000..d53215f61936 --- /dev/null +++ b/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt @@ -0,0 +1,26 @@ +--- urdf_parser/CMakeLists.txt.orig 2018-11-14 01:51:13 UTC ++++ urdf_parser/CMakeLists.txt +@@ -25,17 +25,19 @@ add_executable(urdf_to_graphiz src/urdf_ + target_link_libraries(urdf_to_graphiz urdfdom_model) + + # urdf_mem_test is a binary for testing, not a unit test +-add_executable(urdf_mem_test test/memtest.cpp) +-target_link_libraries(urdf_mem_test urdfdom_model) ++if (BUILD_TESTING) ++ add_executable(urdf_mem_test test/memtest.cpp) ++ target_link_libraries(urdf_mem_test urdfdom_model) ++endif() + +-include(CTest) + if(BUILD_TESTING) ++ include(CTest) + add_subdirectory(test) + endif() + + INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR}) + INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test ++INSTALL(TARGETS check_urdf urdf_to_graphiz + DESTINATION ${CMAKE_INSTALL_BINDIR}) + INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) + INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) commit aa7873339beba902888b5c2bf43d7f60cd9a78a8 Author: Trenton Schulz Date: Sun Nov 3 08:58:55 2019 +0100 Update the ros-urdfdom_headers to match what yuri had. It is noarch, so that seems correct. diff --git a/devel/ros-urdfdom_headers/Makefile b/devel/ros-urdfdom_headers/Makefile index 3d3d96badabd..3432e10b9e4f 100644 --- a/devel/ros-urdfdom_headers/Makefile +++ b/devel/ros-urdfdom_headers/Makefile @@ -2,10 +2,11 @@ PORTNAME= ros-urdfdom_headers DISTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= trueos@norwegianrockcat.com -COMMENT= Headers for URDF parsers +COMMENT= Headers for Unified Robot Description Format (URDF) parsers LICENSE= BSD3CLAUSE @@ -13,6 +14,8 @@ USES= cmake USE_GITHUB= yes GH_ACCOUNT= ros -GH_PROJECT= urdfdom_headers +GH_PROJECT= ${PORTNAME:S/ros-//} + +NO_ARCH= yes .include commit f2046ab0cde861fc8abb012ad63a0ea976719682 Author: Trenton Schulz Date: Sun Nov 3 08:52:59 2019 +0100 Incorporate the changes from yuri. This includes adding a test target. diff --git a/devel/ros-console_bridge/Makefile b/devel/ros-console_bridge/Makefile index a86fa9cd41cb..1911b62b7e5e 100644 --- a/devel/ros-console_bridge/Makefile +++ b/devel/ros-console_bridge/Makefile @@ -2,9 +2,10 @@ PORTNAME= ros-console_bridge DISTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= devel -MAINTAINER= trentonw@ifi.uio.no +MAINTAINER= trueos@norwegianrockcat.com COMMENT= ROS-independent logging that pipes into ROS packages LICENSE= BSD3CLAUSE @@ -14,6 +15,12 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= ros -GH_PROJECT= console_bridge +GH_PROJECT= ${PORTNAME:S/ros-//} + +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDO_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/devel/ros-console_bridge/files/patch-CMakeLists.txt b/devel/ros-console_bridge/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..9a8d48449053 --- /dev/null +++ b/devel/ros-console_bridge/files/patch-CMakeLists.txt @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2018-11-20 07:33:37 UTC ++++ CMakeLists.txt +@@ -116,5 +116,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES + ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge-config.cmake + ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge.pc) + +-enable_testing() +-add_subdirectory(test) ++if (DO_TESTING) ++ enable_testing() ++ add_subdirectory(test) ++endif()