From owner-svn-ports-all@FreeBSD.ORG Wed Apr 9 09:25:30 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C9FF707; Wed, 9 Apr 2014 09:25:30 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09A181B6D; Wed, 9 Apr 2014 09:25:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s399PT4v045193; Wed, 9 Apr 2014 09:25:29 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s399PTvY045192; Wed, 9 Apr 2014 09:25:29 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404090925.s399PTvY045192@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 9 Apr 2014 09:25:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350674 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2014 09:25:30 -0000 Author: bapt Date: Wed Apr 9 09:25:29 2014 New Revision: 350674 URL: http://svnweb.freebsd.org/changeset/ports/350674 QAT: https://qat.redports.org/buildarchive/r350674/ Log: Remove support for not staged ports Approved by: ruby@ (swills) Modified: head/Mk/bsd.ruby.mk Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Wed Apr 9 09:18:25 2014 (r350673) +++ head/Mk/bsd.ruby.mk Wed Apr 9 09:25:29 2014 (r350674) @@ -463,12 +463,8 @@ GEMFILES= ${DISTFILES:C/:[^:]+$//} GEMFILES= ${DISTNAME}${EXTRACT_SUFX} . endif -.if defined(NO_STAGE) -RUBYGEM_ARGS=-l --no-update-sources --no-ri --install-dir ${PREFIX}/lib/ruby/gems/${RUBY_VER} -.else RUBYGEM_ARGS=-l --no-update-sources --no-ri --install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} --ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin GEM_ENV+= RB_USER_INSTALL=yes -.endif .if defined(NOPORTDOCS) RUBYGEM_ARGS+= --no-rdoc .endif @@ -567,13 +563,8 @@ do-install: ruby-setup-install ruby-setup-install: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to install" -. if defined(NO_STAGE) - @cd ${INSTALL_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install -. else @cd ${INSTALL_WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR} -. endif .endif .if defined(USE_LIBRUBY)