Hola!

This trivial update brings node to the latest version.

Tested on amd64 with all node-* ports.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/node/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile    23 Oct 2013 22:00:17 -0000      1.23
+++ Makefile    23 Nov 2013 22:12:31 -0000
@@ -8,7 +8,7 @@ ONLY_FOR_ARCHS= amd64 i386
 
 COMMENT=       V8 JavaScript for clients and servers
 
-NODE_VERSION=  v0.10.21
+NODE_VERSION=  v0.10.22
 
 DISTNAME=      node-${NODE_VERSION}
 PKGNAME=       ${DISTNAME:S/v//g}
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/node/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo    23 Oct 2013 22:00:17 -0000      1.18
+++ distinfo    23 Nov 2013 22:12:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (node-v0.10.21.tar.gz) = fBJb8iwXVgZPKmgxDUgi93yBNM4Xiy+qYVVnGoEkFA0=
-SIZE (node-v0.10.21.tar.gz) = 13647047
+SHA256 (node-v0.10.22.tar.gz) = FX/Fiz8dEJuu+sTrHTKudH3l5tVdh9Dpvsj43RBnnn4=
+SIZE (node-v0.10.22.tar.gz) = 13686897
Index: patches/patch-deps_npm_node_modules_node-gyp_lib_install_js
===================================================================
RCS file: 
/cvs/ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_install_js,v
retrieving revision 1.2
diff -u -p -r1.2 patch-deps_npm_node_modules_node-gyp_lib_install_js
--- patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 23 Aug 2012 
17:29:44 -0000      1.2
+++ patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 23 Nov 2013 
22:12:31 -0000
@@ -3,13 +3,12 @@ $OpenBSD: patch-deps_npm_node_modules_no
 Allow building of sub-packages (ie. node-sqlite3) with USE_SYSTRACE
 set, also prevents downloading of the node distfile again.
 
---- deps/npm/node_modules/node-gyp/lib/install.js.orig Tue Aug 21 18:58:33 2012
-+++ deps/npm/node_modules/node-gyp/lib/install.js      Tue Aug 21 19:00:06 2012
-@@ -212,31 +212,18 @@ function install (gyp, argv, callback) {
-       extracter.on('error', cb)
-       extracter.on('end', afterTarball)
+--- deps/npm/node_modules/node-gyp/lib/install.js.orig Tue Nov 12 13:22:12 2013
++++ deps/npm/node_modules/node-gyp/lib/install.js      Sat Nov 23 15:02:03 2013
+@@ -209,30 +209,18 @@ function install (gyp, argv, callback) {
+         return
+       }
  
--      // download the tarball, gunzip and extract!
 -      var req = download(tarballUrl)
 -      if (!req) return
 -
@@ -32,7 +31,7 @@ set, also prevents downloading of the no
 +            .pipe(gunzip)
 +            .pipe(extracter)
          }
--      })
+       })
 -
 -      req.on('response', function (res) {
 -        if (res.statusCode !== 200) {
@@ -43,7 +42,6 @@ set, also prevents downloading of the no
 -        // start unzipping and untaring
 -        req.pipe(gunzip).pipe(extracter)
 -      })
-+      });
 +      // OpenBSD fix
  
        // invoked after the tarball has finished being extracted
