From owner-svn-ports-all@freebsd.org Sat Jul 9 13:42:55 2016 Return-Path: Delivered-To: svn-ports-all@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 630C7B82D0E; Sat, 9 Jul 2016 13:42:55 +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 1BB551752; Sat, 9 Jul 2016 13:42:55 +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 u69DgsbN040187; Sat, 9 Jul 2016 13:42:54 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u69DgsTb040185; Sat, 9 Jul 2016 13:42:54 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201607091342.u69DgsTb040185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 9 Jul 2016 13:42:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418280 - in head/www: node node4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2016 13:42:55 -0000 Author: pi Date: Sat Jul 9 13:42:53 2016 New Revision: 418280 URL: https://svnweb.freebsd.org/changeset/ports/418280 Log: www/node[4]: Fix OpenSSL dependencies after USES=ssl changes PR: 210891 Submitted by: Bradley T. Hughes (maintainer) Modified: head/www/node/Makefile head/www/node4/Makefile Modified: head/www/node/Makefile ============================================================================== --- head/www/node/Makefile Sat Jul 9 13:38:48 2016 (r418279) +++ head/www/node/Makefile Sat Jul 9 13:42:53 2016 (r418280) @@ -3,7 +3,7 @@ PORTNAME= node PORTVERSION= 6.2.2 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ @@ -16,8 +16,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS OPTIONS_SUB= yes -BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation -BUNDLED_SSL_USE_OFF= OPENSSL=yes +BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation +BUNDLED_SSL_USES_OFF= ssl:openssl +BUNDLED_SSL_CONFIGURE_OFF+= --shared-openssl NLS_CONFIGURE_ON= --with-intl=system-icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu @@ -51,8 +52,6 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ WITH_OPENSSL_PORT= yes .endif -CONFIGURE_ARGS+= --shared-openssl - .endif .include Modified: head/www/node4/Makefile ============================================================================== --- head/www/node4/Makefile Sat Jul 9 13:38:48 2016 (r418279) +++ head/www/node4/Makefile Sat Jul 9 13:42:53 2016 (r418280) @@ -4,7 +4,7 @@ PORTNAME= node PORTVERSION= 4.4.7 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 4 @@ -18,8 +18,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS OPTIONS_SUB= yes -BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation -BUNDLED_SSL_USE_OFF= OPENSSL=yes +BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation +BUNDLED_SSL_USES_OFF= ssl:openssl +BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl NLS_CONFIGURE_ON= --with-intl=system-icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu @@ -50,8 +51,6 @@ LIB_DEPENDS+= libuv.so:devel/libuv WITH_OPENSSL_PORT=yes .endif -CONFIGURE_ARGS+= --shared-openssl - .endif .include