From owner-svn-ports-head@FreeBSD.ORG  Fri Feb  6 05:55:45 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 62A57EDF;
 Fri,  6 Feb 2015 05:55:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 4C65EA17;
 Fri,  6 Feb 2015 05:55:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t165tjle002262;
 Fri, 6 Feb 2015 05:55:45 GMT (envelope-from vanilla@FreeBSD.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t165tidm002260;
 Fri, 6 Feb 2015 05:55:44 GMT (envelope-from vanilla@FreeBSD.org)
Message-Id: <201502060555.t165tidm002260@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: vanilla set sender to
 vanilla@FreeBSD.org using -f
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Fri, 6 Feb 2015 05:55:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r378506 - in head/www: node node-devel
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2015 05:55:45 -0000

Author: vanilla
Date: Fri Feb  6 05:55:44 2015
New Revision: 378506
URL: https://svnweb.freebsd.org/changeset/ports/378506
QAT: https://qat.redports.org/buildarchive/r378506/

Log:
  add iojs as CONFLICT.

Modified:
  head/www/node-devel/Makefile
  head/www/node/Makefile

Modified: head/www/node-devel/Makefile
==============================================================================
--- head/www/node-devel/Makefile	Fri Feb  6 05:52:21 2015	(r378505)
+++ head/www/node-devel/Makefile	Fri Feb  6 05:55:44 2015	(r378506)
@@ -18,7 +18,7 @@ USES=		gmake python:2
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFLICTS=	node-0.[0-9]*
+CONFLICTS=	node-0.[0-9]* iojs-*
 
 ONLY_FOR_ARCHS=	i386 amd64
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib

Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile	Fri Feb  6 05:52:21 2015	(r378505)
+++ head/www/node/Makefile	Fri Feb  6 05:55:44 2015	(r378506)
@@ -16,7 +16,7 @@ USES=		gmake compiler execinfo python:2
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFLICTS=	node-0.[02-9][0-9]* node-devel-0.[0-9]*
+CONFLICTS=	node-0.[02-9][0-9]* node-devel-0.[0-9]* iojs-*
 
 ONLY_FOR_ARCHS=	i386 amd64
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib