Date: Fri, 24 Apr 2015 12:15:28 +0000 (UTC) From: Johannes Jost Meixner <xmj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384635 - in head/www/node: . files Message-ID: <201504241215.t3OCFS7I050672@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: xmj Date: Fri Apr 24 12:15:27 2015 New Revision: 384635 URL: https://svnweb.freebsd.org/changeset/ports/384635 Log: www/node: update to 0.12.2 - update to 0.12.2 - pet portlint (move mode setting to pkg-plist, proper conflicts) PR: 199454 Submitted by: Bradley T. Hughes <bradleythughes@fastmail.fm> Approved by: maintainer (linpct@gmail.com) Added: head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc (contents, props changed) head/www/node/files/patch-deps_v8_src_base_platform_platform-posix.cc (contents, props changed) head/www/node/files/patch-src_node.cc (contents, props changed) Deleted: head/www/node/files/patch-deps_v8_src_platform-freebsd.cc head/www/node/files/patch-deps_v8_src_platform-posix.cc Modified: head/www/node/Makefile head/www/node/distinfo head/www/node/files/patch-lib_dns.js head/www/node/pkg-message head/www/node/pkg-plist Modified: head/www/node/Makefile ============================================================================== --- head/www/node/Makefile Fri Apr 24 12:04:38 2015 (r384634) +++ head/www/node/Makefile Fri Apr 24 12:15:27 2015 (r384635) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 0.12.0 -PORTREVISION= 1 +PORTVERSION= 0.12.2 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-v${PORTVERSION} @@ -17,7 +16,7 @@ USES= compiler execinfo gmake python:2 HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFLICTS= node-0.[02-9][0-9]* node-devel-0.[0-9]* node010-* iojs-* +CONFLICTS= node-0.[02-9][0-9]* node-devel-0.[0-9]* node010-[0-9]* iojs-[0-9]* ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} --without-npm --shared-zlib @@ -53,7 +52,6 @@ post-patch: 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} Modified: head/www/node/distinfo ============================================================================== --- head/www/node/distinfo Fri Apr 24 12:04:38 2015 (r384634) +++ head/www/node/distinfo Fri Apr 24 12:15:27 2015 (r384635) @@ -1,2 +1,2 @@ -SHA256 (node-v0.12.0.tar.gz) = 9700e23af4e9b3643af48cef5f2ad20a1331ff531a12154eef2bfb0bb1682e32 -SIZE (node-v0.12.0.tar.gz) = 19096897 +SHA256 (node-v0.12.2.tar.gz) = ac7e78ade93e633e7ed628532bb8e650caba0c9c33af33581957f3382e2a772d +SIZE (node-v0.12.2.tar.gz) = 19311976 Added: head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc Fri Apr 24 12:15:27 2015 (r384635) @@ -0,0 +1,69 @@ +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2015-03-31 22:13:01 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; + } Added: head/www/node/files/patch-deps_v8_src_base_platform_platform-posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_v8_src_base_platform_platform-posix.cc Fri Apr 24 12:15:27 2015 (r384635) @@ -0,0 +1,11 @@ +--- deps/v8/src/base/platform/platform-posix.cc.orig 2015-03-31 22:13:01 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 + } + Modified: head/www/node/files/patch-lib_dns.js ============================================================================== --- head/www/node/files/patch-lib_dns.js Fri Apr 24 12:04:38 2015 (r384634) +++ head/www/node/files/patch-lib_dns.js Fri Apr 24 12:15:27 2015 (r384635) @@ -1,6 +1,6 @@ ---- lib/dns.js.orig 2015-02-13 23:42:28.000000000 +0800 -+++ lib/dns.js 2015-02-13 23:46:39.000000000 +0800 -@@ -125,6 +125,11 @@ +--- lib/dns.js.orig 2015-03-31 22:13:01 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'); } Added: head/www/node/files/patch-src_node.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-src_node.cc Fri Apr 24 12:15:27 2015 (r384635) @@ -0,0 +1,11 @@ +--- src/node.cc.orig 2015-04-15 04:37:29 UTC ++++ src/node.cc +@@ -2790,7 +2790,7 @@ static void SignalExit(int signo) { + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = SIG_DFL; +- CHECK_EQ(sigaction(signo, &sa, nullptr), 0); ++ CHECK_EQ(sigaction(signo, &sa, NULL), 0); + #endif + raise(signo); + } Modified: head/www/node/pkg-message ============================================================================== --- head/www/node/pkg-message Fri Apr 24 12:04:38 2015 (r384634) +++ head/www/node/pkg-message Fri Apr 24 12:15:27 2015 (r384635) @@ -1,3 +1 @@ - Note: If you need npm (Node Package Manager), please install www/npm. - Modified: head/www/node/pkg-plist ============================================================================== --- head/www/node/pkg-plist Fri Apr 24 12:04:38 2015 (r384634) +++ head/www/node/pkg-plist Fri Apr 24 12:15:27 2015 (r384635) @@ -36,5 +36,5 @@ include/node/v8.h include/node/v8config.h include/node/v8stdint.h lib/node_modules/.keepme -man/man1/node.1.gz +@(,,444) man/man1/node.1.gz share/systemtap/tapset/node.stp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504241215.t3OCFS7I050672>