Date: Sun, 26 Oct 2025 20:01:42 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7a33398708a7 - main - www/rubygem-faraday-gitlab: fixed conflict in 2025Q4 with rubygem-json Message-ID: <202510262001.59QK1g9h065998@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a33398708a7aa70c2f07cc3e9ba29074ac4fdc4 commit 7a33398708a7aa70c2f07cc3e9ba29074ac4fdc4 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:10 +0000 www/rubygem-faraday-gitlab: fixed conflict in 2025Q4 with rubygem-json --- 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 gemhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510262001.59QK1g9h065998>