Date: Mon, 21 Oct 2013 19:37:27 -0400 From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: Baptiste Daroussin <bapt@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r330638 - head/Mk Message-ID: <CACM2dAZ4ko9VJ0mOMQ4kZP_iyWXkdF7eugLGpdjkcZa1MH4jRw@mail.gmail.com> In-Reply-To: <201310171328.r9HDSpxU098368@svn.freebsd.org> References: <201310171328.r9HDSpxU098368@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Thank you. Sorry about adding www/rubygem-geminabox without it! On Thu, Oct 17, 2013 at 9:28 AM, Baptiste Daroussin <bapt@freebsd.org>wrote: > Author: bapt > Date: Thu Oct 17 13:28:50 2013 > New Revision: 330638 > URL: http://svnweb.freebsd.org/changeset/ports/330638 > > Log: > Allow staging rubygems (which here, enforce the bindir for staged > rubygem ports) > > Modified: > head/Mk/bsd.ruby.mk > > Modified: head/Mk/bsd.ruby.mk > > ============================================================================== > --- head/Mk/bsd.ruby.mk Thu Oct 17 13:09:58 2013 (r330637) > +++ head/Mk/bsd.ruby.mk Thu Oct 17 13:28:50 2013 (r330638) > @@ -468,7 +468,11 @@ GEMFILES= ${DISTFILES:C/:[^:]+$//} > GEMFILES= ${DISTNAME}${EXTRACT_SUFX} > . endif > > -RUBYGEM_ARGS=-l --no-update-sources --no-ri --install-dir > ${PREFIX}/lib/ruby/gems/${RUBY_VER} > +.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 > +.endif > .if defined(NOPORTDOCS) > RUBYGEM_ARGS+= --no-rdoc > .endif > @@ -495,15 +499,15 @@ post-install-script: > @${ECHO} ${GEM_CACHE} >> ${TMPPLIST} > @${ECHO} ${GEM_SPEC} >> ${TMPPLIST} > .if !defined(NOPORTDOCS) > - @${FIND} -ds ${PREFIX}/${GEM_DOC_DIR} -type f -print | ${SED} -E > -e \ > - 's,^${PREFIX}/?,,' >> ${TMPPLIST} > - @${FIND} -ds ${PREFIX}/${GEM_DOC_DIR} -type d -print | ${SED} -E > -e \ > - 's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} > -.endif > - @${FIND} -ds ${PREFIX}/${GEM_LIB_DIR} -type f -print | ${SED} -E > -e \ > - 's,^${PREFIX}/?,,' >> ${TMPPLIST} > - @${FIND} -ds ${PREFIX}/${GEM_LIB_DIR} -type d -print | ${SED} -E > -e \ > - 's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} > + @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_DOC_DIR} -type f -print | > ${SED} -E -e \ > + 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} > + @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_DOC_DIR} -type d -print | > ${SED} -E -e \ > + 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} > +.endif > + @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type f -print | > ${SED} -E -e \ > + 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} > + @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type d -print | > ${SED} -E -e \ > + 's,^${STAGEDIR}${STAGEDIR}${PREFIX}/?,@dirrm ,' >> > ${TMPPLIST} > @${ECHO_CMD} "@unexec rmdir %D/${GEMS_DIR} 2>/dev/null || true" >> > ${TMPPLIST} > .if !defined(NOPORTDOCS) > @${ECHO_CMD} "@unexec rmdir %D/${DOC_DIR} 2>/dev/null || true" >> > ${TMPPLIST} > -- --------------------------------------------------------------------------------------------- 4096R/D1EAB94D 2081 E230 3001 6508 8847 1BBF A0A8 DB0F D1EA B94D Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Director IT Operations, RideCharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACM2dAZ4ko9VJ0mOMQ4kZP_iyWXkdF7eugLGpdjkcZa1MH4jRw>