svn commit: r330638 - head/Mk
Baptiste Daroussin
bapt at FreeBSD.org
Thu Oct 17 13:28:51 UTC 2013
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}/?, at 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}/?, at 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}/?, at 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}/?, at 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}
More information about the svn-ports-head
mailing list