Date: Fri, 20 Jun 2025 03:58:56 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: c7aedd6f9162 - main - www/gitlab: fix rubygem-logger conflict Message-ID: <202506200358.55K3wul3028184@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=c7aedd6f9162d473c0355d3e47970ca5fc55fa5a commit c7aedd6f9162d473c0355d3e47970ca5fc55fa5a Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2025-06-18 13:43:01 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2025-06-20 03:55:32 +0000 www/gitlab: fix rubygem-logger conflict --- devel/rubygem-activesupport-gitlab/Makefile | 2 +- devel/rubygem-aws-sdk-core-gitlab/Makefile | 2 +- devel/rubygem-graphql/Makefile | 3 ++- devel/rubygem-prometheus-client-mmap/Makefile | 2 +- devel/rubygem-sidekiq-gitlab/Makefile | 3 ++- dns/rubygem-gitlab-net-dns/Makefile | 3 ++- net/rubygem-oauth2-gitlab/Makefile | 3 ++- www/rubygem-faraday-gitlab/Makefile | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/devel/rubygem-activesupport-gitlab/Makefile b/devel/rubygem-activesupport-gitlab/Makefile index e827dbc8e41b..87203593c575 100644 --- a/devel/rubygem-activesupport-gitlab/Makefile +++ b/devel/rubygem-activesupport-gitlab/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \ rubygem-connection_pool>=2.2.5:net/rubygem-connection_pool \ rubygem-drb>=0:devel/rubygem-drb \ rubygem-i18n>=1.6,2<2,2:devel/rubygem-i18n \ - rubygem-logger>=1.4.2:devel/rubygem-logger \ + rubygem-logger-gitlab>=1.4.2:devel/rubygem-logger-gitlab \ rubygem-minitest>=5.1:devel/rubygem-minitest \ rubygem-mutex_m>=0:devel/rubygem-mutex_m \ rubygem-securerandom>=0.3:security/rubygem-securerandom \ diff --git a/devel/rubygem-aws-sdk-core-gitlab/Makefile b/devel/rubygem-aws-sdk-core-gitlab/Makefile index 86da9e7b17e2..e9ff8f2cdf80 100644 --- a/devel/rubygem-aws-sdk-core-gitlab/Makefile +++ b/devel/rubygem-aws-sdk-core-gitlab/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= rubygem-aws-eventstream>=1.3.0<2:devel/rubygem-aws-eventstream \ rubygem-aws-sigv4>=1.9<2:devel/rubygem-aws-sigv4 \ rubygem-base64>=0:converters/rubygem-base64 \ rubygem-jmespath>=1.6.1<2:devel/rubygem-jmespath \ - rubygem-logger>=0:devel/rubygem-logger + rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab USES= gem diff --git a/devel/rubygem-graphql/Makefile b/devel/rubygem-graphql/Makefile index 82ebce627160..da4b2ce5b106 100644 --- a/devel/rubygem-graphql/Makefile +++ b/devel/rubygem-graphql/Makefile @@ -1,5 +1,6 @@ PORTNAME= graphql PORTVERSION= 2.4.17 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= MIT RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \ rubygem-fiber-storage>=0:devel/rubygem-fiber-storage \ - rubygem-logger>=0:devel/rubygem-logger + rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab USES= gem diff --git a/devel/rubygem-prometheus-client-mmap/Makefile b/devel/rubygem-prometheus-client-mmap/Makefile index ef1fc4564365..d5531e7e74fd 100644 --- a/devel/rubygem-prometheus-client-mmap/Makefile +++ b/devel/rubygem-prometheus-client-mmap/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \ rubygem-bigdecimal>=0:math/rubygem-bigdecimal \ - rubygem-logger>=0:devel/rubygem-logger \ + rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab \ rubygem-rb_sys>=0.9.109<0.10:lang/rubygem-rb_sys USES= cargo gem gmake llvm:build diff --git a/devel/rubygem-sidekiq-gitlab/Makefile b/devel/rubygem-sidekiq-gitlab/Makefile index 57852259176c..bfa6dde06d16 100644 --- a/devel/rubygem-sidekiq-gitlab/Makefile +++ b/devel/rubygem-sidekiq-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= sidekiq PORTVERSION= 7.3.9 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -13,7 +14,7 @@ LICENSE= LGPL3 RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \ rubygem-connection_pool>=2.3.0:net/rubygem-connection_pool \ - rubygem-logger>=0:devel/rubygem-logger \ + rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab \ rubygem-rack>=2.2.4,3:www/rubygem-rack \ rubygem-redis-client>=0.22.2:databases/rubygem-redis-client diff --git a/dns/rubygem-gitlab-net-dns/Makefile b/dns/rubygem-gitlab-net-dns/Makefile index 83d70acdb236..fe6fc62e2349 100644 --- a/dns/rubygem-gitlab-net-dns/Makefile +++ b/dns/rubygem-gitlab-net-dns/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-net-dns PORTVERSION= 0.12.0 +PORTREVISION= 1 CATEGORIES= dns rubygems MASTER_SITES= RG @@ -10,7 +11,7 @@ WWW= https://gitlab.com/gitlab-org/gitlab-net-dns LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual -RUN_DEPENDS= rubygem-logger>=0:devel/rubygem-logger +RUN_DEPENDS= rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab USES= gem diff --git a/net/rubygem-oauth2-gitlab/Makefile b/net/rubygem-oauth2-gitlab/Makefile index 4e554369a79f..ad3ff25c60e2 100644 --- a/net/rubygem-oauth2-gitlab/Makefile +++ b/net/rubygem-oauth2-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= oauth2 PORTVERSION= 2.0.10 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-faraday-gitlab>=0.17.3<4:www/rubygem-faraday-gitlab \ rubygem-jwt>=1.0<4:www/rubygem-jwt \ - rubygem-logger>=1.2<2:devel/rubygem-logger \ + rubygem-logger-gitlab>=1.2<2:devel/rubygem-logger-gitlab \ rubygem-multi_xml>=0.5<1:textproc/rubygem-multi_xml \ rubygem-rack>=1.2,3<4,3:www/rubygem-rack \ rubygem-snaky_hash>=2.0<3:devel/rubygem-snaky_hash \ diff --git a/www/rubygem-faraday-gitlab/Makefile b/www/rubygem-faraday-gitlab/Makefile index e21c6bb7b2d3..1350416cdeeb 100644 --- a/www/rubygem-faraday-gitlab/Makefile +++ b/www/rubygem-faraday-gitlab/Makefile @@ -13,7 +13,7 @@ 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-logger>=0:devel/rubygem-logger + 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?202506200358.55K3wul3028184>