From owner-svn-ports-head@freebsd.org Sat Jun 18 12:28:32 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 B074FA78052; Sat, 18 Jun 2016 12:28:32 +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 71EE61B71; Sat, 18 Jun 2016 12:28:32 +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 u5ICSVGs036579; Sat, 18 Jun 2016 12:28:31 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5ICSVx2036576; Sat, 18 Jun 2016 12:28:31 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201606181228.u5ICSVx2036576@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 18 Jun 2016 12:28:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417063 - in head/www: node node4 node5 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: Sat, 18 Jun 2016 12:28:32 -0000 Author: pi Date: Sat Jun 18 12:28:31 2016 New Revision: 417063 URL: https://svnweb.freebsd.org/changeset/ports/417063 Log: www/node, www/node[45]: Depend on devel/icu instead of the bundled icu-small PR: 210333 Submitted by: Bradley T. Hughes (maintainer) Reviewed by: w.schwarzenfeld@utanet.at Modified: head/www/node/Makefile head/www/node4/Makefile head/www/node5/Makefile Modified: head/www/node/Makefile ============================================================================== --- head/www/node/Makefile Sat Jun 18 11:57:50 2016 (r417062) +++ head/www/node/Makefile Sat Jun 18 12:28:31 2016 (r417063) @@ -3,7 +3,7 @@ PORTNAME= node PORTVERSION= 6.2.1 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ @@ -19,7 +19,7 @@ OPTIONS_SUB= yes BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USE_OFF= OPENSSL=yes -USES= compiler execinfo gmake python:2,build localbase +USES= compiler execinfo gmake python:2,build pkgconfig HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -28,14 +28,17 @@ CONFLICTS_INSTALL= node4-* node-0.[02-9] ONLY_FOR_ARCHS= i386 amd64 armv6 CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ + --with-intl=system-icu \ --shared-cares \ --shared-libuv \ --shared-zlib + PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' -MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} LDFLAGS.host="${LDFLAGS}" LDFLAGS.target="${LDFLAGS}" +MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} LIB_DEPENDS+= libcares.so:dns/c-ares\ + libicui18n.so:devel/icu \ libuv.so:devel/libuv .include @@ -91,6 +94,9 @@ post-patch: ${WRKSRC}/deps/v8/src/d8.gyp \ ${WRKSRC}/node.gyp +post-configure: + @cd ${WRKSRC}/out/tools/icu && ${REINPLACE_CMD} '/\/usr\/local\/include/d' * + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node Modified: head/www/node4/Makefile ============================================================================== --- head/www/node4/Makefile Sat Jun 18 11:57:50 2016 (r417062) +++ head/www/node4/Makefile Sat Jun 18 12:28:31 2016 (r417063) @@ -4,7 +4,7 @@ PORTNAME= node PORTVERSION= 4.4.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 4 @@ -21,7 +21,7 @@ OPTIONS_SUB= yes BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USE_OFF= OPENSSL=yes -USES= compiler execinfo gmake python:2 localbase +USES= compiler execinfo gmake python:2 pkgconfig HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -29,14 +29,16 @@ CONFLICTS_INSTALL= node-[0-9]* node-deve ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ + --with-intl=system-icu \ --without-npm \ --shared-libuv \ --shared-zlib PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' -MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} LDFLAGS.host="${LDFLAGS}" LDFLAGS.target="${LDFLAGS}" +MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} -LIB_DEPENDS+= libuv.so:devel/libuv +LIB_DEPENDS+= libicui18n.so:devel/icu \ + libuv.so:devel/libuv .include Modified: head/www/node5/Makefile ============================================================================== --- head/www/node5/Makefile Sat Jun 18 11:57:50 2016 (r417062) +++ head/www/node5/Makefile Sat Jun 18 12:28:31 2016 (r417063) @@ -3,7 +3,7 @@ PORTNAME= node PORTVERSION= 5.11.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 5 @@ -23,7 +23,7 @@ OPTIONS_SUB= yes BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USE_OFF= OPENSSL=yes -USES= compiler execinfo gmake python:2 localbase +USES= compiler execinfo gmake python:2 pkgconfig HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -31,14 +31,16 @@ CONFLICTS_INSTALL= node-[0-9]* node-deve ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ + --with-intl=system-icu \ --without-npm \ --shared-libuv \ --shared-zlib PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' -MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} LDFLAGS.host="${LDFLAGS}" LDFLAGS.target="${LDFLAGS}" +MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} -LIB_DEPENDS+= libuv.so:devel/libuv +LIB_DEPENDS+= libicui18n.so:devel/icu \ + libuv.so:devel/libuv .include