Attachment #208893 for bug #241744

View | Details | Raw Unified | Return to bug 241744
Collapse All | Expand All




# $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 <bsd.port.mk>

Removed Link Here

(-)a/misc/console-bridge/distinfo (-3 lines)
1	TIMESTAMP = 1548480405
2	SHA256 (ros-console_bridge-0.4.3_GH0.tar.gz) = 9f024a38f0947ed9fa67f58829980c2d90d84740e6de20d75cb00866f07a7a0b
3	SIZE (ros-console_bridge-0.4.3_GH0.tar.gz) = 254021




--- 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()

Removed Link Here

(-)a/misc/console-bridge/pkg-descr (-4 lines)
1	A ROS-independent package for logging that seamlessly pipes into
2	rosconsole/rosout for ROS-dependent packages.
3
4	WWW: https://github.com/ros/console_bridge

Removed Link Here

(-)a/misc/console-bridge/pkg-plist (-9 lines)
1	include/console_bridge/console.h
2	include/console_bridge_export.h
3	lib/console_bridge/cmake/console_bridge-config-version.cmake
4	lib/console_bridge/cmake/console_bridge-config.cmake
5	lib/console_bridge/cmake/console_bridge-targets-%%CMAKE_BUILD_TYPE%%.cmake
6	lib/console_bridge/cmake/console_bridge-targets.cmake
7	lib/libconsole_bridge.so
8	lib/libconsole_bridge.so.0.4
9	libdata/pkgconfig/console_bridge.pc




# $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 <bsd.port.mk>

Removed Link Here

(-)a/misc/urdfdom-headers/distinfo (-3 lines)
1	TIMESTAMP = 1562453336
2	SHA256 (ros-urdfdom_headers-1.0.4_GH0.tar.gz) = 2b3040a5f4d1e421b32d80540dd1d09fa0ef46c1d4152210ca8753c462b90e31
3	SIZE (ros-urdfdom_headers-1.0.4_GH0.tar.gz) = 12470

Removed Link Here

(-)a/misc/urdfdom-headers/pkg-descr (-4 lines)
1	The URDF (U-Robot Description Format) headers provides core data structure
2	headers for URDF.
3
4	WWW: https://github.com/ros/urdfdom_headers




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




# $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 <bsd.port.mk>

Removed Link Here

(-)a/misc/urdfdom/distinfo (-3 lines)
1	TIMESTAMP = 1554003815
2	SHA256 (ros-urdfdom-1.0.3_GH0.tar.gz) = 839d939fbd91d115f928a6e02334638829c58d9c8ea2f81bfa3faffd233c154c
3	SIZE (ros-urdfdom-1.0.3_GH0.tar.gz) = 275339




--- 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)
 




--- 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})

Removed Link Here

(-)a/misc/urdfdom/pkg-descr (-4 lines)
1	urdf is a C++ parser for the Unified Robot Description Format (URDF), which is
2	an XML format for representing a robot model.
3
4	WWW: https://wiki.ros.org/urdf




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
   Update the URDF port to include Yuri's changes.





PORTNAME=	ros-urdfdom
DISTVERSION=	1.0.3
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	trueos@norwegianrockcat.com
COMMENT=	Unified Robot Description Format (URDF) parsers

LICENSE=	BSD3CLAUSE

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=	${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>




--- 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)
 




--- 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})
   Update the ros-urdfdom_headers to match what yuri had.
   
   It is noarch, so that seems correct.





PORTNAME=	ros-urdfdom_headers
DISTVERSION=	1.0.4
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	trueos@norwegianrockcat.com
COMMENT=	Headers for Unified Robot Description Format (URDF) parsers

LICENSE=	BSD3CLAUSE


USE_GITHUB=	yes

