Date: Sat, 5 Jun 2010 23:01:33 -0400 (EDT) From: "Philip M. Gollucci" <pgollucci@freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Cc: ruby@freebsd.org Subject: [PATCH]: Mk/bsd.ruby.mk: support --no-rdoc for -DNOPORTDOCS Message-ID: <201006060301.o5631X4m070589@frieza.p6m7g8.net>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Philip M. Gollucci
>Organization: RideCharge Inc.
>Confidential: no
>Synopsis: [PATCH]: Mk/bsd.ruby.mk: support --no-rdoc for -DNOPORTDOCS
>Severity: non-critical
>Priority: low
>Category: ports
>Class: maintainer-update
>Release: FreeBSD 9.0-CURRENT amd64
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010 root@frieza.p6m7g8.net:/usr/obj/usr/src/sys/FRIEZA amd64
>Description:
>How-To-Repeat:
>Fix:
--- nordoc.diff begins here ---
Index: bsd.ruby.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.ruby.mk,v
retrieving revision 1.195
diff -u -r1.195 bsd.ruby.mk
--- bsd.ruby.mk 28 Apr 2010 23:59:55 -0000 1.195
+++ bsd.ruby.mk 6 Jun 2010 02:41:03 -0000
@@ -424,9 +424,14 @@
GEMFILES= ${DISTNAME}${EXTRACT_SUFX}
. endif
+RUBYGEM_ARGS=-l --no-update-sources --no-ri --install-dir ${PREFIX}/lib/ruby/gems/${RUBY_VER}
+.if defined(NOPORTDOCS)
+RUBYGEM_ARGS+= --no-rdoc
+.endif
+
do-install:
.for _D in ${GEMFILES}
- ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install -l --no-update-sources --no-ri --install-dir ${PREFIX}/lib/ruby/gems/${RUBY_VER} ${DISTDIR}/${DIST_SUBDIR}/${_D} -- --build-args ${CONFIGURE_ARGS}
+ ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${_D} -- --build-args ${CONFIGURE_ARGS}
.endfor
. if defined(RUBYGEM_AUTOPLIST)
@@ -434,16 +439,20 @@
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}
@${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}
+.endif
@${ECHO_CMD} "@unexec rmdir %D/${CACHE_DIR} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/${SPEC_DIR} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/${GEMS_BASE_DIR} 2>/dev/null || true" >> ${TMPPLIST}
--- nordoc.diff ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006060301.o5631X4m070589>