Upgrade to 5.0.0.

PR:		204187
Submitted by:	maintainer

6 files changed, 119 insertions, 111 deletions

diff --git a/www/node-devel/Makefile b/www/node-devel/Makefile
index f15c94b5df37..2e59304de862 100644
--- a/www/node-devel/Makefile
+++ b/www/node-devel/Makefile
@@ -1,38 +1,46 @@
+# Created by: Jin-Sih Lin <linpct@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	node
-PORTVERSION=	0.11.16
+PORTVERSION=	5.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	linpct@gmail.com
-COMMENT=	V8 javascript for client and server
+COMMENT=	V8 JavaScript for client and server
 
 LICENSE=	MIT
 
-USES=		execinfo gmake python:2
+OPTIONS_DEFINE=	DOCS
+
+USES=		compiler execinfo gmake python:2
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFLICTS=	node-0.[0-9]* node010-* iojs-*
+CONFLICTS_INSTALL=	node-0.[0-9]* node010-* iojs-*
 
 ONLY_FOR_ARCHS=	i386 amd64
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 REINPLACE_ARGS=	-i ''
+MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if exists(/usr/bin/clang)
-CC=		clang
-CXX=		clang++
-GYP_DEFINES+=	clang=1
+.if ${COMPILER_TYPE} == clang
+MAKE_ENV+=	LINK=clang++
+CFLAGS+=	-Wno-unused-private-field
+.if ${COMPILER_VERSION} >= 33
+CFLAGS+=	-Wno-nested-anon-types -Wno-unused-function
+.if ${COMPILER_VERSION} >= 34
+CFLAGS+=	-Wno-unused-const-variable
+.endif
+.endif
 .else
-USE_GCC?=	yes
-GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
+MAKE_ARGS+=	strictaliasing=off
+USE_GCC=	yes
 .endif
 
 post-patch:
@@ -40,7 +48,10 @@ post-patch:
 		${WRKSRC}/deps/v8/tools/gyp/v8.gyp
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|python -c|${PYTHON_CMD} -c|" \
+		${WRKSRC}/deps/v8/build/toolchain.gypi
 	@${REINPLACE_CMD} -e "s|'python',|'${PYTHON_CMD}',|" \
+		${WRKSRC}/tools/icu/icu-generic.gyp \
 		${WRKSRC}/deps/v8/build/shim_headers.gypi \
 		${WRKSRC}/deps/v8/tools/gyp/v8.gyp \
 		${WRKSRC}/deps/v8/src/d8.gyp
