Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Oct 2015 17:08:59 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r398503 - head/www/node012
Message-ID:  <201510031708.t93H8x77010558@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Oct  3 17:08:58 2015
New Revision: 398503
URL: https://svnweb.freebsd.org/changeset/ports/398503

Log:
  - Update CONFLICTS_INSTALL
  - Use CONFLICTS_INSTALL instead of CONFLICTS
  - Add blank line after .include <bsd.port.pre.mk>

Modified:
  head/www/node012/Makefile

Modified: head/www/node012/Makefile
==============================================================================
--- head/www/node012/Makefile	Sat Oct  3 17:08:53 2015	(r398502)
+++ head/www/node012/Makefile	Sat Oct  3 17:08:58 2015	(r398503)
@@ -17,7 +17,7 @@ USES=		compiler execinfo gmake python:2
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFLICTS=	node-0.[02-9][0-9]* node-devel-0.[0-9]* node010-[0-9]* iojs-[0-9]*
+CONFLICTS_INSTALL=	node-[0-9]* node-devel-[0-9]* node010-[0-9]* iojs-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib
@@ -26,6 +26,7 @@ REINPLACE_ARGS=	-i ''
 MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 
 .include <bsd.port.pre.mk>
+
 .if ${COMPILER_TYPE} == clang
 MAKE_ENV+=	LINK=clang++
 CFLAGS+=	-Wno-unused-private-field



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510031708.t93H8x77010558>