svn commit: r331176 - in head/devel/ros_comm: . files

[Mikhail Teterin]

Author: mi
Date: Mon Oct 21 19:24:14 2013
New Revision: 331176
URL: http://svnweb.freebsd.org/changeset/ports/331176

Log:
  Attempt to unbreak by adding a few patches. The port could stand upgrading
  to 1.6.7 (from the current 1.4.8), but that may require cooperation with the
  other ROS-ports.

Added:
  head/devel/ros_comm/files/patch-TIME_UTC   (contents, props changed)
  head/devel/ros_comm/files/patch-stdarg   (contents, props changed)
Modified:
  head/devel/ros_comm/Makefile

Modified: head/devel/ros_comm/Makefile
==============================================================================
--- head/devel/ros_comm/Makefile	Mon Oct 21 19:16:24 2013	(r331175)
+++ head/devel/ros_comm/Makefile	Mon Oct 21 19:24:14 2013	(r331176)
@@ -10,14 +10,9 @@ DIST_SUBDIR=	ros
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Robot Operating System - communication-related utilities
 
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2013-11-18
+LICENSE=	BSD
 
-#LICENSE=       BSD LGPL #which?
-
-BROKEN=		does not build
-
-STACKNAME=	${PORTNAME:S/ros-//}
+STACKNAME=	${PORTNAME}
 
 CFLAGS+=	-I${LOCALBASE}/include
 LIB_DEPENDS=	log4cxx.10:${PORTSDIR}/devel/log4cxx

Added: head/devel/ros_comm/files/patch-TIME_UTC
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ros_comm/files/patch-TIME_UTC	Mon Oct 21 19:24:14 2013	(r331176)
@@ -0,0 +1,15 @@
+--- tools/rosbag/src/recorder.cpp	2011-09-02 13:55:20.000000000 -0400
++++ tools/rosbag/src/recorder.cpp	2013-10-21 14:22:48.000000000 -0400
+@@ -437,5 +437,11 @@
+             }
+             boost::xtime xt;
+-            boost::xtime_get(&xt, boost::TIME_UTC);
++            boost::xtime_get(&xt, boost::
++#if BOOST_VERSION <= 105200
++		TIME_UTC_
++#else
++		TIME_UTC
++#endif
++		);
+             xt.nsec += 250000000;
+             queue_condition_.timed_wait(lock, xt);

Added: head/devel/ros_comm/files/patch-stdarg
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ros_comm/files/patch-stdarg	Mon Oct 21 19:24:14 2013	(r331176)
@@ -0,0 +1,9 @@
+--- tools/rosconsole/include/ros/console.h	2011-09-02 13:55:20.000000000 -0400
++++ tools/rosconsole/include/ros/console.h	2013-10-21 14:24:56.000000000 -0400
+@@ -37,4 +37,6 @@
+ #include <ros/time.h>
+ 
++#include <stdarg.h>
++
+ // TODO: this header is no longer needed to be included here, but removing it will break various code that incorrectly does not itself include log4cxx/logger.h
+ // We should vet all the code using log4cxx directly and make sure the includes/link flags are used in those packages, and then we can remove this include