@@ -48,4 +59,4 @@ post-patch:
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/node-devel/distinfo b/www/node-devel/distinfo
index 868583e86a6f..563ffcef2513 100644
--- a/www/node-devel/distinfo
+++ b/www/node-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (node-v0.11.16.tar.gz) = f0d141faa1f7da3aff53e9615d76040d29c0650542be3b09ee80aca2f2cc61f6
-SIZE (node-v0.11.16.tar.gz) = 19059251
+SHA256 (node-v5.0.0.tar.gz) = 698d9662067ae6a20a2586e5c09659735fc0050769a0d8f76f979189ceaccdf4
+SIZE (node-v5.0.0.tar.gz) = 22581813
diff --git a/www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc b/www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc
deleted file mode 100644
index 7a17306b74df..000000000000
--- a/www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc
+++ /dev/null
@@ -1,69 +0,0 @@
---- deps/v8/src/base/platform/platform-freebsd.cc.orig	2015-01-30 06:13:10 UTC
-+++ deps/v8/src/base/platform/platform-freebsd.cc
-@@ -131,23 +131,23 @@ std::vector<OS::SharedLibraryAddress> OS
-     addr_buffer[0] = '0';
-     addr_buffer[1] = 'x';
-     addr_buffer[10] = 0;
--    int result = read(fd, addr_buffer + 2, 8);
--    if (result < 8) break;
-+    ssize_t bytes_read = read(fd, addr_buffer + 2, 8);
-+    if (bytes_read < 8) break;
-     unsigned start = StringToLong(addr_buffer);
--    result = read(fd, addr_buffer + 2, 1);
--    if (result < 1) break;
-+    bytes_read = read(fd, addr_buffer + 2, 1);
-+    if (bytes_read < 1) break;
-     if (addr_buffer[2] != '-') break;
--    result = read(fd, addr_buffer + 2, 8);
--    if (result < 8) break;
-+    bytes_read = read(fd, addr_buffer + 2, 8);
-+    if (bytes_read < 8) break;
-     unsigned end = StringToLong(addr_buffer);
-     char buffer[MAP_LENGTH];
--    int bytes_read = -1;
-+    bytes_read = -1;
-     do {
-       bytes_read++;
-       if (bytes_read >= MAP_LENGTH - 1)
-         break;
--      result = read(fd, buffer + bytes_read, 1);
--      if (result < 1) break;
-+      bytes_read = read(fd, buffer + bytes_read, 1);
-+      if (bytes_read < 1) break;
-     } while (buffer[bytes_read] != '\n');
-     buffer[bytes_read] = 0;
-     // Ignore mappings that are not executable.
-@@ -182,13 +182,13 @@ VirtualMemory::VirtualMemory(size_t size
- 
- VirtualMemory::VirtualMemory(size_t size, size_t alignment)
-     : address_(NULL), size_(0) {
--  DCHECK(IsAligned(alignment, static_cast<intptr_t>(OS::AllocateAlignment())));
-+  DCHECK((alignment % OS::AllocateAlignment()) == 0);
-   size_t request_size = RoundUp(size + alignment,
-                                 static_cast<intptr_t>(OS::AllocateAlignment()));
-   void* reservation = mmap(OS::GetRandomMmapAddr(),
-                            request_size,
-                            PROT_NONE,
--                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
-+                           MAP_PRIVATE | MAP_ANON,
-                            kMmapFd,
-                            kMmapFdOffset);
-   if (reservation == MAP_FAILED) return;
-@@ -260,7 +260,7 @@ void* VirtualMemory::ReserveRegion(size_
-   void* result = mmap(OS::GetRandomMmapAddr(),
-                       size,
-                       PROT_NONE,
--                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
-+                      MAP_PRIVATE | MAP_ANON,
-                       kMmapFd,
-                       kMmapFdOffset);
- 
-@@ -288,7 +288,7 @@ bool VirtualMemory::UncommitRegion(void*
-   return mmap(base,
-               size,
-               PROT_NONE,
--              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
-+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
-               kMmapFd,
-               kMmapFdOffset) != MAP_FAILED;
- }
diff --git a/www/node-devel/files/patch-deps_v8_src_platform-posix.cc b/www/node-devel/files/patch-deps_v8_src_platform-posix.cc
deleted file mode 100644
index ac8c6f6814fe..000000000000
--- a/www/node-devel/files/patch-deps_v8_src_platform-posix.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/v8/src/base/platform/platform-posix.cc.orig	2015-01-30 06:13:10 UTC
-+++ deps/v8/src/base/platform/platform-posix.cc
-@@ -328,7 +328,7 @@ int OS::GetCurrentThreadId() {
- #elif V8_OS_ANDROID
-   return static_cast<int>(gettid());
- #else
--  return static_cast<int>(pthread_self());
-+  return static_cast<int>(reinterpret_cast<intptr_t>(pthread_self()));
- #endif
- }
- 
diff --git a/www/node-devel/files/patch-lib_dns.js b/www/node-devel/files/patch-lib_dns.js
deleted file mode 100644
index f0b647c9a54f..000000000000
--- a/www/node-devel/files/patch-lib_dns.js
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/dns.js.orig	2015-01-30 06:13:10 UTC
-+++ lib/dns.js
-@@ -125,6 +125,11 @@ exports.lookup = function lookup(hostnam
-         hints !== (exports.ADDRCONFIG | exports.V4MAPPED)) {
-       throw new TypeError('invalid argument: hints must use valid flags');
-     }
-+    // FIXME(indutny): V4MAPPED on FreeBSD results in EAI_BADFLAGS, because
-+    // the libc does not support it
-+    if (process.platform === 'freebsd' && family !== 6) {
-+      hints &= ~exports.V4MAPPED;
-+    }
-   } else {
-     family = options >>> 0;
-   }
diff --git a/www/node-devel/pkg-plist b/www/node-devel/pkg-plist
index 245d026a6012..bf262a8ea55f 100644
--- a/www/node-devel/pkg-plist
+++ b/www/node-devel/pkg-plist
@@ -11,9 +11,99 @@ include/node/node_buffer.h
 include/node/node_internals.h
 include/node/node_object_wrap.h
 include/node/node_version.h
+include/node/openssl/aes.h
+include/node/openssl/archs/BSD-x86/opensslconf.h
+include/node/openssl/archs/BSD-x86_64/opensslconf.h
+include/node/openssl/archs/VC-WIN32/opensslconf.h
+include/node/openssl/archs/VC-WIN64A/opensslconf.h
+include/node/openssl/archs/aix-gcc/opensslconf.h
+include/node/openssl/archs/aix64-gcc/opensslconf.h
+include/node/openssl/archs/darwin-i386-cc/opensslconf.h
+include/node/openssl/archs/darwin64-x86_64-cc/opensslconf.h
+include/node/openssl/archs/linux-aarch64/opensslconf.h
+include/node/openssl/archs/linux-armv4/opensslconf.h
+include/node/openssl/archs/linux-elf/opensslconf.h
+include/node/openssl/archs/linux-ppc/opensslconf.h
+include/node/openssl/archs/linux-ppc64/opensslconf.h
+include/node/openssl/archs/linux-x32/opensslconf.h
+include/node/openssl/archs/linux-x86_64/opensslconf.h
+include/node/openssl/archs/solaris-x86-gcc/opensslconf.h
+include/node/openssl/archs/solaris64-x86_64-gcc/opensslconf.h
+include/node/openssl/asn1.h
+include/node/openssl/asn1_mac.h
+include/node/openssl/asn1t.h
+include/node/openssl/bio.h
+include/node/openssl/blowfish.h
+include/node/openssl/bn.h
+include/node/openssl/buffer.h
+include/node/openssl/camellia.h
+include/node/openssl/cast.h
+include/node/openssl/cmac.h
+include/node/openssl/cms.h
+include/node/openssl/comp.h
+include/node/openssl/conf.h
+include/node/openssl/conf_api.h
+include/node/openssl/crypto.h
+include/node/openssl/des.h
+include/node/openssl/des_old.h
+include/node/openssl/dh.h
+include/node/openssl/dsa.h
+include/node/openssl/dso.h
+include/node/openssl/dtls1.h
+include/node/openssl/e_os2.h
+include/node/openssl/ebcdic.h
+include/node/openssl/ec.h
+include/node/openssl/ecdh.h
+include/node/openssl/ecdsa.h
+include/node/openssl/engine.h
+include/node/openssl/err.h
+include/node/openssl/evp.h
+include/node/openssl/hmac.h
+include/node/openssl/idea.h
+include/node/openssl/krb5_asn.h
+include/node/openssl/kssl.h
+include/node/openssl/lhash.h
+include/node/openssl/md4.h
+include/node/openssl/md5.h
+include/node/openssl/mdc2.h
+include/node/openssl/modes.h
+include/node/openssl/obj_mac.h
+include/node/openssl/objects.h
+include/node/openssl/ocsp.h
 include/node/openssl/opensslconf.h
+include/node/openssl/opensslv.h
+include/node/openssl/ossl_typ.h
+include/node/openssl/pem.h
+include/node/openssl/pem2.h
+include/node/openssl/pkcs12.h
+include/node/openssl/pkcs7.h
+include/node/openssl/pqueue.h
+include/node/openssl/rand.h
+include/node/openssl/rc2.h
+include/node/openssl/rc4.h
+include/node/openssl/ripemd.h
+include/node/openssl/rsa.h
+include/node/openssl/safestack.h
+include/node/openssl/seed.h
+include/node/openssl/sha.h
+include/node/openssl/srp.h
+include/node/openssl/srtp.h
+include/node/openssl/ssl.h
+include/node/openssl/ssl2.h
+include/node/openssl/ssl23.h
+include/node/openssl/ssl3.h
+include/node/openssl/stack.h
+include/node/openssl/symhacks.h
+include/node/openssl/tls1.h
+include/node/openssl/ts.h
+include/node/openssl/txt_db.h
+include/node/openssl/ui.h
+include/node/openssl/ui_compat.h
+include/node/openssl/whrlpool.h
+include/node/openssl/x509.h
+include/node/openssl/x509_vfy.h
+include/node/openssl/x509v3.h
 include/node/pthread-fixes.h
-include/node/smalloc.h
 include/node/stdint-msvc2008.h
 include/node/tree.h
 include/node/uv-aix.h
@@ -32,8 +122,9 @@ include/node/v8-platform.h
 include/node/v8-profiler.h
 include/node/v8-testing.h
 include/node/v8-util.h
+include/node/v8-version.h
 include/node/v8.h
 include/node/v8config.h
-include/node/v8stdint.h
 @(,,444) man/man1/node.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/gdbinit
 share/systemtap/tapset/node.stp