Index: patches/patch-deps_uv_src_unix_kqueue_c
===================================================================
RCS file: patches/patch-deps_uv_src_unix_kqueue_c
diff -N patches/patch-deps_uv_src_unix_kqueue_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-deps_uv_src_unix_kqueue_c     23 Nov 2013 22:12:31 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+fix for libuv breakage:
+https://github.com/joyent/libuv/commit/026241ca67717679a7f79d92c4fe1d77f223318c
+--- deps/uv/src/unix/kqueue.c.orig     Tue Nov 12 13:22:12 2013
++++ deps/uv/src/unix/kqueue.c  Thu Nov 21 09:31:37 2013
+@@ -263,6 +263,23 @@ update_timeout:
+   }
+ }
+ 
++void uv__platform_invalidate_fd(uv_loop_t* loop, int fd) {
++  struct kevent* events;
++  uintptr_t i;
++  uintptr_t nfds;
++
++  assert(loop->watchers != NULL);
++
++  events = (struct kevent*) loop->watchers[loop->nwatchers];
++  nfds = (uintptr_t) loop->watchers[loop->nwatchers + 1];
++  if (events == NULL)
++    return;
++
++  /* Invalidate events with same file descriptor */
++  for (i = 0; i < nfds; i++)
++    if ((int) events[i].ident == fd)
++      events[i].ident = -1;
++}
+ 
+ static void uv__fs_event(uv_loop_t* loop, uv__io_t* w, unsigned int fflags) {
+   uv_fs_event_t* handle;
Index: patches/patch-tools_gyp_node_py
===================================================================
RCS file: patches/patch-tools_gyp_node_py
diff -N patches/patch-tools_gyp_node_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_gyp_node_py     23 Nov 2013 22:12:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- tools/gyp_node.py.orig     Tue Nov 12 13:22:12 2013
++++ tools/gyp_node.py  Thu Nov 21 08:11:05 2013
+@@ -7,7 +7,7 @@ import sys
+ script_dir = os.path.dirname(__file__)
+ node_root  = os.path.normpath(os.path.join(script_dir, os.pardir))
+ 
+-sys.path.insert(0, os.path.join(node_root, 'tools', 'gyp', 'pylib'))
++# Use gyp from ports for OpenBSD
+ import gyp
+ 
+ # Directory within which we want all generated files (including Makefiles)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/node/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST   22 Oct 2013 15:29:14 -0000      1.16
+++ pkg/PLIST   23 Nov 2013 22:12:31 -0000
@@ -17,15 +17,13 @@ lib/node_modules/abbrev/package.json
 lib/node_modules/ansi/
 lib/node_modules/ansi/.npmignore
 lib/node_modules/ansi/README.md
+lib/node_modules/ansi/color-spaces.pl
 lib/node_modules/ansi/examples/
 lib/node_modules/ansi/examples/beep/
 lib/node_modules/ansi/examples/beep/index.js
 lib/node_modules/ansi/examples/clear/
 lib/node_modules/ansi/examples/clear/index.js
 lib/node_modules/ansi/examples/cursorPosition.js
-lib/node_modules/ansi/examples/imgcat/
-lib/node_modules/ansi/examples/imgcat/index.js
-lib/node_modules/ansi/examples/imgcat/yoshi.png
 lib/node_modules/ansi/examples/progress/
 lib/node_modules/ansi/examples/progress/index.js
 lib/node_modules/ansi/examples/starwars.js
@@ -63,11 +61,13 @@ lib/node_modules/chownr/chownr.js
 lib/node_modules/chownr/package.json
 lib/node_modules/cmd-shim/
 lib/node_modules/cmd-shim/.npmignore
+lib/node_modules/cmd-shim/.travis.yml
 lib/node_modules/cmd-shim/LICENSE
 lib/node_modules/cmd-shim/README.md
 lib/node_modules/cmd-shim/index.js
 lib/node_modules/cmd-shim/package.json
 lib/node_modules/editor/
+lib/node_modules/editor/LICENSE
 lib/node_modules/editor/README.markdown
 lib/node_modules/editor/example/
 lib/node_modules/editor/example/beep.json
@@ -131,6 +131,13 @@ lib/node_modules/github-url-from-git/Rea
 lib/node_modules/github-url-from-git/index.js
 lib/node_modules/github-url-from-git/package.json
 lib/node_modules/github-url-from-git/test.js
+lib/node_modules/github-url-from-username-repo/
+lib/node_modules/github-url-from-username-repo/.npmignore
+lib/node_modules/github-url-from-username-repo/.travis.yml
+lib/node_modules/github-url-from-username-repo/LICENSE
+lib/node_modules/github-url-from-username-repo/README.md
+lib/node_modules/github-url-from-username-repo/index.js
+lib/node_modules/github-url-from-username-repo/package.json
 lib/node_modules/glob/
 lib/node_modules/glob/.npmignore
 lib/node_modules/glob/.travis.yml
@@ -671,6 +678,7 @@ lib/node_modules/npm/lib/view.js
 lib/node_modules/npm/lib/visnup.js
 lib/node_modules/npm/lib/whoami.js
 lib/node_modules/npm/lib/xmas.js
+lib/node_modules/npm/make.bat
 @mandir lib/node_modules/npm/man/
 lib/node_modules/npm/man/man1/
 @man lib/node_modules/npm/man/man1/npm-README.1
@@ -791,6 +799,7 @@ lib/node_modules/npm/node_modules/editor
 lib/node_modules/npm/node_modules/fstream
 lib/node_modules/npm/node_modules/fstream-npm
 lib/node_modules/npm/node_modules/github-url-from-git
+lib/node_modules/npm/node_modules/github-url-from-username-repo
 lib/node_modules/npm/node_modules/glob
 lib/node_modules/npm/node_modules/graceful-fs
 lib/node_modules/npm/node_modules/inherits
@@ -887,6 +896,7 @@ lib/node_modules/read-package-json/node_
 lib/node_modules/read-package-json/node_modules/normalize-package-data/LICENSE
 
lib/node_modules/read-package-json/node_modules/normalize-package-data/README.md
 lib/node_modules/read-package-json/node_modules/normalize-package-data/lib/
+lib/node_modules/read-package-json/node_modules/normalize-package-data/lib/core_module_names.json
 
lib/node_modules/read-package-json/node_modules/normalize-package-data/lib/extract_description.js
 
lib/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js
 
lib/node_modules/read-package-json/node_modules/normalize-package-data/lib/normalize.js

Reply via email to