git: 4a5d4426c717 - main - lang/ruby33: Update to 3.3.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 08 Sep 2024 18:55:42 UTC
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a5d4426c71750c14d9587b26088b50d62a4b2f7 commit 4a5d4426c71750c14d9587b26088b50d62a4b2f7 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-09-08 18:33:42 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-09-08 18:40:21 +0000 lang/ruby33: Update to 3.3.5 - Clean up Makefile: move knobs together Changes: https://github.com/ruby/ruby/releases https://github.com/ruby/ruby/blob/master/NEWS.md https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ --- Mk/Uses/ruby.mk | 2 +- lang/ruby33/Makefile | 56 ++++++++++++++++++++++----------------------------- lang/ruby33/distinfo | 6 +++--- lang/ruby33/pkg-plist | 10 ++++++++- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index f4e3ce92d388..3e037fafeec1 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -162,7 +162,7 @@ RUBY_PORTREVISION= 0 # # Ruby 3.3 # -RUBY_DISTVERSION= 3.3.4 +RUBY_DISTVERSION= 3.3.5 RUBY_PORTREVISION= 0 # When adding a version, please keep the comment in diff --git a/lang/ruby33/Makefile b/lang/ruby33/Makefile index 0fd86ed469b7..ebbae9e20b34 100644 --- a/lang/ruby33/Makefile +++ b/lang/ruby33/Makefile @@ -35,40 +35,47 @@ EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ --exclude ${DISTNAME}/man/ri.1 \ --no-same-owner --no-same-permissions -GNU_CONFIGURE= yes CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --disable-rpath \ --enable-install-static-library \ --enable-pthread \ --enable-shared \ - --with-ruby-version="${RUBY_VER}" \ + --with-ruby-version=minor \ --with-sitedir="${PREFIX}/lib/ruby/site_ruby" \ --with-vendordir="${PREFIX}/lib/ruby/vendor_ruby" CONFIGURE_ENV= debugflags= - +GNU_CONFIGURE= yes # Keep this, else ruby will fail to load libraries dependent of libpthread. LIBS+= -lpthread WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 3.3 -OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC YJIT -OPTIONS_DEFAULT= RDOC -OPTIONS_SUB= yes +EXTDOCS= ripper/README stringio/README.md syslog/syslog.txt +EXTSAMPLES= bigdecimal/sample/*.rb +INSTALLED_MANUALS= ruby +INSTALLED_SCRIPTS= ruby +# 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' \ + -- +OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC YJIT +OPTIONS_DEFAULT=RDOC +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 YJIT_DESC= Enable YJIT (Yet Another Ruby JIT) -CAPIDOCS_BUILD_DEPENDS= dot:graphics/graphviz \ - doxygen>=1.8.13,2:devel/doxygen +CAPIDOCS_BUILD_DEPENDS= dot:graphics/graphviz \ + doxygen>=1.8.13,2:devel/doxygen CAPIDOCS_CONFIGURE_ENABLE= install-capi -GMP_LIB_DEPENDS= libgmp.so:math/gmp -GMP_CONFIGURE_WITH= gmp -RDOC_CONFIGURE_ENABLE= install-rdoc -YJIT_BUILD_DEPENDS= ${RUST_DEFAULT}>=1.58.0:lang/${RUST_DEFAULT} -YJIT_CONFIGURE_ENABLE= yjit +GMP_CONFIGURE_WITH= gmp +GMP_LIB_DEPENDS= libgmp.so:math/gmp +RDOC_CONFIGURE_ENABLE= install-rdoc +YJIT_BUILD_DEPENDS= ${RUST_DEFAULT}>=1.58.0:lang/${RUST_DEFAULT} +YJIT_CONFIGURE_ENABLE= yjit .include <bsd.port.pre.mk> @@ -97,8 +104,8 @@ LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc -CONFIGURE_ARGS+= --with-setjmp-type=_setjmp -CONFIGURE_ENV+= ac_cv_func__setjmp=yes +CONFIGURE_ARGS+=--with-setjmp-type=_setjmp +CONFIGURE_ENV+= ac_cv_func__setjmp=yes .endif .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} @@ -108,18 +115,6 @@ PKGNAMESUFFIX= ${RUBY_SUFFIX} PLIST_SUB+= IF_DEFAULT="@comment " .endif -INSTALLED_SCRIPTS= ruby -INSTALLED_MANUALS= ruby - -EXTSAMPLES= bigdecimal/sample/*.rb - -EXTDOCS= 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-extract-DOCS-on: ${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc/ChangeLog @@ -154,7 +149,7 @@ pre-install-RDOC-on: post-install: .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} # -# Link just installed "ruby" to "ruby31", etc. +# Link just installed "ruby" to "rubyXX", etc. # . for FILE in ${INSTALLED_SCRIPTS} ${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE} @@ -190,10 +185,7 @@ post-install-DOCS-on: ${STAGEDIR}${RUBY_DOCDIR}/${FILE:C|^([^/]+)/.*|\1|}/ .endfor @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/) - ${INSTALL_DATA} ${WRKSRC}/COPYING* \ - ${WRKSRC}/LEGAL \ - ${WRKSRC}/README* \ - ${STAGEDIR}${RUBY_DOCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/COPYING* ${WRKSRC}/LEGAL ${WRKSRC}/README* ${STAGEDIR}${RUBY_DOCDIR}/ post-install-EXAMPLES-on: # Create all dirs required (":u" isn't available in STABLE yet :-() diff --git a/lang/ruby33/distinfo b/lang/ruby33/distinfo index 035beec17d76..74fd37ab7d31 100644 --- a/lang/ruby33/distinfo +++ b/lang/ruby33/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720536562 -SHA256 (ruby/ruby-3.3.4.tar.xz) = 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad -SIZE (ruby/ruby-3.3.4.tar.xz) = 16366580 +TIMESTAMP = 1725560897 +SHA256 (ruby/ruby-3.3.5.tar.xz) = 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 +SIZE (ruby/ruby-3.3.5.tar.xz) = 16403660 diff --git a/lang/ruby33/pkg-plist b/lang/ruby33/pkg-plist index 96cf42aead20..5c002baf2f00 100644 --- a/lang/ruby33/pkg-plist +++ b/lang/ruby33/pkg-plist @@ -3867,15 +3867,18 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%RDOC%%%%RUBY_RIDIR%%/Gem/BUNDLED_GEMS/cdesc-BUNDLED_GEMS.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/activated%3f-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/base_dir-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/base_dir_priority-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/cdesc-BasicSpecification.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/contains_requirable_file%3f-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/datadir-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/default_gem%3f-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/default_gem_priority-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/default_specifications_dir-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/extension_dir-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/extensions_dir-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/full_gem_path-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/full_name-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/full_name_with_location-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/full_require_paths-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/gem_dir-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BasicSpecification/gems_dir-i.ri @@ -4206,6 +4209,7 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/concurrent_downloads-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/config_file_name-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/credentials_path-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/deep_transform_config_keys%21-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/disable_default_gem_server-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/dump_with_rubygems_yaml-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/ConfigFile/each-i.ri @@ -5522,6 +5526,7 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/unresolved_specs-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/validate-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/validate_dependencies-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/validate_for_resolution-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/validate_metadata-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/validate_permissions-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/version%3d-i.ri @@ -5534,6 +5539,7 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_array_attributes-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_attribute_present-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_authors_field-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_for_resolution-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_lazy_metadata-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_licenses-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_licenses_length-i.ri @@ -5547,6 +5553,7 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_require_paths-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_required%21-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_required_attributes-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_required_metadata%21-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_required_ruby_version-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_rubygems_version-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/SpecificationPolicy/validate_self_inclusion_in_files_list-i.ri @@ -5648,6 +5655,7 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%RDOC%%%%RUBY_RIDIR%%/Gem/Uninstaller/remove_executables-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Uninstaller/safe_delete-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Uninstaller/spec-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/Uninstaller/specification_record-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Uninstaller/uninstall-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Uninstaller/uninstall_gem-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Uninstaller/warn_cannot_uninstall_default_gems-i.ri @@ -5746,7 +5754,6 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%RDOC%%%%RUBY_RIDIR%%/Gem/WebauthnVerificationError/cdesc-WebauthnVerificationError.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/WebauthnVerificationError/new-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/YAMLSerializer/cdesc-YAMLSerializer.ri -%%RDOC%%%%RUBY_RIDIR%%/Gem/YAMLSerializer/convert_to_backward_compatible_key%21-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/YAMLSerializer/dump-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/YAMLSerializer/dump_hash-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/YAMLSerializer/load-i.ri @@ -5815,6 +5822,7 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc %%RDOC%%%%RUBY_RIDIR%%/Gem/marshal_version-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/needs-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/open_file-c.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/open_file_with_flock-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/operating_system_defaults-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/path-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/path_separator-c.ri