From nobody Fri Mar 25 13:49:06 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 D738B1A32C3B; Fri, 25 Mar 2022 13:49:08 +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 4KQ3NM6lcsz3QJ3; Fri, 25 Mar 2022 13:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216148; 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=GhfD06pzim/pAcEunoEk5/xusPWj6yUPeKOfttDepH4=; b=m4lCuYTlw6NFP+UYLT+40na21FuFfdWVcojoo3c9AMNH9pc8K4b0iDEbymB5t6C2umXPfj +Nz7/tqTdyANzST7ezQUEQID7Fd0BYm2mion5j0mJiRozui2OMOKtyDhz1C2dioiN7Cszn 0zmOquHekwiQ5CVVKH6ybFQZsMlc9Mt8wApp60YlKT9w00XMj8eyjbNNpGywxaA5ZP4ngV 7e4zOLkUDrMNJ6NDYdsV5p34BDjhMJ+x3fmalsVjrmEL4Bd9pqemmW4EfV4PHlijPtTvzq uZJzQSl8CGWrZhc0J8WIODohdvKP7bC31j5M3Bkv2OoeOu+dISu+G3CnNgWgdg== 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 0AB715866; Fri, 25 Mar 2022 13:49:07 +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 22PDn6nd026899; Fri, 25 Mar 2022 13:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDn6l4026898; Fri, 25 Mar 2022 13:49:06 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:49:06 GMT Message-Id: <202203251349.22PDn6l4026898@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: a250fafe9d80 - main - mail/rubygem-mail: Add dependencies for Ruby 3.1+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a250fafe9d8079da3a82d084696f25a3800723e8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216148; 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=GhfD06pzim/pAcEunoEk5/xusPWj6yUPeKOfttDepH4=; b=WwiFV+prOfpPcfrFIcOYTdA6x8li8AOXcMZ3wTrPKuUE43XD29rKrKf0rUyl4EzKOUz3zg Ggtuv4hJtV+onasGIoggoYvxpC4zYHNuu4YbUeccmkM9S0pL2dPwY+drb5dsJXcBpP5MAP Lt5Vwj3e7BsojcIBzKMEBr146XUJMG0rYxDYRYBasV19FPUXa9sRIdyP+hUWMzPAiQPvJG FMFP7Wp+R1c911tSOicULECcpoGWNTTFu32HXOxRHsk7xT598ryQUQaheeACKiz4b0xOaV d9DLgvMzmrtKG0OvUPqUQZQWynLwddrDMoaqr+fZcI5uzkljgT6i9zDX5ZXoXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216148; a=rsa-sha256; cv=none; b=PnoLotMsoemr44si6WGsuupJTC/XZFOH9ZFHT1chdI7Gk6LCuJ4kqQSlhyl6HWgjh6j/ii XE5r3eqIb6X5saaKTTAP1noZF+Jkxn2rPgCHEDFD5nu/4j4xvhGTD+vj8Gdk+wVSWN/TZ1 93tLlLF0TUaOcIq5kihuJkGZcTvELNjiLAtU8LHRFERdzLlxSPUPvDRYiGo1Ab4FztE2Zg 7Qs+smBy8W3JhKLnhpSl/Z5deqDDapSf8+nECx2+0LdMEg1c2y2vY1nJxGAndu2kMJH3Q0 OLGad8TGIA+5WAuZdyB2oG/yiaSlzGimPtayRjxkrejwg7Err3lgGsO80qHTrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a250fafe9d8079da3a82d084696f25a3800723e8 commit a250fafe9d8079da3a82d084696f25a3800723e8 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:11:04 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:37:58 +0000 mail/rubygem-mail: Add dependencies for Ruby 3.1+ - Bump PORTREVISION for dependency change This commit also reverts da6b7803d1f8bccac09d69a6d2eaa96e93522743. Reference: https://github.com/mikel/mail/pull/1439 --- mail/rubygem-mail/Makefile | 19 ++++++++++++++----- mail/rubygem-mail/files/patch-mail.gemspec | 18 ------------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/mail/rubygem-mail/Makefile b/mail/rubygem-mail/Makefile index 0c4695ae0124..51bdd9d2e8fb 100644 --- a/mail/rubygem-mail/Makefile +++ b/mail/rubygem-mail/Makefile @@ -2,7 +2,7 @@ PORTNAME= mail PORTVERSION= 2.7.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= mail rubygems MASTER_SITES= RG @@ -13,13 +13,22 @@ COMMENT= Ruby email handler LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-mini_mime>=0.1.1:mail/rubygem-mini_mime \ - rubygem-net-smtp>0:mail/rubygem-net-smtp +RUN_DEPENDS= rubygem-mini_mime>=0.1.1:mail/rubygem-mini_mime USES= cpe gem -CPE_VENDOR= ${PORTNAME}_project USE_RUBY= yes NO_ARCH= yes -.include +CPE_VENDOR= mail_project + +.include + +# See https://github.com/mikel/mail/pull/1439 +.if ${RUBY_VER} >= 3.1 +RUN_DEPENDS+= rubygem-net-imap>=0:mail/rubygem-net-imap \ + rubygem-net-pop>=0:mail/rubygem-net-pop \ + rubygem-net-smtp>=0:mail/rubygem-net-smtp +.endif + +.include diff --git a/mail/rubygem-mail/files/patch-mail.gemspec b/mail/rubygem-mail/files/patch-mail.gemspec deleted file mode 100644 index 5b1682def046..000000000000 --- a/mail/rubygem-mail/files/patch-mail.gemspec +++ /dev/null @@ -1,18 +0,0 @@ ---- mail.gemspec.orig 2021-11-10 18:38:59 UTC -+++ mail.gemspec -@@ -24,6 +24,7 @@ Gem::Specification.new do |s| - end - - if s.respond_to? :add_runtime_dependency then -+ s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0.1.1"]) - s.add_development_dependency(%q.freeze, [">= 1.0.3"]) - s.add_development_dependency(%q.freeze, ["> 0.8.7"]) -@@ -31,6 +32,7 @@ Gem::Specification.new do |s| - s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) - else -+ s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0.1.1"]) - s.add_dependency(%q.freeze, [">= 1.0.3"]) - s.add_dependency(%q.freeze, ["> 0.8.7"])