git: 724e92f337b2 - main - net/rubygem-activestorage-gitlab: fix conflict in 2025Q4 with devel/rubygem-marcel
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 26 Oct 2025 18:59:34 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=724e92f337b2420e2008ba00fdfdedd31048f915
commit 724e92f337b2420e2008ba00fdfdedd31048f915
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-10-26 18:58:58 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-10-26 18:59:31 +0000
net/rubygem-activestorage-gitlab: fix conflict in 2025Q4 with devel/rubygem-marcel
---
net/rubygem-activestorage-gitlab/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/rubygem-activestorage-gitlab/Makefile b/net/rubygem-activestorage-gitlab/Makefile
index aa7f53cc97cc..3bea55bb28f9 100644
--- a/net/rubygem-activestorage-gitlab/Makefile
+++ b/net/rubygem-activestorage-gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= activestorage
PORTVERSION= ${RAILS_VERSION}
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -gitlab
@@ -16,7 +17,7 @@ RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rub
rubygem-activejob-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob-gitlab \
rubygem-activerecord-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord-gitlab \
rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
- rubygem-marcel>=1.0<2:devel/rubygem-marcel
+ rubygem-marcel-gitlab>=1.0<2:devel/rubygem-marcel-gitlab
USES= gem