git: 8645a8ab6852 - 2025Q4 - www/rubygem-faraday-gitlab: fixed conflict in 2025Q4 with rubygem-json

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Sun, 26 Oct 2025 20:13:22 UTC

The branch 2025Q4 has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8645a8ab6852c971728ab71b06147b8dc280d729

commit 8645a8ab6852c971728ab71b06147b8dc280d729
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-10-26 20:01:10 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-10-26 20:01:59 +0000

    www/rubygem-faraday-gitlab: fixed conflict in 2025Q4 with rubygem-json
    
    (cherry picked from commit 7a33398708a7aa70c2f07cc3e9ba29074ac4fdc4)
---
 www/rubygem-faraday-gitlab/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/rubygem-faraday-gitlab/Makefile b/www/rubygem-faraday-gitlab/Makefile
index 058297542ed7..eba0207da681 100644
--- a/www/rubygem-faraday-gitlab/Makefile
+++ b/www/rubygem-faraday-gitlab/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	faraday
 PORTVERSION=	2.13.4
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
@@ -12,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	rubygem-faraday-net_http-gitlab>=2.0<3.5:www/rubygem-faraday-net_http-gitlab \
-		rubygem-json>=0:devel/rubygem-json \
+		rubygem-json-gitlab>=0:devel/rubygem-json-gitlab \
 		rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab
 
 USES=		cpe gem