Date: Mon, 20 Apr 2026 08:18:05 +0000 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: 957a409f7757 - main - www/gitlab: fix deps caused by intermediate commits Message-ID: <69e5e13d.1d396.770f486a@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=957a409f775717072336e70bb0e186a111021728 commit 957a409f775717072336e70bb0e186a111021728 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2026-04-19 13:19:00 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2026-04-20 08:17:37 +0000 www/gitlab: fix deps caused by intermediate commits --- databases/rubygem-click_house-client/Makefile | 2 +- devel/rubygem-sprockets-gitlab/Makefile | 7 ++++--- security/rubygem-omniauth-gl/Makefile | 6 +++--- www/gitlab/Makefile | 4 ++-- www/rubygem-actionpack-gitlab/Makefile | 8 ++++---- www/rubygem-faraday-gitlab/Makefile | 4 ++-- www/rubygem-railties-gitlab/Makefile | 3 ++- www/rubygem-redis-rack-gitlab/Makefile | 4 ++-- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/databases/rubygem-click_house-client/Makefile b/databases/rubygem-click_house-client/Makefile index ed84be98885f..bf1003d919e9 100644 --- a/databases/rubygem-click_house-client/Makefile +++ b/databases/rubygem-click_house-client/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT RUN_DEPENDS= rubygem-activerecord-gitlab>=7<9:databases/rubygem-activerecord-gitlab \ rubygem-activesupport-gitlab>=7<9:devel/rubygem-activesupport-gitlab \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ - rubygem-json-gitlab>=2.7<3:devel/rubygem-json-gitlab + rubygem-json>=2.7<3:devel/rubygem-json USES= gem diff --git a/devel/rubygem-sprockets-gitlab/Makefile b/devel/rubygem-sprockets-gitlab/Makefile index 245423e71283..c3e4e31fb7ea 100644 --- a/devel/rubygem-sprockets-gitlab/Makefile +++ b/devel/rubygem-sprockets-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= sprockets PORTVERSION= 3.7.5 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -13,14 +14,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \ rubygem-concurrent-ruby>=1.0<2:devel/rubygem-concurrent-ruby \ - rubygem-rack22>=1,3<3,3:www/rubygem-rack22 + rubygem-rack-gitlab>=1<3:www/rubygem-rack-gitlab USES= cpe gem -NO_ARCH= yes - CPE_VENDOR= sprockets_project +NO_ARCH= yes + post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/sprockets diff --git a/security/rubygem-omniauth-gl/Makefile b/security/rubygem-omniauth-gl/Makefile index 27effdf64204..f636f87db7e0 100644 --- a/security/rubygem-omniauth-gl/Makefile +++ b/security/rubygem-omniauth-gl/Makefile @@ -1,6 +1,6 @@ PORTNAME= omniauth PORTVERSION= 2.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security rubygems MASTER_SITES= RG # this port is a replacement for rubygem-omniauth which fixes depedency conflicts @@ -16,8 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-hashie-gitlab>=3.4.6:devel/rubygem-hashie-gitlab \ rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab \ - rubygem-rack>=2.2.3,3:www/rubygem-rack \ - rubygem-rack-protection3>=0:www/rubygem-rack-protection3 + rubygem-rack-gitlab>=2.2.3:www/rubygem-rack-gitlab \ + rubygem-rack-protection-gitlab>=0:www/rubygem-rack-protection-gitlab USES= cpe gem diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 88eb355c596c..9fa0474ba5d2 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -211,7 +211,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \ rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ - rubygem-rack-attack>=6.8.0<6.9:www/rubygem-rack-attack \ + rubygem-rack-attack-gitlab>=6.8.0<6.9:www/rubygem-rack-attack-gitlab \ rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.23.0<5.24:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \ @@ -298,7 +298,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-lockbox>=1.4.1<1.5:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ - rubygem-json-gitlab>=2.19.2<2.20:devel/rubygem-json-gitlab \ + rubygem-json>=2.19.2<2.20:devel/rubygem-json \ rubygem-json_schemer>=2.4.0<2.5:devel/rubygem-json_schemer \ rubygem-oj-gitlab>=3.16.16<3.17:devel/rubygem-oj-gitlab \ rubygem-oj-introspect>=0.9<1:devel/rubygem-oj-introspect \ diff --git a/www/rubygem-actionpack-gitlab/Makefile b/www/rubygem-actionpack-gitlab/Makefile index a7cbebf7f169..031d283b5767 100644 --- a/www/rubygem-actionpack-gitlab/Makefile +++ b/www/rubygem-actionpack-gitlab/Makefile @@ -1,6 +1,6 @@ PORTNAME= actionpack PORTVERSION= ${RAILS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -18,9 +18,9 @@ RUN_DEPENDS= rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/r rubygem-cgi>=0:www/rubygem-cgi \ rubygem-nokogiri>=1.8.5:textproc/rubygem-nokogiri \ rubygem-racc>=0:devel/rubygem-racc \ - rubygem-rack22>=2.2.4,3<3.3,3:www/rubygem-rack22 \ - rubygem-rack-session10>=1.0.1:www/rubygem-rack-session10 \ - rubygem-rack-test>=0.6.3:www/rubygem-rack-test \ + rubygem-rack-gitlab>=2.2.4<3.3:www/rubygem-rack-gitlab \ + rubygem-rack-session-gitlab>=1.0.1:www/rubygem-rack-session-gitlab \ + rubygem-rack-test-gitlab>=0.6.3:www/rubygem-rack-test-gitlab \ rubygem-rails-dom-testing-rails-gitlab>=2.2<3:textproc/rubygem-rails-dom-testing-rails-gitlab \ rubygem-rails-html-sanitizer-gitlab>=1.6<2:textproc/rubygem-rails-html-sanitizer-gitlab \ rubygem-useragent>=0.16<1:devel/rubygem-useragent diff --git a/www/rubygem-faraday-gitlab/Makefile b/www/rubygem-faraday-gitlab/Makefile index eba0207da681..3518700c3bb9 100644 --- a/www/rubygem-faraday-gitlab/Makefile +++ b/www/rubygem-faraday-gitlab/Makefile @@ -1,6 +1,6 @@ PORTNAME= faraday PORTVERSION= 2.13.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -13,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-gitlab>=0:devel/rubygem-json-gitlab \ + rubygem-json>=0:devel/rubygem-json \ rubygem-logger-gitlab>=0:devel/rubygem-logger-gitlab USES= cpe gem diff --git a/www/rubygem-railties-gitlab/Makefile b/www/rubygem-railties-gitlab/Makefile index 58424caa7960..67d36fd67aea 100644 --- a/www/rubygem-railties-gitlab/Makefile +++ b/www/rubygem-railties-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= railties PORTVERSION= ${RAILS_VERSION} +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -16,7 +17,7 @@ RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rub rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ rubygem-cgi>=0:www/rubygem-cgi \ rubygem-irb-gitlab>=1.13:devel/rubygem-irb-gitlab \ - rubygem-rackup10>=1.0.0:www/rubygem-rackup10 \ + rubygem-rackup-gitlab>=1.0.0:www/rubygem-rackup-gitlab \ rubygem-rake>=12.2:devel/rubygem-rake \ rubygem-thor>=1.2.2<2:devel/rubygem-thor \ rubygem-tsort>=0.2:devel/rubygem-tsort \ diff --git a/www/rubygem-redis-rack-gitlab/Makefile b/www/rubygem-redis-rack-gitlab/Makefile index dd44fd2612b4..dcbed45f42ce 100644 --- a/www/rubygem-redis-rack-gitlab/Makefile +++ b/www/rubygem-redis-rack-gitlab/Makefile @@ -1,6 +1,6 @@ PORTNAME= redis-rack PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -13,7 +13,7 @@ WWW= https://redis-store.org/redis-rack/ \ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-rack-session10>=0.2.0:www/rubygem-rack-session10 \ +RUN_DEPENDS= rubygem-rack-session-gitlab>=0.2.0:www/rubygem-rack-session-gitlab \ rubygem-redis-store-gitlab>=1.2<2:devel/rubygem-redis-store-gitlab USES= gemhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e5e13d.1d396.770f486a>