From owner-svn-ports-head@freebsd.org Thu May 5 19:49:39 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6B02B2F790; Thu, 5 May 2016 19:49:39 +0000 (UTC) (envelope-from pi@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 mx1.freebsd.org (Postfix) with ESMTPS id 6EF311DB9; Thu, 5 May 2016 19:49:39 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u45Jncls044488; Thu, 5 May 2016 19:49:38 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u45JncbJ044485; Thu, 5 May 2016 19:49:38 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201605051949.u45JncbJ044485@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 5 May 2016 19:49:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414659 - in head/www: node010 node012 node4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 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: Thu, 05 May 2016 19:49:39 -0000 Author: pi Date: Thu May 5 19:49:38 2016 New Revision: 414659 URL: https://svnweb.freebsd.org/changeset/ports/414659 Log: www/node010, node012, node4: fix CONFLICTS - Forgot this in the last commit PR: 209215 Submitted by: Bradley T. Hughes (maintainer) Modified: head/www/node010/Makefile head/www/node012/Makefile head/www/node4/Makefile Modified: head/www/node010/Makefile ============================================================================== --- head/www/node010/Makefile Thu May 5 18:39:38 2016 (r414658) +++ head/www/node010/Makefile Thu May 5 19:49:38 2016 (r414659) @@ -20,7 +20,7 @@ USES= compiler execinfo gmake python:2 HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFLICTS_INSTALL= iojs-[0-9]* node-[0-9]* node-devel-[0-9]* node012-[0-9]* +CONFLICTS_INSTALL= iojs-[0-9]* node-[0-9]* node-devel-[0-9]* node012-[0-9]* node4-[0-9]* node5-[0-9]* ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} --without-npm --shared-zlib Modified: head/www/node012/Makefile ============================================================================== --- head/www/node012/Makefile Thu May 5 18:39:38 2016 (r414658) +++ head/www/node012/Makefile Thu May 5 19:49:38 2016 (r414659) @@ -20,7 +20,7 @@ USES= compiler execinfo gmake python:2 HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFLICTS_INSTALL= node-[0-9]* node-devel-[0-9]* node010-[0-9]* iojs-[0-9]* +CONFLICTS_INSTALL= node-[0-9]* node-devel-[0-9]* node010-[0-9]* iojs-[0-9]* node4-[0-9]* node5-[0-9]* ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} --without-npm --shared-zlib Modified: head/www/node4/Makefile ============================================================================== --- head/www/node4/Makefile Thu May 5 18:39:38 2016 (r414658) +++ head/www/node4/Makefile Thu May 5 19:49:38 2016 (r414659) @@ -20,7 +20,7 @@ USES= compiler execinfo gmake python:2 HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFLICTS_INSTALL= node-* node-0.[02-9][0-9]* node-devel-0.[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]* +CONFLICTS_INSTALL= node-[0-9]* node-devel-0.[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]* node5-[0-9]* ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} --without-npm --shared-zlib