Date: Wed, 23 Jan 2019 21:10:27 +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: r491057 - head/www/node6 Message-ID: <201901232110.x0NLARii015115@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bhughes Date: Wed Jan 23 21:10:26 2019 New Revision: 491057 URL: https://svnweb.freebsd.org/changeset/ports/491057 Log: www/node6: build on FreeBSD >=12 Change the default options to enable BUNDLED_SSL by default on FreeBSD >=12, which includes OpenSSL 1.1 in the base system, not the 1.0.2 required by Node.js 6.x LTS. 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. Sponsored by: Miles AS Modified: head/www/node6/Makefile Modified: head/www/node6/Makefile ============================================================================== --- head/www/node6/Makefile Wed Jan 23 20:12:44 2019 (r491056) +++ head/www/node6/Makefile Wed Jan 23 21:10:26 2019 (r491057) @@ -3,6 +3,7 @@ PORTNAME= node PORTVERSION= 6.16.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 6 @@ -13,11 +14,16 @@ COMMENT= V8 JavaScript for client and server (6.x LTS) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN_SSL= openssl111 libressl libressl-devel +BROKEN_SSL_REASON= Node.js 6.x LTS requires OpenSSL 1.0.2 or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc64 -OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE -OPTIONS_DEFAULT=DTRACE -OPTIONS_SUB= yes +OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE +OPTIONS_DEFAULT= DTRACE +OPTIONS_DEFAULT_FreeBSD_12= BUNDLED_SSL +OPTIONS_DEFAULT_FreeBSD_13= BUNDLED_SSL +OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} +OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE @@ -61,12 +67,8 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ .include <bsd.port.options.mk> -.if empty(PORT_OPTIONS:MBUNDLED_SSL) - -.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?201901232110.x0NLARii015115>