Attachment 211350 Details for Bug 241554 – Updated patch file

[patch] Updated patch file

lang_ruby26_ruby27.patch (text/plain), 18.93 KB, created by Yasuhiro Kimura on 2020-02-04 17:24:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2020-02-04 17:24:04 UTC

Size: 18.93 KB

patch

obsolete

>Index: Mk/bsd.ruby.mk
>===================================================================
>--- Mk/bsd.ruby.mk	(revision 525094)
>+++ 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
> 
>@@ -176,7 +176,7 @@
> # Ruby 2.7
> #
> RUBY_VERSION=		2.7.0
>-RUBY_PORTREVISION=	1
>+RUBY_PORTREVISION=	2
> RUBY_PORTEPOCH=		1
> RUBY27=			""	# PLIST_SUB helpers
> 
>@@ -257,7 +257,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/.//}
>@@ -304,11 +308,15 @@
> 			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
> 			RUBY24=${RUBY24} \
> 			RUBY25=${RUBY25} \
>-			RUBY26=${RUBY26}
>+			RUBY26=${RUBY26} \
>+			RUBY27=${RUBY27}
> 
> .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: devel/rubygem-irb/Makefile
>===================================================================
>--- devel/rubygem-irb/Makefile	(revision 525094)
>+++ devel/rubygem-irb/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	irb
> PORTVERSION=	1.2.1
>+PORTREVISION=	1
> CATEGORIES=	devel rubygems
> MASTER_SITES=	RG
> 
>@@ -18,6 +19,9 @@
> 
> NO_ARCH=	yes
> 
>+PLIST_FILES=	bin/irb \
>+		share/man/man1/irb.1.gz
>+
> .include <bsd.port.pre.mk>
> 
> .if ${RUBY_VER} < 2.6
>@@ -24,8 +28,8 @@
> IGNORE=		irb is included in lang/${RUBY_NAME}
> .endif
> 
>-# irb executable is installed by ruby port
>-post-install:
>-	${RM} ${STAGEDIR}${PREFIX}/bin/irb
>+pre-install:
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1
>+	${INSTALL_DATA} ${FILESDIR}/irb.1 ${STAGEDIR}${PREFIX}/share/man/man1
> 
> .include <bsd.port.post.mk>
>Index: devel/rubygem-irb/files/irb.1
>===================================================================
>--- devel/rubygem-irb/files/irb.1	(nonexistent)
>+++ devel/rubygem-irb/files/irb.1	(working copy)
>@@ -0,0 +1,172 @@
>+.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
>+.Dd April 20, 2017
>+.Dt IRB \&1 "Ruby Programmer's Reference Guide"
>+.Os UNIX
>+.Sh NAME
>+.Nm irb
>+.Nd Interactive Ruby Shell
>+.Sh SYNOPSIS
>+.Nm
>+.Op Fl -version
>+.Op Fl dfm
>+.Op Fl I Ar directory
>+.Op Fl r Ar library
>+.Op Fl - Ns Oo no Oc Ns inspect
>+.Op Fl - Ns Oo no Oc Ns readline
>+.Op Fl -prompt Ar mode
>+.Op Fl -prompt-mode Ar mode
>+.Op Fl -inf-ruby-mode
>+.Op Fl -simple-prompt
>+.Op Fl -noprompt
>+.Op Fl -tracer
>+.Op Fl -back-trace-limit Ar n
>+.Op Fl -irb_debug Ar n
>+.Op Fl -
>+.Op program_file
>+.Op argument ...
>+.Pp
>+.Sh DESCRIPTION
>+.Nm
>+is the REPL(read-eval-print loop) environment for Ruby programs.
>+.Pp
>+.Sh OPTIONS
>+.Bl -tag -width "1234567890123" -compact
>+.Pp
>+.It Fl -version
>+Prints the version of
>+.Nm .
>+.Pp
>+.It Fl E Ar external Ns Op : Ns Ar internal
>+.It Fl -encoding Ar external Ns Op : Ns Ar internal
>+Same as `ruby -E' .
>+Specifies the default value(s) for external encodings and internal encoding. Values should be separated with colon (:).
>+.Pp
>+You can omit the one for internal encodings, then the value
>+.Pf ( Li "Encoding.default_internal" ) will be nil.
>+.Pp
>+.It Fl I Ar path
>+Same as `ruby -I' .
>+Specifies
>+.Li $LOAD_PATH
>+directory
>+.Pp
>+.It Fl U
>+Same as `ruby -U' .
>+Sets the default value for internal encodings
>+.Pf ( Li "Encoding.default_internal" ) to UTF-8.
>+.Pp
>+.It Fl d
>+Same as `ruby -d' .
>+Sets
>+.Li $DEBUG
>+to true.
>+.Pp
>+.It Fl f
>+Suppresses read of
>+.Pa ~/.irbrc .
>+.Pp
>+.It Fl h
>+.It Fl -help
>+Prints a summary of the options.
>+.Pp
>+.It Fl r Ar library
>+Same as `ruby -r'.
>+Causes irb to load the library using require.
>+.Pp
>+.It Fl -inspect
>+Uses `inspect' for output (default except for bc mode)
>+.Pp
>+.It Fl -noinspect
>+Doesn't use inspect for output
>+.Pp
>+.It Fl -readline
>+Uses Readline extension module.
>+.Pp
>+.It Fl -noreadline
>+Doesn't use Readline extension module.
>+.Pp
>+.It Fl -prompt Ar mode
>+.It Fl -prompt-mode Ar mode
>+Switch prompt mode. Pre-defined prompt modes are
>+`default', `simple', `xmp' and `inf-ruby'.
>+.Pp
>+.It Fl -inf-ruby-mode
>+Uses prompt appropriate for inf-ruby-mode on emacs.
>+Suppresses --readline.
>+.Pp
>+.It Fl -simple-prompt
>+Makes prompts simple.
>+.Pp
>+.It Fl -noprompt
>+No prompt mode.
>+.Pp
>+.It Fl -tracer
>+Displays trace for each execution of commands.
>+.Pp
>+.It Fl -back-trace-limit Ar n
>+Displays backtrace top
>+.Ar n
>+and tail
>+.Ar n Ns .
>+The default value is 16.
>+.Pp
>+.It Fl -irb_debug Ar n
>+Sets internal debug level to n (not for popular use)
>+.Pp
>+.El
>+.Pp
>+.Sh ENVIRONMENT
>+.Bl -tag -compact
>+.It Ev IRBRC
>+.Pp
>+.El
>+.Pp
>+Also
>+.Nm
>+depends on same variables as
>+.Xr ruby 1 .
>+.Pp
>+.Sh FILES
>+.Bl -tag -compact
>+.It Pa ~/.irbrc
>+Personal irb initialization.
>+.Pp
>+.El
>+.Pp
>+.Sh EXAMPLES
>+.Dl % irb
>+.Dl irb(main):001:0> Ic 1 + 1
>+.Dl 2
>+.Dl irb(main):002:0> Ic def t(x)
>+.Dl irb(main):003:1> Ic   x+1
>+.Dl irb(main):004:1> Ic end
>+.Dl => :t
>+.Dl irb(main):005:0> Ic t(3)
>+.Dl => 4
>+.Dl irb(main):006:0> Ic if t(3) == 4
>+.Dl irb(main):007:1> Ic p :ok
>+.Dl irb(main):008:1> Ic end
>+.Dl :ok
>+.Dl => :ok
>+.Dl irb(main):009:0> Ic quit
>+.Dl %
>+.Pp
>+.Sh SEE ALSO
>+.Xr ruby 1 .
>+.Pp
>+.Sh REPORTING BUGS
>+.Bl -bullet
>+.It
>+Security vulnerabilities should be reported via an email to
>+.Mt security@ruby-lang.org .
>+Reported problems will be published after being fixed.
>+.Pp
>+.It
>+Other bugs and feature requests can be reported via the
>+Ruby Issue Tracking System
>+.Pq Lk https://bugs.ruby-lang.org/ .
>+Do not report security vulnerabilities
>+via this system because it publishes the vulnerabilities immediately.
>+.El
>+.Sh AUTHORS
>+Written by Keiju ISHITSUKA.
>Index: devel/rubygem-rdoc/Makefile
>===================================================================
>--- devel/rubygem-rdoc/Makefile	(revision 525094)
>+++ devel/rubygem-rdoc/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	rdoc
> PORTVERSION=	6.1.2
>+PORTREVISION=	1
> CATEGORIES=	devel rubygems
> MASTER_SITES=	RG
> 
>@@ -17,7 +18,17 @@
> 
> NO_ARCH=	yes
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${RUBY_VER} >= 2.6
>+PLIST_FILES=	bin/rdoc bin/ri share/man/man1/ri.1.gz
>+
>+pre-install:
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1
>+	${INSTALL_DATA} ${FILESDIR}/ri.1 ${STAGEDIR}${PREFIX}/share/man/man1
>+.else
> post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rdoc ${STAGEDIR}${PREFIX}/bin/ri
>+.endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: devel/rubygem-rdoc/files/ri.1
>===================================================================
>--- devel/rubygem-rdoc/files/ri.1	(nonexistent)
>+++ devel/rubygem-rdoc/files/ri.1	(working copy)
>@@ -0,0 +1,247 @@
>+.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
>+.Dd April 20, 2017
>+.Dt RI \&1 "Ruby Programmer's Reference Guide"
>+.Os UNIX
>+.Sh NAME
>+.Nm ri
>+.Nd Ruby API reference front end
>+.Sh SYNOPSIS
>+.Nm
>+.Op Fl ahilTv
>+.Op Fl d Ar DIRNAME
>+.Op Fl f Ar FORMAT
>+.Op Fl w Ar WIDTH
>+.Op Fl - Ns Oo Cm no- Oc Ns Cm pager
>+.Op Fl -server Ns Oo = Ns Ar PORT Oc
>+.Op Fl - Ns Oo Cm no- Oc Ns Cm list-doc-dirs
>+.Op Fl -no-standard-docs
>+.Op Fl - Ns Oo Cm no- Oc Ns Bro Cm system Ns | Ns Cm site Ns | Ns Cm gems Ns | Ns Cm home Brc
>+.Op Fl - Ns Oo Cm no- Oc Ns Cm profile
>+.Op Fl -dump Ns = Ns Ar CACHE
>+.Op Ar name ...
>+.Sh DESCRIPTION
>+.Nm
>+is a command-line front end for the Ruby API reference.
>+You can search and read the API reference for classes and methods with
>+.Nm .
>+.Pp
>+.Nm
>+is a part of Ruby.
>+.Pp
>+.Ar name
>+can be:
>+.Bl -diag -offset indent
>+.It Class | Module | Module::Class
>+.Pp
>+.It Class::method | Class#method | Class.method | method
>+.Pp
>+.It gem_name: | gem_name:README | gem_name:History
>+.El
>+.Pp
>+All class names may be abbreviated to their minimum unambiguous form.
>+If a name is ambiguous, all valid options will be listed.
>+.Pp
>+A
>+.Ql \&.
>+matches either class or instance methods, while #method
>+matches only instance and ::method matches only class methods.
>+.Pp
>+README and other files may be displayed by prefixing them with the gem name
>+they're contained in.  If the gem name is followed by a
>+.Ql \&:
>+all files in the gem will be shown.
>+The file name extension may be omitted where it is unambiguous.
>+.Pp
>+For example:
>+.Bd -literal -offset indent
>+ri Fil
>+ri File
>+ri File.new
>+ri zip
>+ri rdoc:README
>+.Ed
>+.Pp
>+Note that shell quoting or escaping may be required for method names
>+containing punctuation:
>+.Bd -literal -offset indent
>+ri 'Array.[]'
>+ri compact\e!
>+.Ed
>+.Pp
>+To see the default directories
>+.Nm
>+will search, run:
>+.Bd -literal -offset indent
>+ri --list-doc-dirs
>+.Ed
>+.Pp
>+Specifying the
>+.Fl -system , Fl -site , Fl -home , Fl -gems ,
>+or
>+.Fl -doc-dir
>+options will limit
>+.Nm
>+to searching only the specified directories.
>+.Pp
>+.Nm
>+options may be set in the
>+.Ev RI
>+environment variable.
>+.Pp
>+The
>+.Nm
>+pager can be set with the
>+.Ev RI_PAGER
>+environment variable or the
>+.Ev PAGER
>+environment variable.
>+.Pp
>+.Sh OPTIONS
>+.Bl -tag -width "1234567890123" -compact
>+.Pp
>+.It Fl i
>+.It Fl - Ns Oo Cm no- Oc Ns Cm interactive
>+In interactive mode you can repeatedly
>+look up methods with autocomplete.
>+.Pp
>+.It Fl a
>+.It Fl - Ns Oo Cm no- Oc Ns Cm all
>+Show all documentation for a class or module.
>+.Pp
>+.It Fl l
>+.It Fl - Ns Oo Cm no- Oc Ns Cm list
>+List classes
>+.Nm
>+knows about.
>+.Pp
>+.It Fl - Ns Oo Cm no- Oc Ns Cm pager
>+Send output to a pager,
>+rather than directly to stdout.
>+.Pp
>+.It Fl T
>+Synonym for
>+.Fl -no-pager .
>+.Pp
>+.It Fl w Ar WIDTH
>+.It Fl -width Ns = Ns Ar WIDTH
>+Set the width of the output.
>+.Pp
>+.It Fl -server Ns Oo = Ns Ar PORT Oc
>+Run RDoc server on the given port.
>+The default port is\~8214.
>+.Pp
>+.It Fl f Ar FORMAT
>+.It Fl -format Ns = Ns Ar FORMAT
>+Use the selected formatter.
>+The default formatter is
>+.Li bs
>+for paged output and
>+.Li ansi
>+otherwise.
>+Valid formatters are:
>+.Li ansi , Li bs , Li markdown , Li rdoc .
>+.Pp
>+.It Fl h
>+.It Fl -help
>+Show help and exit.
>+.Pp
>+.It Fl v
>+.It Fl -version
>+Output version information and exit.
>+.El
>+.Pp
>+Data source options:
>+.Bl -tag -width "1234567890123" -compact
>+.Pp
>+.It Fl - Ns Oo Cm no- Oc Ns Cm list-doc-dirs
>+List the directories from which
>+.Nm
>+will source documentation on stdout and exit.
>+.Pp
>+.It Fl d Ar DIRNAME
>+.It Fl -doc-dir Ns = Ns Ar DIRNAME
>+List of directories from which to source
>+documentation in addition to the standard
>+directories.  May be repeated.
>+.Pp
>+.It Fl -no-standard-docs
>+Do not include documentation from the Ruby standard library,
>+.Pa site_lib ,
>+installed gems, or
>+.Pa ~/.rdoc .
>+Use with
>+.Fl -doc-dir .
>+.Pp
>+.It Fl - Ns Oo Cm no- Oc Ns Cm system
>+Include documentation from Ruby's standard library.  Defaults to true.
>+.Pp
>+.It Fl - Ns Oo Cm no- Oc Ns Cm site
>+Include documentation from libraries installed in
>+.Pa site_lib .
>+Defaults to true.
>+.Pp
>+.It Fl - Ns Oo Cm no- Oc Ns Cm gems
>+Include documentation from RubyGems.  Defaults to true.
>+.Pp
>+.It Fl - Ns Oo Cm no- Oc Ns Cm home
>+Include documentation stored in
>+.Pa ~/.rdoc .
>+Defaults to true.
>+.El
>+.Pp
>+Debug options:
>+.Bl -tag -width "1234567890123" -compact
>+.Pp
>+.It Fl - Ns Oo Cm no- Oc Ns Cm profile
>+Run with the Ruby profiler.
>+.Pp
>+.It Fl -dump Ns = Ns Ar CACHE
>+Dump data from an ri cache or data file.
>+.El
>+.Pp
>+.Sh ENVIRONMENT
>+.Bl -tag -width "USERPROFILE" -compact
>+.Pp
>+.It Ev RI
>+Options to prepend to those specified on the command-line.
>+.Pp
>+.It Ev RI_PAGER
>+.It Ev PAGER
>+Pager program to use for displaying.
>+.Pp
>+.It Ev HOME
>+.It Ev USERPROFILE
>+.It Ev HOMEPATH
>+Path to the user's home directory.
>+.El
>+.Pp
>+.Sh FILES
>+.Bl -tag -width "USERPROFILE" -compact
>+.Pp
>+.It Pa ~/.rdoc
>+Path for ri data in the user's home directory.
>+.Pp
>+.El
>+.Pp
>+.Sh SEE ALSO
>+.Xr ruby 1 ,
>+.Xr rdoc 1 ,
>+.Xr gem 1
>+.Pp
>+.Sh REPORTING BUGS
>+.Bl -bullet
>+.It
>+Security vulnerabilities should be reported via an email to
>+.Mt security@ruby-lang.org .
>+Reported problems will be published after being fixed.
>+.Pp
>+.It
>+Other bugs and feature requests can be reported via the
>+Ruby Issue Tracking System
>+.Pq Lk https://bugs.ruby-lang.org/ .
>+Do not report security vulnerabilities
>+via this system because it publishes the vulnerabilities immediately.
>+.El
>+.Sh AUTHORS
>+Written by
>+.An Dave Thomas Aq dave@pragmaticprogrammer.com .
>Index: lang/ruby26/Makefile
>===================================================================
>--- lang/ruby26/Makefile	(revision 525094)
>+++ 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 525094)
>+++ lang/ruby26/pkg-message	(working copy)
>@@ -4,10 +4,12 @@
> 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/rubygem-irb:		irb - Interactive Ruby shell
>+	devel/ruby-gems:		gem - RubyGems package manager
>+	devel/rubygem-irb:		irb - Interactive Ruby
>+	devel/rubygem-rake:		rake - Ruby Make
>+	devel/rubygem-rdoc:		rdoc,ri - 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:
>Index: lang/ruby26/pkg-plist
>===================================================================
>--- lang/ruby26/pkg-plist	(revision 525094)
>+++ 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
>Index: lang/ruby27/Makefile
>===================================================================
>--- lang/ruby27/Makefile	(revision 525094)
>+++ lang/ruby27/Makefile	(working copy)
>@@ -107,10 +107,6 @@
> CONFIGURE_ENV+=	ac_cv_func__setjmp=yes
> .endif
> 
>-.if ${PORT_OPTIONS:MCAPIDOCS}
>-MAKE_JOBS_UNSAFE=	yes
>-.endif
>-
> .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
> PLIST_SUB+=	IF_DEFAULT=""
> .else
>@@ -118,8 +114,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 +129,9 @@
> 
> 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* \
>-	  ext/dbm ext/gdbm ext/win32ole
>+.for d in bin/bundle* bin/gem bin/irb bin/*racc* bin/rdoc bin/ri \
>+	  ext/dbm ext/gdbm ext/win32ole lib/bundler*  libexec/bundler* \
>+	  man/bundle* man/gemfile* man/irb.1 man/ri.1
> 	  	@${RM} -r ${BUILD_WRKSRC}/${d}
> .endfor
> 
>Index: lang/ruby27/pkg-message
>===================================================================
>--- lang/ruby27/pkg-message	(revision 525094)
>+++ lang/ruby27/pkg-message	(working copy)
>@@ -4,10 +4,12 @@
> 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-racc:		racc - LALR(1) parser generator for 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:
>Index: lang/ruby27/pkg-plist
>===================================================================
>--- lang/ruby27/pkg-plist	(revision 525094)
>+++ lang/ruby27/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%%RUBY_SUFFIX%%
> include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h
>@@ -41,8 +35,6 @@
> lib/lib%%RUBY_NAME%%-static.a
> lib/lib%%RUBY_NAME%%.so
> lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
>-%%RUBY_LIBDIR%%/English.rb
>-%%RUBY_LIBDIR%%/abbrev.rb
> %%RUBY_ARCHLIBDIR%%/bigdecimal.so
> %%RUBY_ARCHLIBDIR%%/cgi/escape.so
> %%RUBY_ARCHLIBDIR%%/continuation.so
>@@ -142,6 +134,8 @@
> %%RUBY_ARCHLIBDIR%%/strscan.so
> %%RUBY_ARCHLIBDIR%%/syslog.so
> %%RUBY_ARCHLIBDIR%%/zlib.so
>+%%RUBY_LIBDIR%%/English.rb
>+%%RUBY_LIBDIR%%/abbrev.rb
> %%RUBY_LIBDIR%%/base64.rb
> %%RUBY_LIBDIR%%/benchmark.rb
> %%RUBY_LIBDIR%%/benchmark/version.rb
>@@ -960,10 +954,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

Actions: View | Diff

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