From owner-svn-ports-head@FreeBSD.ORG Fri Feb 21 18:32:35 2014 Return-Path: Delivered-To: svn-ports-head@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 A58A9A3F; Fri, 21 Feb 2014 18:32:35 +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 908F21DB7; Fri, 21 Feb 2014 18:32:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1LIWZQ9097380; Fri, 21 Feb 2014 18:32:35 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1LIWZJf097379; Fri, 21 Feb 2014 18:32:35 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201402211832.s1LIWZJf097379@svn.freebsd.org> From: Antoine Brodin Date: Fri, 21 Feb 2014 18:32:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345524 - head/devel/ruby-gems X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Feb 2014 18:32:35 -0000 Author: antoine Date: Fri Feb 21 18:32:35 2014 New Revision: 345524 URL: http://svnweb.freebsd.org/changeset/ports/345524 QAT: https://qat.redports.org/buildarchive/r345524/ Log: Stage support Tested by: miwi (and me) Modified: head/devel/ruby-gems/Makefile Modified: head/devel/ruby-gems/Makefile ============================================================================== --- head/devel/ruby-gems/Makefile Fri Feb 21 18:30:45 2014 (r345523) +++ head/devel/ruby-gems/Makefile Fri Feb 21 18:32:35 2014 (r345524) @@ -21,12 +21,6 @@ NO_BUILD= yes PLIST_SUB+= DISTNAME="${DISTNAME}" \ RUBY_VER_SHORT="${RUBY_VER_SHORT}" -.if !defined(NOPORTDOCS) -RUBY_SETUP_OPTIONS= --ri --rdoc -.else -RUBY_SETUP_OPTIONS= --no-ri --no-rdoc -.endif - GEMS_BASE_DIR= lib/ruby/gems GEMS_BASE_DIR_P= ${GEMS_BASE_DIR} GEMS_VER_DIR= ${GEMS_BASE_DIR}/${RUBY_VER} @@ -37,25 +31,33 @@ GEMS_DOC_DIR= ${GEMS_DOC_BASE_DIR}/${DI GEMS_DOC_DIR_P= ${GEMS_DOC_BASE_DIR_P}/%%DISTNAME%% RUBY_VER_SHORT= ${RUBY_VER:S/.//} -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS + +.include + +.if ${PORT_OPTIONS:MDOCS} +RUBY_SETUP_OPTIONS= --ri --rdoc --destdir=${STAGEDIR} +GEM_ENV+= GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_VER_DIR} +.else +RUBY_SETUP_OPTIONS= --no-ri --no-rdoc --destdir=${STAGEDIR} +.endif do-install: - @${MKDIR} ${PREFIX}/${GEMS_DOC_BASE_DIR}/ - @${TOUCH} ${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this + @${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_DOC_BASE_DIR}/ + @${TOUCH} ${STAGEDIR}${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this cd ${WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS} post-install: - @${LN} -sf ${PREFIX}/bin/gem${RUBY_VER_SHORT} ${PREFIX}/bin/gem + @${LN} -sf gem${RUBY_VER_SHORT} ${STAGEDIR}${PREFIX}/bin/gem # # Find all RDOC and RI files # -.if !defined(NOPORTDOCS) - @${FIND} -ds ${PREFIX}/${GEMS_DOC_DIR}/ ! -type d | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} -ds ${PREFIX}/${GEMS_DOC_DIR}/ -type d -mindepth 1 | \ - ${SED} -E -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} +.if ${PORT_OPTIONS:MDOCS} + @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR}/ ! -type d | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR}/ -type d -mindepth 1 | \ + ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${ECHO_CMD} "@dirrm ${GEMS_DOC_DIR}" >> ${TMPPLIST} .endif @@ -71,19 +73,19 @@ x-generate-plist: ${ECHO} %%RUBY_SITELIBDIR%%/gauntlet_rubygems.rb >> pkg-plist.new ${ECHO} %%RUBY_SITELIBDIR%%/rbconfig/datadir.rb >> pkg-plist.new ${ECHO} %%RUBY_SITELIBDIR%%/rubygems.rb >> pkg-plist.new - ${FIND} ${RUBY_SITELIBDIR}/rubygems -type f | ${SORT} | ${SED} -e 's,${RUBY_SITELIBDIR},%%RUBY_SITELIBDIR%%,' >> pkg-plist.new + ${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/rubygems -type f | ${SORT} | ${SED} -e 's,${STAGEDIR}${RUBY_SITELIBDIR},%%RUBY_SITELIBDIR%%,' >> pkg-plist.new ${ECHO} %%RUBY_SITELIBDIR%%/ubygems.rb >> pkg-plist.new - ${FIND} ${PREFIX}/${GEMS_DOC_DIR} -type f | ${SORT} | ${SED} -e 's,${PREFIX}/${GEMS_DOC_DIR},%%PORTDOCS%%${GEMS_DOC_DIR_P},' >> pkg-plist.new + ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR} -type f | ${SORT} | ${SED} -e 's,${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR},%%PORTDOCS%%${GEMS_DOC_DIR_P},' >> pkg-plist.new - ${FIND} ${RUBY_SITELIBDIR}/rubygems -type d | ${SORT} -r | ${SED} -e 's,${RUBY_SITELIBDIR},@dirrm %%RUBY_SITELIBDIR%%,' >> pkg-plist.new + ${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/rubygems -type d | ${SORT} -r | ${SED} -e 's,${STAGEDIR}${RUBY_SITELIBDIR},@dirrm %%RUBY_SITELIBDIR%%,' >> pkg-plist.new ${ECHO} @dirrm %%RUBY_SITELIBDIR%%/rbconfig >> pkg-plist.new ${ECHO} @dirrmtry ${GEMS_VER_DIR_P}/specifications >> pkg-plist.new ${ECHO} @dirrmtry ${GEMS_VER_DIR_P}/gems >> pkg-plist.new ${ECHO} @dirrmtry ${GEMS_VER_DIR_P}/cache >> pkg-plist.new - ${FIND} ${PREFIX}/${GEMS_DOC_DIR} -type d | ${SORT} -r | ${SED} -e 's,${PREFIX}/${GEMS_DOC_DIR},%%PORTDOCS%%@dirrm ${GEMS_DOC_DIR_P},' >> pkg-plist.new + ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR} -type d | ${SORT} -r | ${SED} -e 's,${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR},%%PORTDOCS%%@dirrm ${GEMS_DOC_DIR_P},' >> pkg-plist.new ${ECHO} ${GEMS_DOC_BASE_DIR_P}/.keep_this >> pkg-plist.new ${ECHO} @dirrmtry ${GEMS_DOC_BASE_DIR_P} >> pkg-plist.new ${ECHO} @dirrmtry ${GEMS_VER_DIR_P} >> pkg-plist.new ${ECHO} @dirrmtry ${GEMS_BASE_DIR_P} >> pkg-plist.new -.include +.include