Attachment 152830 Details for Bug 197507 – node-0.12.0.patch

node-0.12.0.patch

node-0.12.0.patch (text/plain), 6.93 KB, created by linpct on 2015-02-10 05:36:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: linpct

Created: 2015-02-10 05:36:07 UTC

Size: 6.93 KB

patch

obsolete

>diff -ruN www/node.orig/Makefile www/node/Makefile
>--- www/node.orig/Makefile	2015-02-06 21:46:36.000000000 +0800
>+++ www/node/Makefile	2015-02-08 00:17:44.000000000 +0800
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/www/node/Makefile 378506 2015-02-06 05:55:44Z vanilla $
> 
> PORTNAME=	node
>-PORTVERSION=	0.10.35
>+PORTVERSION=	0.12.0
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> DISTNAME=	${PORTNAME}-v${PORTVERSION}
>@@ -40,18 +40,21 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '1 s|${SETENV} python|${PYTHON_CMD}|' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
>+		${WRKSRC}/deps/v8/tools/gyp/v8.gyp
>+	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
>+		${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e "s|'python',|'${PYTHON_CMD}',|" \
>-		${WRKSRC}/deps/v8/build/common.gypi \
>+		${WRKSRC}/deps/v8/build/shim_headers.gypi \
> 		${WRKSRC}/deps/v8/tools/gyp/v8.gyp \
> 		${WRKSRC}/deps/v8/src/d8.gyp
>-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
>-		${WRKSRC}/deps/v8/build/common.gypi \
>-		${WRKSRC}/deps/v8/tools/gyp/v8.gyp
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/node_modules/
> 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/node_modules/.keepme
> 	${CHMOD} ${MANMODE} ${STAGEDIR}${PREFIX}/man/man1/node.1
>+	@${ECHO_MSG}
>+	@${ECHO_MSG} "Note: If you need npm (Node Package Manager), please install www/npm."
>+	@${ECHO_MSG}
> 
> .include <bsd.port.post.mk>
>diff -ruN www/node.orig/distinfo www/node/distinfo
>--- www/node.orig/distinfo	2015-01-05 12:49:44.000000000 +0800
>+++ www/node/distinfo	2015-02-08 00:02:08.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (node-v0.10.35.tar.gz) = 0043656bb1724cb09dbdc960a2fd6ee37d3badb2f9c75562b2d11235daa40a03
>-SIZE (node-v0.10.35.tar.gz) = 14417025
>+SHA256 (node-v0.12.0.tar.gz) = 9700e23af4e9b3643af48cef5f2ad20a1331ff531a12154eef2bfb0bb1682e32
>+SIZE (node-v0.12.0.tar.gz) = 19096897
>diff -ruN www/node.orig/files/patch-deps_v8_src_platform-freebsd.cc www/node/files/patch-deps_v8_src_platform-freebsd.cc
>--- www/node.orig/files/patch-deps_v8_src_platform-freebsd.cc	2014-10-28 11:05:49.000000000 +0800
>+++ www/node/files/patch-deps_v8_src_platform-freebsd.cc	2015-02-10 10:54:29.000000000 +0800
>@@ -1,6 +1,46 @@
>---- deps/v8/src/platform-freebsd.cc.orig	2014-09-16 18:47:52.000000000 -0400
>-+++ deps/v8/src/platform-freebsd.cc	2014-10-08 13:23:25.000000000 -0400
>-@@ -343,7 +343,7 @@
>+--- ./deps/v8/src/base/platform/platform-freebsd.cc.orig	2015-02-07 04:04:23.000000000 +0800
>++++ ./deps/v8/src/base/platform/platform-freebsd.cc	2015-02-10 10:53:45.000000000 +0800
>+@@ -131,23 +131,23 @@
>+     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, 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,
>@@ -9,7 +49,7 @@
>                             kMmapFd,
>                             kMmapFdOffset);
>    if (reservation == MAP_FAILED) return;
>-@@ -415,7 +415,7 @@
>+@@ -260,7 +260,7 @@
>    void* result = mmap(OS::GetRandomMmapAddr(),
>                        size,
>                        PROT_NONE,
>@@ -18,7 +58,7 @@
>                        kMmapFd,
>                        kMmapFdOffset);
>  
>-@@ -445,7 +445,7 @@
>+@@ -288,7 +288,7 @@
>    return mmap(base,
>                size,
>                PROT_NONE,
>diff -ruN www/node.orig/files/patch-deps_v8_src_platform-posix.cc www/node/files/patch-deps_v8_src_platform-posix.cc
>--- www/node.orig/files/patch-deps_v8_src_platform-posix.cc	1970-01-01 08:00:00.000000000 +0800
>+++ www/node/files/patch-deps_v8_src_platform-posix.cc	2015-02-09 21:58:28.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- ./deps/v8/src/base/platform/platform-posix.cc.orig	2015-02-07 04:04:23.000000000 +0800
>++++ ./deps/v8/src/base/platform/platform-posix.cc	2015-02-08 01:11:42.000000000 +0800
>+@@ -328,7 +328,7 @@
>+ #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 -ruN www/node.orig/pkg-plist www/node/pkg-plist
>--- www/node.orig/pkg-plist	2015-01-05 13:14:49.000000000 +0800
>+++ www/node/pkg-plist	2015-02-10 00:57:19.000000000 +0800
>@@ -1,8 +1,10 @@
> bin/node
>+include/node/android-ifaddrs.h
> include/node/ares.h
> include/node/ares_version.h
> include/node/common.gypi
> include/node/config.gypi
>+include/node/libplatform/libplatform.h
> include/node/nameser.h
> include/node/node.h
> include/node/node_buffer.h
>@@ -10,21 +12,29 @@
> include/node/node_object_wrap.h
> include/node/node_version.h
> include/node/openssl/opensslconf.h
>-include/node/uv-private/ngx-queue.h
>-include/node/uv-private/stdint-msvc2008.h
>-include/node/uv-private/tree.h
>-include/node/uv-private/uv-bsd.h
>-include/node/uv-private/uv-darwin.h
>-include/node/uv-private/uv-linux.h
>-include/node/uv-private/uv-sunos.h
>-include/node/uv-private/uv-unix.h
>-include/node/uv-private/uv-win.h
>+include/node/pthread-fixes.h
>+include/node/smalloc.h
>+include/node/stdint-msvc2008.h
>+include/node/tree.h
>+include/node/uv-aix.h
>+include/node/uv-bsd.h
>+include/node/uv-darwin.h
>+include/node/uv-errno.h
>+include/node/uv-linux.h
>+include/node/uv-sunos.h
>+include/node/uv-threadpool.h
>+include/node/uv-unix.h
>+include/node/uv-version.h
>+include/node/uv-win.h
> include/node/uv.h
> include/node/v8-debug.h
>-include/node/v8-preparser.h
>+include/node/v8-platform.h
> include/node/v8-profiler.h
> include/node/v8-testing.h
>+include/node/v8-util.h
> include/node/v8.h
>+include/node/v8config.h
> include/node/v8stdint.h
> lib/node_modules/.keepme
> man/man1/node.1.gz
>+share/systemtap/tapset/node.stp

Actions: View

Attachments on bug 197507: 152830