diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile index 11c53ffafad9..7c2fbf477d34 100644 --- a/lang/ruby30/Makefile +++ b/lang/ruby30/Makefile @@ -1,218 +1,215 @@ # Created by: Akinori MUSHA aka knu PORTNAME= ruby PORTVERSION= ${RUBY_PORTVERSION} PORTREVISION= ${RUBY_PORTREVISION} PORTEPOCH= ${RUBY_PORTEPOCH} CATEGORIES= lang ruby MASTER_SITES= RUBY/${MASTER_SITE_SUBDIR_RUBY} DISTNAME= ${RUBY_DISTNAME} DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org COMMENT= Object-oriented interpreted scripting language LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL LICENSE_FILE_RUBY= ${WRKSRC}/COPYING # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi USES= autoreconf cpe ssl tar:xz CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --disable-rpath \ --enable-pthread \ --enable-shared \ --enable-install-static-library \ --with-ruby-version=minor \ --with-sitedir="${PREFIX}/lib/ruby/site_ruby" \ --with-vendordir="${PREFIX}/lib/ruby/vendor_ruby" CONFIGURE_ENV= debugflags= CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes # Keep this, else ruby will fail to load libraries dependent of libpthread. LIBS+= -lpthread -L${LOCALBASE}/lib USE_LDCONFIG= yes WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 3.0 USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC OPTIONS_DEFAULT= RDOC LIBEDIT OPTIONS_SINGLE= EDIT OPTIONS_SINGLE_EDIT= LIBEDIT READLINE OPTIONS_SUB= yes CAPIDOCS_DESC= Build and install C API documents GMP_DESC= Use GMP to accelerate Bignum operations RDOC_DESC= Build and install Rdoc indexes EDIT_DESC= Which line editing lib to use LIBEDIT_DESC= Use libedit READLINE_DESC= Use libreadline CAPIDOCS_BUILD_DEPENDS= doxygen>=1.8.13,2:devel/doxygen \ dot:graphics/graphviz CAPIDOCS_CONFIGURE_ENABLE= install-capi GMP_CONFIGURE_WITH= gmp GMP_LIB_DEPENDS= libgmp.so:math/gmp LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-dir=${LOCALBASE} LIBEDIT_USES= libedit RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${LOCALBASE} READLINE_USES= readline CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} CPE_UPDATE= p${RUBY_PATCHLEVEL} .include # PORTREVISION/PORTEPOCH hack .if ${PORTREVISION} != 0 _SUF1= _${PORTREVISION} .endif .if ${PORTEPOCH} != 0 _SUF2= ,${PORTEPOCH} .endif -.if ${OPSYS} == "FreeBSD" -.if exists(/usr/sbin/dtrace) && (${ARCH} == amd64 || ${ARCH} == i386) -CONFIGURE_ARGS+=--enable-dtrace -.else -CONFIGURE_ARGS+=--disable-dtrace -.endif -.endif +#.if ${OPSYS} == "FreeBSD" +#.if exists(/usr/sbin/dtrace) && (${ARCH} == amd64 || ${ARCH} == i386) +#CONFIGURE_ARGS+=--enable-dtrace +#.else +#CONFIGURE_ARGS+=--disable-dtrace +#.endif +#.endif # keep in sync with all platforms where libunwind is available .if (${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH:Mpowerpc64*}) LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) || ${ARCH} == powerpc USE_GCC= yes .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 CONFIGURE_ARGS+=--with-setjmp-type=_setjmp CONFIGURE_ENV+= ac_cv_func__setjmp=yes .endif .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} PLIST_SUB+= IF_DEFAULT="" .else -PKGNAMESUFFIX= ${RUBY_VER:C/\.//} +PKGNAMESUFFIX= ${RUBY_SUFFIX} PLIST_SUB+= IF_DEFAULT="@comment " .endif -INSTALLED_SCRIPTS= erb ruby -INSTALLED_MANUALS= erb ruby +INSTALLED_SCRIPTS= ruby +INSTALLED_MANUALS= ruby EXTSAMPLES= bigdecimal/sample/*.rb EXTDOCS= readline/README \ ripper/README \ stringio/README.md \ syslog/syslog.txt # Macros to change variables in rbconfig.rb RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' -- post-patch: # We get these from other ports -.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} +.for d in bin/* ext/dbm ext/gdbm ext/win32* lib/bundler* libexec/bundler* man/bundle* man/erb.1 man/gemfile* man/irb.1 man/ri.1 + @${RM} -r ${BUILD_WRKSRC}/${d} .endfor post-build: # # Hack to allow modules to be installed into separate PREFIX and/or under user # privileges # @${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3" @${RB_SET_CONF_VAR} "INSTALL" "'/usr/bin/install -c'" @${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'" @${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'" @${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'" post-build-CAPIDOCS-on: @${FIND} ${WRKSRC}/doc -type d -empty -delete pre-install: ${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR} ${MKDIR} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR} pre-install-DOCS-on: ${MKDIR} ${STAGEDIR}${RUBY_DOCDIR} pre-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${RUBY_EXAMPLESDIR} pre-install-RDOC-on: ${MKDIR} ${STAGEDIR}${RUBY_RIDIR} ${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR} post-install: .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} # # Link just installed "ruby" to "ruby27", etc. # . for FILE in ${INSTALLED_SCRIPTS} ${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE} . endfor # # Link "ruby.1.gz" to "ruby27.1.gz", etc. # . for FILE in ${INSTALLED_MANUALS} ${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/${FILE}.1.gz . endfor .endif post-install-DEBUG-off: # # XXX: hack to strip ruby binary. Ruby uses its own install script that seems # bogus to hack. # .if defined(STRIP) && ${STRIP} == -s ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER} ${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \; .endif post-install-DOCS-on: # Create all dirs required (":u" isn't avaiable in STABLE yet :-() ${MKDIR} ${EXTDOCS:C|^([^/]+)/.*|\1|:S|^|${STAGEDIR}${RUBY_DOCDIR}/|} .for FILE in ${EXTDOCS} ${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \ ${STAGEDIR}${RUBY_DOCDIR}/${FILE:C|^([^/]+)/.*|\1|}/ .endfor @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/) ${INSTALL_DATA} ${WRKSRC}/COPYING* \ ${WRKSRC}/ChangeLog \ ${WRKSRC}/LEGAL \ ${WRKSRC}/README* \ ${STAGEDIR}${RUBY_DOCDIR}/ post-install-EXAMPLES-on: # Create all dirs required (":u" isn't avaiable in STABLE yet :-() ${MKDIR} ${EXTSAMPLES:C|^([^/]+)/.*|\1|:S|^|${STAGEDIR}${RUBY_EXAMPLESDIR}/|} .for FILE in ${EXTSAMPLES} ${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \ ${STAGEDIR}${RUBY_EXAMPLESDIR}/${FILE:C|^([^/]+)/.*|\1|}/ .endfor (cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_EXAMPLESDIR}/) do-test: cd ${WRKSRC} && ${MAKE_CMD} test .include diff --git a/lang/ruby30/distinfo b/lang/ruby30/distinfo index f3dc7ddc7cd4..b3a1a8949266 100644 --- a/lang/ruby30/distinfo +++ b/lang/ruby30/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601660611 -SHA256 (ruby/ruby-3.0.0-preview1.tar.xz) = aa7cce0c99f4ea2145fef9b78d74a44857754396790cd23bad75d759811e7a2a -SIZE (ruby/ruby-3.0.0-preview1.tar.xz) = 12703060 +TIMESTAMP = 1618171945 +SHA256 (ruby/ruby-3.0.1.tar.xz) = d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 +SIZE (ruby/ruby-3.0.1.tar.xz) = 14486780 diff --git a/lang/ruby30/files/patch-tool_rbinstall.rb b/lang/ruby30/files/patch-tool_rbinstall.rb index 9e02a2c30733..18faf8e5f498 100644 --- a/lang/ruby30/files/patch-tool_rbinstall.rb +++ b/lang/ruby30/files/patch-tool_rbinstall.rb @@ -1,150 +1,167 @@ ---- tool/rbinstall.rb.orig 2020-10-02 17:47:07 UTC +--- tool/rbinstall.rb.orig 2020-12-08 09:02:31 UTC +++ tool/rbinstall.rb -@@ -864,147 +864,6 @@ end +@@ -864,164 +864,6 @@ end # :startdoc: -install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do - install_default_gem('lib', srcdir) -end -install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do - install_default_gem('ext', srcdir) -end - --def load_gemspec(file) +-def load_gemspec(file, expanded = false) - file = File.realpath(file) - code = File.read(file, encoding: "utf-8:-") -- code.gsub!(/`git.*?`/m, '""') -- code.gsub!(/%x\[git.*?\]/m, '""') +- code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split\([^\)]*\)/m) do +- files = [] +- if expanded +- base = File.dirname(file) +- Dir.glob("**/*", File::FNM_DOTMATCH, base: base) do |n| +- case File.basename(n); when ".", ".."; next; end +- next if File.directory?(File.join(base, n)) +- files << n.dump +- end +- end +- "[" + files.join(", ") + "]" +- end - spec = eval(code, binding, file) - unless Gem::Specification === spec - raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)." - end - spec.loaded_from = file +- spec.files.reject! {|n| n.end_with?(".gemspec") or n.start_with?(".git")} +- - spec -end - -def install_default_gem(dir, srcdir) - gem_dir = Gem.default_dir - install_dir = with_destdir(gem_dir) - prepare "default gems from #{dir}", gem_dir - makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)}) - - default_spec_dir = Gem.default_specifications_dir - - gems = Dir.glob("#{srcdir}/#{dir}/**/*.gemspec").map {|src| - spec = load_gemspec(src) - file_collector = RbInstall::Specs::FileCollector.new(src) - files = file_collector.collect - next if files.empty? - spec.files = files - spec - } - gems.compact.sort_by(&:name).each do |gemspec| - old_gemspecs = Dir[File.join(with_destdir(default_spec_dir), "#{gemspec.name}-*.gemspec")] - if old_gemspecs.size > 0 - old_gemspecs.each {|spec| rm spec } - end - - full_name = "#{gemspec.name}-#{gemspec.version}" - - puts "#{INDENT}#{gemspec.name} #{gemspec.version}" - gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec") - open_for_install(gemspec_path, $data_mode) do - gemspec.to_ruby.gsub(/.*\0.*\n/, '') - end - - specific_gem_dir = File.join(gem_dir, 'gems', full_name) - - makedirs(specific_gem_dir) - - unless gemspec.executables.empty? then - bin_dir = File.join(specific_gem_dir, gemspec.bindir) - makedirs(bin_dir) - - gemspec.executables.map {|exec| - install File.join(srcdir, 'libexec', exec), - File.join(bin_dir, exec) - } - end - end -end - -install?(:ext, :comm, :gem, :'bundled-gems') do - gem_dir = Gem.default_dir - install_dir = with_destdir(gem_dir) - prepare "bundled gems", gem_dir - makedirs(Gem.ensure_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)}) - installed_gems = {} - options = { - :install_dir => install_dir, - :bin_dir => with_destdir(bindir), - :domain => :local, - :ignore_dependencies => true, - :dir_mode => $dir_mode, - :data_mode => $data_mode, - :prog_mode => $script_mode, - :wrappers => true, - :format_executable => true, - } - gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" - extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir - File.foreach("#{srcdir}/gems/bundled_gems") do |name| - next if /^\s*(?:#|$)/ =~ name - next unless /^(\S+)\s+(\S+).*/ =~ name - gem_name = "#$1-#$2" -- path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec" -- next unless File.exist?(path) -- spec = load_gemspec(path) +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" +- if File.exist?(path) +- spec = load_gemspec(path) +- else +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec" +- next unless File.exist?(path) +- spec = load_gemspec(path, true) +- end - next unless spec.platform == Gem::Platform::RUBY - next unless spec.full_name == gem_name - spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" - if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") - spec.extensions[0] ||= "-" - end - package = RbInstall::DirPackage.new spec - ins = RbInstall::UnpackedInstaller.new(package, options) - puts "#{INDENT}#{spec.name} #{spec.version}" - ins.install - unless $dryrun - File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) - end - unless spec.extensions.empty? - install_recursive(ext, spec.extension_dir) - end - installed_gems[spec.full_name] = true - end - installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} - unless installed_gems.empty? - prepare "bundled gem cache", gem_dir+"/cache" - install installed_gems, gem_dir+"/cache" - end - next if gems.empty? - if defined?(Zlib) - Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) - silent = Gem::SilentUI.new - gems.each do |gem| - package = Gem::Package.new(gem) - inst = RbInstall::GemInstaller.new(package, options) - inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) - begin - Gem::DefaultUserInteraction.use_ui(silent) {inst.install} - rescue Gem::InstallError - next - end - gemname = File.basename(gem) - puts "#{INDENT}#{gemname}" - end - # fix directory permissions - # TODO: Gem.install should accept :dir_mode option or something - File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) - # fix .gemspec permissions - File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) - else - puts "skip installing bundled gems because of lacking zlib" - end -end - parse_args() include FileUtils diff --git a/lang/ruby30/files/patch-upstream-bug17191 b/lang/ruby30/files/patch-upstream-bug17191 deleted file mode 100644 index 0de7aa99a73b..000000000000 --- a/lang/ruby30/files/patch-upstream-bug17191 +++ /dev/null @@ -1,43 +0,0 @@ -From a9ff39087092b21059fca046ace9ca87770692a4 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Tue, 29 Sep 2020 13:41:59 +0900 -Subject: [PATCH] Fixed installation failure [Bug #17191] - -Try update and extract bundled gems only when baseruby is -available. It should be done only when installing from -developemental build and not from the tarball, but it is not -obvious to differentiate them. ---- - common.mk | 2 +- - defs/gmake.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git common.mk common.mk -index 603429bd35..509f09c1fe 100644 ---- common.mk -+++ common.mk -@@ -1296,7 +1296,7 @@ update-config_files: PHONY - config.guess config.sub - - refresh-gems: update-bundled_gems prepare-gems --prepare-gems: update-gems extract-gems -+prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems) - - update-gems$(gnumake:yes=-nongnumake): PHONY - $(ECHO) Downloading bundled gem files... -diff --git defs/gmake.mk defs/gmake.mk -index 7e9566fee6..31af44a4f1 100644 ---- defs/gmake.mk -+++ defs/gmake.mk -@@ -246,7 +246,7 @@ HELP_EXTRA_TASKS = \ - " update-github: merge master branch and push it to Pull Request [PR=1234]" \ - "" - --extract-gems: update-gems -+extract-gems: $(HAVE_BASERUBY:yes=update-gems) - - BUNDLED_GEMS := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems) - --- -2.28.0 - diff --git a/lang/ruby30/pkg-message b/lang/ruby30/pkg-message index f17727bf3fcb..7d55a95f7e5c 100644 --- a/lang/ruby30/pkg-message +++ b/lang/ruby30/pkg-message @@ -1,22 +1,24 @@ [ { type: install message: <