git: 0842afa76816 - main - www/rubygem-typhoeus-gitlab: fix merge conflict in 2025Q4 with www/rubygem-typhoeus

The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0842afa76816033c2ab539122099c6f4f1940459

commit 0842afa76816033c2ab539122099c6f4f1940459
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-10-26 19:18:25 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-10-26 19:19:36 +0000

    www/rubygem-typhoeus-gitlab: fix merge conflict in 2025Q4 with www/rubygem-typhoeus
    
    which prevents build gitlab 18.4.3
---
 www/Makefile                                 |  1 +
 www/gitlab/Makefile                          |  2 +-
 www/gitlab/Makefile.common                   |  2 +-
 www/rubygem-faraday-typhoeus-gitlab/Makefile |  3 ++-
 www/rubygem-typhoeus-gitlab/Makefile         | 20 ++++++++++++++++++++
 www/rubygem-typhoeus-gitlab/distinfo         |  3 +++
 www/rubygem-typhoeus-gitlab/pkg-descr        |  8 ++++++++
 7 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/www/Makefile b/www/Makefile
index 8a0a86640272..bf605da21389 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2487,6 +2487,7 @@
     SUBDIR += rubygem-turbolinks
     SUBDIR += rubygem-turbolinks-source
     SUBDIR += rubygem-typhoeus
+    SUBDIR += rubygem-typhoeus-gitlab
     SUBDIR += rubygem-typhoeus14
     SUBDIR += rubygem-uglifier
     SUBDIR += rubygem-underscore-rails
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 911afd467867..63bf21a177f7 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -145,7 +145,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-aws-sdk-s3-gitlab>=1.193.0<1.194:devel/rubygem-aws-sdk-s3-gitlab \
 	rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \
 	rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \
-	rubygem-typhoeus14>=1.4.0<1.5:www/rubygem-typhoeus14 \
+	rubygem-typhoeus-gitlab>=1.4.0<1.5:www/rubygem-typhoeus-gitlab \
 	rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \
 	rubygem-deckar01-task_list-gitlab>=2.3.4<2.4:www/rubygem-deckar01-task_list-gitlab \
 	rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index e0848ef8faaa..3019a00025a3 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
 GITLAB_VERSION=		18.4.3
-GITLAB_PORTREVISION=	0
+GITLAB_PORTREVISION=	1
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
diff --git a/www/rubygem-faraday-typhoeus-gitlab/Makefile b/www/rubygem-faraday-typhoeus-gitlab/Makefile
index 2559b38d853c..41342f2151f0 100644
--- a/www/rubygem-faraday-typhoeus-gitlab/Makefile
+++ b/www/rubygem-faraday-typhoeus-gitlab/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	faraday-typhoeus
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
@@ -12,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	rubygem-faraday-gitlab>=2.0<3:www/rubygem-faraday-gitlab \
-		rubygem-typhoeus>=1.4<2:www/rubygem-typhoeus
+		rubygem-typhoeus-gitlab>=1.4<2:www/rubygem-typhoeus-gitlab
 
 USES=		gem
 
diff --git a/www/rubygem-typhoeus-gitlab/Makefile b/www/rubygem-typhoeus-gitlab/Makefile
new file mode 100644
index 000000000000..39a564f53441
--- /dev/null
+++ b/www/rubygem-typhoeus-gitlab/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	typhoeus
+PORTVERSION=	1.4.1
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-gitlab
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Parallel HTTP request library
+WWW=		https://github.com/typhoeus/typhoeus
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-ethon>=0.9.0:www/rubygem-ethon
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-typhoeus-gitlab/distinfo b/www/rubygem-typhoeus-gitlab/distinfo
new file mode 100644
index 000000000000..32bc6f482eed
--- /dev/null
+++ b/www/rubygem-typhoeus-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1700760710
+SHA256 (rubygem/typhoeus-1.4.1.gem) = 1c17db8364bd45ab302dc61e460173c3e69835896be88a3df07c206d5c55ef7c
+SIZE (rubygem/typhoeus-1.4.1.gem) = 57856
diff --git a/www/rubygem-typhoeus-gitlab/pkg-descr b/www/rubygem-typhoeus-gitlab/pkg-descr
new file mode 100644
index 000000000000..086ea1d8e6f3
--- /dev/null
+++ b/www/rubygem-typhoeus-gitlab/pkg-descr
@@ -0,0 +1,8 @@
+Typhoeus runs HTTP requests in parallel while
+cleanly encapsulating handling logic.
+
+It's a library for accessing web services in Ruby,
+specifically designed for building RESTful service
+oriented architectures in Ruby that need to be fast
+enough to process calls to multiple services within
+the client's HTTP request/response life cycle.