Date: Fri, 20 Jun 2025 03:58:58 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: bfc57a708128 - main - www/gitlab: fix rubygem-grape conflict Message-ID: <202506200358.55K3wwap028261@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=bfc57a708128245ced9913422926bd582791739b commit bfc57a708128245ced9913422926bd582791739b Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2025-06-18 13:51:44 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2025-06-20 03:55:33 +0000 www/gitlab: fix rubygem-grape conflict --- devel/rubygem-grape-path-helpers/Makefile | 5 +++-- devel/rubygem-grape-swagger/Makefile | 3 ++- devel/rubygem-grape20/Makefile | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/devel/rubygem-grape-path-helpers/Makefile b/devel/rubygem-grape-path-helpers/Makefile index 26c644e6c4ab..2353edc61a7f 100644 --- a/devel/rubygem-grape-path-helpers/Makefile +++ b/devel/rubygem-grape-path-helpers/Makefile @@ -1,5 +1,6 @@ PORTNAME= grape-path-helpers PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -10,8 +11,8 @@ WWW= https://gitlab.com/gitlab-org/grape-path-helpers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-activesupport70>=0:devel/rubygem-activesupport70 \ - rubygem-grape>=2.0<3:devel/rubygem-grape \ +RUN_DEPENDS= rubygem-activesupport-gitlab>=0:devel/rubygem-activesupport-gitlab \ + rubygem-grape20>=2.0<3:devel/rubygem-grape20 \ rubygem-rake>=12:devel/rubygem-rake \ rubygem-ruby2_keywords>=0.0.2<0.1:devel/rubygem-ruby2_keywords diff --git a/devel/rubygem-grape-swagger/Makefile b/devel/rubygem-grape-swagger/Makefile index 9989d06f69ba..4cfe6aa3297b 100644 --- a/devel/rubygem-grape-swagger/Makefile +++ b/devel/rubygem-grape-swagger/Makefile @@ -1,5 +1,6 @@ PORTNAME= grape-swagger PORTVERSION= 2.1.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -10,7 +11,7 @@ WWW= https://github.com/ruby-grape/grape-swagger LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-grape>=1.7<3.0:devel/rubygem-grape \ +RUN_DEPENDS= rubygem-grape20>=1.7<3.0:devel/rubygem-grape20 \ rubygem-rack-test>=2<3:www/rubygem-rack-test USES= gem diff --git a/devel/rubygem-grape20/Makefile b/devel/rubygem-grape20/Makefile index ac608654a965..db5d709155ad 100644 --- a/devel/rubygem-grape20/Makefile +++ b/devel/rubygem-grape20/Makefile @@ -1,5 +1,6 @@ PORTNAME= grape PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 20 @@ -12,9 +13,9 @@ WWW= https://www.ruby-grape.org/ \ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport70>=5:devel/rubygem-activesupport70 \ +RUN_DEPENDS= rubygem-activesupport-gitlab>=5:devel/rubygem-activesupport-gitlab \ rubygem-builder>=0:devel/rubygem-builder \ - rubygem-dry-types>=1.1:devel/rubygem-dry-types \ + rubygem-dry-types-gitlab>=1.1:devel/rubygem-dry-types-gitlab \ rubygem-mustermann-grape10>=1.0.0<1.1:devel/rubygem-mustermann-grape10 \ rubygem-rack>=1.3.0,3:www/rubygem-rack \ rubygem-rack-accept>=0:www/rubygem-rack-accepthome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506200358.55K3wwap028261>