From owner-svn-ports-all@freebsd.org Sat Nov 3 22:16:26 2018 Return-Path: Delivered-To: svn-ports-all@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 7BD6110E9D16; Sat, 3 Nov 2018 22:16:26 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED6846CCB2; Sat, 3 Nov 2018 22:16:25 +0000 (UTC) (envelope-from sunpoet@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 956AC1FAED; Sat, 3 Nov 2018 22:16:25 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA3MGPiM038937; Sat, 3 Nov 2018 22:16:25 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA3MGPZP038936; Sat, 3 Nov 2018 22:16:25 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201811032216.wA3MGPZP038936@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 3 Nov 2018 22:16:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483917 - head/www/npm X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/www/npm X-SVN-Commit-Revision: 483917 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ED6846CCB2 X-Spamd-Result: default: False [-0.11 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2018 22:16:26 -0000 Author: sunpoet Date: Sat Nov 3 22:16:25 2018 New Revision: 483917 URL: https://svnweb.freebsd.org/changeset/ports/483917 Log: Add NODE10 option - Clean up CONFLICTS_INSTALL - Bump PORTREVISION for dependency change Modified: head/www/npm/Makefile Modified: head/www/npm/Makefile ============================================================================== --- head/www/npm/Makefile Sat Nov 3 22:16:15 2018 (r483916) +++ head/www/npm/Makefile Sat Nov 3 22:16:25 2018 (r483917) @@ -3,6 +3,7 @@ PORTNAME= npm PORTVERSION= 6.4.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= LOCAL/sunpoet @@ -14,12 +15,13 @@ LICENSE_FILE= ${WRKSRC}/lib/node_modules/npm/LICENSE RUN_DEPENDS= gmake:devel/gmake -CONFLICTS_INSTALL?= npm-node4 npm-node6 npm-node8 npm2 npm3 npm4 +CONFLICTS_INSTALL?= npm-node10 npm-node6 npm-node8 OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= NODE NODE6 NODE8 +OPTIONS_SINGLE_BACKEND= NODE NODE10 NODE6 NODE8 OPTIONS_DEFAULT=NODE -NODE_DESC= Use Node.js 9.x/10.x (www/node) as backend +NODE_DESC= Use Node.js 11.x (www/node) as backend +NODE10_DESC= Use Node.js 10.x (www/node10) as backend NODE6_DESC= Use Node.js 6.x (www/node6) as backend NODE8_DESC= Use Node.js 8.x (www/node8) as backend @@ -35,6 +37,7 @@ SHEBANG_GLOB= *.py SHEBANG_FILES= lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples NODE_RUN_DEPENDS= node>=0.8.0:www/node +NODE10_RUN_DEPENDS= node>=0.8.0:www/node10 NODE6_RUN_DEPENDS= node6>=0.8.0:www/node6 NODE8_RUN_DEPENDS= node8>=0.8.0:www/node8