From nobody Sun Mar 31 10:46:26 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V6rRR0sHNz5FlJs; Sun, 31 Mar 2024 10:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V6rRR0d8Tz4Fqn; Sun, 31 Mar 2024 10:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711881987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Q95CQYMkDkZyg2XVNvB7vQ/RSOvLUJ2UKq07jzAm6I=; b=wyAfzOlVBTarJG1/qOOKlHVtD6Zz5H8wo4yN2gEi1EBgYCAoAylrLdWYyCypjdbFCvZgkw 5xLpgihb5LnQ6Gacu7Gkt6BQZ9i1YpdvXi+UxjUXiX6vXLFYmHIw07JcG6NGehvdjHthTx wZWYFfXG62ezDLnFNQCGpEsSumPVtm2VN1pw4A3WZGLMooF2WRpJFFqWQzQNMI4OV9qrBg JeQ8qlN+AxtvNeuY/s+mr7btUhuDz2N/OsFG/SAhNmBaXZCPpSGgNg8bjHFH0OlfDkdATC kbYMDZUVyjPKSzYcC9q/Fs+8dO/wcSfC8J8jB8ViGYjZQpsek2rtaoeZstddaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711881987; a=rsa-sha256; cv=none; b=wwEyRug/ZNPXJk9PXMwQDxoSrGhcIPdXoHnFZoNLzRK0nbwpg9/Kyo3C53ezTBbWpvokN1 v2lFqwu0/2u2FW1ybpoJi5/LLGKUaL9Q9FPgREH1UzB28PjmdlbT8bg4mHd1iG2THjLw11 ednbuE+7jlNmRfUT5osaSR2YftDX6HrqbO47FFwfXYkTI1ENKsEXYDPdDL/KZoo0HgUDMR pEki1hdPybdIr7i8n4n+EjqW7UNAmw6GNzRmRieppbyOVDuG+TadqoaDwc20DGSRdlTPy/ QFXIHEnFFVncdQr9J7boVzD90E9824+MRvveI27Rkcpel4k38fkW5OTH5fwdWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711881987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Q95CQYMkDkZyg2XVNvB7vQ/RSOvLUJ2UKq07jzAm6I=; b=qyzALuk0AiibJq1bAgQbKzRqC00nR8tZWqAig3my1j22c+JBKtlHE4zkC0TX9LKBI6jJ8l 6HT21PivICeWyJaYSW8xxZOrbwYjrsp7dH7MlZnGAHMONOOlCxW6BTBKPYQH49HCp2pcPL ou0hVAgUvdMHELzAiVUmbNqEnx4uJcf6vBH1UcE0PaOhD/FBMxWWF0jODJzpWA4QUxvADK 38RgIz+mDl/ihGVibopaKeXHTqxUQf7G0P5wLoFqDLLndl1e7OS59MJkRBBem1MouaQWw1 bl93Sdl4SoEcSzaED3wHGUnEEU5abP+mbL5sWXg5T6v8sIExrqqTkYuTxgU12g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V6rRR0DPYzbDn; Sun, 31 Mar 2024 10:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42VAkQSx011474; Sun, 31 Mar 2024 10:46:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42VAkQ1D011471; Sun, 31 Mar 2024 10:46:26 GMT (envelope-from git) Date: Sun, 31 Mar 2024 10:46:26 GMT Message-Id: <202403311046.42VAkQ1D011471@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: d9726846d0d5 - main - lang/ruby30: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9726846d0d5b9ce871d3d6183dd9a5cc7c07514 Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=d9726846d0d5b9ce871d3d6183dd9a5cc7c07514 commit d9726846d0d5b9ce871d3d6183dd9a5cc7c07514 Author: Rene Ladan AuthorDate: 2024-03-31 10:45:20 +0000 Commit: Rene Ladan CommitDate: 2024-03-31 10:45:20 +0000 lang/ruby30: Remove expired port 2024-03-30 lang/ruby30: Please migrate to newer versions. Ruby 3.0 will reach its EoL on March 30, 2024 Sort MOVED while here --- MOVED | 5 +- lang/Makefile | 1 - lang/ruby30/Makefile | 223 - lang/ruby30/distinfo | 3 - lang/ruby30/files/patch-configure.ac | 36 - lang/ruby30/files/patch-lib_mkmf.rb | 11 - .../files/patch-lib_rdoc_generator_json__index.rb | 20 - lang/ruby30/files/patch-libressl | 11 - lang/ruby30/files/patch-tool_mkconfig.rb | 14 - lang/ruby30/files/patch-tool_rbinstall.rb | 167 - lang/ruby30/files/patch-util.c | 29 - lang/ruby30/pkg-descr | 17 - lang/ruby30/pkg-message | 30 - lang/ruby30/pkg-plist | 12721 ------------------- 14 files changed, 3 insertions(+), 13285 deletions(-) diff --git a/MOVED b/MOVED index ecb33c5f5f2a..4bef1a9b5ac0 100644 --- a/MOVED +++ b/MOVED @@ -3043,6 +3043,8 @@ net-im/gtkcord4|net-im/dissent|2024-03-03|Project renamed devel/anjuta|devel/gnome-builder|2024-03-12|Has expired: Unmaintained, upstream WWW owned by gambling site, use devel/gnome-builder deskutils/rubrica||2024-03-12|Has expired: Upstream WWW redirects to a different site not related to the application x11/mrxvt-devel|x11/mrxvt|2024-03-12|Merge most recent version into main port +math/qalculate-qt@qt5|math/qalculate-qt|2024-03-13|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored math/qalculate-qt port based on Qt 6.x instead +math/qalculate-qt@qt6|math/qalculate-qt|2024-03-13|Flavorization has been removed. Continue to enjoy math/qalculate-qt based on Qt 6.x as usual games/xataxx||2024-03-16|Has expired: No available WWW editors/kak-lsp|editors/kakoune-lsp|2024-03-17|Project was renamed upstream www/npm-node16||2024-03-17|Has expired: Depends on deprecated node16 @@ -3060,5 +3062,4 @@ security/rubygem-metasploit-aggregator||2024-03-24|Has expired: No longer used, net-p2p/tooth||2024-03-24|Has expired: Project has been renamed to Tuba. Consider porting to the new project. See https://github.com/GeopJr/Tuba www/tidy-devel|www/tidy-html5|2024-03-25|Has expired: no more dev at SF, replaced by www/tidy-html5 www/tidy-lib|www/tidy-html5|2024-03-25|Has expired: no more dev at SF, replaced by www/tidy-html5 -math/qalculate-qt@qt5|math/qalculate-qt|2024-03-13|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored math/qalculate-qt port based on Qt 6.x instead -math/qalculate-qt@qt6|math/qalculate-qt|2024-03-13|Flavorization has been removed. Continue to enjoy math/qalculate-qt based on Qt 6.x as usual +lang/ruby30||2024-03-31|Has expired: Please migrate to newer versions. Ruby 3.0 will reach its EoL on March 30, 2024 diff --git a/lang/Makefile b/lang/Makefile index ddf8407b98e1..c9e84d057b0d 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -321,7 +321,6 @@ SUBDIR += rhino SUBDIR += rizin SUBDIR += rizin-cutter - SUBDIR += ruby30 SUBDIR += ruby31 SUBDIR += ruby32 SUBDIR += ruby33 diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile deleted file mode 100644 index bd4f07adb06e..000000000000 --- a/lang/ruby30/Makefile +++ /dev/null @@ -1,223 +0,0 @@ -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 -WWW= https://www.ruby-lang.org/en/ - -LICENSE= BSD2CLAUSE RUBY -LICENSE_COMB= dual -LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL -LICENSE_FILE_RUBY= ${WRKSRC}/COPYING - -BROKEN_FreeBSD_15= ext/openssl/extconf.rb:113: OpenSSL >= 1.0.1, < 3.0.0 or LibreSSL >= 2.5.0 is required -DEPRECATED= Please migrate to newer versions. Ruby 3.0 will reach its EoL on March 30, 2024 -EXPIRATION_DATE=2024-03-30 - -# 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 localbase ruby:none 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= -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -# Keep this, else ruby will fail to load libraries dependent of libpthread. -LIBS+= -lpthread -USE_LDCONFIG= yes -WRKSRC= ${RUBY_WRKSRC} - -RUBY_VER= 3.0 - -OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC OPENSSL -OPTIONS_DEFAULT= RDOC LIBEDIT OPENSSL -OPTIONS_SINGLE= EDIT -OPTIONS_SINGLE_EDIT= LIBEDIT READLINE -OPTIONS_SUB= yes -OPTIONS_EXCLUDE_FreeBSD_14= OPENSSL - -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 -OPENSSL_USES= ssl -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 || ${ARCH} == powerpc64le || ${ARCH} == powerpc64 || ${ARCH} == powerpc) -#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} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le -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 -.endif - -.if ${RUBY_VER} == ${RUBY_DEFAULT_VER} -PLIST_SUB+= IF_DEFAULT="" -.else -PKGNAMESUFFIX= ${RUBY_SUFFIX} -PLIST_SUB+= IF_DEFAULT="@comment " -.endif - -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -OPTIONS_EXCLUDE= OPENSSL -.endif - -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/* 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 "ruby30", etc. -# -. for FILE in ${INSTALLED_SCRIPTS} - ${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE} -. endfor -# -# Link "ruby.1.gz" to "ruby30.1.gz", etc. -# -. for FILE in ${INSTALLED_MANUALS} - ${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/${FILE}.1.gz -. endfor -.endif - -post-install-CAPIDOCS-on: - ${RM} ${WRKSRC}/doc/capi/.timestamp ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp - cd ${STAGEDIR}${PREFIX} && ${FIND} share/doc/ruby${RUBY_SUFFIX}/capi/ -type f >> ${TMPPLIST} - -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${RUBY_SUFFIX} - ${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 available 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 available 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 deleted file mode 100644 index e11ba2578860..000000000000 --- a/lang/ruby30/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1680201168 -SHA256 (ruby/ruby-3.0.6.tar.xz) = b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 -SIZE (ruby/ruby-3.0.6.tar.xz) = 15864560 diff --git a/lang/ruby30/files/patch-configure.ac b/lang/ruby30/files/patch-configure.ac deleted file mode 100644 index 44a6172a23f4..000000000000 --- a/lang/ruby30/files/patch-configure.ac +++ /dev/null @@ -1,36 +0,0 @@ ---- configure.ac.orig 2022-04-12 11:48:55 UTC -+++ configure.ac -@@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS(utime.h) - AC_CHECK_HEADERS(time.h) - AC_CHECK_HEADERS(ucontext.h) - AC_CHECK_HEADERS(utime.h) --AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [ -+AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [ - AC_CHECK_HEADERS(x86intrin.h) - ]) - -@@ -2825,7 +2825,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ - : ${LDSHARED='$(CC) -shared'} - AS_IF([test "$rb_cv_binary_elf" = yes], [ - LDFLAGS="$LDFLAGS -rdynamic" -- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@' -+ DLDFLAGS="$DLDFLAGS "'-Wl,-E' - ], [ - test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' - ]) -@@ -3324,6 +3324,7 @@ AS_CASE("$enable_shared", [yes], [ - [freebsd*|dragonfly*], [ - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' - LIBRUBY_SONAME='$(LIBRUBY_SO)' -+ RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}']) - AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ - LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" - LIBRUBY_ALIASES='' -@@ -3960,6 +3961,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [ - AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS) - ], [ - arch="${target_cpu}-${target_os}" -+ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}]) - AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch") - ]) - diff --git a/lang/ruby30/files/patch-lib_mkmf.rb b/lang/ruby30/files/patch-lib_mkmf.rb deleted file mode 100644 index f333fdfd2e67..000000000000 --- a/lang/ruby30/files/patch-lib_mkmf.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/mkmf.rb.orig 2018-10-09 14:09:35 UTC -+++ lib/mkmf.rb -@@ -234,7 +234,7 @@ module MakeMakefile - end - $extmk ||= false - if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h") -- $topdir = $hdrdir -+ $topdir = $hdrdir + "/" + "#{CONFIG['arch']}/ruby/" - $top_srcdir = $hdrdir - $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"] - elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h") diff --git a/lang/ruby30/files/patch-lib_rdoc_generator_json__index.rb b/lang/ruby30/files/patch-lib_rdoc_generator_json__index.rb deleted file mode 100644 index 1152e4201544..000000000000 --- a/lang/ruby30/files/patch-lib_rdoc_generator_json__index.rb +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/rdoc/generator/json_index.rb.orig 2017-11-27 10:45:24 UTC -+++ lib/rdoc/generator/json_index.rb -@@ -175,7 +175,7 @@ class RDoc::Generator::JsonIndex - debug_msg "Writing gzipped search index to %s" % outfile - - Zlib::GzipWriter.open(outfile) do |gz| -- gz.mtime = File.mtime(search_index_file) -+ gz.mtime = 1 - gz.orig_name = search_index_file.basename.to_s - gz.write search_index - gz.close -@@ -193,7 +193,7 @@ class RDoc::Generator::JsonIndex - debug_msg "Writing gzipped file to %s" % outfile - - Zlib::GzipWriter.open(outfile) do |gz| -- gz.mtime = File.mtime(dest) -+ gz.mtime = 1 - gz.orig_name = dest.basename.to_s - gz.write data - gz.close diff --git a/lang/ruby30/files/patch-libressl b/lang/ruby30/files/patch-libressl deleted file mode 100644 index df9a9b8ee04f..000000000000 --- a/lang/ruby30/files/patch-libressl +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/openssl/ossl_ocsp.c.orig 2022-04-12 11:48:55 UTC -+++ ext/openssl/ossl_ocsp.c -@@ -1093,7 +1093,7 @@ ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self - * exists in LibreSSL 2.1.10, 2.2.9, 2.3.6, 2.4.1. - */ - if (!(flg & (OCSP_NOCHAIN | OCSP_NOVERIFY)) && -- sk_X509_num(x509s) && sk_X509_num(bs->certs)) { -+ sk_X509_num(x509s) && sk_X509_num(OCSP_resp_get0_certs(bs))) { - int i; - - bs = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_BASICRESP), bs); diff --git a/lang/ruby30/files/patch-tool_mkconfig.rb b/lang/ruby30/files/patch-tool_mkconfig.rb deleted file mode 100644 index 2b9c106e5a61..000000000000 --- a/lang/ruby30/files/patch-tool_mkconfig.rb +++ /dev/null @@ -1,14 +0,0 @@ ---- tool/mkconfig.rb.orig 2019-12-25 09:50:58 UTC -+++ tool/mkconfig.rb -@@ -160,8 +160,9 @@ def vars.expand(val, config = self) - val.replace(newval) unless newval == val - val - end --prefix = vars.expand(vars["prefix"] ||= "") --rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "") -+prefix = vars.expand(vars["rubyarchdir"]) -+major, minor, *rest = RUBY_VERSION.split('.') -+rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}" - relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir - - puts %[\ diff --git a/lang/ruby30/files/patch-tool_rbinstall.rb b/lang/ruby30/files/patch-tool_rbinstall.rb deleted file mode 100644 index 18faf8e5f498..000000000000 --- a/lang/ruby30/files/patch-tool_rbinstall.rb +++ /dev/null @@ -1,167 +0,0 @@ ---- tool/rbinstall.rb.orig 2020-12-08 09:02:31 UTC -+++ tool/rbinstall.rb -@@ -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, expanded = false) -- file = File.realpath(file) -- code = File.read(file, encoding: "utf-8:-") -- 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}/#{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-util.c b/lang/ruby30/files/patch-util.c deleted file mode 100644 index f454ef14eb0d..000000000000 --- a/lang/ruby30/files/patch-util.c +++ /dev/null @@ -1,29 +0,0 @@ ---- util.c.orig 2022-04-12 11:48:55 UTC -+++ util.c -@@ -214,6 +214,7 @@ typedef int (cmpfunc_t)(const void*, const void*, void - - typedef int (cmpfunc_t)(const void*, const void*, void*); - -+#if !defined HAVE_GNU_QSORT_R - #if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION - /* In contrast to its name, Visual Studio qsort_s is incompatible with - * C11 in the order of the comparison function's arguments, and same -@@ -259,7 +260,7 @@ ruby_qsort(void* base, const size_t nel, const size_t - qsort_s(base, nel, size, cmp, d); - } - # define HAVE_GNU_QSORT_R 1 --#elif !defined HAVE_GNU_QSORT_R -+#else - /* mm.c */ - - #define mmtype long -@@ -525,7 +526,8 @@ ruby_qsort(void* base, const size_t nel, const size_t - else goto nxt; /* need not to sort both sides */ - } - } --#endif /* HAVE_GNU_QSORT_R */ -+#endif -+#endif /* !HAVE_GNU_QSORT_R */ - - char * - ruby_strdup(const char *str) diff --git a/lang/ruby30/pkg-descr b/lang/ruby30/pkg-descr deleted file mode 100644 index a537df18eb88..000000000000 --- a/lang/ruby30/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -Ruby is the interpreted scripting language for quick and -easy object-oriented programming. It has many features to -process text files and to do system management tasks (as in -Perl). It is simple, straight-forward, and extensible. - -Features of Ruby are shown below. - - + Simple Syntax - + *Normal* Object-Oriented features(ex. class, method calls) - + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method) - + Operator Overloading - + Exception Handling - + Iterators and Closures - + Garbage Collection - + Dynamic Loading of Object files(on some architecture) - + Highly Portable(works on many UNIX machines, and on DOS, - Windows, Mac, BeOS etc.) diff --git a/lang/ruby30/pkg-message b/lang/ruby30/pkg-message deleted file mode 100644 index 98780026ea3e..000000000000 --- a/lang/ruby30/pkg-message +++ /dev/null @@ -1,30 +0,0 @@ -[ -{ type: install - message: <