From owner-svn-ports-head@freebsd.org Fri May 31 10:00:05 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B6E515B7FA5; Fri, 31 May 2019 10:00:05 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 086D68B846; Fri, 31 May 2019 10:00:05 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D21D926ADE; Fri, 31 May 2019 10:00:04 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4VA04kn014647; Fri, 31 May 2019 10:00:04 GMT (envelope-from pizzamig@FreeBSD.org) Received: (from pizzamig@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4VA04S6014645; Fri, 31 May 2019 10:00:04 GMT (envelope-from pizzamig@FreeBSD.org) Message-Id: <201905311000.x4VA04S6014645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pizzamig set sender to pizzamig@FreeBSD.org using -f From: Luca Pizzamiglio Date: Fri, 31 May 2019 10:00:04 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: pizzamig X-SVN-Commit-Paths: in head/www: yarn yarn-node10 yarn-node8 X-SVN-Commit-Revision: 503132 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 086D68B846 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 May 2019 10:00:05 -0000 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