From owner-svn-ports-all@FreeBSD.ORG  Sun Dec  8 21:13:56 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BE1A6D36;
 Sun,  8 Dec 2013 21:13:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA6BF105F;
 Sun,  8 Dec 2013 21:13:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8LDucU053323;
 Sun, 8 Dec 2013 21:13:56 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8LDu61053322;
 Sun, 8 Dec 2013 21:13:56 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201312082113.rB8LDu61053322@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Sun, 8 Dec 2013 21:13:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335942 - head/devel/ros/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Dec 2013 21:13:56 -0000

Author: marino
Date: Sun Dec  8 21:13:56 2013
New Revision: 335942
URL: http://svnweb.freebsd.org/changeset/ports/335942

Log:
  devel/ros: Properly support specified gmake
  
  This port needs gmake, but "make" was hardcoded.
  This fix unbreaks it on head where bmake is default.

Added:
  head/devel/ros/files/patch-tools_rospack_Makefile   (contents, props changed)

Added: head/devel/ros/files/patch-tools_rospack_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ros/files/patch-tools_rospack_Makefile	Sun Dec  8 21:13:56 2013	(r335942)
@@ -0,0 +1,39 @@
+--- tools/rospack/Makefile.orig	2011-09-02 17:53:09.000000000 +0000
++++ tools/rospack/Makefile
+@@ -10,28 +10,28 @@ all:
+ 	-mkdir -p bin
+ 	@if ! (cd build && cmake ..); then \
+ 	  echo "[rosbuild] CMake failed; trying to clean and start over"; \
+-	  make clean; \
++	  $(MAKE) clean; \
+ 	  mkdir -p build; \
+ 	  cd build && cmake ..; \
+ 	fi
+-	cd build && make $(PARALLEL_JOBS)
++	cd build && $(MAKE) $(PARALLEL_JOBS)
+ 
+ install: all
+-	cd build && make install
++	cd build && $(MAKE) install
+ 
+ # The clean target blows everything away
+ clean:
+-	-cd build && make clean
++	-cd build && $(MAKE) clean
+ 	rm -rf build
+ 
+ test: all
+-	if cd build && make -k $@; then make test-results; else make test-results && exit 1; fi
++	if cd build && $(MAKE) -k $@; then make test-results; else $(MAKE) test-results && exit 1; fi
+ tests: all
+-	cd build && make $@
++	cd build && $(MAKE) $@
+ test-future: all
+-	cd build && make -k $@
++	cd build && $(MAKE) -k $@
+ gcoverage: all
+-	cd build && make $@
++	cd build && $(MAKE) $@
+ 
+ #SRC = main.cpp
+ #LIBSRC = rospack.cpp \