From owner-svn-ports-all@freebsd.org Sun Nov 24 19:53:42 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 24C371B90B7; Sun, 24 Nov 2019 19:53:42 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47LgpG01YLz4PVY; Sun, 24 Nov 2019 19:53:42 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D91F3136F; Sun, 24 Nov 2019 19:53:41 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAOJrfNq015549; Sun, 24 Nov 2019 19:53:41 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAOJreZL015540; Sun, 24 Nov 2019 19:53:40 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201911241953.xAOJreZL015540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 24 Nov 2019 19:53:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: 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... X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: 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/urdfdom-headers X-SVN-Commit-Revision: 518357 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2019 19:53:42 -0000 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 (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@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 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@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 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@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