aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/ros-common/Makefile5
-rw-r--r--devel/ros-common_msgs/Makefile21
-rw-r--r--devel/ros-image_common/Makefile5
-rw-r--r--devel/ros-laser_pipeline/Makefile9
-rw-r--r--devel/ros-nxt/Makefile11
-rw-r--r--math/ros-geometry/Makefile36
6 files changed, 45 insertions, 42 deletions
diff --git a/devel/ros-common/Makefile b/devel/ros-common/Makefile
index c0dd2a8b081e..62e534358f04 100644
--- a/devel/ros-common/Makefile
+++ b/devel/ros-common/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ros-common
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTFILES= common-${PORTVERSION}.tar.bz2 bfl-31655.tar.gz \
@@ -23,10 +24,10 @@ STACKNAME= ${PORTNAME:S/ros-//}
WRKSRC= ${WRKDIR}/${STACKNAME}
BUILD_DEPENDS= rosmake:${PORTSDIR}/devel/ros \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs \
+ ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs \
chrpath:${PORTSDIR}/devel/chrpath
RUN_DEPENDS= roscore:${PORTSDIR}/devel/ros \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs
+ ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs
USE_PYTHON= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/devel/ros-common_msgs/Makefile b/devel/ros-common_msgs/Makefile
index 6849b67e3220..60bff389a490 100644
--- a/devel/ros-common_msgs/Makefile
+++ b/devel/ros-common_msgs/Makefile
@@ -1,14 +1,14 @@
-# New ports collection makefile for: common_msgs
+# New ports collection makefile for: ros-common_msgs
# Date created: 2010-11-22
# Whom: Rene Ladan <rene@FreeBSD.org>
#
# $FreeBSD$
-PORTNAME= common_msgs
+PORTNAME= ros-common_msgs
PORTVERSION= 1.2.2
-PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
+DISTNAME= common_msgs-${PORTVERSION}
DIST_SUBDIR= ros
MAINTAINER= rene@FreeBSD.org
@@ -16,7 +16,8 @@ COMMENT= Robot Operating System - common messages
LICENSE= BSD
-WRKSRC= ${WRKDIR}/${PORTNAME}
+STACKNAME= ${PORTNAME:S/ros-//}
+WRKSRC= ${WRKDIR}/${STACKNAME}
BUILD_DEPENDS= rosmake:${PORTSDIR}/devel/ros
RUN_DEPENDS= roscore:${PORTSDIR}/devel/ros
@@ -41,26 +42,26 @@ do-build:
(cd ${WRKSRC} ; ${MAKE_ENV} ${LOCALBASE}/bin/rosmake ${MAKE_ARGS})
do-install:
- ${MKDIR} ${PREFIX}/ros/stacks/${PORTNAME}
+ ${MKDIR} ${PREFIX}/ros/stacks/${STACKNAME}
# delete files explicitly because negation in find (for COPYTREE_SHARE) is bogus
.for d in actionlib_msgs diagnostic_msgs geometry_msgs nav_msgs sensor_msgs \
test_common_msgs
${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
- (cd ${WRKSRC} ; ${COPYTREE_SHARE} ${d} ${PREFIX}/ros/stacks/${PORTNAME})
+ (cd ${WRKSRC} ; ${COPYTREE_SHARE} ${d} ${PREFIX}/ros/stacks/${STACKNAME})
.endfor
.for f in CMakeLists.txt Makefile stack.xml
- ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/ros/stacks/${PORTNAME}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/ros/stacks/${STACKNAME}
.endfor
#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 \
+ ${STRIP_CMD} ${PREFIX}/ros/stacks/${STACKNAME}/sensor_msgs/lib/libsensor_msgs.so
+ ${LN} -s ${PREFIX}/ros/stacks/${STACKNAME}/sensor_msgs/lib/libsensor_msgs.so \
${PREFIX}/lib
# make scripts executable
.for f in actionlib_msgs/genaction.py \
test_common_msgs/test/test_common_msgs_migration.py
- ${CHMOD} 0555 ${PREFIX}/ros/stacks/${PORTNAME}/${f}
+ ${CHMOD} 0555 ${PREFIX}/ros/stacks/${STACKNAME}/${f}
.endfor
.include <bsd.port.mk>
diff --git a/devel/ros-image_common/Makefile b/devel/ros-image_common/Makefile
index 8e54b6aac97b..61cbbf760ce0 100644
--- a/devel/ros-image_common/Makefile
+++ b/devel/ros-image_common/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ros-image_common
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTNAME= image_common-${PORTVERSION}
@@ -21,11 +22,11 @@ WRKSRC= ${WRKDIR}/${STACKNAME}
BUILD_DEPENDS= rosmake:${PORTSDIR}/devel/ros \
${LOCALBASE}/ros/stacks/common/stack.xml:${PORTSDIR}/devel/ros-common \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs \
+ ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs \
chrpath:${PORTSDIR}/devel/chrpath
RUN_DEPENDS= roscore:${PORTSDIR}/devel/ros \
${LOCALBASE}/ros/stacks/common/stack.xml:${PORTSDIR}/devel/ros-common \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs
+ ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs
USE_PYTHON= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/devel/ros-laser_pipeline/Makefile b/devel/ros-laser_pipeline/Makefile
index 6479d1f88c11..ffe139828ac3 100644
--- a/devel/ros-laser_pipeline/Makefile
+++ b/devel/ros-laser_pipeline/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ros-laser_pipeline
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTNAME= laser_pipeline-${PORTVERSION}
@@ -21,13 +22,13 @@ WRKSRC= ${WRKDIR}/${STACKNAME}
BUILD_DEPENDS= rosmake:${PORTSDIR}/devel/ros \
${LOCALBASE}/ros/stacks/common/stack.xml:${PORTSDIR}/devel/ros-common \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs \
- ${LOCALBASE}/ros/stacks/geometry/stack.xml:${PORTSDIR}/math/geometry \
+ ${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/common/stack.xml:${PORTSDIR}/devel/ros-common \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs \
- ${LOCALBASE}/ros/stacks/geometry/stack.xml:${PORTSDIR}/math/geometry
+ ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs \
+ ${LOCALBASE}/ros/stacks/geometry/stack.xml:${PORTSDIR}/math/ros-geometry
USE_PYTHON= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/devel/ros-nxt/Makefile b/devel/ros-nxt/Makefile
index 09dfa149b66f..982d80029301 100644
--- a/devel/ros-nxt/Makefile
+++ b/devel/ros-nxt/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ros-nxt
PORTVERSION= 0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTFILES= nxt-${PORTVERSION}.tar.bz2 nxt-python-1.1.2.zip
@@ -26,12 +26,12 @@ WRKSRC= ${WRKDIR}/${STACKNAME}
EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
BUILD_DEPENDS= rosmake:${PORTSDIR}/devel/ros \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs \
- ${LOCALBASE}/ros/stacks/geometry/stack.xml:${PORTSDIR}/math/geometry \
+ ${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/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs \
- ${LOCALBASE}/ros/stacks/geometry/stack.xml:${PORTSDIR}/math/geometry \
+ ${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
USE_PYTHON= yes
USE_BZIP2= yes
@@ -52,7 +52,6 @@ MAKE_ARGS= -i --no-rosdep --status-rate=0 --disable-logging
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 800069
-IGNORE= USB stack cannot locate NXT
LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
.endif
diff --git a/math/ros-geometry/Makefile b/math/ros-geometry/Makefile
index 8451bb1b6e90..8028bdf67edb 100644
--- a/math/ros-geometry/Makefile
+++ b/math/ros-geometry/Makefile
@@ -1,12 +1,11 @@
-# New ports collection makefile for: geometry
+# New ports collection makefile for: ros-geometry
# Date created: 2010-11-22
# Whom: Rene Ladan <rene@FreeBSD.org>
#
# $FreeBSD$
-PORTNAME= geometry
+PORTNAME= ros-geometry
PORTVERSION= 1.2.0
-PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTFILES= geometry-${PORTVERSION}.tar.bz2 bullet-2.76-patched2.tar.gz \
@@ -20,14 +19,15 @@ COMMENT= Robot Operating System - geometric and math libraries
#LICENSE_COMB= multi
#LICENSE= BSD LGPL* Zlib # which LGPL and Zlib not defined yet
-WRKSRC= ${WRKDIR}/${PORTNAME}
+STACKNAME= ${PORTNAME:S/ros-//}
+WRKSRC= ${WRKDIR}/${STACKNAME}
BUILD_DEPENDS= rosmake:${PORTSDIR}/devel/ros \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs \
+ ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs \
chrpath:${PORTSDIR}/devel/chrpath \
${PYTHON_SITELIBDIR}/sipconfig.py:${PORTSDIR}/devel/py-sip
RUN_DEPENDS= roscore:${PORTSDIR}/devel/ros \
- ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/common_msgs
+ ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs
USE_PYTHON= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
@@ -58,9 +58,9 @@ do-build:
(cd ${WRKSRC} ; ${MAKE_ENV} ${LOCALBASE}/bin/rosmake ${MAKE_ARGS})
do-install:
- ${MKDIR} ${PREFIX}/ros/stacks/${PORTNAME}
+ ${MKDIR} ${PREFIX}/ros/stacks/${STACKNAME}
# update .pc file
- ${REINPLACE_CMD} -E -e "s|${WRKSRC}|${PREFIX}/ros/stacks/${PORTNAME}|" \
+ ${REINPLACE_CMD} -E -e "s|${WRKSRC}|${PREFIX}/ros/stacks/${STACKNAME}|" \
${WRKSRC}/kdl/lib/pkgconfig/orocos-kdl.pc
${INSTALL_DATA} ${WRKSRC}/kdl/lib/pkgconfig/orocos-kdl.pc ${PREFIX}/libdata/pkgconfig
# delete files explicitly because negation in find (for COPYTREE_SHARE) is bogus
@@ -68,19 +68,19 @@ do-install:
${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 -type f -or -name \*.pc -type f | ${XARGS} ${RM} -rf
- (cd ${WRKSRC} ; ${COPYTREE_SHARE} ${d} ${PREFIX}/ros/stacks/${PORTNAME})
+ (cd ${WRKSRC} ; ${COPYTREE_SHARE} ${d} ${PREFIX}/ros/stacks/${STACKNAME})
.endfor
.for f in CMakeLists.txt Makefile stack.xml rosdep.yaml
- ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/ros/stacks/${PORTNAME}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/ros/stacks/${STACKNAME}
.endfor
# strip ELF programs and make them executable
.for f in tf/bin/change_notifier tf/bin/static_transform_publisher \
tf/bin/tf_echo tf/bin/tf_monitor tf/test/btTest tf/test/testBroadcaster \
tf/test/testListener tf/test/transform_listener_unittest
- ${STRIP_CMD} ${PREFIX}/ros/stacks/${PORTNAME}/${f}
- ${LOCALBASE}/bin/chrpath -d ${PREFIX}/ros/stacks/${PORTNAME}/${f}
- ${CHMOD} 0555 ${PREFIX}/ros/stacks/${PORTNAME}/${f}
+ ${STRIP_CMD} ${PREFIX}/ros/stacks/${STACKNAME}/${f}
+ ${LOCALBASE}/bin/chrpath -d ${PREFIX}/ros/stacks/${STACKNAME}/${f}
+ ${CHMOD} 0555 ${PREFIX}/ros/stacks/${STACKNAME}/${f}
.endfor
# strip and symlink ELF libaries
.for f in bullet/lib/libBulletCollision.so.2.76 \
@@ -89,21 +89,21 @@ do-install:
eigen_conversions/lib/libeigen_conversions.so \
kdl/lib/liborocos-kdl.so.1.0.99 kdl/lib/PyKDL.so tf/lib/_tf.so \
tf/lib/libtf.so tf_conversions/lib/libtf_conversions.so
- ${STRIP_CMD} ${PREFIX}/ros/stacks/${PORTNAME}/${f}
- ${LOCALBASE}/bin/chrpath -d ${PREFIX}/ros/stacks/${PORTNAME}/${f}
- ${LN} -s ${PREFIX}/ros/stacks/${PORTNAME}/${f} ${PREFIX}/lib
+ ${STRIP_CMD} ${PREFIX}/ros/stacks/${STACKNAME}/${f}
+ ${LOCALBASE}/bin/chrpath -d ${PREFIX}/ros/stacks/${STACKNAME}/${f}
+ ${LN} -s ${PREFIX}/ros/stacks/${STACKNAME}/${f} ${PREFIX}/lib
.endfor
# symbolic links
.for f in bullet/lib/libBulletCollision.so bullet/lib/libBulletDynamics.so \
bullet/lib/libBulletSoftBody.so bullet/lib/libLinearMath.so \
kdl/lib/liborocos-kdl.so kdl/lib/liborocos-kdl.so.1.0
- ${LN} -s ${PREFIX}/ros/stacks/${PORTNAME}/${f} ${PREFIX}/lib
+ ${LN} -s ${PREFIX}/ros/stacks/${STACKNAME}/${f} ${PREFIX}/lib
.endfor
# make scripts executable
.for f in tf/scripts/python_benchmark.py tf/scripts/reset_time.py \
tf/scripts/tf_remap tf/scripts/view_frames \
tf/test/test_datatype_conversion.py
- ${CHMOD} 0555 ${PREFIX}/ros/stacks/${PORTNAME}/${f}
+ ${CHMOD} 0555 ${PREFIX}/ros/stacks/${STACKNAME}/${f}
.endfor
.include <bsd.port.mk>