5 files changed, 3 insertions, 45 deletions

diff --git a/devel/ros/Makefile b/devel/ros/Makefile
index 6e7a6bc24dbf..00541528f936 100644
--- a/devel/ros/Makefile
+++ b/devel/ros/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ros
-PORTVERSION=	1.2.5
+PORTVERSION=	1.2.6
 CATEGORIES=	devel
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/ros/
 DISTFILES=	ros-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
diff --git a/devel/ros/distinfo b/devel/ros/distinfo
index 0bd14544f90b..5353e991e3ca 100644
--- a/devel/ros/distinfo
+++ b/devel/ros/distinfo
@@ -1,5 +1,5 @@
-SHA256 (ros/ros-1.2.5.tar.bz2) = 7df54a08caaed36cd30cb66a429222614a7c7900be0a5c524a47ce790e6828f7
-SIZE (ros/ros-1.2.5.tar.bz2) = 1541170
+SHA256 (ros/ros-1.2.6.tar.bz2) = 4dd3ed44c88655a6e4947531a8dd7a57c3fc64f0d2b3e8e660a2d50a2f091acd
+SIZE (ros/ros-1.2.6.tar.bz2) = 1537227
 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
diff --git a/devel/ros/files/patch-3rdparty__wxswig__Makefile b/devel/ros/files/patch-3rdparty__wxswig__Makefile
deleted file mode 100644
index 4fc03c85ac53..000000000000
--- a/devel/ros/files/patch-3rdparty__wxswig__Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- 3rdparty/wxswig/Makefile.orig	2010-09-28 22:37:32.000000000 +0200
-+++ 3rdparty/wxswig/Makefile	2011-02-13 13:18:06.000000000 +0100
-@@ -13,7 +13,11 @@
- 		./configure --prefix=$(WXSWIG_ROOT)
- 
- wxswig: $(SOURCE_DIR)/unpacked
-+ifneq ($(MAKE),)
-+	cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && $(MAKE) $(ROS_PARALLEL_JOBS) && $(MAKE) install
-+else
- 	cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && make $(ROS_PARALLEL_JOBS) && make install
-+endif
- 	mv bin/swig bin/swig-real
- 	cp swig-wrap bin/swig
- 	touch wxswig
diff --git a/devel/ros/files/patch-test__test_rosbag__Makefile b/devel/ros/files/patch-test__test_rosbag__Makefile
deleted file mode 100644
index 88dbc72b6cf0..000000000000
--- a/devel/ros/files/patch-test__test_rosbag__Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- test/test_rosbag/Makefile.orig	2010-05-06 00:22:45.000000000 +0200
-+++ test/test_rosbag/Makefile	2011-02-13 13:20:26.000000000 +0100
-@@ -4,7 +4,11 @@
- 	@mkdir -p build
- 	-mkdir -p bin
- 	cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
-+ifneq ($(MAKE),)
-+	cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
-+else
- 	cd build && make $(ROS_PARALLEL_JOBS)
-+endif
- 
- PACKAGE_NAME=$(shell basename $(PWD))
- 
diff --git a/devel/ros/files/patch-test__test_rosbagmigration__Makefile b/devel/ros/files/patch-test__test_rosbagmigration__Makefile
deleted file mode 100644
index a07288ec9893..000000000000
--- a/devel/ros/files/patch-test__test_rosbagmigration__Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- test/test_rosbagmigration/Makefile.orig	2009-07-20 03:49:11.000000000 +0200
-+++ test/test_rosbagmigration/Makefile	2011-02-13 13:39:46.000000000 +0100
-@@ -4,7 +4,11 @@
- 	@mkdir -p build
- 	-mkdir -p bin
- 	cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
-+ifneq ($(MAKE),)
-+	cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
-+else
- 	cd build && make $(ROS_PARALLEL_JOBS)
-+endif
- 
- PACKAGE_NAME=$(shell basename $(PWD))
-