Date: Fri, 13 Mar 2020 09:27:15 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528339 - in head: Mk devel/rubygem-irb devel/rubygem-rdoc lang/ruby27 Message-ID: <202003130927.02D9RFoA034335@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Fri Mar 13 09:27:15 2020 New Revision: 528339 URL: https://svnweb.freebsd.org/changeset/ports/528339 Log: lang/ruby27: throw out irb, ri, rdoc from lang/ruby27 because they're provided as "default gem" since Ruby 2.6. We provide "default gem"s as gem ports rather than a part of lang/ruby* port. files/patch-tool_rbinstall.rb makes not to install such default gems however hollow wrapper scripts bin/{irb,ri,rdoc} and their manpages were still left. This commit intend to move out such wrapper scripts and manpages to gem ports completely. PR: 243888 Submitted by: Yasuhiro KIMURA <yasu@utahime.org> (initial revision) meta (myself) Differential Revision: https://reviews.freebsd.org/D23514 Modified: head/Mk/bsd.ruby.mk head/devel/rubygem-irb/Makefile head/devel/rubygem-rdoc/Makefile head/lang/ruby27/Makefile head/lang/ruby27/pkg-message head/lang/ruby27/pkg-plist Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Fri Mar 13 09:12:41 2020 (r528338) +++ head/Mk/bsd.ruby.mk Fri Mar 13 09:27:15 2020 (r528339) @@ -176,7 +176,7 @@ RUBY26= "" # PLIST_SUB helpers # Ruby 2.7 # RUBY_VERSION= 2.7.0 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 2 RUBY_PORTEPOCH= 1 RUBY27= "" # PLIST_SUB helpers Modified: head/devel/rubygem-irb/Makefile ============================================================================== --- head/devel/rubygem-irb/Makefile Fri Mar 13 09:12:41 2020 (r528338) +++ head/devel/rubygem-irb/Makefile Fri Mar 13 09:27:15 2020 (r528339) @@ -2,6 +2,7 @@ PORTNAME= irb PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -20,12 +21,19 @@ NO_ARCH= yes .include <bsd.port.pre.mk> -.if ${RUBY_VER} < 2.6 -IGNORE= irb is included in lang/${RUBY_NAME} -.endif +.if ${RUBY_VER} >= 2.7 +PLIST_FILES= bin/irb \ + share/man/man1/irb.1.gz -# irb executable is installed by ruby port post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1 + ${INSTALL_DATA} ${WRKSRC}/man/irb.1 +.elif ${RUBY_VER} == 2.6 +# WIP: irb wrapper script is installed by ruby port so far, see bug 241554, 237833 +post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/irb +.else +IGNORE= ${PORTNAME} is included in lang/${RUBY_NAME} +.endif .include <bsd.port.post.mk> Modified: head/devel/rubygem-rdoc/Makefile ============================================================================== --- head/devel/rubygem-rdoc/Makefile Fri Mar 13 09:12:41 2020 (r528338) +++ head/devel/rubygem-rdoc/Makefile Fri Mar 13 09:27:15 2020 (r528339) @@ -2,6 +2,7 @@ PORTNAME= rdoc PORTVERSION= 6.1.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -17,7 +18,16 @@ USE_RUBY= yes NO_ARCH= yes +.include <bsd.port.pre.mk> + +.if ${RUBY_VER} >= 2.7 +PLIST_FILES= bin/rdoc bin/ri +.elif ${RUBY_VER} == 2.6 +# WIP: rdoc wrapper script is installed by ruby port so far, see bug 241554, 237833 post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/rdoc ${STAGEDIR}${PREFIX}/bin/ri +.else +IGNORE= ${PORTNAME} is included in lang/${RUBY_NAME} +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/lang/ruby27/Makefile ============================================================================== --- head/lang/ruby27/Makefile Fri Mar 13 09:12:41 2020 (r528338) +++ head/lang/ruby27/Makefile Fri Mar 13 09:27:15 2020 (r528339) @@ -118,8 +118,8 @@ PKGNAMESUFFIX= ${RUBY_VER:C/\.//} PLIST_SUB+= IF_DEFAULT="@comment " .endif -INSTALLED_SCRIPTS= erb irb rdoc ri ruby -INSTALLED_MANUALS= erb irb ri ruby +INSTALLED_SCRIPTS= erb ruby +INSTALLED_MANUALS= erb ruby EXTSAMPLES= bigdecimal/sample/*.rb @@ -133,7 +133,9 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(C post-patch: # We get these from other ports -.for d in bin/bundle* bin/*racc* lib/bundler* libexec/bundler* man/bundle* bin/gem man/gemfile* \ +.for d in bin/bundle* bin/gem bin/*racc* bin/irb bin/rdoc bin/ri \ + lib/bundler* libexec/bundler* \ + man/bundle* man/gemfile* man/irb.1 man/ri.1 \ ext/dbm ext/gdbm ext/win32ole @${RM} -r ${BUILD_WRKSRC}/${d} .endfor Modified: head/lang/ruby27/pkg-message ============================================================================== --- head/lang/ruby27/pkg-message Fri Mar 13 09:12:41 2020 (r528338) +++ head/lang/ruby27/pkg-message Fri Mar 13 09:27:15 2020 (r528339) @@ -4,10 +4,11 @@ Some of the standard commands are provided as separate ports for ease of upgrading: - devel/ruby-gems: gem - RubyGems package manager - devel/rubygem-irb: irb - Interactive Ruby - devel/rubygem-rake: rake - Ruby Make - devel/rubygem-rdoc: rdoc - Ruby Documentation System + devel/ruby-gems: gem - RubyGems package manager + devel/rubygem-irb: irb - Interactive Ruby + devel/rubygem-rake: rake - Ruby Make + devel/rubygem-rdoc: rdoc - Ruby Documentation System + sysutils/rubygem-bundler: bundler - Tool that manages gem dependencies for ruby applications And some of the standard libraries are provided as separate ports since they require extra dependencies: Modified: head/lang/ruby27/pkg-plist ============================================================================== --- head/lang/ruby27/pkg-plist Fri Mar 13 09:12:41 2020 (r528338) +++ head/lang/ruby27/pkg-plist Fri Mar 13 09:27:15 2020 (r528339) @@ -1,11 +1,5 @@ %%IF_DEFAULT%%bin/erb bin/erb%%RUBY_SUFFIX%% -%%IF_DEFAULT%%bin/irb -bin/irb%%RUBY_SUFFIX%% -%%IF_DEFAULT%%bin/rdoc -bin/rdoc%%RUBY_SUFFIX%% -%%IF_DEFAULT%%bin/ri -bin/ri%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/ruby bin/ruby%%RUBY_SUFFIX%% include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h @@ -960,10 +954,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%IF_DEFAULT%%man/man1/erb.1.gz man/man1/erb%%RUBY_SUFFIX%%.1.gz -%%IF_DEFAULT%%man/man1/irb.1.gz -man/man1/irb%%RUBY_SUFFIX%%.1.gz -%%IF_DEFAULT%%man/man1/ri.1.gz -man/man1/ri%%RUBY_SUFFIX%%.1.gz %%IF_DEFAULT%%man/man1/ruby.1.gz man/man1/%%RUBY_NAME%%.1.gz %%DOCS%%%%RUBY_DOCDIR%%/COPYING
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003130927.02D9RFoA034335>