Date: Fri, 20 Jun 2025 03:59:03 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: da59b0698120 - main - www/gitlab: fix rubygem-fog-core conflict Message-ID: <202506200359.55K3x3Ig028418@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=da59b06981202a12989c0aeea824818b7df74876 commit da59b06981202a12989c0aeea824818b7df74876 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2025-06-18 14:04:00 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2025-06-20 03:55:33 +0000 www/gitlab: fix rubygem-fog-core conflict --- net/rubygem-fog-aliyun-gitlab/Makefile | 7 ++++--- net/rubygem-fog-google-gitlab/Makefile | 7 ++++--- net/rubygem-gitlab-fog-azure-rm/Makefile | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/net/rubygem-fog-aliyun-gitlab/Makefile b/net/rubygem-fog-aliyun-gitlab/Makefile index 4156d19c5dca..28f72a163828 100644 --- a/net/rubygem-fog-aliyun-gitlab/Makefile +++ b/net/rubygem-fog-aliyun-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= fog-aliyun PORTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -12,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-addressable>=2.8.0<2.9:www/rubygem-addressable \ - rubygem-aliyun-sdk>=0.8.0<0.9:devel/rubygem-aliyun-sdk \ - rubygem-fog-core>=0:devel/rubygem-fog-core \ - rubygem-fog-json>=0:devel/rubygem-fog-json \ + rubygem-aliyun-sdk-gitlab>=0.8.0<0.9:devel/rubygem-aliyun-sdk-gitlab \ + rubygem-fog-core-gitlab>=0:devel/rubygem-fog-core-gitlab \ + rubygem-fog-json-gitlab>=0:devel/rubygem-fog-json-gitlab \ rubygem-ipaddress>=0.8<1:net/rubygem-ipaddress \ rubygem-xml-simple-gitlab>=1.1<2:textproc/rubygem-xml-simple-gitlab diff --git a/net/rubygem-fog-google-gitlab/Makefile b/net/rubygem-fog-google-gitlab/Makefile index 80ad3c5411b8..1b9d28707340 100644 --- a/net/rubygem-fog-google-gitlab/Makefile +++ b/net/rubygem-fog-google-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= fog-google PORTVERSION= 1.24.1 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -12,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-addressable>=2.7.0:www/rubygem-addressable \ - rubygem-fog-core250>=0<2.6:devel/rubygem-fog-core250 \ - rubygem-fog-json>=1.2<2:devel/rubygem-fog-json \ - rubygem-fog-xml>=0.1.0<0.2:textproc/rubygem-fog-xml \ + rubygem-fog-core-gitlab>=0<2.5:devel/rubygem-fog-core-gitlab \ + rubygem-fog-json-gitlab>=1.2<2:devel/rubygem-fog-json-gitlab \ + rubygem-fog-xml-gitlab>=0.1.0<0.2:textproc/rubygem-fog-xml-gitlab \ rubygem-google-apis-compute_v1-gitlab>=0.53<1:devel/rubygem-google-apis-compute_v1-gitlab \ rubygem-google-apis-dns_v1-gitlab>=0.28<1:dns/rubygem-google-apis-dns_v1-gitlab \ rubygem-google-apis-iamcredentials_v1-gitlab>=0.15<1:devel/rubygem-google-apis-iamcredentials_v1-gitlab \ diff --git a/net/rubygem-gitlab-fog-azure-rm/Makefile b/net/rubygem-gitlab-fog-azure-rm/Makefile index b0e3b6c1c8ca..0ac1e1ea0cc3 100644 --- a/net/rubygem-gitlab-fog-azure-rm/Makefile +++ b/net/rubygem-gitlab-fog-azure-rm/Makefile @@ -13,9 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-faraday-gitlab>=2.0<3:www/rubygem-faraday-gitlab \ rubygem-faraday-follow_redirects-gitlab>=0.3.0<0.4:www/rubygem-faraday-follow_redirects-gitlab \ rubygem-faraday-net_http_persistent-gitlab>=2.0<3:www/rubygem-faraday-net_http_persistent-gitlab \ - rubygem-fog-core>=2.1<3:devel/rubygem-fog-core \ - rubygem-fog-json>=1.2<2:devel/rubygem-fog-json \ - rubygem-mime-types>=0:misc/rubygem-mime-types \ + rubygem-fog-core-gitlab>=2.1<3:devel/rubygem-fog-core-gitlab \ + rubygem-fog-json-gitlab>=1.2<2:devel/rubygem-fog-json-gitlab \ + rubygem-mime-types-gitlab>=0:misc/rubygem-mime-types-gitlab \ rubygem-net-http-persistent>=4.0<5:www/rubygem-net-http-persistent \ rubygem-nokogiri>=1.10.8<2:textproc/rubygem-nokogirihome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506200359.55K3x3Ig028418>