5 files changed, 105 insertions, 38 deletions

diff --git a/devel/ros-nxt/Makefile b/devel/ros-nxt/Makefile
index 982d80029301..e2e21d6faf4d 100644
--- a/devel/ros-nxt/Makefile
+++ b/devel/ros-nxt/Makefile
@@ -5,31 +5,36 @@
 # $FreeBSD$
 
 PORTNAME=	ros-nxt
-PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTVERSION=	0.1.1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/ros/
-DISTFILES=	nxt-${PORTVERSION}.tar.bz2 nxt-python-1.1.2.zip
+MASTER_SITES=	https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/:rel \
+		${MASTER_SITE_GOOGLE_CODE}:gc \
+		http://foote-ros-pkg.googlecode.com/files/:foote
+DISTFILES=	nxt-${PORTVERSION}.tar.bz2:rel nxt-python-1.1.2.zip:gc \
+		nxt_description.parts.tar.gz:foote
 DIST_SUBDIR=	ros
 EXTRACT_ONLY=	nxt-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	rene@FreeBSD.org
 COMMENT=	Robot Operating System - LEGO NXT interface
 
+PROJECTHOST=	nxt-python
 LICENSE_COMB=	multi
 LICENSE=	BSD GPLv3
 
 STACKNAME=	${PORTNAME:S/ros-//}
-WRKSRC=		${WRKDIR}/${STACKNAME}
+WRKSRC=		${WRKDIR}/${STACKNAME}-${PORTVERSION}
 
 # TODO port python-bluez for secondary bluetooth interface (no bluetooth here)
 
 EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS=	rosmake:${PORTSDIR}/devel/ros \
+		${LOCALBASE}/ros/stacks/ros_comm/stack.xml:${PORTSDIR}/devel/ros_comm \
 		${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs \
 		${LOCALBASE}/ros/stacks/geometry/stack.xml:${PORTSDIR}/math/ros-geometry \
 		chrpath:${PORTSDIR}/devel/chrpath
 RUN_DEPENDS=	roscore:${PORTSDIR}/devel/ros \
+		${LOCALBASE}/ros/stacks/ros_comm/stack.xml:${PORTSDIR}/devel/ros_comm \
 		${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs \
 		${LOCALBASE}/ros/stacks/geometry/stack.xml:${PORTSDIR}/math/ros-geometry \
 		${PYTHON_SITELIBDIR}/usb.so:${PORTSDIR}/devel/py-usb
@@ -44,7 +49,7 @@ MAKE_ENV+=	CPATH=${LOCALBASE}/include \
 		LIBRARY_PATH=${LOCALBASE}/lib \
 		MAKE=${LOCALBASE}/bin/gmake \
 		ROS_ROOT=${LOCALBASE}/ros/ros \
-		ROS_PACKAGE_PATH=${LOCALBASE}/ros/stacks/common_msgs:${LOCALBASE}/ros/stacks/geometry:${WRKSRC} \
+		ROS_PACKAGE_PATH=${LOCALBASE}/ros/stacks/ros_comm:${LOCALBASE}/ros/stacks/common_msgs:${LOCALBASE}/ros/stacks/geometry:${WRKSRC} \
 		PYTHONPATH=${LOCALBASE}/ros/ros/core/roslib/src
 
 MAKE_ARGS=	-i --no-rosdep --status-rate=0 --disable-logging
@@ -56,6 +61,7 @@ LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
 .endif
 
 post-extract:
+	${CP} ${_DISTDIR}/nxt_description.parts.tar.gz ${WRKSRC}/nxt_description/meshes/nxt_description.tar.gz
 	${MKDIR} ${WRKSRC}/nxt_python/build
 	${CP} ${_DISTDIR}/nxt-python-1.1.2.zip ${WRKSRC}/nxt_python/build
 	# already extract and mark as such because we have to patch it
@@ -73,12 +79,15 @@ PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 
 do-install:
 	${MKDIR} ${PREFIX}/ros/stacks/${STACKNAME}
+# delete file already extracted
+	${RM} ${WRKSRC}/nxt_description/meshes/nxt_description.tar.gz
 # delete files explicitly because negation in find (for COPYTREE_SHARE) is bogus
 .for d in nxt_controllers nxt_description nxt_lxf2urdf nxt_msgs nxt_python \
     nxt_ros #nxt_rviz_plugin
 	${FIND} ${WRKSRC}/${d} -name build -type d -or -name \*.bak -type f \
 	    -or -name .svnignore -type f -or -name .cvsignore -type f \
-	    -or -name \*.orig | ${XARGS} ${RM} -rf
+	    -or -name \*.orig -or -name installed -type f \
+	    -or -name wiped -type f | ${XARGS} ${RM} -rf
 	(cd ${WRKSRC} ; ${COPYTREE_SHARE} ${d} ${PREFIX}/ros/stacks/${STACKNAME})
 .endfor
 .for f in CMakeLists.txt Makefile rosdep.yaml stack.xml
@@ -96,4 +105,8 @@ do-install:
 	${CHMOD} 0555 ${PREFIX}/ros/stacks/${STACKNAME}/${f}
 .endfor
 
+post-install:
+	${PYTHON_CMD} -O -mcompileall ${PREFIX}/ros/stacks/${STACKNAME}/
+	${PYTHON_CMD} -mcompileall ${PREFIX}/ros/stacks/${STACKNAME}/
+
 .include <bsd.port.post.mk>
diff --git a/devel/ros-nxt/distinfo b/devel/ros-nxt/distinfo
index 7bf3bd3c48e3..f8373a6c8d29 100644
--- a/devel/ros-nxt/distinfo
+++ b/devel/ros-nxt/distinfo
@@ -1,4 +1,6 @@
-SHA256 (ros/nxt-0.1.0.tar.bz2) = ddae2ce9e07df6609f63aaed39827d20797101e11db869097ceaddf6ffeece57
-SIZE (ros/nxt-0.1.0.tar.bz2) = 11463862
+SHA256 (ros/nxt-0.1.1.tar.bz2) = f8c1a8f9ef45653b75e48ef87b71249fe402cb3efdf47290bb5a17b764437e0a
+SIZE (ros/nxt-0.1.1.tar.bz2) = 2181030
 SHA256 (ros/nxt-python-1.1.2.zip) = b5e2d60d74e5f26de0f1590d80b006965a57062bdd1167b73fa84dad3a7306bc
 SIZE (ros/nxt-python-1.1.2.zip) = 44805
+SHA256 (ros/nxt_description.parts.tar.gz) = 0b7aa949389e199cc8c61362567b75bd5a5129a80a3a9ea0eb453ae8598b7a9f
+SIZE (ros/nxt_description.parts.tar.gz) = 11902705
diff --git a/devel/ros-nxt/files/patch-nxt_description__CMakeLists.txt b/devel/ros-nxt/files/patch-nxt_description__CMakeLists.txt
new file mode 100644
index 000000000000..6afa7d7de5c1
--- /dev/null
+++ b/devel/ros-nxt/files/patch-nxt_description__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- nxt_description/CMakeLists.txt.orig	2010-09-25 22:24:28.000000000 +0200
++++ nxt_description/CMakeLists.txt	2011-05-28 01:34:08.000000000 +0200
+@@ -16,7 +16,6 @@
+ #set the default path for built libraries to the "lib" directory
+ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+ 
+-rosbuild_download_data(http://foote-ros-pkg.googlecode.com/files/nxt_description.parts.tar.gz meshes/nxt_description.tar.gz 5b1eb23778428d33f8f6462e41d5c5e8)
+ rosbuild_untar_file(meshes/nxt_description.tar.gz meshes/parts ALL)
+ 
+ #uncomment if you have defined messages
diff --git a/devel/ros-nxt/files/patch-rosdep.yaml b/devel/ros-nxt/files/patch-rosdep.yaml
index df053240c272..fa78aaf468a3 100644
--- a/devel/ros-nxt/files/patch-rosdep.yaml
+++ b/devel/ros-nxt/files/patch-rosdep.yaml
@@ -20,4 +20,4 @@
    fedora: pyusb
    rhel: python-usb
    gentoo: dev-python/pyusb
-+  freebsd: py26-usb
++  freebsd: py27-usb
diff --git a/devel/ros-nxt/pkg-plist b/devel/ros-nxt/pkg-plist
index 6623b9cfee9c..6b54e130f68e 100644
--- a/devel/ros-nxt/pkg-plist
+++ b/devel/ros-nxt/pkg-plist
@@ -6,13 +6,20 @@ ros/stacks/nxt/nxt_controllers/ROS_NOBUILD
 ros/stacks/nxt/nxt_controllers/mainpage.dox
 ros/stacks/nxt/nxt_controllers/manifest.xml
 ros/stacks/nxt/nxt_controllers/scripts/base_controller.py
+ros/stacks/nxt/nxt_controllers/scripts/base_controller.pyc
+ros/stacks/nxt/nxt_controllers/scripts/base_controller.pyo
 ros/stacks/nxt/nxt_controllers/scripts/base_odometry.py
+ros/stacks/nxt/nxt_controllers/scripts/base_odometry.pyc
+ros/stacks/nxt/nxt_controllers/scripts/base_odometry.pyo
 ros/stacks/nxt/nxt_controllers/scripts/joint_position_controller.py
+ros/stacks/nxt/nxt_controllers/scripts/joint_position_controller.pyc
+ros/stacks/nxt/nxt_controllers/scripts/joint_position_controller.pyo
 ros/stacks/nxt/nxt_description/CMakeLists.txt
 ros/stacks/nxt/nxt_description/Makefile
 ros/stacks/nxt/nxt_description/ROS_NOBUILD
 ros/stacks/nxt/nxt_description/mainpage.dox
 ros/stacks/nxt/nxt_description/manifest.xml
+ros/stacks/nxt/nxt_description/meshes/README
 ros/stacks/nxt/nxt_description/meshes/parts/1044.dae
 ros/stacks/nxt/nxt_description/meshes/parts/1044.png
 ros/stacks/nxt/nxt_description/meshes/parts/152.dae
@@ -115,7 +122,11 @@ ros/stacks/nxt/nxt_lxf2urdf/ldraw.xml
 ros/stacks/nxt/nxt_lxf2urdf/mainpage.dox
 ros/stacks/nxt/nxt_lxf2urdf/manifest.xml
 ros/stacks/nxt/nxt_lxf2urdf/scripts/lxf2urdf.py
+ros/stacks/nxt/nxt_lxf2urdf/scripts/lxf2urdf.pyc
+ros/stacks/nxt/nxt_lxf2urdf/scripts/lxf2urdf.pyo
 ros/stacks/nxt/nxt_lxf2urdf/scripts/transformations.py
+ros/stacks/nxt/nxt_lxf2urdf/scripts/transformations.pyc
+ros/stacks/nxt/nxt_lxf2urdf/scripts/transformations.pyo
 ros/stacks/nxt/nxt_msgs/CMakeLists.txt
 ros/stacks/nxt/nxt_msgs/Makefile
 ros/stacks/nxt/nxt_msgs/ROS_NOBUILD
@@ -127,26 +138,6 @@ ros/stacks/nxt/nxt_msgs/msg/Contact.msg
 ros/stacks/nxt/nxt_msgs/msg/Gyro.msg
 ros/stacks/nxt/nxt_msgs/msg/JointCommand.msg
 ros/stacks/nxt/nxt_msgs/msg/Range.msg
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/.Accelerometer.asd-dep
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/.Color.asd-dep
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/.Contact.asd-dep
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/.Gyro.asd-dep
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/.JointCommand.asd-dep
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/.Range.asd-dep
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/Accelerometer.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/Color.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/Contact.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/Gyro.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/JointCommand.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/Range.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/_package.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/_package_Accelerometer.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/_package_Color.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/_package_Contact.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/_package_Gyro.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/_package_JointCommand.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/_package_Range.lisp
-ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs/nxt_msgs-msg.asd
 ros/stacks/nxt/nxt_msgs/msg_gen/cpp/include/nxt_msgs/Accelerometer.h
 ros/stacks/nxt/nxt_msgs/msg_gen/cpp/include/nxt_msgs/Color.h
 ros/stacks/nxt/nxt_msgs/msg_gen/cpp/include/nxt_msgs/Contact.h
@@ -154,14 +145,44 @@ ros/stacks/nxt/nxt_msgs/msg_gen/cpp/include/nxt_msgs/Gyro.h
 ros/stacks/nxt/nxt_msgs/msg_gen/cpp/include/nxt_msgs/JointCommand.h
 ros/stacks/nxt/nxt_msgs/msg_gen/cpp/include/nxt_msgs/Range.h
 ros/stacks/nxt/nxt_msgs/msg_gen/generated
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/Accelerometer.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/Color.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/Contact.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/Gyro.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/JointCommand.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/Range.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/_package.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/_package_Accelerometer.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/_package_Color.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/_package_Contact.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/_package_Gyro.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/_package_JointCommand.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/_package_Range.lisp
+ros/stacks/nxt/nxt_msgs/msg_gen/lisp/nxt_msgs-msg.asd
 ros/stacks/nxt/nxt_msgs/src/nxt_msgs/__init__.py
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/__init__.pyc
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/__init__.pyo
 ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Accelerometer.py
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Accelerometer.pyc
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Accelerometer.pyo
 ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Color.py
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Color.pyc
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Color.pyo
 ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Contact.py
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Contact.pyc
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Contact.pyo
 ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Gyro.py
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Gyro.pyc
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Gyro.pyo
 ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_JointCommand.py
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_JointCommand.pyc
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_JointCommand.pyo
 ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Range.py
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Range.pyc
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/_Range.pyo
 ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/__init__.py
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/__init__.pyc
+ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg/__init__.pyo
 ros/stacks/nxt/nxt_python/CMakeLists.txt
 ros/stacks/nxt/nxt_python/Makefile
 ros/stacks/nxt/nxt_python/ROS_NOBUILD
@@ -171,40 +192,58 @@ ros/stacks/nxt/nxt_python/bin/nxt_test
 ros/stacks/nxt/nxt_python/colorsensor.patch
 ros/stacks/nxt/nxt_python/epydoc.config
 ros/stacks/nxt/nxt_python/gyro.patch
-ros/stacks/nxt/nxt_python/installed
 ros/stacks/nxt/nxt_python/mainpage.dox
 ros/stacks/nxt/nxt_python/manifest.xml
 ros/stacks/nxt/nxt_python/rosdoc.yaml
 ros/stacks/nxt/nxt_python/sensor_tests/color_sensor_test.py
+ros/stacks/nxt/nxt_python/sensor_tests/color_sensor_test.pyc
+ros/stacks/nxt/nxt_python/sensor_tests/color_sensor_test.pyo
 ros/stacks/nxt/nxt_python/sensor_tests/touch_sensor_test.py
+ros/stacks/nxt/nxt_python/sensor_tests/touch_sensor_test.pyc
+ros/stacks/nxt/nxt_python/sensor_tests/touch_sensor_test.pyo
 ros/stacks/nxt/nxt_python/src/nxt/__init__.py
 ros/stacks/nxt/nxt_python/src/nxt/__init__.pyc
+ros/stacks/nxt/nxt_python/src/nxt/__init__.pyo
 ros/stacks/nxt/nxt_python/src/nxt/bluesock.py
 ros/stacks/nxt/nxt_python/src/nxt/bluesock.pyc
+ros/stacks/nxt/nxt_python/src/nxt/bluesock.pyo
 ros/stacks/nxt/nxt_python/src/nxt/brick.py
 ros/stacks/nxt/nxt_python/src/nxt/brick.pyc
+ros/stacks/nxt/nxt_python/src/nxt/brick.pyo
 ros/stacks/nxt/nxt_python/src/nxt/compass.py
 ros/stacks/nxt/nxt_python/src/nxt/compass.pyc
+ros/stacks/nxt/nxt_python/src/nxt/compass.pyo
 ros/stacks/nxt/nxt_python/src/nxt/direct.py
 ros/stacks/nxt/nxt_python/src/nxt/direct.pyc
+ros/stacks/nxt/nxt_python/src/nxt/direct.pyo
 ros/stacks/nxt/nxt_python/src/nxt/error.py
 ros/stacks/nxt/nxt_python/src/nxt/error.pyc
+ros/stacks/nxt/nxt_python/src/nxt/error.pyo
 ros/stacks/nxt/nxt_python/src/nxt/locator.py
 ros/stacks/nxt/nxt_python/src/nxt/locator.pyc
+ros/stacks/nxt/nxt_python/src/nxt/locator.pyo
 ros/stacks/nxt/nxt_python/src/nxt/motor.py
 ros/stacks/nxt/nxt_python/src/nxt/motor.pyc
+ros/stacks/nxt/nxt_python/src/nxt/motor.pyo
 ros/stacks/nxt/nxt_python/src/nxt/sensor.py
 ros/stacks/nxt/nxt_python/src/nxt/sensor.pyc
+ros/stacks/nxt/nxt_python/src/nxt/sensor.pyo
 ros/stacks/nxt/nxt_python/src/nxt/server.py
 ros/stacks/nxt/nxt_python/src/nxt/server.pyc
+ros/stacks/nxt/nxt_python/src/nxt/server.pyo
 ros/stacks/nxt/nxt_python/src/nxt/system.py
 ros/stacks/nxt/nxt_python/src/nxt/system.pyc
+ros/stacks/nxt/nxt_python/src/nxt/system.pyo
 ros/stacks/nxt/nxt_python/src/nxt/telegram.py
 ros/stacks/nxt/nxt_python/src/nxt/telegram.pyc
+ros/stacks/nxt/nxt_python/src/nxt/telegram.pyo
 ros/stacks/nxt/nxt_python/src/nxt/usbsock.py
 ros/stacks/nxt/nxt_python/src/nxt/usbsock.pyc
+ros/stacks/nxt/nxt_python/src/nxt/usbsock.pyo
 ros/stacks/nxt/nxt_python/src/nxt_python-1.1.2-py%%PYTHON_VER%%.egg-info
 ros/stacks/nxt/nxt_python/test_sensors.py
+ros/stacks/nxt/nxt_python/test_sensors.pyc
+ros/stacks/nxt/nxt_python/test_sensors.pyo
 ros/stacks/nxt/nxt_python/ultrasonic.patch
 ros/stacks/nxt/nxt_ros/CMakeLists.txt
 ros/stacks/nxt/nxt_ros/Makefile
@@ -212,11 +251,14 @@ ros/stacks/nxt/nxt_ros/ROS_NOBUILD
 ros/stacks/nxt/nxt_ros/mainpage.dox
 ros/stacks/nxt/nxt_ros/manifest.xml
 ros/stacks/nxt/nxt_ros/scripts/joint_states_aggregator.py
+ros/stacks/nxt/nxt_ros/scripts/joint_states_aggregator.pyc
+ros/stacks/nxt/nxt_ros/scripts/joint_states_aggregator.pyo
 ros/stacks/nxt/nxt_ros/scripts/nxt_ros.py
+ros/stacks/nxt/nxt_ros/scripts/nxt_ros.pyc
+ros/stacks/nxt/nxt_ros/scripts/nxt_ros.pyo
 ros/stacks/nxt/rosdep.yaml
 ros/stacks/nxt/stack.xml
 @dirrm ros/stacks/nxt/nxt_ros/scripts
-@exec mkdir -p %D/ros/stacks/nxt/nxt_ros/bin
 @dirrm ros/stacks/nxt/nxt_ros/bin
 @dirrm ros/stacks/nxt/nxt_ros
 @dirrm ros/stacks/nxt/nxt_python/src/nxt
@@ -227,27 +269,27 @@ ros/stacks/nxt/stack.xml
 @dirrm ros/stacks/nxt/nxt_msgs/src/nxt_msgs/msg
 @dirrm ros/stacks/nxt/nxt_msgs/src/nxt_msgs
 @dirrm ros/stacks/nxt/nxt_msgs/src
+@dirrm ros/stacks/nxt/nxt_msgs/msg_gen/lisp
 @dirrm ros/stacks/nxt/nxt_msgs/msg_gen/cpp/include/nxt_msgs
 @dirrm ros/stacks/nxt/nxt_msgs/msg_gen/cpp/include
 @dirrm ros/stacks/nxt/nxt_msgs/msg_gen/cpp
 @dirrm ros/stacks/nxt/nxt_msgs/msg_gen
-@dirrm ros/stacks/nxt/nxt_msgs/msg/lisp/nxt_msgs
-@dirrm ros/stacks/nxt/nxt_msgs/msg/lisp
 @dirrm ros/stacks/nxt/nxt_msgs/msg
-@exec mkdir -p %D/ros/stacks/nxt/nxt_msgs/bin
 @dirrm ros/stacks/nxt/nxt_msgs/bin
 @dirrm ros/stacks/nxt/nxt_msgs
 @dirrm ros/stacks/nxt/nxt_lxf2urdf/scripts
-@exec mkdir -p %D/ros/stacks/nxt/nxt_lxf2urdf/bin
 @dirrm ros/stacks/nxt/nxt_lxf2urdf/bin
 @dirrm ros/stacks/nxt/nxt_lxf2urdf
 @dirrm ros/stacks/nxt/nxt_description/meshes/parts
 @dirrm ros/stacks/nxt/nxt_description/meshes
-@exec mkdir -p %D/ros/stacks/nxt/nxt_description/bin
 @dirrm ros/stacks/nxt/nxt_description/bin
 @dirrm ros/stacks/nxt/nxt_description
 @dirrm ros/stacks/nxt/nxt_controllers/scripts
-@exec mkdir -p %D/ros/stacks/nxt/nxt_controllers/bin
 @dirrm ros/stacks/nxt/nxt_controllers/bin
 @dirrm ros/stacks/nxt/nxt_controllers
 @dirrm ros/stacks/nxt
+@exec mkdir -p %D/ros/stacks/nxt/nxt_ros/bin
+@exec mkdir -p %D/ros/stacks/nxt/nxt_msgs/bin
+@exec mkdir -p %D/ros/stacks/nxt/nxt_lxf2urdf/bin
+@exec mkdir -p %D/ros/stacks/nxt/nxt_description/bin
+@exec mkdir -p %D/ros/stacks/nxt/nxt_controllers/bin