Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Apr 2015 15:54:55 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r382918 - head/devel/ruby-gems
Message-ID:  <201504011554.t31FstDb051963@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Wed Apr  1 15:54:54 2015
New Revision: 382918
URL: https://svnweb.freebsd.org/changeset/ports/382918
QAT: https://qat.redports.org/buildarchive/r382918/

Log:
  devel/ruby-gems: fix with DOCS option disabled
  
  PR:		198052

Modified:
  head/devel/ruby-gems/Makefile
  head/devel/ruby-gems/pkg-plist

Modified: head/devel/ruby-gems/Makefile
==============================================================================
--- head/devel/ruby-gems/Makefile	Wed Apr  1 14:44:17 2015	(r382917)
+++ head/devel/ruby-gems/Makefile	Wed Apr  1 15:54:54 2015	(r382918)
@@ -49,16 +49,14 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.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}
+RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR}
+GEM_ENV=		GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}
+
+.if !${PORT_OPTIONS:MDOCS}
+RUBY_SETUP_OPTIONS+=	--no-ri --no-rdoc
 .endif
 
 do-install:
-	@${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:

Modified: head/devel/ruby-gems/pkg-plist
==============================================================================
--- head/devel/ruby-gems/pkg-plist	Wed Apr  1 14:44:17 2015	(r382917)
+++ head/devel/ruby-gems/pkg-plist	Wed Apr  1 15:54:54 2015	(r382918)
@@ -158,9 +158,9 @@ bin/gem%%RUBY_VER_SHORT%%
 %%RUBY_SITELIBDIR%%/rubygems/version.rb
 %%RUBY_SITELIBDIR%%/rubygems/version_option.rb
 %%RUBY_SITELIBDIR%%/ubygems.rb
-lib/ruby/gems/%%RUBY_VER%%/doc/.keep_this
 @dir lib/ruby/gems/%%RUBY_VER%%/build_info
 @dir %%EXT_DIR%%
 @dir %%CACHE_DIR%%
 @dir %%GEMS_DIR%%
 @dir %%SPEC_DIR%%
+@dir %%DOC_DIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504011554.t31FstDb051963>