Date: Wed, 23 Jan 2019 21:22:58 +0000 (UTC) From: "Bradley T. Hughes" <bhughes@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491060 - head/www/node Message-ID: <201901232122.x0NLMw7n025443@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bhughes Date: Wed Jan 23 21:22:57 2019 New Revision: 491060 URL: https://svnweb.freebsd.org/changeset/ports/491060 Log: www/node: disable BUNDLED_SSL by default on FreeBSD >=12 Change the default options on FreeBSD >=12 since OpenSSL 1.1.1 is available in the base system. Bump PORTREVISION due to the change in defaults. While here, convert the port to use BROKEN_SSL, taking care to set BROKEN_SSL+=base when appropriate. PR: 234762 Reported by: amdmi3 Sponsored by: Miles AS Modified: head/www/node/Makefile Modified: head/www/node/Makefile ============================================================================== --- head/www/node/Makefile Wed Jan 23 21:21:13 2019 (r491059) +++ head/www/node/Makefile Wed Jan 23 21:22:57 2019 (r491060) @@ -3,6 +3,7 @@ PORTNAME= node PORTVERSION= 11.7.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ @@ -13,10 +14,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to build: KeyError: 'action' +BROKEN_SSL= openssl libressl libressl-devel +BROKEN_SSL_REASON= Node.js 11.x requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE -OPTIONS_DEFAULT= BUNDLED_SSL DTRACE +OPTIONS_DEFAULT= DTRACE +OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL +OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) @@ -64,16 +69,8 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ .include <bsd.port.options.mk> -.if empty(PORT_OPTIONS:MBUNDLED_SSL) - -.if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} != openssl111 -IGNORE= node.js requires openssl 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl111 to /etc/make.conf or enable BUNDLED_SSL option -.endif - -.if !empty(SSL_DEFAULT:Mlibressl*) -IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL -.endif - +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 +BROKEN_SSL+= base .endif .include <bsd.port.pre.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901232122.x0NLMw7n025443>