GH_ACCOUNT=	ros
GH_PROJECT=	${PORTNAME:S/ros-//}

NO_ARCH=	yes

.include <bsd.port.mk>
   Incorporate the changes from yuri.
   
   This includes adding a test target.





PORTNAME=	ros-console_bridge
DISTVERSION=	0.4.3
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	trueos@norwegianrockcat.com
COMMENT=	ROS-independent logging that pipes into ROS packages

LICENSE=	BSD3CLAUSE

USE_LDCONFIG=	yes

GH_ACCOUNT=	ros
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>




--- 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()

Return to bug 241744

Removed Link Here

(-)a/misc/console-bridge/Makefile (-25 lines)
1	# $FreeBSD$
2
3	PORTNAME= console-bridge
4	DISTVERSION= 0.4.3
5	PORTREVISION= 1
6	CATEGORIES= misc
7
8	MAINTAINER= yuri@FreeBSD.org
9	COMMENT= Package for logging that seamlessly pipes into rosconsole
10
11	LICENSE= BSD3CLAUSE
12
13	USES= cmake compiler:c++11-lang
14	USE_GITHUB= yes
15	GH_ACCOUNT= ros
16	GH_PROJECT= ${PORTNAME:S/-/_/}
17	USE_LDCONFIG= yes
18
19	do-test:
20	@cd ${BUILD_WRKSRC} && \
21	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDO_TESTING=ON ${CMAKE_SOURCE_PATH} && \
22	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
23	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
24
25	.include <bsd.port.mk>

Removed Link Here

(-)a/misc/console-bridge/files/patch-CMakeLists.txt (-12 lines)
1	--- CMakeLists.txt.orig 2018-11-20 07:33:37 UTC
2	+++ CMakeLists.txt
3	@@ -116,5 +116,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES
4	ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge-config.cmake
5	ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge.pc)
6
7	-enable_testing()
8	-add_subdirectory(test)
9	+if (DO_TESTING)
10	+ enable_testing()
11	+ add_subdirectory(test)
12	+endif()

Removed Link Here

(-)a/misc/urdfdom-headers/Makefile (-20 lines)
1	# $FreeBSD$
2
3	PORTNAME= urdfdom-headers
4	DISTVERSION= 1.0.4
5	CATEGORIES= misc
6
7	MAINTAINER= yuri@FreeBSD.org
8	COMMENT= Unified Robot Description Format (URDF) parser headers
9
10	LICENSE= BSD3CLAUSE
11	LICENSE_FILE= ${WRKSRC}/LICENSE
12
13	USES= cmake
14	USE_GITHUB= yes
15	GH_ACCOUNT= ros
16	GH_PROJECT= ${PORTNAME:S/-/_/}
17
18	NO_ARCH= yes
19
20	.include <bsd.port.mk>

Removed Link Here

(-)a/misc/urdfdom-headers/pkg-plist (-19 lines)
1	include/urdf_exception/exception.h
2	include/urdf_model/color.h
3	include/urdf_model/joint.h
4	include/urdf_model/link.h
5	include/urdf_model/model.h
6	include/urdf_model/pose.h
7	include/urdf_model/twist.h
8	include/urdf_model/types.h
9	include/urdf_model/utils.h
10	include/urdf_model_state/model_state.h
11	include/urdf_model_state/twist.h
12	include/urdf_model_state/types.h
13	include/urdf_sensor/sensor.h
14	include/urdf_sensor/types.h
15	include/urdf_world/types.h
16	include/urdf_world/world.h
17	lib/urdfdom_headers/cmake/urdfdom_headers-config-version.cmake
18	lib/urdfdom_headers/cmake/urdfdom_headers-config.cmake
19	libdata/pkgconfig/urdfdom_headers.pc

Removed Link Here

(-)a/misc/urdfdom/Makefile (-30 lines)
1	# $FreeBSD$
2
3	PORTNAME= urdfdom
4	DISTVERSION= 1.0.3
5	PORTREVISION= 1
6	CATEGORIES= misc
7
8	MAINTAINER= yuri@FreeBSD.org
9	COMMENT= Unified Robot Description Format (URDF) parser
10
11	LICENSE= BSD3CLAUSE
12	LICENSE_FILE= ${WRKSRC}/LICENSE
13
14	BUILD_DEPENDS= urdfdom-headers>0:misc/urdfdom-headers
15	LIB_DEPENDS= libconsole_bridge.so:misc/console-bridge \
16	libtinyxml.so:textproc/tinyxml
17	RUN_DEPENDS= urdfdom-headers>0:misc/urdfdom-headers
18
19	USES= compiler:c++11-lang cmake
20	USE_GITHUB= yes
21	GH_ACCOUNT= ros
22	USE_LDCONFIG= yes
23
24	do-test: # some tests are known to fail: https://github.com/ros/urdfdom/issues/118
25	@cd ${BUILD_WRKSRC} && \
26	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
27	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
28	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
29
30	.include <bsd.port.mk>

Removed Link Here

