Attachment 209586 Details for Bug 241554 – Updated patch file

[patch] Updated patch file

lang_ruby26.patch (text/plain), 4.03 KB, created by Yasuhiro Kimura on 2019-12-02 07:43:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2019-12-02 07:43:13 UTC

Size: 4.03 KB

patch

obsolete

>Index: Mk/bsd.ruby.mk
>===================================================================
>--- Mk/bsd.ruby.mk	(revision 518112)
>+++ Mk/bsd.ruby.mk	(working copy)
>@@ -167,7 +167,7 @@
> # Ruby 2.6
> #
> RUBY_VERSION=		2.6.5
>-RUBY_PORTREVISION=	0
>+RUBY_PORTREVISION=	1
> RUBY_PORTEPOCH=		1
> RUBY26=			""	# PLIST_SUB helpers
> 
>@@ -247,7 +247,11 @@
> RUBY_MODNAME?=		${PORTNAME}
> 
> # Commands
>+.if ${RUBY_VER} >= 2.6
>+RUBY_RDOC?=		${LOCALBASE}/bin/rdoc
>+.else
> RUBY_RDOC?=		${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//}
>+.endif
> 
> # Ports
> RUBY_BASE_PORT?=	lang/ruby${RUBY_VER:S/.//}
>@@ -298,7 +302,10 @@
> 
> .if defined(USE_RUBY_RDOC)
> MAKE_ENV+=	RUBY_RDOC=${RUBY_RDOC}
>+.if ${RUBY_VER} >= 2.6
>+BUILD_DEPENDS=	rubygem-rdoc>=0:devel/rubygem-rdoc
> .endif
>+.endif
> 
> # require check
> .if defined(RUBY_REQUIRE)
>Index: lang/ruby26/Makefile
>===================================================================
>--- lang/ruby26/Makefile	(revision 518112)
>+++ lang/ruby26/Makefile	(working copy)
>@@ -118,8 +118,8 @@
> 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,8 +133,8 @@
> 
> post-patch:
> # We get these from other ports
>-.for d in bin/bundle* lib/bundler*  libexec/bundler* man/bundle* bin/gem man/gemfile* \
>-	  ext/dbm ext/gdbm ext/win32ole
>+.for d in bin/bundle* bin/gem 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
> 
>Index: lang/ruby26/pkg-message
>===================================================================
>--- lang/ruby26/pkg-message	(revision 518112)
>+++ lang/ruby26/pkg-message	(working copy)
>@@ -4,8 +4,10 @@
> Some of the standard commands are provided as separate ports for ease
> of upgrading:
> 
>+	devel/rubygem-irb:	irb - Interactive Ruby shell
> 	devel/ruby-gems:	gem - RubyGems package manager
> 	devel/rubygem-rake:	rake - Ruby Make
>+	devel/rubygem-rdoc:	rdoc,ri - Ruby documentation system
> 
> And some of the standard libraries are provided as separate ports
> since they require extra dependencies:
>Index: lang/ruby26/pkg-plist
>===================================================================
>--- lang/ruby26/pkg-plist	(revision 518112)
>+++ lang/ruby26/pkg-plist	(working copy)
>@@ -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_NAME%%
> include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h
>@@ -897,10 +891,6 @@
> 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
>@@ -2798,6 +2788,7 @@
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c.html
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c_source.html
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db1/struct_y_y_l_t_y_p_e.html
>+%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/structbitset.html
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.map
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.md5
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.png
>@@ -8316,6 +8307,7 @@
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.map
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.md5
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.png
>+%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/def/structsock__timestamp__info.html
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.map
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.md5
> %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.png

Actions: View | Diff

Attachments on bug 241554: 208661 | 208672 | 209586 | 211350