git: fcfd49ce7c4f - main - www/gitlab-ce: force gitlab-ce to use node16

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Fri, 29 Oct 2021 06:34:28 UTC
The branch main has been updated by mfechner:

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

commit fcfd49ce7c4f924f4ba517114609662d030357b1
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2021-10-28 14:41:20 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2021-10-29 06:33:39 +0000

    www/gitlab-ce: force gitlab-ce to use node16
    
    As www/node was upgrade to version 17 it causes the upgrade process
    of gitlab-ce to fail. Gitlab requires yarn which requires node
    but the modules gitlab is using are not supporting node 17 yet.
---
 devel/rubygem-webpacker-rails61/Makefile | 3 ++-
 www/gitlab-ce/Makefile                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/devel/rubygem-webpacker-rails61/Makefile b/devel/rubygem-webpacker-rails61/Makefile
index 68cbfc07b946..fd7847c8adfc 100644
--- a/devel/rubygem-webpacker-rails61/Makefile
+++ b/devel/rubygem-webpacker-rails61/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	webpacker
 PORTVERSION=	5.4.3
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails61
@@ -14,7 +15,7 @@ RUN_DEPENDS=	rubygem-activesupport61>=5.2:devel/rubygem-activesupport61 \
 		rubygem-rack-proxy>=0.6.1:www/rubygem-rack-proxy \
 		rubygem-railties61>=5.2:www/rubygem-railties61 \
 		rubygem-semantic_range>=2.3.0:devel/rubygem-semantic_range \
-		yarn:www/yarn
+		yarn:www/yarn-node16
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index e847ebaf0707..c572fe269d11 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -21,7 +21,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	gitlab-shell>=13.21.1:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.0.14:databases/redis \
-	yarn>=1.10.0:www/yarn \
+	yarn-node16>=1.10.0:www/yarn-node16 \
 	gtar>0:archivers/gtar \
 	bash>0:shells/bash \
 	rubygem-rails61>=6.1.4.1<6.1.4.2:www/rubygem-rails61 \