svn commit: r518357 - in head: . devel/ros-console_bridge devel/ros-console_bridge/files devel/ros-urdfdom devel/ros-urdfdom/files devel/ros-urdfdom_headers misc/console-bridge misc/urdfdom misc/ur...
Kurt Jaeger
pi at FreeBSD.org
Sun Nov 24 19:53:42 UTC 2019
Author: pi
Date: Sun Nov 24 19:53:39 2019
New Revision: 518357
URL: https://svnweb.freebsd.org/changeset/ports/518357
Log:
merge duplicate ROS-related ports in devel and misc
There are currently duplicate ports for ROS:
devel/ros-console_bridge and misc/console-bridge
devel/ros-urdfdom and misc/urdfdom
devel/ros-urdfdom_headers and misc/urdfdom-headers
This patch merges the misc ports into the devel ports. The upshot
should be that the duplication and confusion is removed but we keep
the functionality.
PR: 241744
Submitted by: Trenton Schulz <trueos at norwegianrockcat.com> (maintainer)
Approved by: yuri (maintainer of the duplicate ports)
Added:
head/devel/ros-console_bridge/files/
head/devel/ros-console_bridge/files/patch-CMakeLists.txt (contents, props changed)
head/devel/ros-urdfdom/files/
head/devel/ros-urdfdom/files/patch-CMakeLists.txt (contents, props changed)
head/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt (contents, props changed)
Deleted:
head/misc/console-bridge/
head/misc/urdfdom/
head/misc/urdfdom-headers/
Modified:
head/MOVED
head/devel/ros-console_bridge/Makefile
head/devel/ros-urdfdom/Makefile
head/devel/ros-urdfdom/pkg-plist
head/devel/ros-urdfdom_headers/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Sun Nov 24 19:49:45 2019 (r518356)
+++ head/MOVED Sun Nov 24 19:53:39 2019 (r518357)
@@ -13498,3 +13498,6 @@ www/httpdirfs|sysutils/fusefs-httpdirfs|2019-11-23|Ren
math/tvm|misc/tvm|2019-11-24|Move to a more appropriate category
math/onnx|misc/onnx|2019-11-24|Move to a more appropriate category
math/py-onnx-tf|misc/py-onnx-tf|2019-11-24|Move to a more appropriate category
+misc/console-bridge|devel/ros-console_bridge|2019-11-24|Use devel/ros-console_bridge instead
+misc/urdfdom-headers|devel/ros-urdfdom_headers|2019-11-24|Use devel/ros-urdfdom_headers instead
+misc/urdfdom|devel/ros-urdfdom|2019-11-24|Use devel/ros-urdfdom instead
Modified: head/devel/ros-console_bridge/Makefile
==============================================================================
--- head/devel/ros-console_bridge/Makefile Sun Nov 24 19:49:45 2019 (r518356)
+++ head/devel/ros-console_bridge/Makefile Sun Nov 24 19:53:39 2019 (r518357)
@@ -2,9 +2,10 @@
PORTNAME= ros-console_bridge
DISTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= devel
-MAINTAINER= trentonw at ifi.uio.no
+MAINTAINER= trueos at 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 <bsd.port.mk>
Added: head/devel/ros-console_bridge/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ros-console_bridge/files/patch-CMakeLists.txt Sun Nov 24 19:53:39 2019 (r518357)
@@ -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()
Modified: head/devel/ros-urdfdom/Makefile
==============================================================================
--- head/devel/ros-urdfdom/Makefile Sun Nov 24 19:49:45 2019 (r518356)
+++ head/devel/ros-urdfdom/Makefile Sun Nov 24 19:53:39 2019 (r518357)
@@ -2,23 +2,30 @@
PORTNAME= ros-urdfdom
DISTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= trueos at 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 <bsd.port.mk>
Added: head/devel/ros-urdfdom/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ros-urdfdom/files/patch-CMakeLists.txt Sun Nov 24 19:53:39 2019 (r518357)
@@ -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)
+
Added: head/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt Sun Nov 24 19:53:39 2019 (r518357)
@@ -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})
Modified: head/devel/ros-urdfdom/pkg-plist
==============================================================================
--- head/devel/ros-urdfdom/pkg-plist Sun Nov 24 19:49:45 2019 (r518356)
+++ head/devel/ros-urdfdom/pkg-plist Sun Nov 24 19:53:39 2019 (r518357)
@@ -1,5 +1,4 @@
bin/check_urdf
-bin/urdf_mem_test
bin/urdf_to_graphiz
include/urdf_parser/exportdecl.h
include/urdf_parser/urdf_parser.h
Modified: head/devel/ros-urdfdom_headers/Makefile
==============================================================================
--- head/devel/ros-urdfdom_headers/Makefile Sun Nov 24 19:49:45 2019 (r518356)
+++ head/devel/ros-urdfdom_headers/Makefile Sun Nov 24 19:53:39 2019 (r518357)
@@ -2,10 +2,11 @@
PORTNAME= ros-urdfdom_headers
DISTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= trueos at 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 <bsd.port.mk>
More information about the svn-ports-head
mailing list