Skip to content

Commit

Permalink
www/yarn: make yarn-node16 available
Browse files Browse the repository at this point in the history
Currently many node packages do not support node 17 which is
used for www/node.
This for example fixes the usage of www/gitlab-ce which cannot
run the upgrade step if node 17 is used.

PR:		259475
PR:		259476
PR:		259477
Approved by:	pizzamig (maintainer)
  • Loading branch information
jlduran authored and mfechner committed Oct 29, 2021
1 parent a269704 commit d2948b5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
1 change: 1 addition & 0 deletions www/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2360,6 +2360,7 @@
SUBDIR += yanopaste
SUBDIR += yarn
SUBDIR += yarn-node14
SUBDIR += yarn-node16
SUBDIR += yarr
SUBDIR += yaws
SUBDIR += you-get
Expand Down
2 changes: 1 addition & 1 deletion www/yarn-node14/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PKGNAMESUFFIX= -node14

CONFLICTS_INSTALL= yarn

OPTIONS_EXCLUDE= NODE
OPTIONS_EXCLUDE= NODE NODE16
OPTIONS_SLAVE= NODE14

MASTERDIR= ${.CURDIR}/../yarn
Expand Down
12 changes: 12 additions & 0 deletions www/yarn-node16/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Created by: Luca Pizzamiglio <pizzamig@FreeBSD.org>

PKGNAMESUFFIX= -node16

CONFLICTS_INSTALL= yarn

OPTIONS_EXCLUDE= NODE NODE14
OPTIONS_SLAVE= NODE16

MASTERDIR= ${.CURDIR}/../yarn

.include "${MASTERDIR}/Makefile"
7 changes: 5 additions & 2 deletions www/yarn/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
PORTNAME= yarn
DISTVERSIONPREFIX= v
DISTVERSION= 1.22.17
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/

Expand All @@ -13,20 +14,22 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cpe
CPE_VENDOR= ${PORTNAME}pkg

CONFLICTS_INSTALL?= yarn-node14 yarn-node10
CONFLICTS_INSTALL?= yarn-node16 yarn-node14 yarn-node10

OPTIONS_DEFINE= HADOOPCOMPAT
OPTIONS_SINGLE= BACKEND
OPTIONS_SINGLE_BACKEND= NODE14 NODE
OPTIONS_SINGLE_BACKEND= NODE16 NODE14 NODE
OPTIONS_DEFAULT= NODE
HADOOPCOMPAT_DESC= hadoop2 compatibility, the yarn script is excluded
NODE_DESC= Use www/node as backend
NODE14_DESC= Use www/node14 as backend
NODE16_DESC= Use www/node16 as backend

OPTIONS_SUB= yes

NODE_RUN_DEPENDS= node>=0.8.0:www/node
NODE14_RUN_DEPENDS= node14>=14.0.0:www/node14
NODE16_RUN_DEPENDS= node16>=16.0.0:www/node16

HADOOPCOMPAT_CONFLICTS_INSTALL_OFF= hadoop2*

Expand Down

0 comments on commit d2948b5

Please sign in to comment.