Attachment 208661 Details for Bug 241554 – Patch file

[patch] Patch file

lang_ruby.patch (text/plain), 5.42 KB, created by Yasuhiro Kimura on 2019-10-28 23:31:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2019-10-28 23:31:46 UTC

Size: 5.42 KB

patch

obsolete

>Index: Mk/bsd.ruby.mk
>===================================================================
>--- Mk/bsd.ruby.mk	(revision 515742)
>+++ Mk/bsd.ruby.mk	(working copy)
>@@ -175,7 +175,7 @@
> # Ruby 2.6
> #
> RUBY_RELVERSION=	2.6.5
>-RUBY_PORTREVISION=	0
>+RUBY_PORTREVISION=	1
> RUBY_PORTEPOCH=		1
> RUBY_PATCHLEVEL=	0
> RUBY26=			""	# PLIST_SUB helpers
>Index: lang/ruby26/Makefile
>===================================================================
>--- lang/ruby26/Makefile	(revision 515742)
>+++ lang/ruby26/Makefile	(working copy)
>@@ -118,8 +118,14 @@
> PLIST_SUB+=	IF_DEFAULT="@comment "
> .endif
> 
>-INSTALLED_SCRIPTS=	erb irb rdoc ri ruby
>-INSTALLED_MANUALS=	erb irb ri ruby
>+INSTALLED_SCRIPTS=	erb ruby
>+INSTALLED_SEC1_MANUALS=	bundle-add bundle-binstubs bundle-check bundle-clean bundle-config \
>+			bundle-doctor bundle-exec bundle-gem bundle-info bundle-init \
>+			bundle-inject bundle-install bundle-list bundle-lock bundle-open \
>+			bundle-outdated bundle-package bundle-platform bundle-pristine \
>+			bundle-remove bundle-show bundle-update bundle-viz bundle \
>+			erb irb ri ruby
>+INSTALLED_SEC5_MANUALS=	gemfile
> 
> EXTSAMPLES=	bigdecimal/sample/*.rb
> 
>@@ -133,7 +139,7 @@
> 
> post-patch:
> # We get these from other ports
>-.for d in bin/bundle* lib/bundler*  libexec/bundler* man/bundle* bin/gem man/gemfile* \
>+.for d in bin/bundle* bin/gem bin/irb bin/rdoc bin/ri lib/bundler*  libexec/bundler* \
> 	  ext/dbm ext/gdbm ext/win32ole
> 	  	@${RM} -r ${BUILD_WRKSRC}/${d}
> .endfor
>@@ -177,9 +183,12 @@
> #
> # Link "ruby.1.gz" to "ruby26.1.gz", etc.
> #
>-. for FILE in ${INSTALLED_MANUALS}
>+. for FILE in ${INSTALLED_SEC1_MANUALS}
> 	${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/${FILE}.1.gz
> . endfor
>+. for FILE in ${INSTALLED_SEC5_MANUALS}
>+	${LN} -fs ${FILE}${RUBY_SUFFIX}.5.gz ${STAGEDIR}${MANPREFIX}/man/man5/${FILE}.5.gz
>+. endfor
> .endif
> 
> post-install-DEBUG-off:
>Index: lang/ruby26/pkg-message
>===================================================================
>--- lang/ruby26/pkg-message	(revision 515742)
>+++ 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
>+	ddevel/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 515742)
>+++ 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
>@@ -895,6 +889,54 @@
> %%RUBY_LIBDIR%%/yaml/dbm.rb
> %%RUBY_LIBDIR%%/yaml/store.rb
> libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
>+%%IF_DEFAULT%%man/man1/bundle-add.1.gz
>+man/man1/bundle-add%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-binstubs.1.gz
>+man/man1/bundle-binstubs%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-check.1.gz
>+man/man1/bundle-check%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-clean.1.gz
>+man/man1/bundle-clean%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-config.1.gz
>+man/man1/bundle-config%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-doctor.1.gz
>+man/man1/bundle-doctor%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-exec.1.gz
>+man/man1/bundle-exec%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-gem.1.gz
>+man/man1/bundle-gem%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-info.1.gz
>+man/man1/bundle-info%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-init.1.gz
>+man/man1/bundle-init%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-inject.1.gz
>+man/man1/bundle-inject%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-install.1.gz
>+man/man1/bundle-install%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-list.1.gz
>+man/man1/bundle-list%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-lock.1.gz
>+man/man1/bundle-lock%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-open.1.gz
>+man/man1/bundle-open%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-outdated.1.gz
>+man/man1/bundle-outdated%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-package.1.gz
>+man/man1/bundle-package%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-platform.1.gz
>+man/man1/bundle-platform%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-pristine.1.gz
>+man/man1/bundle-pristine%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-remove.1.gz
>+man/man1/bundle-remove%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-show.1.gz
>+man/man1/bundle-show%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-update.1.gz
>+man/man1/bundle-update%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle-viz.1.gz
>+man/man1/bundle-viz%%RUBY_SUFFIX%%.1.gz
>+%%IF_DEFAULT%%man/man1/bundle.1.gz
>+man/man1/bundle%%RUBY_SUFFIX%%.1.gz
> %%IF_DEFAULT%%man/man1/erb.1.gz
> man/man1/erb%%RUBY_SUFFIX%%.1.gz
> %%IF_DEFAULT%%man/man1/irb.1.gz
>@@ -903,6 +945,8 @@
> man/man1/ri%%RUBY_SUFFIX%%.1.gz
> %%IF_DEFAULT%%man/man1/ruby.1.gz
> man/man1/%%RUBY_NAME%%.1.gz
>+%%IF_DEFAULT%%man/man5/gemfile.5.gz
>+man/man5/gemfile%%RUBY_SUFFIX%%.5.gz
> %%DOCS%%%%RUBY_DOCDIR%%/COPYING
> %%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja
> %%DOCS%%%%RUBY_DOCDIR%%/ChangeLog

Actions: View | Diff

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