kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Upgrade the built-in googletest to 1.5.0

Browse source 
- Use ${WRKSRC}/googletest_backup instead of /var/tmp as a temporary backup
  directory if dealing with an googletest installed from ports
- Add a stacks directory, which will be used as a destination for other
  ROS packages
- Improve pkg-message
- Bump PORTREVISION
- Cleanups
This commit is contained in:
Rene Ladan 2010-10-31 23:31:24 +00:00
parent a71757d8cb
commit 37916e63e8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=263863
20 changed files with 228 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
devel/ros-documentation/Makefile
View file

@ -6,13 +6,15 @@
PORTNAME= ros
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/${PORTNAME}/
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 gtest-1.3.0.tar.gz SWIG-1.3.29-wx.tar.gz
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
gtest-1.5.0.tar.gz
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2
MAINTAINER= rene@freebsd.org
MAINTAINER= rene@FreeBSD.org
COMMENT= Robot Operating System - core utilities
LICENSE= BSD
@ -44,9 +46,7 @@ USE_GNOME= pkgconfig pygtk2
USE_PYTHON= yes
USE_WX= 2.8
WX_COMPS= python:build python:run
USE_BZIP2= yes
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
@ -60,6 +60,7 @@ MAKE_JOBS_UNSAFE= yes
MAKE_ENV+= CPATH=${LOCALBASE}/include \
EXTRA_CMAKE_FLAGS="-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}" \
LIBRARY_PATH=${LOCALBASE}/lib \
MAKE=${LOCALBASE}/bin/gmake \
PATH=${PATH}:${WRKSRC}/bin \
PYTHONPATH=${WRKSRC}/core/roslib/src \
@ -83,15 +84,16 @@ post-extract:
${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|"
# move 3rdparty distfiles into place
${MKDIR} ${WRKSRC}/3rdparty/gtest/build
${CP} ${_DISTDIR}/gtest-1.3.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
${CP} ${_DISTDIR}/gtest-1.5.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
${MKDIR} ${WRKSRC}/3rdparty/wxswig/build
${CP} ${_DISTDIR}/SWIG-1.3.29-wx.tar.gz ${WRKSRC}/3rdparty/wxswig/build
pre-build:
.if exists(${LOCALBASE}/lib/libgtest.so)
# temporarily move libraries from devel/googletest out of the way
${MKDIR} ${WRKSRC}/googletest_backup
.for f in .a .la .so .so.* _main.a _main.la _main.so _main.so.*
${MV} ${LOCALBASE}/lib/libgtest${f} /var/tmp
${MV} ${LOCALBASE}/lib/libgtest${f} ${WRKSRC}/googletest_backup
.endfor
.endif
# temporarily alter how ROS is built for the port build
@ -99,16 +101,17 @@ pre-build:
${WRKSRC}/Makefile
post-build:
.if exists(/var/tmp/libgtest.so)
.if exists(${WRKSRC}/googletest_backup/libgtest.so)
# restore libraries from devel/googletest
.for f in .a .la .so .so.* _main.a _main.la _main.so _main.so.*
${MV} /var/tmp/libgtest${f} ${LOCALBASE}/lib
${MV} ${WRKSRC}/googletest_backup/libgtest${f} ${LOCALBASE}/lib
.endfor
.endif
# restore original ROS Makefile
${MV} ${WRKSRC}/Makefile.bak ${WRKSRC}/Makefile
do-install:
${MKDIR} ${PREFIX}/${PORTNAME}/stacks
${MKDIR} ${PREFIX}/${PORTNAME}/bin
.for f in rospack rosplay rosrecord rosstack rxconsole rxloggerlevel

7
devel/ros-documentation/distinfo
View file

@ -1,9 +1,6 @@
MD5 (ros/ros-1.2.4.tar.bz2) = f1b20ea6beb303ce64bf2a10a40bb71a
SHA256 (ros/ros-1.2.4.tar.bz2) = 199bd4d9f2578a165dfb42cd24bd0a5bfa489ec2085cd1ac8e5f6d2ab2ef2516
SIZE (ros/ros-1.2.4.tar.bz2) = 1535133
MD5 (ros/gtest-1.3.0.tar.gz) = 714e9c00c0616ea72ba076c6c5f401d2
SHA256 (ros/gtest-1.3.0.tar.gz) = 03a4c85cb7cf1754e052317b289625daa73485da664ede18ba21cf754d3e8bd7
SIZE (ros/gtest-1.3.0.tar.gz) = 636326
MD5 (ros/SWIG-1.3.29-wx.tar.gz) = db156f40bddb3875d1363a0b29c753f0
SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
SHA256 (ros/gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff
SIZE (ros/gtest-1.5.0.tar.gz) = 896874

40
devel/ros-documentation/files/patch-gtest Normal file
View file

@ -0,0 +1,40 @@
--- 3rdparty/gtest/Makefile.orig 2010-10-25 08:35:45.000000000 +0200
+++ 3rdparty/gtest/Makefile 2010-10-27 21:24:06.000000000 +0200
@@ -1,9 +1,9 @@
all: gtest
-TARBALL = build/gtest-1.3.0.tar.gz
-TARBALL_URL = http://pr.willowgarage.com/downloads/gtest-1.3.0.tar.gz
-SOURCE_DIR = build/gtest-1.3.0
-MD5SUM_FILE = gtest-1.3.0.tar.gz.md5sum
+TARBALL = build/gtest-1.5.0.tar.gz
+TARBALL_URL = ftp://rene-ladan.nl/not-fetchable/gtest-1.5.0.tar.gz
+SOURCE_DIR = build/gtest-1.5.0
+MD5SUM_FILE = gtest-1.5.0.tar.gz.md5sum
include $(shell rospack find mk)/download_unpack_build.mk
# gtest's death test appears to hang when gtest is compiled with Bullseye's
@@ -17,7 +17,7 @@
endif
gtest: $(SOURCE_DIR)/unpacked
- cd $(SOURCE_DIR) && PATH=$(NEWPATH) ./configure --prefix=$(CURDIR)/gtest
+ cd $(SOURCE_DIR) && PATH=$(NEWPATH) CXXFLAGS="$(CXXFLAGS) -DGTEST_HAS_TR1_TUPLE=0" ./configure --prefix=$(CURDIR)/gtest
cd $(SOURCE_DIR) && PATH=$(NEWPATH) make install
touch gtest
--- core/rosbuild/public.cmake.orig 2010-10-25 08:35:45.000000000 +0200
+++ core/rosbuild/public.cmake 2010-10-28 11:40:56.000000000 +0200
@@ -419,7 +419,7 @@
include_directories(${_gtest_PACKAGE_PATH}/gtest/include)
link_directories(${_gtest_PACKAGE_PATH}/gtest/lib)
set(_gtest_LIBRARIES -lgtest)
- set(_gtest_CFLAGS_OTHER "")
+ set(_gtest_CFLAGS_OTHER "-DGTEST_HAS_TR1_TUPLE=0")
set(_gtest_LDFLAGS_OTHER "-Wl,-rpath,${_gtest_PACKAGE_PATH}/gtest/lib")
#
--- /dev/null 2010-11-01 00:11:00.000000000 +0100
+++ 3rdparty/gtest/gtest-1.5.0.tar.gz.md5sum 2010-11-01 00:12:51.000000000 +0100
@@ -0,0 +1 @@
+7e27f5f3b79dd1ce9092e159cdbd0635 gtest-1.5.0.tar.gz

3
devel/ros-documentation/files/pkg-message.in
View file

@ -1,11 +1,12 @@
To use ROS, add these variables to your environment:
ROS_MASTER_URI <HTTP address of the host running roscore>:11311
ROS_PACKAGE_PATH <directory where you will store additional ROS software>
ROS_ROOT %%PREFIX%%/ros
ROS_PACKAGE_PATH ${ROS_ROOT}/stacks:/my_other_ROS_directory
PYTHONPATH ${ROS_ROOT}/core/roslib/src
If you intend to build software with ROS:
CPATH %%LOCALBASE%%/include
EXTRA_CMAKE_FLAGS -DwxWidgets_CONFIG_EXECUTABLE=%%WX_CONFIG%%
LIBRARY_PATH %%LOCALBASE%%/lib
MAKE %%LOCALBASE%%/bin/gmake
ROS_BOOST_ROOT %%LOCALBASE%%

2
devel/ros-documentation/pkg-plist
View file

@ -69,6 +69,7 @@ ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-param-util-generated.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-param-util.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-port.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-string.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-tuple.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-type-util.h
ros/3rdparty/gtest/gtest/lib/libgtest.a
ros/3rdparty/gtest/gtest/lib/libgtest.la
@ -3555,6 +3556,7 @@ ros/tools/xdot/src/xdot/xdot.py
@dirrm ros/tools/topic_tools/demos
@dirrm ros/tools/topic_tools/bin
@dirrm ros/tools/topic_tools
@dirrm ros/stacks
@dirrm ros/tools/rxtools/src/rxtools
@dirrm ros/tools/rxtools/src/rxloggerlevel
@dirrm ros/tools/rxtools/src/rxconsole

19
devel/ros-rx/Makefile
View file

@ -6,13 +6,15 @@
PORTNAME= ros
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/${PORTNAME}/
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 gtest-1.3.0.tar.gz SWIG-1.3.29-wx.tar.gz
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
gtest-1.5.0.tar.gz
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2
MAINTAINER= rene@freebsd.org
MAINTAINER= rene@FreeBSD.org
COMMENT= Robot Operating System - core utilities
LICENSE= BSD
@ -44,9 +46,7 @@ USE_GNOME= pkgconfig pygtk2
USE_PYTHON= yes
USE_WX= 2.8
WX_COMPS= python:build python:run
USE_BZIP2= yes
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
@ -60,6 +60,7 @@ MAKE_JOBS_UNSAFE= yes
MAKE_ENV+= CPATH=${LOCALBASE}/include \
EXTRA_CMAKE_FLAGS="-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}" \
LIBRARY_PATH=${LOCALBASE}/lib \
MAKE=${LOCALBASE}/bin/gmake \
PATH=${PATH}:${WRKSRC}/bin \
PYTHONPATH=${WRKSRC}/core/roslib/src \
@ -83,15 +84,16 @@ post-extract:
${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|"
# move 3rdparty distfiles into place
${MKDIR} ${WRKSRC}/3rdparty/gtest/build
${CP} ${_DISTDIR}/gtest-1.3.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
${CP} ${_DISTDIR}/gtest-1.5.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
${MKDIR} ${WRKSRC}/3rdparty/wxswig/build
${CP} ${_DISTDIR}/SWIG-1.3.29-wx.tar.gz ${WRKSRC}/3rdparty/wxswig/build
pre-build:
.if exists(${LOCALBASE}/lib/libgtest.so)
# temporarily move libraries from devel/googletest out of the way
${MKDIR} ${WRKSRC}/googletest_backup
.for f in .a .la .so .so.* _main.a _main.la _main.so _main.so.*
${MV} ${LOCALBASE}/lib/libgtest${f} /var/tmp
${MV} ${LOCALBASE}/lib/libgtest${f} ${WRKSRC}/googletest_backup
.endfor
.endif
# temporarily alter how ROS is built for the port build
@ -99,16 +101,17 @@ pre-build:
${WRKSRC}/Makefile
post-build:
.if exists(/var/tmp/libgtest.so)
.if exists(${WRKSRC}/googletest_backup/libgtest.so)
# restore libraries from devel/googletest
.for f in .a .la .so .so.* _main.a _main.la _main.so _main.so.*
${MV} /var/tmp/libgtest${f} ${LOCALBASE}/lib
${MV} ${WRKSRC}/googletest_backup/libgtest${f} ${LOCALBASE}/lib
.endfor
.endif
# restore original ROS Makefile
${MV} ${WRKSRC}/Makefile.bak ${WRKSRC}/Makefile
do-install:
${MKDIR} ${PREFIX}/${PORTNAME}/stacks
${MKDIR} ${PREFIX}/${PORTNAME}/bin
.for f in rospack rosplay rosrecord rosstack rxconsole rxloggerlevel

7
devel/ros-rx/distinfo
View file

@ -1,9 +1,6 @@
MD5 (ros/ros-1.2.4.tar.bz2) = f1b20ea6beb303ce64bf2a10a40bb71a
SHA256 (ros/ros-1.2.4.tar.bz2) = 199bd4d9f2578a165dfb42cd24bd0a5bfa489ec2085cd1ac8e5f6d2ab2ef2516
SIZE (ros/ros-1.2.4.tar.bz2) = 1535133
MD5 (ros/gtest-1.3.0.tar.gz) = 714e9c00c0616ea72ba076c6c5f401d2
SHA256 (ros/gtest-1.3.0.tar.gz) = 03a4c85cb7cf1754e052317b289625daa73485da664ede18ba21cf754d3e8bd7
SIZE (ros/gtest-1.3.0.tar.gz) = 636326
MD5 (ros/SWIG-1.3.29-wx.tar.gz) = db156f40bddb3875d1363a0b29c753f0
SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
SHA256 (ros/gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff
SIZE (ros/gtest-1.5.0.tar.gz) = 896874

40
devel/ros-rx/files/patch-gtest Normal file
View file

@ -0,0 +1,40 @@
--- 3rdparty/gtest/Makefile.orig 2010-10-25 08:35:45.000000000 +0200
+++ 3rdparty/gtest/Makefile 2010-10-27 21:24:06.000000000 +0200
@@ -1,9 +1,9 @@
all: gtest
-TARBALL = build/gtest-1.3.0.tar.gz
-TARBALL_URL = http://pr.willowgarage.com/downloads/gtest-1.3.0.tar.gz
-SOURCE_DIR = build/gtest-1.3.0
-MD5SUM_FILE = gtest-1.3.0.tar.gz.md5sum
+TARBALL = build/gtest-1.5.0.tar.gz
+TARBALL_URL = ftp://rene-ladan.nl/not-fetchable/gtest-1.5.0.tar.gz
+SOURCE_DIR = build/gtest-1.5.0
+MD5SUM_FILE = gtest-1.5.0.tar.gz.md5sum
include $(shell rospack find mk)/download_unpack_build.mk
# gtest's death test appears to hang when gtest is compiled with Bullseye's
@@ -17,7 +17,7 @@
endif
gtest: $(SOURCE_DIR)/unpacked
- cd $(SOURCE_DIR) && PATH=$(NEWPATH) ./configure --prefix=$(CURDIR)/gtest
+ cd $(SOURCE_DIR) && PATH=$(NEWPATH) CXXFLAGS="$(CXXFLAGS) -DGTEST_HAS_TR1_TUPLE=0" ./configure --prefix=$(CURDIR)/gtest
cd $(SOURCE_DIR) && PATH=$(NEWPATH) make install
touch gtest
--- core/rosbuild/public.cmake.orig 2010-10-25 08:35:45.000000000 +0200
+++ core/rosbuild/public.cmake 2010-10-28 11:40:56.000000000 +0200
@@ -419,7 +419,7 @@
include_directories(${_gtest_PACKAGE_PATH}/gtest/include)
link_directories(${_gtest_PACKAGE_PATH}/gtest/lib)
set(_gtest_LIBRARIES -lgtest)
- set(_gtest_CFLAGS_OTHER "")
+ set(_gtest_CFLAGS_OTHER "-DGTEST_HAS_TR1_TUPLE=0")
set(_gtest_LDFLAGS_OTHER "-Wl,-rpath,${_gtest_PACKAGE_PATH}/gtest/lib")
#
--- /dev/null 2010-11-01 00:11:00.000000000 +0100
+++ 3rdparty/gtest/gtest-1.5.0.tar.gz.md5sum 2010-11-01 00:12:51.000000000 +0100
@@ -0,0 +1 @@
+7e27f5f3b79dd1ce9092e159cdbd0635 gtest-1.5.0.tar.gz

3
devel/ros-rx/files/pkg-message.in
View file

@ -1,11 +1,12 @@
To use ROS, add these variables to your environment:
ROS_MASTER_URI <HTTP address of the host running roscore>:11311
ROS_PACKAGE_PATH <directory where you will store additional ROS software>
ROS_ROOT %%PREFIX%%/ros
ROS_PACKAGE_PATH ${ROS_ROOT}/stacks:/my_other_ROS_directory
PYTHONPATH ${ROS_ROOT}/core/roslib/src
If you intend to build software with ROS:
CPATH %%LOCALBASE%%/include
EXTRA_CMAKE_FLAGS -DwxWidgets_CONFIG_EXECUTABLE=%%WX_CONFIG%%
LIBRARY_PATH %%LOCALBASE%%/lib
MAKE %%LOCALBASE%%/bin/gmake
ROS_BOOST_ROOT %%LOCALBASE%%

2
devel/ros-rx/pkg-plist
View file

@ -69,6 +69,7 @@ ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-param-util-generated.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-param-util.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-port.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-string.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-tuple.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-type-util.h
ros/3rdparty/gtest/gtest/lib/libgtest.a
ros/3rdparty/gtest/gtest/lib/libgtest.la
@ -3555,6 +3556,7 @@ ros/tools/xdot/src/xdot/xdot.py
@dirrm ros/tools/topic_tools/demos
@dirrm ros/tools/topic_tools/bin
@dirrm ros/tools/topic_tools
@dirrm ros/stacks
@dirrm ros/tools/rxtools/src/rxtools
@dirrm ros/tools/rxtools/src/rxloggerlevel
@dirrm ros/tools/rxtools/src/rxconsole

19
devel/ros/Makefile
View file

@ -6,13 +6,15 @@
PORTNAME= ros
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/${PORTNAME}/
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 gtest-1.3.0.tar.gz SWIG-1.3.29-wx.tar.gz
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
gtest-1.5.0.tar.gz
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2
MAINTAINER= rene@freebsd.org
MAINTAINER= rene@FreeBSD.org
COMMENT= Robot Operating System - core utilities
LICENSE= BSD
@ -44,9 +46,7 @@ USE_GNOME= pkgconfig pygtk2
USE_PYTHON= yes
USE_WX= 2.8
WX_COMPS= python:build python:run
USE_BZIP2= yes
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
@ -60,6 +60,7 @@ MAKE_JOBS_UNSAFE= yes
MAKE_ENV+= CPATH=${LOCALBASE}/include \
EXTRA_CMAKE_FLAGS="-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}" \
LIBRARY_PATH=${LOCALBASE}/lib \
MAKE=${LOCALBASE}/bin/gmake \
PATH=${PATH}:${WRKSRC}/bin \
PYTHONPATH=${WRKSRC}/core/roslib/src \
@ -83,15 +84,16 @@ post-extract:
${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|"
# move 3rdparty distfiles into place
${MKDIR} ${WRKSRC}/3rdparty/gtest/build
${CP} ${_DISTDIR}/gtest-1.3.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
${CP} ${_DISTDIR}/gtest-1.5.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
${MKDIR} ${WRKSRC}/3rdparty/wxswig/build
${CP} ${_DISTDIR}/SWIG-1.3.29-wx.tar.gz ${WRKSRC}/3rdparty/wxswig/build
pre-build:
.if exists(${LOCALBASE}/lib/libgtest.so)
# temporarily move libraries from devel/googletest out of the way
${MKDIR} ${WRKSRC}/googletest_backup
.for f in .a .la .so .so.* _main.a _main.la _main.so _main.so.*
${MV} ${LOCALBASE}/lib/libgtest${f} /var/tmp
${MV} ${LOCALBASE}/lib/libgtest${f} ${WRKSRC}/googletest_backup
.endfor
.endif
# temporarily alter how ROS is built for the port build
@ -99,16 +101,17 @@ pre-build:
${WRKSRC}/Makefile
post-build:
.if exists(/var/tmp/libgtest.so)
.if exists(${WRKSRC}/googletest_backup/libgtest.so)
# restore libraries from devel/googletest
.for f in .a .la .so .so.* _main.a _main.la _main.so _main.so.*
${MV} /var/tmp/libgtest${f} ${LOCALBASE}/lib
${MV} ${WRKSRC}/googletest_backup/libgtest${f} ${LOCALBASE}/lib
.endfor
.endif
# restore original ROS Makefile
${MV} ${WRKSRC}/Makefile.bak ${WRKSRC}/Makefile
do-install:
${MKDIR} ${PREFIX}/${PORTNAME}/stacks
${MKDIR} ${PREFIX}/${PORTNAME}/bin
.for f in rospack rosplay rosrecord rosstack rxconsole rxloggerlevel

7
devel/ros/distinfo
View file

@ -1,9 +1,6 @@
MD5 (ros/ros-1.2.4.tar.bz2) = f1b20ea6beb303ce64bf2a10a40bb71a
SHA256 (ros/ros-1.2.4.tar.bz2) = 199bd4d9f2578a165dfb42cd24bd0a5bfa489ec2085cd1ac8e5f6d2ab2ef2516
SIZE (ros/ros-1.2.4.tar.bz2) = 1535133
MD5 (ros/gtest-1.3.0.tar.gz) = 714e9c00c0616ea72ba076c6c5f401d2
SHA256 (ros/gtest-1.3.0.tar.gz) = 03a4c85cb7cf1754e052317b289625daa73485da664ede18ba21cf754d3e8bd7
SIZE (ros/gtest-1.3.0.tar.gz) = 636326
MD5 (ros/SWIG-1.3.29-wx.tar.gz) = db156f40bddb3875d1363a0b29c753f0
SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
SHA256 (ros/gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff
SIZE (ros/gtest-1.5.0.tar.gz) = 896874

40
devel/ros/files/patch-gtest Normal file
View file

@ -0,0 +1,40 @@
--- 3rdparty/gtest/Makefile.orig 2010-10-25 08:35:45.000000000 +0200
+++ 3rdparty/gtest/Makefile 2010-10-27 21:24:06.000000000 +0200
@@ -1,9 +1,9 @@
all: gtest
-TARBALL = build/gtest-1.3.0.tar.gz
-TARBALL_URL = http://pr.willowgarage.com/downloads/gtest-1.3.0.tar.gz
-SOURCE_DIR = build/gtest-1.3.0
-MD5SUM_FILE = gtest-1.3.0.tar.gz.md5sum
+TARBALL = build/gtest-1.5.0.tar.gz
+TARBALL_URL = ftp://rene-ladan.nl/not-fetchable/gtest-1.5.0.tar.gz
+SOURCE_DIR = build/gtest-1.5.0
+MD5SUM_FILE = gtest-1.5.0.tar.gz.md5sum
include $(shell rospack find mk)/download_unpack_build.mk
# gtest's death test appears to hang when gtest is compiled with Bullseye's
@@ -17,7 +17,7 @@
endif
gtest: $(SOURCE_DIR)/unpacked
- cd $(SOURCE_DIR) && PATH=$(NEWPATH) ./configure --prefix=$(CURDIR)/gtest
+ cd $(SOURCE_DIR) && PATH=$(NEWPATH) CXXFLAGS="$(CXXFLAGS) -DGTEST_HAS_TR1_TUPLE=0" ./configure --prefix=$(CURDIR)/gtest
cd $(SOURCE_DIR) && PATH=$(NEWPATH) make install
touch gtest
--- core/rosbuild/public.cmake.orig 2010-10-25 08:35:45.000000000 +0200
+++ core/rosbuild/public.cmake 2010-10-28 11:40:56.000000000 +0200
@@ -419,7 +419,7 @@
include_directories(${_gtest_PACKAGE_PATH}/gtest/include)
link_directories(${_gtest_PACKAGE_PATH}/gtest/lib)
set(_gtest_LIBRARIES -lgtest)
- set(_gtest_CFLAGS_OTHER "")
+ set(_gtest_CFLAGS_OTHER "-DGTEST_HAS_TR1_TUPLE=0")
set(_gtest_LDFLAGS_OTHER "-Wl,-rpath,${_gtest_PACKAGE_PATH}/gtest/lib")
#
--- /dev/null 2010-11-01 00:11:00.000000000 +0100
+++ 3rdparty/gtest/gtest-1.5.0.tar.gz.md5sum 2010-11-01 00:12:51.000000000 +0100
@@ -0,0 +1 @@
+7e27f5f3b79dd1ce9092e159cdbd0635 gtest-1.5.0.tar.gz

3
devel/ros/files/pkg-message.in
View file

@ -1,11 +1,12 @@
To use ROS, add these variables to your environment:
ROS_MASTER_URI <HTTP address of the host running roscore>:11311
ROS_PACKAGE_PATH <directory where you will store additional ROS software>
ROS_ROOT %%PREFIX%%/ros
ROS_PACKAGE_PATH ${ROS_ROOT}/stacks:/my_other_ROS_directory
PYTHONPATH ${ROS_ROOT}/core/roslib/src
If you intend to build software with ROS:
CPATH %%LOCALBASE%%/include
EXTRA_CMAKE_FLAGS -DwxWidgets_CONFIG_EXECUTABLE=%%WX_CONFIG%%
LIBRARY_PATH %%LOCALBASE%%/lib
MAKE %%LOCALBASE%%/bin/gmake
ROS_BOOST_ROOT %%LOCALBASE%%

2
devel/ros/pkg-plist
View file

@ -69,6 +69,7 @@ ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-param-util-generated.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-param-util.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-port.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-string.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-tuple.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-type-util.h
ros/3rdparty/gtest/gtest/lib/libgtest.a
ros/3rdparty/gtest/gtest/lib/libgtest.la
@ -3555,6 +3556,7 @@ ros/tools/xdot/src/xdot/xdot.py
@dirrm ros/tools/topic_tools/demos
@dirrm ros/tools/topic_tools/bin
@dirrm ros/tools/topic_tools
@dirrm ros/stacks
@dirrm ros/tools/rxtools/src/rxtools
@dirrm ros/tools/rxtools/src/rxloggerlevel
@dirrm ros/tools/rxtools/src/rxconsole

19
devel/ros_comm/Makefile
View file

@ -6,13 +6,15 @@
PORTNAME= ros
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/${PORTNAME}/
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 gtest-1.3.0.tar.gz SWIG-1.3.29-wx.tar.gz
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
gtest-1.5.0.tar.gz
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.bz2
MAINTAINER= rene@freebsd.org
MAINTAINER= rene@FreeBSD.org
COMMENT= Robot Operating System - core utilities
LICENSE= BSD
@ -44,9 +46,7 @@ USE_GNOME= pkgconfig pygtk2
USE_PYTHON= yes
USE_WX= 2.8
WX_COMPS= python:build python:run
USE_BZIP2= yes
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
@ -60,6 +60,7 @@ MAKE_JOBS_UNSAFE= yes
MAKE_ENV+= CPATH=${LOCALBASE}/include \
EXTRA_CMAKE_FLAGS="-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}" \
LIBRARY_PATH=${LOCALBASE}/lib \
MAKE=${LOCALBASE}/bin/gmake \
PATH=${PATH}:${WRKSRC}/bin \
PYTHONPATH=${WRKSRC}/core/roslib/src \
@ -83,15 +84,16 @@ post-extract:
${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|"
# move 3rdparty distfiles into place
${MKDIR} ${WRKSRC}/3rdparty/gtest/build
${CP} ${_DISTDIR}/gtest-1.3.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
${CP} ${_DISTDIR}/gtest-1.5.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
${MKDIR} ${WRKSRC}/3rdparty/wxswig/build
${CP} ${_DISTDIR}/SWIG-1.3.29-wx.tar.gz ${WRKSRC}/3rdparty/wxswig/build
pre-build:
.if exists(${LOCALBASE}/lib/libgtest.so)
# temporarily move libraries from devel/googletest out of the way
${MKDIR} ${WRKSRC}/googletest_backup
.for f in .a .la .so .so.* _main.a _main.la _main.so _main.so.*
${MV} ${LOCALBASE}/lib/libgtest${f} /var/tmp
${MV} ${LOCALBASE}/lib/libgtest${f} ${WRKSRC}/googletest_backup
.endfor
.endif
# temporarily alter how ROS is built for the port build
@ -99,16 +101,17 @@ pre-build:
${WRKSRC}/Makefile
post-build:
.if exists(/var/tmp/libgtest.so)
.if exists(${WRKSRC}/googletest_backup/libgtest.so)
# restore libraries from devel/googletest
.for f in .a .la .so .so.* _main.a _main.la _main.so _main.so.*
${MV} /var/tmp/libgtest${f} ${LOCALBASE}/lib
${MV} ${WRKSRC}/googletest_backup/libgtest${f} ${LOCALBASE}/lib
.endfor
.endif
# restore original ROS Makefile
${MV} ${WRKSRC}/Makefile.bak ${WRKSRC}/Makefile
do-install:
${MKDIR} ${PREFIX}/${PORTNAME}/stacks
${MKDIR} ${PREFIX}/${PORTNAME}/bin
.for f in rospack rosplay rosrecord rosstack rxconsole rxloggerlevel

7
devel/ros_comm/distinfo
View file

@ -1,9 +1,6 @@
MD5 (ros/ros-1.2.4.tar.bz2) = f1b20ea6beb303ce64bf2a10a40bb71a
SHA256 (ros/ros-1.2.4.tar.bz2) = 199bd4d9f2578a165dfb42cd24bd0a5bfa489ec2085cd1ac8e5f6d2ab2ef2516
SIZE (ros/ros-1.2.4.tar.bz2) = 1535133
MD5 (ros/gtest-1.3.0.tar.gz) = 714e9c00c0616ea72ba076c6c5f401d2
SHA256 (ros/gtest-1.3.0.tar.gz) = 03a4c85cb7cf1754e052317b289625daa73485da664ede18ba21cf754d3e8bd7
SIZE (ros/gtest-1.3.0.tar.gz) = 636326
MD5 (ros/SWIG-1.3.29-wx.tar.gz) = db156f40bddb3875d1363a0b29c753f0
SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
SHA256 (ros/gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff
SIZE (ros/gtest-1.5.0.tar.gz) = 896874

40
devel/ros_comm/files/patch-gtest Normal file
View file

@ -0,0 +1,40 @@
--- 3rdparty/gtest/Makefile.orig 2010-10-25 08:35:45.000000000 +0200
+++ 3rdparty/gtest/Makefile 2010-10-27 21:24:06.000000000 +0200
@@ -1,9 +1,9 @@
all: gtest
-TARBALL = build/gtest-1.3.0.tar.gz
-TARBALL_URL = http://pr.willowgarage.com/downloads/gtest-1.3.0.tar.gz
-SOURCE_DIR = build/gtest-1.3.0
-MD5SUM_FILE = gtest-1.3.0.tar.gz.md5sum
+TARBALL = build/gtest-1.5.0.tar.gz
+TARBALL_URL = ftp://rene-ladan.nl/not-fetchable/gtest-1.5.0.tar.gz
+SOURCE_DIR = build/gtest-1.5.0
+MD5SUM_FILE = gtest-1.5.0.tar.gz.md5sum
include $(shell rospack find mk)/download_unpack_build.mk
# gtest's death test appears to hang when gtest is compiled with Bullseye's
@@ -17,7 +17,7 @@
endif
gtest: $(SOURCE_DIR)/unpacked
- cd $(SOURCE_DIR) && PATH=$(NEWPATH) ./configure --prefix=$(CURDIR)/gtest
+ cd $(SOURCE_DIR) && PATH=$(NEWPATH) CXXFLAGS="$(CXXFLAGS) -DGTEST_HAS_TR1_TUPLE=0" ./configure --prefix=$(CURDIR)/gtest
cd $(SOURCE_DIR) && PATH=$(NEWPATH) make install
touch gtest
--- core/rosbuild/public.cmake.orig 2010-10-25 08:35:45.000000000 +0200
+++ core/rosbuild/public.cmake 2010-10-28 11:40:56.000000000 +0200
@@ -419,7 +419,7 @@
include_directories(${_gtest_PACKAGE_PATH}/gtest/include)
link_directories(${_gtest_PACKAGE_PATH}/gtest/lib)
set(_gtest_LIBRARIES -lgtest)
- set(_gtest_CFLAGS_OTHER "")
+ set(_gtest_CFLAGS_OTHER "-DGTEST_HAS_TR1_TUPLE=0")
set(_gtest_LDFLAGS_OTHER "-Wl,-rpath,${_gtest_PACKAGE_PATH}/gtest/lib")
#
--- /dev/null 2010-11-01 00:11:00.000000000 +0100
+++ 3rdparty/gtest/gtest-1.5.0.tar.gz.md5sum 2010-11-01 00:12:51.000000000 +0100
@@ -0,0 +1 @@
+7e27f5f3b79dd1ce9092e159cdbd0635 gtest-1.5.0.tar.gz

3
devel/ros_comm/files/pkg-message.in
View file

@ -1,11 +1,12 @@
To use ROS, add these variables to your environment:
ROS_MASTER_URI <HTTP address of the host running roscore>:11311
ROS_PACKAGE_PATH <directory where you will store additional ROS software>
ROS_ROOT %%PREFIX%%/ros
ROS_PACKAGE_PATH ${ROS_ROOT}/stacks:/my_other_ROS_directory
PYTHONPATH ${ROS_ROOT}/core/roslib/src
If you intend to build software with ROS:
CPATH %%LOCALBASE%%/include
EXTRA_CMAKE_FLAGS -DwxWidgets_CONFIG_EXECUTABLE=%%WX_CONFIG%%
LIBRARY_PATH %%LOCALBASE%%/lib
MAKE %%LOCALBASE%%/bin/gmake
ROS_BOOST_ROOT %%LOCALBASE%%

2
devel/ros_comm/pkg-plist
View file

@ -69,6 +69,7 @@ ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-param-util-generated.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-param-util.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-port.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-string.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-tuple.h
ros/3rdparty/gtest/gtest/include/gtest/internal/gtest-type-util.h
ros/3rdparty/gtest/gtest/lib/libgtest.a
ros/3rdparty/gtest/gtest/lib/libgtest.la
@ -3555,6 +3556,7 @@ ros/tools/xdot/src/xdot/xdot.py
@dirrm ros/tools/topic_tools/demos
@dirrm ros/tools/topic_tools/bin
@dirrm ros/tools/topic_tools
@dirrm ros/stacks
@dirrm ros/tools/rxtools/src/rxtools
@dirrm ros/tools/rxtools/src/rxloggerlevel
@dirrm ros/tools/rxtools/src/rxconsole