Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 May 2019 10:00:04 +0000 (UTC)
From:      Luca Pizzamiglio <pizzamig@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r503132 - in head/www: yarn yarn-node10 yarn-node8
Message-ID:  <201905311000.x4VA04S6014645@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pizzamig
Date: Fri May 31 10:00:04 2019
New Revision: 503132
URL: https://svnweb.freebsd.org/changeset/ports/503132

Log:
  www/yarn www/yarn-node10 www/yarn-node8: Fix CONFLICTS declarations
  
  Fix CONFLICTS_INSTALL typos and definition.
  
  PR:		238255
  Reported by:	Pascal Christen
  Sponsored by:	trivago N.V.

Modified:
  head/www/yarn-node10/Makefile
  head/www/yarn-node8/Makefile
  head/www/yarn/Makefile

Modified: head/www/yarn-node10/Makefile
==============================================================================
--- head/www/yarn-node10/Makefile	Fri May 31 09:54:49 2019	(r503131)
+++ head/www/yarn-node10/Makefile	Fri May 31 10:00:04 2019	(r503132)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	-node10
 
-CONFLICS_INSTALL=	yarn yarn-node8
+CONFLICTS_INSTALL=	yarn yarn-node8
 
 OPTIONS_EXCLUDE=	NODE NODE8 NODE6
 OPTIONS_SLAVE=	NODE10

Modified: head/www/yarn-node8/Makefile
==============================================================================
--- head/www/yarn-node8/Makefile	Fri May 31 09:54:49 2019	(r503131)
+++ head/www/yarn-node8/Makefile	Fri May 31 10:00:04 2019	(r503132)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	-node8
 
-CONFLICS_INSTALL=	yarn yarn-node10
+CONFLICTS_INSTALL=	yarn yarn-node10
 
 OPTIONS_EXCLUDE=	NODE NODE10 NODE6
 OPTIONS_SLAVE=	NODE8

Modified: head/www/yarn/Makefile
==============================================================================
--- head/www/yarn/Makefile	Fri May 31 09:54:49 2019	(r503131)
+++ head/www/yarn/Makefile	Fri May 31 10:00:04 2019	(r503132)
@@ -12,7 +12,7 @@ COMMENT=	Package manager for node, alternative to npm
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS?=	yarn-node10 yarn-node8
+CONFLICTS_INSTALL?=	yarn-node10 yarn-node8
 
 OPTIONS_DEFINE=	HADOOPCOMPAT
 OPTIONS_SINGLE=	BACKEND



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905311000.x4VA04S6014645>