(-)a/misc/urdfdom/files/patch-CMakeLists.txt (-13 lines)
1	--- CMakeLists.txt.orig 2018-11-20 07:38:15 UTC
2	+++ CMakeLists.txt
3	@@ -56,7 +56,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CM
4	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
5	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
6
7	-enable_testing()
8	+if (BUILD_TESTING)
9	+ enable_testing()
10	+endif()
11
12	add_subdirectory(urdf_parser)
13

Removed Link Here

(-)a/misc/urdfdom/files/patch-urdf__parser_CMakeLists.txt (-26 lines)
1	--- urdf_parser/CMakeLists.txt.orig 2018-11-14 01:51:13 UTC
2	+++ urdf_parser/CMakeLists.txt
3	@@ -25,17 +25,19 @@ add_executable(urdf_to_graphiz src/urdf_
4	target_link_libraries(urdf_to_graphiz urdfdom_model)
5
6	# urdf_mem_test is a binary for testing, not a unit test
7	-add_executable(urdf_mem_test test/memtest.cpp)
8	-target_link_libraries(urdf_mem_test urdfdom_model)
9	+if (BUILD_TESTING)
10	+ add_executable(urdf_mem_test test/memtest.cpp)
11	+ target_link_libraries(urdf_mem_test urdfdom_model)
12	+endif()
13
14	-include(CTest)
15	if(BUILD_TESTING)
16	+ include(CTest)
17	add_subdirectory(test)
18	endif()
19
20	INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR})
21	INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR})
22	-INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test
23	+INSTALL(TARGETS check_urdf urdf_to_graphiz
24	DESTINATION ${CMAKE_INSTALL_BINDIR})
25	INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR})
26	INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR})

Removed Link Here

(-)a/misc/urdfdom/pkg-plist (-14 lines)
1	bin/check_urdf
2	bin/urdf_to_graphiz
3	include/urdf_parser/exportdecl.h
4	include/urdf_parser/urdf_parser.h
5	lib/liburdfdom_model.so
6	lib/liburdfdom_model.so.1.0
7	lib/liburdfdom_model_state.so
8	lib/liburdfdom_model_state.so.1.0
9	lib/liburdfdom_sensor.so
10	lib/liburdfdom_sensor.so.1.0
11	lib/liburdfdom_world.so
12	lib/liburdfdom_world.so.1.0
13	lib/urdfdom/cmake/urdfdom-config.cmake
14	libdata/pkgconfig/urdfdom.pc
15	Update the URDF port to include Yuri's changes.	0	Update the URDF port to include Yuri's changes.

Lines 2-24 Link Here

(-)b/devel/ros-urdfdom/Makefile (-4 / +11 lines)
2		2
3	PORTNAME= ros-urdfdom	3	PORTNAME= ros-urdfdom
4	DISTVERSION= 1.0.3	4	DISTVERSION= 1.0.3
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6		7
7	MAINTAINER= trueos@norwegianrockcat.com	8	MAINTAINER= trueos@norwegianrockcat.com
8	COMMENT= URDF parsers	9	COMMENT= Unified Robot Description Format (URDF) parsers
9		10
10	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
11		12
12	BUILD_DEPENDS= ${LOCALBASE}/lib/urdfdom_headers/cmake/urdfdom_headers-config.cmake:devel/ros-urdfdom_headers	13	BUILD_DEPENDS= ros-urdfdom_headers>0:devel/ros-urdfdom_headers
13	LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \	14	LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \
14	libconsole_bridge.so:devel/ros-console_bridge	15	libconsole_bridge.so:devel/ros-console_bridge
		16	RUN_DEPENDS= ros-urdfdom_headers>0:devel/ros-urdfdom_headers
