- Use WRKSRC instead of WRKDIR in the MAKE environment to point to the

  build directory
- No need to make scripts in */src/* executable
- Don't move libraries to PREFIX/lib but symlink them there, some Python
  modules depend on the libraries in their original location
- Sort pkg-plist
- Bump PORTREVISION

4 files changed, 26 insertions, 116 deletions

diff --git a/devel/common_msgs/Makefile b/devel/common_msgs/Makefile
index 7282a287d917..6849b67e3220 100644
--- a/devel/common_msgs/Makefile
+++ b/devel/common_msgs/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	common_msgs
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/ros/
 DIST_SUBDIR=	ros
@@ -31,7 +32,7 @@ MAKE_ENV+=	CPATH=${LOCALBASE}/include \
 		LIBRARY_PATH=${LOCALBASE}/lib \
 		MAKE=${LOCALBASE}/bin/gmake \
 		ROS_ROOT=${LOCALBASE}/ros/ros \
-		ROS_PACKAGE_PATH=${WRKDIR} \
+		ROS_PACKAGE_PATH=${WRKSRC} \
 		PYTHONPATH=${LOCALBASE}/ros/ros/core/roslib/src
 
 MAKE_ARGS=	-i --no-rosdep --status-rate=0 --disable-logging
@@ -52,59 +53,12 @@ do-install:
 .for f in CMakeLists.txt Makefile stack.xml
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/ros/stacks/${PORTNAME}
 .endfor
-#move and strip ELF libaries
-	${MV} ${PREFIX}/ros/stacks/${PORTNAME}/sensor_msgs/lib/libsensor_msgs.so \
+#strip and symlink ELF libraries
+	${STRIP_CMD} ${PREFIX}/ros/stacks/${PORTNAME}/sensor_msgs/lib/libsensor_msgs.so
+	${LN} -s ${PREFIX}/ros/stacks/${PORTNAME}/sensor_msgs/lib/libsensor_msgs.so \
 	    ${PREFIX}/lib
-	${STRIP_CMD} ${PREFIX}/lib/libsensor_msgs.so
-#make scripts executable
+# make scripts executable
 .for f in actionlib_msgs/genaction.py \
-    actionlib_msgs/src/actionlib_msgs/msg/_GoalID.py \
-    actionlib_msgs/src/actionlib_msgs/msg/_GoalStatus.py \
-    actionlib_msgs/src/actionlib_msgs/msg/_GoalStatusArray.py \
-    diagnostic_msgs/src/diagnostic_msgs/msg/_DiagnosticArray.py \
-    diagnostic_msgs/src/diagnostic_msgs/msg/_DiagnosticStatus.py \
-    diagnostic_msgs/src/diagnostic_msgs/msg/_KeyValue.py \
-    diagnostic_msgs/src/diagnostic_msgs/srv/_SelfTest.py \
-    geometry_msgs/src/geometry_msgs/msg/_Point.py \
-    geometry_msgs/src/geometry_msgs/msg/_Point32.py \
-    geometry_msgs/src/geometry_msgs/msg/_PointStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Polygon.py \
-    geometry_msgs/src/geometry_msgs/msg/_PolygonStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Pose.py \
-    geometry_msgs/src/geometry_msgs/msg/_Pose2D.py \
-    geometry_msgs/src/geometry_msgs/msg/_PoseArray.py \
-    geometry_msgs/src/geometry_msgs/msg/_PoseStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_PoseWithCovariance.py \
-    geometry_msgs/src/geometry_msgs/msg/_PoseWithCovarianceStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Quaternion.py \
-    geometry_msgs/src/geometry_msgs/msg/_QuaternionStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Transform.py \
-    geometry_msgs/src/geometry_msgs/msg/_TransformStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Twist.py \
-    geometry_msgs/src/geometry_msgs/msg/_TwistStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_TwistWithCovariance.py \
-    geometry_msgs/src/geometry_msgs/msg/_TwistWithCovarianceStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Vector3.py \
-    geometry_msgs/src/geometry_msgs/msg/_Vector3Stamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Wrench.py \
-    geometry_msgs/src/geometry_msgs/msg/_WrenchStamped.py \
-    nav_msgs/src/nav_msgs/msg/_GridCells.py \
-    nav_msgs/src/nav_msgs/msg/_MapMetaData.py \
-    nav_msgs/src/nav_msgs/msg/_OccupancyGrid.py \
-    nav_msgs/src/nav_msgs/msg/_Odometry.py nav_msgs/src/nav_msgs/msg/_Path.py \
-    nav_msgs/src/nav_msgs/srv/_GetMap.py nav_msgs/src/nav_msgs/srv/_GetPlan.py \
-    sensor_msgs/src/sensor_msgs/msg/_CameraInfo.py \
-    sensor_msgs/src/sensor_msgs/msg/_ChannelFloat32.py \
-    sensor_msgs/src/sensor_msgs/msg/_CompressedImage.py \
-    sensor_msgs/src/sensor_msgs/msg/_Image.py \
-    sensor_msgs/src/sensor_msgs/msg/_Imu.py \
-    sensor_msgs/src/sensor_msgs/msg/_JointState.py \
-    sensor_msgs/src/sensor_msgs/msg/_LaserScan.py \
-    sensor_msgs/src/sensor_msgs/msg/_PointCloud.py \
-    sensor_msgs/src/sensor_msgs/msg/_PointCloud2.py \
-    sensor_msgs/src/sensor_msgs/msg/_PointField.py \
-    sensor_msgs/src/sensor_msgs/msg/_RegionOfInterest.py \
-    sensor_msgs/src/sensor_msgs/srv/_SetCameraInfo.py \
     test_common_msgs/test/test_common_msgs_migration.py
 	${CHMOD} 0555 ${PREFIX}/ros/stacks/${PORTNAME}/${f}
 .endfor
diff --git a/devel/common_msgs/pkg-plist b/devel/common_msgs/pkg-plist
index 1d225cf16cdf..6b0b5a4dbe70 100644
--- a/devel/common_msgs/pkg-plist
+++ b/devel/common_msgs/pkg-plist
@@ -4,7 +4,6 @@ ros/stacks/common_msgs/Makefile
 ros/stacks/common_msgs/actionlib_msgs/CMakeLists.txt
 ros/stacks/common_msgs/actionlib_msgs/Makefile
 ros/stacks/common_msgs/actionlib_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/actionlib_msgs/bin
 ros/stacks/common_msgs/actionlib_msgs/cmake/actionbuild.cmake
 ros/stacks/common_msgs/actionlib_msgs/genaction.py
 ros/stacks/common_msgs/actionlib_msgs/manifest.xml
@@ -34,7 +33,6 @@ ros/stacks/common_msgs/actionlib_msgs/src/actionlib_msgs/msg/__init__.py
 ros/stacks/common_msgs/diagnostic_msgs/CMakeLists.txt
 ros/stacks/common_msgs/diagnostic_msgs/Makefile
 ros/stacks/common_msgs/diagnostic_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/diagnostic_msgs/bin
 ros/stacks/common_msgs/diagnostic_msgs/mainpage.dox
 ros/stacks/common_msgs/diagnostic_msgs/manifest.xml
 ros/stacks/common_msgs/diagnostic_msgs/migration_rules/diagnostic_msgs.bmr
@@ -74,7 +72,6 @@ ros/stacks/common_msgs/diagnostic_msgs/srv_gen/generated
 ros/stacks/common_msgs/geometry_msgs/CMakeLists.txt
 ros/stacks/common_msgs/geometry_msgs/Makefile
 ros/stacks/common_msgs/geometry_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/geometry_msgs/bin
 ros/stacks/common_msgs/geometry_msgs/mainpage.dox
 ros/stacks/common_msgs/geometry_msgs/manifest.xml
 ros/stacks/common_msgs/geometry_msgs/migration_rules/geometry_msgs.bmr
@@ -224,7 +221,6 @@ ros/stacks/common_msgs/geometry_msgs/src/geometry_msgs/msg/__init__.py
 ros/stacks/common_msgs/nav_msgs/CMakeLists.txt
 ros/stacks/common_msgs/nav_msgs/Makefile
 ros/stacks/common_msgs/nav_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/nav_msgs/bin
 ros/stacks/common_msgs/nav_msgs/mainpage.dox
 ros/stacks/common_msgs/nav_msgs/manifest.xml
 ros/stacks/common_msgs/nav_msgs/migration_rules/nav_msgs.bmr
@@ -282,10 +278,10 @@ ros/stacks/common_msgs/nav_msgs/srv_gen/generated
 ros/stacks/common_msgs/sensor_msgs/CMakeLists.txt
 ros/stacks/common_msgs/sensor_msgs/Makefile
 ros/stacks/common_msgs/sensor_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/sensor_msgs/bin
 ros/stacks/common_msgs/sensor_msgs/include/sensor_msgs/fill_image.h
 ros/stacks/common_msgs/sensor_msgs/include/sensor_msgs/image_encodings.h
 ros/stacks/common_msgs/sensor_msgs/include/sensor_msgs/point_cloud_conversion.h
+ros/stacks/common_msgs/sensor_msgs/lib/libsensor_msgs.so
 ros/stacks/common_msgs/sensor_msgs/mainpage.dox
 ros/stacks/common_msgs/sensor_msgs/manifest.xml
 ros/stacks/common_msgs/sensor_msgs/migration_rules/sensor_msgs.bmr
@@ -378,7 +374,6 @@ ros/stacks/common_msgs/stack.xml
 ros/stacks/common_msgs/test_common_msgs/CMakeLists.txt
 ros/stacks/common_msgs/test_common_msgs/Makefile
 ros/stacks/common_msgs/test_common_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/test_common_msgs/bin
 ros/stacks/common_msgs/test_common_msgs/mainpage.dox
 ros/stacks/common_msgs/test_common_msgs/manifest.xml
 ros/stacks/common_msgs/test_common_msgs/test/saved/Acceleration.saved
@@ -420,6 +415,7 @@ ros/stacks/common_msgs/test_common_msgs/test/saved/Wrench.saved
 ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/test_common_msgs/test/saved
 @dirrm ros/stacks/common_msgs/test_common_msgs/test
+@exec mkdir -p %D/ros/stacks/common_msgs/test_common_msgs/bin
 @dirrm ros/stacks/common_msgs/test_common_msgs/bin
 @dirrm ros/stacks/common_msgs/test_common_msgs
 @dirrm ros/stacks/common_msgs/sensor_msgs/srv_gen/cpp/include/sensor_msgs
@@ -445,6 +441,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/sensor_msgs/lib
 @dirrm ros/stacks/common_msgs/sensor_msgs/include/sensor_msgs
 @dirrm ros/stacks/common_msgs/sensor_msgs/include
+@exec mkdir -p %D/ros/stacks/common_msgs/sensor_msgs/bin
 @dirrm ros/stacks/common_msgs/sensor_msgs/bin
 @dirrm ros/stacks/common_msgs/sensor_msgs
 @dirrm ros/stacks/common_msgs/nav_msgs/srv_gen/cpp/include/nav_msgs
@@ -466,6 +463,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/nav_msgs/msg/lisp
 @dirrm ros/stacks/common_msgs/nav_msgs/msg
 @dirrm ros/stacks/common_msgs/nav_msgs/migration_rules
+@exec mkdir -p %D/ros/stacks/common_msgs/nav_msgs/bin
 @dirrm ros/stacks/common_msgs/nav_msgs/bin
 @dirrm ros/stacks/common_msgs/nav_msgs
 @dirrm ros/stacks/common_msgs/geometry_msgs/src/geometry_msgs/msg
@@ -479,6 +477,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/geometry_msgs/msg/lisp
 @dirrm ros/stacks/common_msgs/geometry_msgs/msg
 @dirrm ros/stacks/common_msgs/geometry_msgs/migration_rules
+@exec mkdir -p %D/ros/stacks/common_msgs/geometry_msgs/bin
 @dirrm ros/stacks/common_msgs/geometry_msgs/bin
 @dirrm ros/stacks/common_msgs/geometry_msgs
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/srv_gen/cpp/include/diagnostic_msgs
@@ -500,6 +499,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/msg/lisp
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/msg
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/migration_rules
+@exec mkdir -p %D/ros/stacks/common_msgs/diagnostic_msgs/bin
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/bin
 @dirrm ros/stacks/common_msgs/diagnostic_msgs
 @dirrm ros/stacks/common_msgs/actionlib_msgs/src/actionlib_msgs/msg
@@ -513,6 +513,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/actionlib_msgs/msg/lisp
 @dirrm ros/stacks/common_msgs/actionlib_msgs/msg
 @dirrm ros/stacks/common_msgs/actionlib_msgs/cmake
+@exec mkdir -p %D/ros/stacks/common_msgs/actionlib_msgs/bin
 @dirrm ros/stacks/common_msgs/actionlib_msgs/bin
 @dirrm ros/stacks/common_msgs/actionlib_msgs
 @dirrm ros/stacks/common_msgs
diff --git a/devel/ros-common_msgs/Makefile b/devel/ros-common_msgs/Makefile
index 7282a287d917..6849b67e3220 100644
--- a/devel/ros-common_msgs/Makefile
+++ b/devel/ros-common_msgs/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	common_msgs
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/ros/
 DIST_SUBDIR=	ros
@@ -31,7 +32,7 @@ MAKE_ENV+=	CPATH=${LOCALBASE}/include \
 		LIBRARY_PATH=${LOCALBASE}/lib \
 		MAKE=${LOCALBASE}/bin/gmake \
 		ROS_ROOT=${LOCALBASE}/ros/ros \
-		ROS_PACKAGE_PATH=${WRKDIR} \
+		ROS_PACKAGE_PATH=${WRKSRC} \
 		PYTHONPATH=${LOCALBASE}/ros/ros/core/roslib/src
 
 MAKE_ARGS=	-i --no-rosdep --status-rate=0 --disable-logging
@@ -52,59 +53,12 @@ do-install:
 .for f in CMakeLists.txt Makefile stack.xml
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/ros/stacks/${PORTNAME}
 .endfor
-#move and strip ELF libaries
-	${MV} ${PREFIX}/ros/stacks/${PORTNAME}/sensor_msgs/lib/libsensor_msgs.so \
+#strip and symlink ELF libraries
+	${STRIP_CMD} ${PREFIX}/ros/stacks/${PORTNAME}/sensor_msgs/lib/libsensor_msgs.so
+	${LN} -s ${PREFIX}/ros/stacks/${PORTNAME}/sensor_msgs/lib/libsensor_msgs.so \
 	    ${PREFIX}/lib
-	${STRIP_CMD} ${PREFIX}/lib/libsensor_msgs.so
-#make scripts executable
+# make scripts executable
 .for f in actionlib_msgs/genaction.py \
-    actionlib_msgs/src/actionlib_msgs/msg/_GoalID.py \
-    actionlib_msgs/src/actionlib_msgs/msg/_GoalStatus.py \
-    actionlib_msgs/src/actionlib_msgs/msg/_GoalStatusArray.py \
-    diagnostic_msgs/src/diagnostic_msgs/msg/_DiagnosticArray.py \
-    diagnostic_msgs/src/diagnostic_msgs/msg/_DiagnosticStatus.py \
-    diagnostic_msgs/src/diagnostic_msgs/msg/_KeyValue.py \
-    diagnostic_msgs/src/diagnostic_msgs/srv/_SelfTest.py \
-    geometry_msgs/src/geometry_msgs/msg/_Point.py \
-    geometry_msgs/src/geometry_msgs/msg/_Point32.py \
-    geometry_msgs/src/geometry_msgs/msg/_PointStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Polygon.py \
-    geometry_msgs/src/geometry_msgs/msg/_PolygonStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Pose.py \
-    geometry_msgs/src/geometry_msgs/msg/_Pose2D.py \
-    geometry_msgs/src/geometry_msgs/msg/_PoseArray.py \
-    geometry_msgs/src/geometry_msgs/msg/_PoseStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_PoseWithCovariance.py \
-    geometry_msgs/src/geometry_msgs/msg/_PoseWithCovarianceStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Quaternion.py \
-    geometry_msgs/src/geometry_msgs/msg/_QuaternionStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Transform.py \
-    geometry_msgs/src/geometry_msgs/msg/_TransformStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Twist.py \
-    geometry_msgs/src/geometry_msgs/msg/_TwistStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_TwistWithCovariance.py \
-    geometry_msgs/src/geometry_msgs/msg/_TwistWithCovarianceStamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Vector3.py \
-    geometry_msgs/src/geometry_msgs/msg/_Vector3Stamped.py \
-    geometry_msgs/src/geometry_msgs/msg/_Wrench.py \
-    geometry_msgs/src/geometry_msgs/msg/_WrenchStamped.py \
-    nav_msgs/src/nav_msgs/msg/_GridCells.py \
-    nav_msgs/src/nav_msgs/msg/_MapMetaData.py \
-    nav_msgs/src/nav_msgs/msg/_OccupancyGrid.py \
-    nav_msgs/src/nav_msgs/msg/_Odometry.py nav_msgs/src/nav_msgs/msg/_Path.py \
-    nav_msgs/src/nav_msgs/srv/_GetMap.py nav_msgs/src/nav_msgs/srv/_GetPlan.py \
-    sensor_msgs/src/sensor_msgs/msg/_CameraInfo.py \
-    sensor_msgs/src/sensor_msgs/msg/_ChannelFloat32.py \
-    sensor_msgs/src/sensor_msgs/msg/_CompressedImage.py \
-    sensor_msgs/src/sensor_msgs/msg/_Image.py \
-    sensor_msgs/src/sensor_msgs/msg/_Imu.py \
-    sensor_msgs/src/sensor_msgs/msg/_JointState.py \
-    sensor_msgs/src/sensor_msgs/msg/_LaserScan.py \
-    sensor_msgs/src/sensor_msgs/msg/_PointCloud.py \
-    sensor_msgs/src/sensor_msgs/msg/_PointCloud2.py \
-    sensor_msgs/src/sensor_msgs/msg/_PointField.py \
-    sensor_msgs/src/sensor_msgs/msg/_RegionOfInterest.py \
-    sensor_msgs/src/sensor_msgs/srv/_SetCameraInfo.py \
     test_common_msgs/test/test_common_msgs_migration.py
 	${CHMOD} 0555 ${PREFIX}/ros/stacks/${PORTNAME}/${f}
 .endfor
diff --git a/devel/ros-common_msgs/pkg-plist b/devel/ros-common_msgs/pkg-plist
index 1d225cf16cdf..6b0b5a4dbe70 100644
--- a/devel/ros-common_msgs/pkg-plist
+++ b/devel/ros-common_msgs/pkg-plist
@@ -4,7 +4,6 @@ ros/stacks/common_msgs/Makefile
 ros/stacks/common_msgs/actionlib_msgs/CMakeLists.txt
 ros/stacks/common_msgs/actionlib_msgs/Makefile
 ros/stacks/common_msgs/actionlib_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/actionlib_msgs/bin
 ros/stacks/common_msgs/actionlib_msgs/cmake/actionbuild.cmake
 ros/stacks/common_msgs/actionlib_msgs/genaction.py
 ros/stacks/common_msgs/actionlib_msgs/manifest.xml
@@ -34,7 +33,6 @@ ros/stacks/common_msgs/actionlib_msgs/src/actionlib_msgs/msg/__init__.py
 ros/stacks/common_msgs/diagnostic_msgs/CMakeLists.txt
 ros/stacks/common_msgs/diagnostic_msgs/Makefile
 ros/stacks/common_msgs/diagnostic_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/diagnostic_msgs/bin
 ros/stacks/common_msgs/diagnostic_msgs/mainpage.dox
 ros/stacks/common_msgs/diagnostic_msgs/manifest.xml
 ros/stacks/common_msgs/diagnostic_msgs/migration_rules/diagnostic_msgs.bmr
@@ -74,7 +72,6 @@ ros/stacks/common_msgs/diagnostic_msgs/srv_gen/generated
 ros/stacks/common_msgs/geometry_msgs/CMakeLists.txt
 ros/stacks/common_msgs/geometry_msgs/Makefile
 ros/stacks/common_msgs/geometry_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/geometry_msgs/bin
 ros/stacks/common_msgs/geometry_msgs/mainpage.dox
 ros/stacks/common_msgs/geometry_msgs/manifest.xml
 ros/stacks/common_msgs/geometry_msgs/migration_rules/geometry_msgs.bmr
@@ -224,7 +221,6 @@ ros/stacks/common_msgs/geometry_msgs/src/geometry_msgs/msg/__init__.py
 ros/stacks/common_msgs/nav_msgs/CMakeLists.txt
 ros/stacks/common_msgs/nav_msgs/Makefile
 ros/stacks/common_msgs/nav_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/nav_msgs/bin
 ros/stacks/common_msgs/nav_msgs/mainpage.dox
 ros/stacks/common_msgs/nav_msgs/manifest.xml
 ros/stacks/common_msgs/nav_msgs/migration_rules/nav_msgs.bmr
@@ -282,10 +278,10 @@ ros/stacks/common_msgs/nav_msgs/srv_gen/generated
 ros/stacks/common_msgs/sensor_msgs/CMakeLists.txt
 ros/stacks/common_msgs/sensor_msgs/Makefile
 ros/stacks/common_msgs/sensor_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/sensor_msgs/bin
 ros/stacks/common_msgs/sensor_msgs/include/sensor_msgs/fill_image.h
 ros/stacks/common_msgs/sensor_msgs/include/sensor_msgs/image_encodings.h
 ros/stacks/common_msgs/sensor_msgs/include/sensor_msgs/point_cloud_conversion.h
+ros/stacks/common_msgs/sensor_msgs/lib/libsensor_msgs.so
 ros/stacks/common_msgs/sensor_msgs/mainpage.dox
 ros/stacks/common_msgs/sensor_msgs/manifest.xml
 ros/stacks/common_msgs/sensor_msgs/migration_rules/sensor_msgs.bmr
@@ -378,7 +374,6 @@ ros/stacks/common_msgs/stack.xml
 ros/stacks/common_msgs/test_common_msgs/CMakeLists.txt
 ros/stacks/common_msgs/test_common_msgs/Makefile
 ros/stacks/common_msgs/test_common_msgs/ROS_NOBUILD
-@exec mkdir -p %D/ros/stacks/common_msgs/test_common_msgs/bin
 ros/stacks/common_msgs/test_common_msgs/mainpage.dox
 ros/stacks/common_msgs/test_common_msgs/manifest.xml
 ros/stacks/common_msgs/test_common_msgs/test/saved/Acceleration.saved
@@ -420,6 +415,7 @@ ros/stacks/common_msgs/test_common_msgs/test/saved/Wrench.saved
 ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/test_common_msgs/test/saved
 @dirrm ros/stacks/common_msgs/test_common_msgs/test
+@exec mkdir -p %D/ros/stacks/common_msgs/test_common_msgs/bin
 @dirrm ros/stacks/common_msgs/test_common_msgs/bin
 @dirrm ros/stacks/common_msgs/test_common_msgs
 @dirrm ros/stacks/common_msgs/sensor_msgs/srv_gen/cpp/include/sensor_msgs
@@ -445,6 +441,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/sensor_msgs/lib
 @dirrm ros/stacks/common_msgs/sensor_msgs/include/sensor_msgs
 @dirrm ros/stacks/common_msgs/sensor_msgs/include
+@exec mkdir -p %D/ros/stacks/common_msgs/sensor_msgs/bin
 @dirrm ros/stacks/common_msgs/sensor_msgs/bin
 @dirrm ros/stacks/common_msgs/sensor_msgs
 @dirrm ros/stacks/common_msgs/nav_msgs/srv_gen/cpp/include/nav_msgs
@@ -466,6 +463,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/nav_msgs/msg/lisp
 @dirrm ros/stacks/common_msgs/nav_msgs/msg
 @dirrm ros/stacks/common_msgs/nav_msgs/migration_rules
+@exec mkdir -p %D/ros/stacks/common_msgs/nav_msgs/bin
 @dirrm ros/stacks/common_msgs/nav_msgs/bin
 @dirrm ros/stacks/common_msgs/nav_msgs
 @dirrm ros/stacks/common_msgs/geometry_msgs/src/geometry_msgs/msg
@@ -479,6 +477,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/geometry_msgs/msg/lisp
 @dirrm ros/stacks/common_msgs/geometry_msgs/msg
 @dirrm ros/stacks/common_msgs/geometry_msgs/migration_rules
+@exec mkdir -p %D/ros/stacks/common_msgs/geometry_msgs/bin
 @dirrm ros/stacks/common_msgs/geometry_msgs/bin
 @dirrm ros/stacks/common_msgs/geometry_msgs
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/srv_gen/cpp/include/diagnostic_msgs
@@ -500,6 +499,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/msg/lisp
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/msg
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/migration_rules
+@exec mkdir -p %D/ros/stacks/common_msgs/diagnostic_msgs/bin
 @dirrm ros/stacks/common_msgs/diagnostic_msgs/bin
 @dirrm ros/stacks/common_msgs/diagnostic_msgs
 @dirrm ros/stacks/common_msgs/actionlib_msgs/src/actionlib_msgs/msg
@@ -513,6 +513,7 @@ ros/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
 @dirrm ros/stacks/common_msgs/actionlib_msgs/msg/lisp
 @dirrm ros/stacks/common_msgs/actionlib_msgs/msg
 @dirrm ros/stacks/common_msgs/actionlib_msgs/cmake
+@exec mkdir -p %D/ros/stacks/common_msgs/actionlib_msgs/bin
 @dirrm ros/stacks/common_msgs/actionlib_msgs/bin
 @dirrm ros/stacks/common_msgs/actionlib_msgs
 @dirrm ros/stacks/common_msgs