From owner-svn-ports-all@FreeBSD.ORG  Sun Feb  9 01:54:57 2014
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 20275CAA;
 Sun,  9 Feb 2014 01:54:57 +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 0B59C1343;
 Sun,  9 Feb 2014 01:54:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s191suL1019076;
 Sun, 9 Feb 2014 01:54:56 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s191suDx019075;
 Sun, 9 Feb 2014 01:54:56 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201402090154.s191suDx019075@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 9 Feb 2014 01:54:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343416 - head/Mk
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, 09 Feb 2014 01:54:57 -0000

Author: bdrewery
Date: Sun Feb  9 01:54:56 2014
New Revision: 343416
URL: http://svnweb.freebsd.org/changeset/ports/343416
QAT: https://qat.redports.org/buildarchive/r343416/

Log:
  Allow staging USE_RUBY_SETUP ports.
  
  They must be built with the proper prefix, but at install
  phase they should be passed --prefix=STAGEDIR. It will
  already install to the previously used PREFIX so this
  will end up installing into ${STAGEDIR}${PREFIX}
  
  With hat:	ruby

Modified:
  head/Mk/bsd.ruby.mk

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Sun Feb  9 01:54:21 2014	(r343415)
+++ head/Mk/bsd.ruby.mk	Sun Feb  9 01:54:56 2014	(r343416)
@@ -555,7 +555,11 @@ do-install:	ruby-setup-install
 ruby-setup-install:
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to install"
 	@cd ${INSTALL_WRKSRC}; \
+.  if defined(NO_STAGE)
 	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install
+.  else
+	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR}
+.  endif
 .endif
 
 .if defined(USE_LIBRUBY)