git: 7daa61676e2b - 2025Q2 - www/gitlab: fix rubygem-httparty conflict
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 20 Jun 2025 07:16:41 UTC
The branch 2025Q2 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7daa61676e2b0e04e1dfae3ea99eac663272d29c
commit 7daa61676e2b0e04e1dfae3ea99eac663272d29c
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-06-18 13:47:13 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-06-20 05:38:28 +0000
www/gitlab: fix rubygem-httparty conflict
(cherry picked from commit 8a1dcd88639dda7ec3b0cb01d4e87758ea0c89b4)
---
devel/rubygem-gitlab/Makefile | 3 ++-
www/rubygem-ruby-openai37/Makefile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/devel/rubygem-gitlab/Makefile b/devel/rubygem-gitlab/Makefile
index 69c777f919c1..e6243575ae50 100644
--- a/devel/rubygem-gitlab/Makefile
+++ b/devel/rubygem-gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gitlab
PORTVERSION= 4.20.1
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -10,7 +11,7 @@ WWW= https://github.com/NARKOZ/gitlab
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-httparty>=0.20<1:www/rubygem-httparty \
+RUN_DEPENDS= rubygem-httparty-gitlab>=0.20<1:www/rubygem-httparty-gitlab \
rubygem-terminal-table>=1.5.1:textproc/rubygem-terminal-table
USES= gem
diff --git a/www/rubygem-ruby-openai37/Makefile b/www/rubygem-ruby-openai37/Makefile
index 7717bd1d1613..eb4930a0f9a7 100644
--- a/www/rubygem-ruby-openai37/Makefile
+++ b/www/rubygem-ruby-openai37/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ruby-openai
PORTVERSION= 3.7.0
+PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 37
@@ -11,7 +12,7 @@ WWW= https://github.com/alexrudall/ruby-openai
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-httparty>=0.18.1:www/rubygem-httparty
+RUN_DEPENDS= rubygem-httparty-gitlab>=0.18.1:www/rubygem-httparty-gitlab
NO_ARCH= yes
USES= gem