15		17
16	USES= cmake compiler:c++11-lang	18	USES= cmake compiler:c++11-lang
17	USE_GITHUB= yes	19	USE_GITHUB= yes
18	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
19		21
20	GH_ACCOUNT= ros	22	GH_ACCOUNT= ros
21	GH_PROJECT= urdfdom	23	GH_PROJECT= ${PORTNAME:S/ros-//}
22	GH_TAGNAME= 1.0.3	24
		25	do-test: # some tests are known to fail: https://github.com/ros/urdfdom/issues/118
		26	@cd ${BUILD_WRKSRC} && \
		27	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
		28	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
		29	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
23		30
24	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Added Link Here

(-)b/devel/ros-urdfdom/files/patch-CMakeLists.txt (+13 lines)
1	--- CMakeLists.txt.orig 2018-11-20 07:38:15 UTC
2	+++ CMakeLists.txt
3	@@ -56,7 +56,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CM
4	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
5	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
6
7	-enable_testing()
8	+if (BUILD_TESTING)
9	+ enable_testing()
10	+endif()
11
12	add_subdirectory(urdf_parser)
13

Added Link Here

(-)b/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt (+26 lines)
1	--- urdf_parser/CMakeLists.txt.orig 2018-11-14 01:51:13 UTC
2	+++ urdf_parser/CMakeLists.txt
3	@@ -25,17 +25,19 @@ add_executable(urdf_to_graphiz src/urdf_
4	target_link_libraries(urdf_to_graphiz urdfdom_model)
5
6	# urdf_mem_test is a binary for testing, not a unit test
7	-add_executable(urdf_mem_test test/memtest.cpp)
8	-target_link_libraries(urdf_mem_test urdfdom_model)
9	+if (BUILD_TESTING)
10	+ add_executable(urdf_mem_test test/memtest.cpp)
11	+ target_link_libraries(urdf_mem_test urdfdom_model)
12	+endif()
13
14	-include(CTest)
15	if(BUILD_TESTING)
16	+ include(CTest)
17	add_subdirectory(test)
18	endif()
19
20	INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR})
21	INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR})
22	-INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test
23	+INSTALL(TARGETS check_urdf urdf_to_graphiz
24	DESTINATION ${CMAKE_INSTALL_BINDIR})
25	INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR})
26	INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR})
0	Update the ros-urdfdom_headers to match what yuri had.	27	Update the ros-urdfdom_headers to match what yuri had.
1		28
2	It is noarch, so that seems correct.	29	It is noarch, so that seems correct.

Lines 2-11 Link Here

(-)b/devel/ros-urdfdom_headers/Makefile (-2 / +5 lines)
2		2
3	PORTNAME= ros-urdfdom_headers	3	PORTNAME= ros-urdfdom_headers
4	DISTVERSION= 1.0.4	4	DISTVERSION= 1.0.4
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6		7
7	MAINTAINER= trueos@norwegianrockcat.com	8	MAINTAINER= trueos@norwegianrockcat.com
8	COMMENT= Headers for URDF parsers	9	COMMENT= Headers for Unified Robot Description Format (URDF) parsers
9		10
10	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
11		12
Lines 13-18 USES= cmake Link Here
13	USE_GITHUB= yes	14	USE_GITHUB= yes
14		15
15	GH_ACCOUNT= ros	16	GH_ACCOUNT= ros
16	GH_PROJECT= urdfdom_headers	17	GH_PROJECT= ${PORTNAME:S/ros-//}
		18
		19	NO_ARCH= yes
17		20
18	.include <bsd.port.mk>	21	.include <bsd.port.mk>
19	Incorporate the changes from yuri.	22	Incorporate the changes from yuri.
20		23
21	This includes adding a test target.	24	This includes adding a test target.

Lines 2-10 Link Here

(-)b/devel/ros-console_bridge/Makefile (-2 / +9 lines)
2		2
3	PORTNAME= ros-console_bridge	3	PORTNAME= ros-console_bridge
4	DISTVERSION= 0.4.3	4	DISTVERSION= 0.4.3
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6		7
7	MAINTAINER= trentonw@ifi.uio.no	8	MAINTAINER= trueos@norwegianrockcat.com
8	COMMENT= ROS-independent logging that pipes into ROS packages	9	COMMENT= ROS-independent logging that pipes into ROS packages
9		10
10	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
Lines 14-19 USE_GITHUB= yes Link Here
14	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
15		16
16	GH_ACCOUNT= ros	17	GH_ACCOUNT= ros
17	GH_PROJECT= console_bridge	18	GH_PROJECT= ${PORTNAME:S/ros-//}
		19
		20	do-test:
		21	@cd ${BUILD_WRKSRC} && \
		22	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDO_TESTING=ON ${CMAKE_SOURCE_PATH} && \
		23	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
		24	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
18		25
19	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Added Link Here

(-)b/devel/ros-console_bridge/files/patch-CMakeLists.txt (+12 lines)
1	--- CMakeLists.txt.orig 2018-11-20 07:33:37 UTC
2	+++ CMakeLists.txt
3	@@ -116,5 +116,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES
4	ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge-config.cmake
5	ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge.pc)
6
7	-enable_testing()
8	-add_subdirectory(test)
9	+if (DO_TESTING)
10	+ enable_testing()
11	+ add_subdirectory(test)
12	+endif()