From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 6 03:10:09 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E22821065674 for ; Sun, 6 Jun 2010 03:10:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BE3588FC21 for ; Sun, 6 Jun 2010 03:10:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o563A8ru058917 for ; Sun, 6 Jun 2010 03:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o563A8vO058916; Sun, 6 Jun 2010 03:10:08 GMT (envelope-from gnats) Resent-Date: Sun, 6 Jun 2010 03:10:08 GMT Resent-Message-Id: <201006060310.o563A8vO058916@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CF1E106566C; Sun, 6 Jun 2010 03:01:37 +0000 (UTC) (envelope-from pgollucci@frieza.p6m7g8.net) Received: from frieza.p6m7g8.net (wsip-174-79-184-239.dc.dc.cox.net [174.79.184.239]) by mx1.freebsd.org (Postfix) with ESMTP id 879898FC0A; Sun, 6 Jun 2010 03:01:34 +0000 (UTC) Received: from frieza.p6m7g8.net (localhost [127.0.0.1]) by frieza.p6m7g8.net (8.14.4/8.14.4) with ESMTP id o5631XsS070590; Sat, 5 Jun 2010 23:01:33 -0400 (EDT) (envelope-from pgollucci@frieza.p6m7g8.net) Received: (from pgollucci@localhost) by frieza.p6m7g8.net (8.14.4/8.14.4/Submit) id o5631X4m070589; Sat, 5 Jun 2010 23:01:33 -0400 (EDT) (envelope-from pgollucci) Message-Id: <201006060301.o5631X4m070589@frieza.p6m7g8.net> Date: Sat, 5 Jun 2010 23:01:33 -0400 (EDT) From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: ruby@FreeBSD.org Subject: ports/147547: [PATCH]: Mk/bsd.ruby.mk: support --no-rdoc for -DNOPORTDOCS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Philip M. Gollucci" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2010 03:10:09 -0000 >Number: 147547 >Category: ports >Synopsis: [PATCH]: Mk/bsd.ruby.mk: support --no-rdoc for -DNOPORTDOCS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jun 06 03:10:08 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 9.0-CURRENT amd64 >Organization: RideCharge Inc. >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 --- >Release-Note: >Audit-Trail: >Unformatted: