svn commit: r414659 - in head/www: node010 node012 node4

[Kurt Jaeger]

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 <bradleythughes at fastmail.fm> (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