aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2015-02-06 13:55:44 +0800
committervanilla <vanilla@FreeBSD.org>2015-02-06 13:55:44 +0800
commit0bc2c0805706293c4d23c732c4dac3f48c811ea8 (patch)
tree6eb6f5d9bb59b0bfb5f3469b510dd96f018da149
parent69b9df28f73c2a07e3ecd8899fa4362bd8e8e4f8 (diff)
downloadfreebsd-ports-gnome-0bc2c0805706293c4d23c732c4dac3f48c811ea8.tar.gz
freebsd-ports-gnome-0bc2c0805706293c4d23c732c4dac3f48c811ea8.tar.zst
freebsd-ports-gnome-0bc2c0805706293c4d23c732c4dac3f48c811ea8.zip
add iojs as CONFLICT.
-rw-r--r--www/node-devel/Makefile2
-rw-r--r--www/node/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/www/node-devel/Makefile b/www/node-devel/Makefile
index 9f1b8da4f1c3..4513aaa5dfbe 100644
--- a/www/node-devel/Makefile
+++ b/www/node-devel/Makefile
@@ -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
diff --git a/www/node/Makefile b/www/node/Makefile
index 407792cf7b9d..351c6828134f 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -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