From nobody Thu Apr 13 20:36:35 2023 X-Original-To: dev-commits-ports-main@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 4PyBFJ08jlz44ZpK; Thu, 13 Apr 2023 20:36:36 +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 4PyBFH73WKz45j1; Thu, 13 Apr 2023 20:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681418196; 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=xPMJkehjKQ/kbjvjw1giL/+wOgc90PheQ5gBqbklSDY=; b=ojb6mUTpGL/5NIl4WbNAbk6fUSQRkFJbOrJbVrIvNtlYDLorMbwcq3ySHmIShKKsWuRSxZ qReV3QjPtcFovCPQY2nfD2SBGPZRrUVj2D4sejMDA5r9wKBocrey4zNXdQsjInvKkTp9Kl mCauuwrvcyyq6u4QprUpPqH2n8xa8jCvmJB6Zxvh7fnD4cRW35VhH4MXo987TWPcszb8hj R4GDjyCumSZpO8ap4YWRyUTPwon8TZVTCHVYfjs98nx4aNWZExD33ETE4sD6fXTb5//dUP GEYz1sAhzNpyM4OYvzL5iz4QWFS+72pqhD7MYdaU9FyyATs2I9dcxgPszSy7fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681418196; 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=xPMJkehjKQ/kbjvjw1giL/+wOgc90PheQ5gBqbklSDY=; b=mvc8EzxD3jFrjvhTkQFoBy8Wg1aWs1LclorkfbWNPUKxeU6Yx7Kp4tnlxdOgrU9I3wUgf0 9Uk+kfC8I2tqtbPBPHOmLp2O5g3djNt2Uq6GEC/UU0peCR6zJEn+eKqNVKq2P5j/BI7ikN Uebdm7VoGbLNrf75IQl9RmwM3phuKtmT+feVlRPmLdtXywaaLYVdEi+JcnYYG4a4m9qzQ/ cpQUgM/jMT7iHGNplWdXehCWn1AIwoj5VRcESJ1bIxIc68RpSv2ZBjv+8wBgIQXnjymU1+ Wtvc5sJ77hQox1x8gtIx5hmqr6ZAP14ICMWNZhSWOK77wolrQAMXWJbEf3+D9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681418196; a=rsa-sha256; cv=none; b=J5ac+DuSqLyx5wD5A6+lYkGASIC2CUF43EW4ogrXqcbxyEnbXoB+P57s51SyO5FolG1NRF c1CSJ5JTKnxY0+51QsX3yE1Ui+XHCDisbaY9pmbmnsEMRKBUlPsnECdNjBkelA78Hma6PO Kp1NqyW+jnEvdiw+PDAFeklgZF5xm+11WT08048PqB0NdWleQDplsqpuAss+pre7X2twkb rgbvHrN6pLqN1QlejQGPrRC7poaSMPw+aLW1tXzcYlfufy4cUgLUUnQ8JQtO+Ctqkq4Uaj Vygbd3GhO2TluOvWPg6ljy/SPTa84e/KzmrHE5eg0Ojs3q9qrbhJqhcFpDmtYg== 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 4PyBFH62TPzwbP; Thu, 13 Apr 2023 20:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DKaZOI063408; Thu, 13 Apr 2023 20:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DKaZE5063404; Thu, 13 Apr 2023 20:36:35 GMT (envelope-from git) Date: Thu, 13 Apr 2023 20:36:35 GMT Message-Id: <202304132036.33DKaZE5063404@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: 6edd7f25f39e - main - lang: unregister and remove expired lang/ruby27 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 6edd7f25f39eb40147d33ec8fcbbad00e2852c9d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=6edd7f25f39eb40147d33ec8fcbbad00e2852c9d commit 6edd7f25f39eb40147d33ec8fcbbad00e2852c9d Author: Rene Ladan AuthorDate: 2023-04-13 20:33:53 +0000 Commit: Rene Ladan CommitDate: 2023-04-13 20:35:40 +0000 lang: unregister and remove expired lang/ruby27 Bump example version from 2.7 to 3.1 which is the default version. --- MOVED | 1 + Mk/Uses/ruby.mk | 14 +- Mk/bsd.default-versions.mk | 4 +- lang/Makefile | 1 - lang/ruby27/Makefile | 226 - lang/ruby27/distinfo | 3 - lang/ruby27/files/patch-configure.ac | 27 - lang/ruby27/files/patch-lib_mkmf.rb | 11 - .../files/patch-lib_rdoc_generator_json__index.rb | 20 - lang/ruby27/files/patch-libressl | 11 - lang/ruby27/files/patch-tool_mkconfig.rb | 14 - lang/ruby27/files/patch-tool_rbinstall.rb | 142 - lang/ruby27/files/patch-util.c | 29 - lang/ruby27/pkg-descr | 17 - lang/ruby27/pkg-message | 22 - lang/ruby27/pkg-plist | 14898 ------------------- 16 files changed, 6 insertions(+), 15434 deletions(-) diff --git a/MOVED b/MOVED index ae5e001d67d0..c5a3224c39b1 100644 --- a/MOVED +++ b/MOVED @@ -17908,3 +17908,4 @@ textproc/rubygem-loofah218|textproc/rubygem-loofah|2023-04-09|Remove obsoleted p textproc/rubygem-rouge329|textproc/rubygem-rouge|2023-04-09|Remove obsoleted port. Use textproc/rubygem-rouge instead www/rubygem-erubi19|www/rubygem-erubi|2023-04-09|Remove obsoleted port. Use www/rubygem-erubi instead multimedia/mythtv-frontend|multimedia/mythtv|2023-04-10|Frontend is no part of multimedia/mythtv +lang/ruby27|lang/ruby30|2023-04-13|Please migrate to newer versions. Ruby 2.7 will reach its EoL on April 12, 2023 diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index 5a86dc836a7c..ada4fe2f230f 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -15,7 +15,7 @@ # [variables that a user may define] # # RUBY_VER - (See below) -# RUBY_DEFAULT_VER - Set to (e.g.) "2.7" if you want to refer to "ruby27" +# RUBY_DEFAULT_VER - Set to (e.g.) "3.1" if you want to refer to "ruby31" # just as "ruby". # RUBY_ARCH - (See below) # @@ -144,14 +144,7 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} . if defined(RUBY_VER) # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -. if ${RUBY_VER} == 2.7 -# -# Ruby 2.7 -# -RUBY_DISTVERSION= 2.7.7 -RUBY_PORTREVISION= 0 - -. elif ${RUBY_VER} == 3.0 +. if ${RUBY_VER} == 3.0 # # Ruby 3.0 # @@ -177,7 +170,7 @@ RUBY_PORTREVISION= 0 # # Other versions # -IGNORE= Only ruby 2.7, 3.0, 3.1 and 3.2 are supported +IGNORE= Only ruby 3.0, 3.1 and 3.2 are supported _INVALID_RUBY_VER= 1 . endif RUBY_PORTEPOCH= 1 @@ -186,7 +179,6 @@ RUBY_VERSION= ${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} . if !defined(_INVALID_RUBY_VER) -RUBY27?= "@comment " RUBY30?= "@comment " RUBY31?= "@comment " RUBY32?= "@comment " diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 3b24a91fc6fd..ce7c1789b1a8 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -10,7 +10,7 @@ # Users who want to override these defaults can easily do so by defining # DEFAULT_VERSIONS in their make.conf as follows: # -# DEFAULT_VERSIONS= perl5=5.20 ruby=2.7 +# DEFAULT_VERSIONS= perl5=5.20 ruby=3.1 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK) _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes @@ -122,7 +122,7 @@ PYTHON_DEFAULT?= 3.9 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.7, 3.8, 3.9, 3.10, 3.11 PYTHON3_DEFAULT?= 3.9 -# Possible values: 2.7, 3.0, 3.1, 3.2 +# Possible values: 3.0, 3.1, 3.2 RUBY_DEFAULT?= 3.1 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust diff --git a/lang/Makefile b/lang/Makefile index 6e135e3601ab..8f47153ae080 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -307,7 +307,6 @@ SUBDIR += rexx-regutil SUBDIR += rexx-wrapper SUBDIR += rhino - SUBDIR += ruby27 SUBDIR += ruby30 SUBDIR += ruby31 SUBDIR += ruby32 diff --git a/lang/ruby27/Makefile b/lang/ruby27/Makefile deleted file mode 100644 index 73c1965bae3d..000000000000 --- a/lang/ruby27/Makefile +++ /dev/null @@ -1,226 +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 - -DEPRECATED= Please migrate to newer versions. Ruby 2.7 will reach its EoL on April 12, 2023 -EXPIRATION_DATE= 2023-04-12 - -# 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 ruby:none 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} -MAKE_JOBS_UNSAFE= yes - -RUBY_VER= 2.7 - -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 || ${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} == powerpc64 || ${ARCH} == powerpc64le -LIB_DEPENDS+= libunwind.so:devel/libunwind -.endif - -.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 -USE_GCC= yes -.endif - -.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc -CONFIGURE_ARGS+=--with-setjmp-type=_setjmp -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 -PKGNAMESUFFIX= ${RUBY_SUFFIX} -PLIST_SUB+= IF_DEFAULT="@comment " -.endif - -INSTALLED_SCRIPTS= erb ruby -INSTALLED_MANUALS= erb 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} -.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-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 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/ruby27/distinfo b/lang/ruby27/distinfo deleted file mode 100644 index dca1fc93f59f..000000000000 --- a/lang/ruby27/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1669313585 -SHA256 (ruby/ruby-2.7.7.tar.xz) = b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c -SIZE (ruby/ruby-2.7.7.tar.xz) = 12101804 diff --git a/lang/ruby27/files/patch-configure.ac b/lang/ruby27/files/patch-configure.ac deleted file mode 100644 index 2ad70b2c403a..000000000000 --- a/lang/ruby27/files/patch-configure.ac +++ /dev/null @@ -1,27 +0,0 @@ ---- configure.ac.orig 2022-04-12 11:25:48 UTC -+++ configure.ac -@@ -2714,7 +2714,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' - ]) -@@ -3200,6 +3200,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='' -@@ -3833,6 +3834,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/ruby27/files/patch-lib_mkmf.rb b/lang/ruby27/files/patch-lib_mkmf.rb deleted file mode 100644 index f333fdfd2e67..000000000000 --- a/lang/ruby27/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/ruby27/files/patch-lib_rdoc_generator_json__index.rb b/lang/ruby27/files/patch-lib_rdoc_generator_json__index.rb deleted file mode 100644 index 1152e4201544..000000000000 --- a/lang/ruby27/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/ruby27/files/patch-libressl b/lang/ruby27/files/patch-libressl deleted file mode 100644 index adce5095db84..000000000000 --- a/lang/ruby27/files/patch-libressl +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/openssl/ossl_ocsp.c.orig 2022-04-12 11:25:48 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/ruby27/files/patch-tool_mkconfig.rb b/lang/ruby27/files/patch-tool_mkconfig.rb deleted file mode 100644 index 2b9c106e5a61..000000000000 --- a/lang/ruby27/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/ruby27/files/patch-tool_rbinstall.rb b/lang/ruby27/files/patch-tool_rbinstall.rb deleted file mode 100644 index f3d2c7585883..000000000000 --- a/lang/ruby27/files/patch-tool_rbinstall.rb +++ /dev/null @@ -1,142 +0,0 @@ ---- tool/rbinstall.rb.orig 2019-12-25 09:50:58 UTC -+++ tool/rbinstall.rb -@@ -790,139 +790,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) -- file = File.realpath(file) -- code = File.read(file, encoding: "utf-8:-") -- code.gsub!(/`git.*?`/m, '""') -- code.gsub!(/%x\[git.*?\]/m, '""') -- 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 --end -- --def install_default_gem(dir, srcdir) -- gem_dir = Gem.default_dir -- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) -- prepare "default gems from #{dir}", gem_dir, directories -- -- spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) -- default_spec_dir = "#{spec_dir}/default" -- makedirs(default_spec_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| FileUtils.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 -- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) -- prepare "bundled gems", gem_dir, directories -- install_dir = with_destdir(gem_dir) -- 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 => $prog_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 -- dirs = Gem::Util.glob_files_in_dir "*/", "#{srcdir}/gems" -- Gem::Specification.each_gemspec(dirs) do |path| -- spec = load_gemspec(path) -- next unless spec.platform == Gem::Platform::RUBY -- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] -- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" -- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") -- spec.extensions[0] ||= "-" -- end -- ins = RbInstall::UnpackedInstaller.new(spec, options) -- puts "#{INDENT}#{spec.name} #{spec.version}" -- ins.install -- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) -- 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? -- 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| -- inst = Gem::Installer.new(gem, 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/ruby27/files/patch-util.c b/lang/ruby27/files/patch-util.c deleted file mode 100644 index 34686785879f..000000000000 --- a/lang/ruby27/files/patch-util.c +++ /dev/null @@ -1,29 +0,0 @@ ---- util.c.orig 2022-04-12 11:25:48 UTC -+++ util.c -@@ -210,6 +210,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 -@@ -255,7 +256,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 -@@ -521,7 +522,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/ruby27/pkg-descr b/lang/ruby27/pkg-descr deleted file mode 100644 index a537df18eb88..000000000000 --- a/lang/ruby27/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/ruby27/pkg-message b/lang/ruby27/pkg-message deleted file mode 100644 index f17727bf3fcb..000000000000 --- a/lang/ruby27/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -[ -{ type: install - message: <