lang/ruby20: update to 2.0.0 p643

While here, bring in an rdoc fix

Obtained from:	55fbd8947f
This commit is contained in:
Steve Wills 2015-03-07 17:53:51 +00:00
parent 0dbb7428c3
commit f61e451a34
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=380711
5 changed files with 20 additions and 48 deletions

View File

@ -177,9 +177,9 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
# Ruby 2.0
#
RUBY_RELVERSION= 2.0.0
RUBY_PORTREVISION= 2
RUBY_PORTREVISION= 0
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 598
RUBY_PATCHLEVEL= 643
RUBY20= "" # PLIST_SUB helpers
. elif ${RUBY_VER} == 2.1

View File

@ -1,2 +1,2 @@
SHA256 (ruby/ruby-2.0.0-p598.tar.bz2) = 67b2a93690f53e12b635ba1bcdbd41e8c5593f13d575fea92fdd8801ca088f0f
SIZE (ruby/ruby-2.0.0-p598.tar.bz2) = 10758882
SHA256 (ruby/ruby-2.0.0-p643.tar.bz2) = 1f626f20647693a215a8db3ea0d6ab5ab9cee7c1945cc441b9f8f7b9612b91a0
SIZE (ruby/ruby-2.0.0-p643.tar.bz2) = 10772113

View File

@ -0,0 +1,13 @@
--- lib/rdoc/single_class.rb
+++ lib/rdoc/single_class.rb
@@ -10,6 +10,10 @@ def ancestors
superclass ? super + [superclass] : super
end
+ def aref_prefix # :nodoc:
+ 'sclass'
+ end
+
##
# The definition of this singleton class, <tt>class << MyClassName</tt>

View File

@ -1,44 +0,0 @@
--- lib/mkmf.rb.orig 2014-01-02 19:26:11.544779781 +0000
+++ lib/mkmf.rb 2014-01-02 19:27:02.558776514 +0000
@@ -189,21 +189,21 @@
]
elsif $configure_args.has_key?('--vendor')
dirs = [
- ['BINDIR', '$(DESTDIR)$(bindir)'],
- ['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'],
- ['RUBYLIBDIR', '$(DESTDIR)$(vendorlibdir)$(target_prefix)'],
- ['RUBYARCHDIR', '$(DESTDIR)$(vendorarchdir)$(target_prefix)'],
- ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
- ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
+ ['BINDIR', '$(bindir)'],
+ ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
+ ['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'],
+ ['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'],
+ ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
+ ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
]
else
dirs = [
- ['BINDIR', '$(DESTDIR)$(bindir)'],
- ['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'],
- ['RUBYLIBDIR', '$(DESTDIR)$(sitelibdir)$(target_prefix)'],
- ['RUBYARCHDIR', '$(DESTDIR)$(sitearchdir)$(target_prefix)'],
- ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
- ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
+ ['BINDIR', '$(bindir)'],
+ ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
+ ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'],
+ ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'],
+ ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
+ ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
]
end
dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
@@ -1740,7 +1740,6 @@
end
def with_destdir(dir)
- return dir unless $extmk
dir = dir.sub($dest_prefix_pattern, '')
/\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
end

View File

@ -711,6 +711,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/rubygems/source_specific_file.rb
%%RUBY_LIBDIR%%/rubygems/spec_fetcher.rb
%%RUBY_LIBDIR%%/rubygems/specification.rb
%%RUBY_LIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem
%%RUBY_LIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot.pem
%%RUBY_LIBDIR%%/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
%%RUBY_LIBDIR%%/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
%%RUBY_LIBDIR%%/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
@ -1631,6 +1633,7 @@ man/man1/%%RUBY_NAME%%.1.gz
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d2b/ossl__x509store_8c__incl.png
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d2b/parse_8h.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d2b/parse_8h_source.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d2d/structmethod__entry__arg.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d2f/syslog_8c.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d2f/syslog_8c_source.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d32/nkf-utf8_2nkf_8c__incl.map