From nobody Wed Apr 06 01:22:56 2022 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 C8B071A8FF43; Wed, 6 Apr 2022 01:22:56 +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 4KY6Fr5Cl1z3vVZ; Wed, 6 Apr 2022 01:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649208176; 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=0PqIiPRomlEroE3CTV9Qolsu3vXb7mVbMlQ8oVcjpAE=; b=l1GJP1ALM3ktyEx5bLCPyCeNv7miSPDXl2bakvDtrsDj3DQS3ymmJkEWkgSZlsnrVoTzST GlI7WEFqdAheBmK4Gr0+wbELhWR5VLx3tFfwaYF8SYL072W3i9WrnTjBhyPLortGsxf8Rc rT1bc578b7b8lOVlfZqW5YJQ9tvkX6VXOQy7KSUWGEw9mlG8XZYz2ueFRpVVZPT6tUxlOR KgADzMT9ZgwXLwbotZiizTBEoEXHJx6ZLqM2d+DrIR6eaLFK4TbzsUI052Br5QAN7hBlA6 9GWTKNHVFtqGI7SrfeAjTh8p19NW0ojuHzRa0Fl2iorAYsXjVgDbY/pLA1BUpQ== 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 92ACF11F0C; Wed, 6 Apr 2022 01:22:56 +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 2361MuO5097999; Wed, 6 Apr 2022 01:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2361Mupe097998; Wed, 6 Apr 2022 01:22:56 GMT (envelope-from git) Date: Wed, 6 Apr 2022 01:22:56 GMT Message-Id: <202204060122.2361Mupe097998@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: c18c1057fd1e - main - */*: Cleanup after removal of lang/ruby26 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c18c1057fd1e6a0dbd4800700b929064e43e1a29 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649208176; 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=0PqIiPRomlEroE3CTV9Qolsu3vXb7mVbMlQ8oVcjpAE=; b=U8a8WhWZBp3Kvmuo+j3cEKaglW7ksz4ndYNnXm9F6ajeQ/vxTAPv348780equAmItMfGyD m5AeCrmaaMp02A9QQ3MoBP6ImPmWWOiosv8Bk+YxD/OXLi120o/JumGtGI+F0hs+SckUE/ 5IrvAl+6gbvBH9GG+j7rS+6DKxEzKSdbXOFWF8Bddmu2BLQFI1Z3cyAGJaZzGfIVpRytjz 3MeJHt7r1Dw+d+ytOwX9tcZtvzYPfPNqH+SUCIi17GYkU9LUUdHZeft5BuLKDg97HbtUYT SiEboBhOhwcnQv4O5oMFKkiSJyW47DMGCb8VlKpJbiYqIuZKxKGGsyjPj8SSaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649208176; a=rsa-sha256; cv=none; b=wev+Ww7dCY3OyY8VEiMrHV06Ytv31BiVikxEdTeXsQOh3d0a9q7Fz1vskzrIOenhwIawew ZgbYLr4Whl4FIqkQwofCg8idgYODJpSRmBkwcmIkVgoxrPFmz78n5nwdQHBo7Q9HRmMZVy nCow83KCu/b4+8tvzBuR+BmnRLAoKWtpCnUWJw1JRqwS96r4eQtkBuROKlxShp5Yd3coJ5 QqXbYcvzTdai6l7CSIeaoKREucSr5DLgIS3a4W+bUF/BkAphYuiL2N5h+DxxvHpCi/6rg5 O9QzdE+TT9on54joT6RYhZkZa6F4X0doN4orKUkiT6g+HG5kMc9v0kKPsJORlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=c18c1057fd1e6a0dbd4800700b929064e43e1a29 commit c18c1057fd1e6a0dbd4800700b929064e43e1a29 Author: Yasuhiro Kimura AuthorDate: 2022-04-02 07:56:15 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-04-06 01:20:03 +0000 */*: Cleanup after removal of lang/ruby26 * Remove conditions that are applied to Ruby 2.6 or before. * Remove BROKEN_RUBY26. * Mark ports broken with all supported versions of Ruby as DEPRECATED and set EXPIRATION_DATE. Reviewed by: rene Approved by: rene (portmgr) Differential Revision: https://reviews.freebsd.org/D34745 --- Mk/bsd.ruby.mk | 4 ---- devel/rubygem-dry-configurable/Makefile | 2 -- devel/rubygem-error_highlight/Makefile | 1 - devel/rubygem-gem-compare/Makefile | 1 - devel/rubygem-irb/Makefile | 12 +----------- devel/rubygem-rdoc/Makefile | 13 +------------ devel/rubygem-xdg/Makefile | 1 - devel/rubygem-xdg4/Makefile | 2 -- devel/rubygem-xdg5/Makefile | 1 - mail/rubygem-tmail/Makefile | 3 +++ security/ruby-bitwarden/Makefile | 3 +++ www/rubygem-importmap-rails/Makefile | 2 -- www/rubygem-propshaft/Makefile | 2 -- 13 files changed, 8 insertions(+), 39 deletions(-) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 82bff4d01783..1d3788ee5db4 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -233,11 +233,7 @@ RUBY_CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" RUBY_MODNAME?= ${PORTNAME} # Commands -.if ${RUBY_VER} < 2.7 -RUBY_RDOC?= ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//} -.else RUBY_RDOC?= ${LOCALBASE}/bin/rdoc -.endif # Ports RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//} diff --git a/devel/rubygem-dry-configurable/Makefile b/devel/rubygem-dry-configurable/Makefile index 515b9b31410e..c90f778cc408 100644 --- a/devel/rubygem-dry-configurable/Makefile +++ b/devel/rubygem-dry-configurable/Makefile @@ -11,8 +11,6 @@ COMMENT= Mixin to add configuration functionality to your classes LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_RUBY26= yes - RUN_DEPENDS= rubygem-concurrent-ruby>=1.0<2:devel/rubygem-concurrent-ruby \ rubygem-dry-core>=0.6<1:devel/rubygem-dry-core diff --git a/devel/rubygem-error_highlight/Makefile b/devel/rubygem-error_highlight/Makefile index 3dcb77a42549..bd4a3bb9ad22 100644 --- a/devel/rubygem-error_highlight/Makefile +++ b/devel/rubygem-error_highlight/Makefile @@ -12,7 +12,6 @@ LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE.txt -BROKEN_RUBY26= yes BROKEN_RUBY27= yes BROKEN_RUBY30= yes diff --git a/devel/rubygem-gem-compare/Makefile b/devel/rubygem-gem-compare/Makefile index b402e0a04b35..6ad4f936514b 100644 --- a/devel/rubygem-gem-compare/Makefile +++ b/devel/rubygem-gem-compare/Makefile @@ -9,7 +9,6 @@ COMMENT= RubyGems plugin for comparing gem versions LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_RUBY26= yes BROKEN_RUBY27= yes RUN_DEPENDS= rubygem-curb>=0:ftp/rubygem-curb \ diff --git a/devel/rubygem-irb/Makefile b/devel/rubygem-irb/Makefile index 3b916e411ad9..c6ca0492c6f5 100644 --- a/devel/rubygem-irb/Makefile +++ b/devel/rubygem-irb/Makefile @@ -16,21 +16,11 @@ USE_RUBY= yes NO_ARCH= yes -.include - -.if ${RUBY_VER} >= 2.7 PLIST_FILES= bin/irb \ share/man/man1/irb.1.gz post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1 ${INSTALL_DATA} ${WRKSRC}/man/irb.1 ${STAGEDIR}${PREFIX}/share/man/man1 -.elif ${RUBY_VER} == 2.6 -# WIP: irb wrapper script is installed by ruby port so far, see bug 241554, 237833 -post-install: - ${RM} ${STAGEDIR}${PREFIX}/bin/irb -.else -IGNORE= ${PORTNAME} is included in ${RUBY_PORT} -.endif -.include +.include diff --git a/devel/rubygem-rdoc/Makefile b/devel/rubygem-rdoc/Makefile index 7f935635245c..7f50c8b2992e 100644 --- a/devel/rubygem-rdoc/Makefile +++ b/devel/rubygem-rdoc/Makefile @@ -19,21 +19,10 @@ NO_ARCH= yes CPE_VENDOR= ruby-lang -.include - -.if ${RUBY_VER} >= 2.7 PLIST_FILES= bin/rdoc bin/ri share/man/man1/ri.1.gz post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1 ${INSTALL_DATA} ${WRKSRC}/man/ri.1 ${STAGEDIR}${PREFIX}/share/man/man1 -.elif ${RUBY_VER} == 2.6 -# WIP: rdoc wrapper script is installed by ruby port so far, see bug 241554, 237833 -post-install: - ${RM} ${STAGEDIR}${PREFIX}/bin/rdoc ${STAGEDIR}${PREFIX}/bin/ri -.else -IGNORE= ${PORTNAME} is included in ${RUBY_PORT} -.endif - -.include +.include diff --git a/devel/rubygem-xdg/Makefile b/devel/rubygem-xdg/Makefile index 93c5394f76e1..714821058e82 100644 --- a/devel/rubygem-xdg/Makefile +++ b/devel/rubygem-xdg/Makefile @@ -13,7 +13,6 @@ LICENSE_NAME= Hippocratic License 2.1.0 LICENSE_FILE= ${WRKSRC}/LICENSE.adoc LICENSE_PERMS= auto-accept dist-mirror pkg-mirror -BROKEN_RUBY26= yes BROKEN_RUBY27= yes BROKEN_RUBY30= yes diff --git a/devel/rubygem-xdg4/Makefile b/devel/rubygem-xdg4/Makefile index bd3eeaf8dd03..0a327d347f55 100644 --- a/devel/rubygem-xdg4/Makefile +++ b/devel/rubygem-xdg4/Makefile @@ -13,8 +13,6 @@ COMMENT= XDG Base Directory Standard Library for Ruby LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.adoc -BROKEN_RUBY26= yes - USES= gem USE_RUBY= yes diff --git a/devel/rubygem-xdg5/Makefile b/devel/rubygem-xdg5/Makefile index bb4d92fbda5f..6671796d402b 100644 --- a/devel/rubygem-xdg5/Makefile +++ b/devel/rubygem-xdg5/Makefile @@ -12,7 +12,6 @@ COMMENT= XDG Base Directory Standard Library for Ruby LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.adoc -BROKEN_RUBY26= yes BROKEN_RUBY27= yes USES= gem diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile index 2f0a9a37fbc4..47b35b69fa2c 100644 --- a/mail/rubygem-tmail/Makefile +++ b/mail/rubygem-tmail/Makefile @@ -8,6 +8,9 @@ MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= RFC2822/MIME compliant mail manipulating library for Ruby +DEPRECATED= Broken with all supported versions of Ruby +EXPIRATION_DATE= 2022-06-30 + # Seems to be a dead project, last upgrade 2010-02-07 and homepage does not load anymore: # https://rubygems.org/gems/tmail, http://tmail.rubyforge.org/ BROKEN_RUBY27= yes diff --git a/security/ruby-bitwarden/Makefile b/security/ruby-bitwarden/Makefile index 0d105f56fd6e..d9e47dc1f040 100644 --- a/security/ruby-bitwarden/Makefile +++ b/security/ruby-bitwarden/Makefile @@ -10,6 +10,9 @@ COMMENT= Ruby implementation of the BitWarden API LICENSE= ISCL +DEPRECATED= Broken with all supported versions of Ruby +EXPIRATION_DATE= 2022-06-30 + # Port is not maintained anymore: # https://github.com/jcs/rubywarden BROKEN_RUBY27= yes diff --git a/www/rubygem-importmap-rails/Makefile b/www/rubygem-importmap-rails/Makefile index db7f95f9776c..ed887230fbf8 100644 --- a/www/rubygem-importmap-rails/Makefile +++ b/www/rubygem-importmap-rails/Makefile @@ -11,8 +11,6 @@ COMMENT= Use ESM with importmap to manage modern JavaScript in Rails without tra LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -BROKEN_RUBY26= yes - RUN_DEPENDS= rubygem-actionpack70>=6.0.0:www/rubygem-actionpack70 \ rubygem-railties70>=6.0.0:www/rubygem-railties70 diff --git a/www/rubygem-propshaft/Makefile b/www/rubygem-propshaft/Makefile index ee2cb227d08d..70d1d3859e44 100644 --- a/www/rubygem-propshaft/Makefile +++ b/www/rubygem-propshaft/Makefile @@ -11,8 +11,6 @@ COMMENT= Deliver assets for Rails LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -BROKEN_RUBY26= yes - RUN_DEPENDS= rubygem-actionpack70>=7.0.0:www/rubygem-actionpack70 \ rubygem-activesupport70>=7.0.0:devel/rubygem-activesupport70 \ rubygem-rack>=0,3:www/rubygem-rack \