git: 7c011c9c337c - main - devel/gitaly: allow usage of newer rubygem-activesupport61
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 01 Jan 2023 05:57:42 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7c011c9c337c6e3af8781fedb28573cc57ca07f3
commit 7c011c9c337c6e3af8781fedb28573cc57ca07f3
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-01-01 05:52:43 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-01-01 05:57:37 +0000
devel/gitaly: allow usage of newer rubygem-activesupport61
Fixes change introduced in 338a2b2b8a93eceba61d440dadbe9a1923617254
---
devel/gitaly/Makefile | 6 +++---
devel/gitaly/files/patch-ruby_Gemfile | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 4bc751259bfc..f80061a2a519 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gitaly
DISTVERSION= 15.5.6
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= devel
@@ -19,9 +19,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
MY_DEPENDS= git>=2.36.1:devel/git \
rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \
rubygem-rugged>=1.2<2:devel/rubygem-rugged \
- rubygem-github-linguist>=7.20<8:textproc/rubygem-github-linguist \
+ rubygem-github-linguist>=7.23<8:textproc/rubygem-github-linguist \
rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \
- rubygem-activesupport61>=6.1.6.1<6.1.7:devel/rubygem-activesupport61 \
+ rubygem-activesupport61>=6.1.6<6.2:devel/rubygem-activesupport61 \
rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.2<4.2.8:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index a9090f3b7ff5..3a4b1615b6d8 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,4 +1,4 @@
---- ruby/Gemfile.orig 2022-11-11 19:21:41 UTC
+--- ruby/Gemfile.orig 2022-12-07 19:19:46 UTC
+++ ruby/Gemfile
@@ -1,15 +1,15 @@
source 'https://rubygems.org'
@@ -7,7 +7,7 @@
-gem 'github-linguist', '~> 7.20.0', require: 'linguist'
-gem 'gitlab-markup', '~> 1.7.1'
-gem 'activesupport', '~> 6.1.6.1'
-+gem 'github-linguist', '~> 7.23.0', require: 'linguist'
++gem 'github-linguist', '~> 7.23', require: 'linguist'
+gem 'gitlab-markup', '~> 1.8.0'
+gem 'activesupport', '~> 6.1.6'
gem 'rdoc', '~> 6.0'