Date: Tue, 31 Aug 2010 13:40:04 GMT From: Jyun-Yan You <jyyou@cs.nctu.edu.tw> To: ruby@FreeBSD.org Subject: Re: ports/144568: devel/ruby-gems: Ruby 1.9.1 has rubygems version 1.3.1 built in, but some gems require a newer version. 1.3.5 is available by the ports, but needs the following changes. Message-ID: <201008311340.o7VDe4te036701@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/144568; it has been noted by GNATS. From: Jyun-Yan You <jyyou@cs.nctu.edu.tw> To: bug-followup@FreeBSD.org, astounding@gmail.com Cc: Subject: Re: ports/144568: devel/ruby-gems: Ruby 1.9.1 has rubygems version 1.3.1 built in, but some gems require a newer version. 1.3.5 is available by the ports, but needs the following changes. Date: Tue, 31 Aug 2010 21:21:07 +0800 --M9NhX3UHpAaciwkO Content-Type: text/plain; charset=big5 Content-Disposition: inline I make a new diff for current devel/ruby-gems (1.3.7). --M9NhX3UHpAaciwkO Content-Type: text/x-diff; charset=big5 Content-Disposition: attachment; filename="ruby-gems.diff" diff -ruN --exclude=CVS /usr/ports/devel/ruby-gems/Makefile /amd/gcs/98/9855518/ruby-gems/Makefile --- /usr/ports/devel/ruby-gems/Makefile 2010-05-26 14:32:18.000000000 +0800 +++ /amd/gcs/98/9855518/ruby-gems/Makefile 2010-08-31 02:29:15.000000000 +0800 @@ -20,7 +20,6 @@ USE_RUBY= yes RUBY_SETUP= setup.rb -RUBY_VER= 1.8 NO_BUILD= yes @@ -43,8 +42,10 @@ .include <bsd.port.pre.mk> -.if ${RUBY_VER} == 1.9 -IGNORE= already included in this ruby distribution +.if ${RUBY_VER} == ${RUBY_DEFAULT_VER} +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " .endif do-install: @@ -53,7 +54,10 @@ post-install: @${MKDIR} ${PREFIX}/${GEMS_DOC_BASE_DIR}/ @${TOUCH} ${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this - @${LN} -sf ${PREFIX}/bin/gem18 ${PREFIX}/bin/gem + +.if ${RUBY_VER} == ${RUBY_DEFAULT_VER} + @${LN} -sf ${PREFIX}/bin/gem${RUBY_SUFFIX} ${PREFIX}/bin/gem +.endif .if !defined(NOPORTDOCS) @${FIND} -ds ${PREFIX}/lib/ruby/gems/${RUBY_VER}/doc/${DISTNAME} \ @@ -68,9 +72,9 @@ # This target is only meant to be used by the port maintainer. x-generate-plist: - ${ECHO} bin/gem > pkg-plist.new - ${ECHO} bin/gem18 >> pkg-plist.new - ${ECHO} bin/update_rubygems18 >> pkg-plist.new + ${ECHO} %%IF_DEFAULT%%bin/gem > pkg-plist.new + ${ECHO} bin/gem%%RUBY_SUFFIX%% >> pkg-plist.new + ${ECHO} bin/update_rubygems%%RUBY_SUFFIX%% >> pkg-plist.new ${ECHO} ${GEMS_VER_DIR_P}/cache/sources-0.0.2.gem >> pkg-plist.new ${FIND} ${PREFIX}/${GEMS_VER_DIR}/gems/sources-0.0.2 -type f | ${SORT} | ${SED} -e 's,${PREFIX}/${GEMS_VER_DIR},${GEMS_VER_DIR_P},' >> pkg-plist.new ${ECHO} ${GEMS_VER_DIR_P}/specifications/sources-0.0.2.gemspec >> pkg-plist.new diff -ruN --exclude=CVS /usr/ports/devel/ruby-gems/pkg-plist /amd/gcs/98/9855518/ruby-gems/pkg-plist --- /usr/ports/devel/ruby-gems/pkg-plist 2010-05-26 14:32:18.000000000 +0800 +++ /amd/gcs/98/9855518/ruby-gems/pkg-plist 2010-08-31 02:29:51.000000000 +0800 @@ -1,7 +1,7 @@ @comment $FreeBSD: ports/devel/ruby-gems/pkg-plist,v 1.23 2010/05/26 06:32:18 pgollucci Exp $ -bin/gem -bin/gem18 -bin/update_rubygems18 +%%IF_DEFAULT%%bin/gem +bin/gem%%RUBY_SUFFIX%% +bin/update_rubygems%%RUBY_SUFFIX%% lib/ruby/gems/%%RUBY_VER%%/cache/sources-0.0.2.gem lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.2/lib/sources.rb lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec --M9NhX3UHpAaciwkO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008311340.o7VDe4te036701>