4 files changed, 14 insertions, 16 deletions

diff --git a/devel/ros_comm/Makefile b/devel/ros_comm/Makefile
index 09dd8a3664b4..bf208e9fb736 100644
--- a/devel/ros_comm/Makefile
+++ b/devel/ros_comm/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	ros_comm
-PORTVERSION=	1.4.5
+PORTVERSION=	1.4.6
 CATEGORIES=	devel
-MASTER_SITES=	https://code.ros.org/svn/release/download/stacks/ros_comm/ros_comm-${PORTVERSION}/
+MASTER_SITES=	https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/
 DIST_SUBDIR=	ros
 
 MAINTAINER=	rene@FreeBSD.org
@@ -15,7 +15,7 @@ COMMENT=	Robot Operating System - communication-related utilities
 
 #LICENSE=       BSD LGPL #which?
 
-STACKNAME=	${PORTNAME}
+STACKNAME=	${PORTNAME:S/ros-//}
 
 CFLAGS+=	-I${LOCALBASE}/include
 LIB_DEPENDS=	log4cxx.10:${PORTSDIR}/devel/log4cxx
diff --git a/devel/ros_comm/distinfo b/devel/ros_comm/distinfo
index c42d8854b7fe..15cc0c0d85db 100644
--- a/devel/ros_comm/distinfo
+++ b/devel/ros_comm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ros/ros_comm-1.4.5.tar.bz2) = cddcc8a540b6eec90c9f9ffc8b7495c31feeffb95c3f48e7bfb6fd8659afeeae
-SIZE (ros/ros_comm-1.4.5.tar.bz2) = 772244
+SHA256 (ros/ros_comm-1.4.6.tar.bz2) = a31c6ce8b4b7349056a5020b57f85865fdb982b2777ec01ea18f386f856e6af6
+SIZE (ros/ros_comm-1.4.6.tar.bz2) = 774477
diff --git a/devel/ros_comm/files/patch-test__test_ros__src__test_ros__testSlave.py b/devel/ros_comm/files/patch-test__test_ros__src__test_ros__testSlave.py
deleted file mode 100644
index 0a52a7ddd6d4..000000000000
--- a/devel/ros_comm/files/patch-test__test_ros__src__test_ros__testSlave.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./test/test_ros/src/test_ros/testSlave.py.orig	2011-03-02 01:15:16.000000000 +0100
-+++ ./test/test_ros/src/test_ros/testSlave.py	2011-03-20 15:22:55.000000000 +0100
-@@ -69,7 +69,7 @@
-         # retrieve handle on node
-         self.caller_id = rospy.get_caller_id()
-         self.node_api = self.apiSuccess(self.master.lookupNode(self.caller_id, 'test_node'))
--        self.assert_(self.node_api.startswith('http')
-+        self.assert_(self.node_api.startswith('http'))
-         self.node = xmlrpclib.ServerProxy(self.node_api)
-         
-     def testGetPid(self):
diff --git a/devel/ros_comm/pkg-plist b/devel/ros_comm/pkg-plist
index eee99b4a1011..037e75293d6c 100644
--- a/devel/ros_comm/pkg-plist
+++ b/devel/ros_comm/pkg-plist
@@ -1043,6 +1043,7 @@ ros/stacks/ros_comm/test/test_roscpp/src/latching_publisher.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/loads_of_publishers.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/log.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/log_aftermain.cpp
+ros/stacks/ros_comm/test/test_roscpp/src/logs_after_shutdown.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/multiple_init_fini.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/multiple_subscriptions.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/name_remapping.cpp
@@ -1080,6 +1081,8 @@ ros/stacks/ros_comm/test/test_roscpp/src/subscribe_star.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/subscribe_unsubscribe.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/subscribe_unsubscribe_repeatedly.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/subscription_callback_types.cpp
+ros/stacks/ros_comm/test/test_roscpp/src/test_ns_node_remapping.cpp
+ros/stacks/ros_comm/test/test_roscpp/src/test_remapping.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/test_roscpp/__init__.py
 ros/stacks/ros_comm/test/test_roscpp/src/test_roscpp/__init__.pyc
 ros/stacks/ros_comm/test/test_roscpp/src/test_roscpp/__init__.pyo
@@ -1107,6 +1110,7 @@ ros/stacks/ros_comm/test/test_roscpp/src/test_roscpp/srv/_TestStringString.pyo
 ros/stacks/ros_comm/test/test_roscpp/src/test_roscpp/srv/__init__.py
 ros/stacks/ros_comm/test/test_roscpp/src/test_roscpp/srv/__init__.pyc
 ros/stacks/ros_comm/test/test_roscpp/src/test_roscpp/srv/__init__.pyo
+ros/stacks/ros_comm/test/test_roscpp/src/test_search_param.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/timer_callbacks.cpp
 ros/stacks/ros_comm/test/test_roscpp/src/wait_for_message.cpp
 ros/stacks/ros_comm/test/test_roscpp/srv/BadTestStringString.srv
@@ -1123,18 +1127,22 @@ ros/stacks/ros_comm/test/test_roscpp/srv_gen/lisp/test_roscpp-srv.asd
 ros/stacks/ros_comm/test/test_roscpp/test/CMakeLists.txt
 ros/stacks/ros_comm/test/test_roscpp/test/check_master.xml
 ros/stacks/ros_comm/test/test_roscpp/test/get_master_information.xml
+ros/stacks/ros_comm/test/test_roscpp/test/global_remappings.xml
 ros/stacks/ros_comm/test/test_roscpp/test/handles.xml
 ros/stacks/ros_comm/test/test_roscpp/test/incrementing_sequence.xml
 ros/stacks/ros_comm/test/test_roscpp/test/inspection.xml
 ros/stacks/ros_comm/test/test_roscpp/test/intraprocess_subscriptions.xml
 ros/stacks/ros_comm/test/test_roscpp/test/latching_publisher.xml
 ros/stacks/ros_comm/test/test_roscpp/test/loads_of_publishers.xml
+ros/stacks/ros_comm/test/test_roscpp/test/local_remappings.xml
 ros/stacks/ros_comm/test/test_roscpp/test/log.xml
 ros/stacks/ros_comm/test/test_roscpp/test/multiple_init_fini.xml
 ros/stacks/ros_comm/test/test_roscpp/test/multiple_subscriptions.xml
 ros/stacks/ros_comm/test/test_roscpp/test/name_remapping.xml
 ros/stacks/ros_comm/test/test_roscpp/test/namespaces.xml
+ros/stacks/ros_comm/test/test_roscpp/test/no_remappings.xml
 ros/stacks/ros_comm/test/test_roscpp/test/nonconst_subscriptions.xml
+ros/stacks/ros_comm/test/test_roscpp/test/ns_node_remapping.xml
 ros/stacks/ros_comm/test/test_roscpp/test/parameter_validation.xml
 ros/stacks/ros_comm/test/test_roscpp/test/params.xml
 ros/stacks/ros_comm/test/test_roscpp/test/pingpong.xml
@@ -1149,6 +1157,7 @@ ros/stacks/ros_comm/test/test_roscpp/test/pubsub_resub_once.xml
 ros/stacks/ros_comm/test/test_roscpp/test/pubsub_unadv.xml
 ros/stacks/ros_comm/test/test_roscpp/test/pubsub_unsub.xml
 ros/stacks/ros_comm/test/test_roscpp/test/real_time_test.xml
+ros/stacks/ros_comm/test/test_roscpp/test/search_param.xml
 ros/stacks/ros_comm/test/test_roscpp/test/service_adv_multiple.xml
 ros/stacks/ros_comm/test/test_roscpp/test/service_call.xml
 ros/stacks/ros_comm/test/test_roscpp/test/service_call_unadv.xml