- Update to 0.8.6 (from www/node-devel)

PR:		ports/170204
Submitted by:	Jin-Sih Lin <linpct@gmail.com> (maintainer)

8 files changed, 52 insertions, 77 deletions

diff --git a/www/node/Makefile b/www/node/Makefile
index fcecdb4af551..014808758be9 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	node
-PORTVERSION=	0.6.19
+PORTVERSION=	0.8.6
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -14,54 +14,30 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	linpct@gmail.com
 COMMENT=	V8 JavaScript for client and server
 
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 
-OPTIONS=	SHARED_V8 "Build with lang/v8" off
-
-CONFLICTS=	node-0.[0-57-9]* node-devel-0.[0-9]*
+MAN1=		node.1
 
-CONFIGURE_ARGS=	--no-ssl2 \
-		--openssl-includes=${OPENSSLINC} \
-		--openssl-libpath=${OPENSSLLIB} \
-		--prefix=${PREFIX:S/^${DESTDIR}//} \
-		--without-npm
 HAS_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
-ONLY_FOR_ARCHS=	i386 amd64
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	2.7
-USE_OPENSSL=	yes
-
-MAN1=		node.1
-
-.if !defined(DISABLE_MAKE_JOBS)
-WAF_ARGS=	--jobs=${MAKE_JOBS_NUMBER}
-.endif
-
-.include <bsd.port.options.mk>
+USE_GMAKE=	yes
 
-.if defined(WITH_SHARED_V8)
-CONFIGURE_ARGS+=--shared-v8 \
-		--shared-v8-includes=${LOCALBASE}/include \
-		--shared-v8-libpath=${LOCALBASE}/lib \
-		--without-snapshot
-LIB_DEPENDS+=	v8:${PORTSDIR}/lang/v8
-PLIST_SUB+=	SHARED_V8="@comment "
-.else
-PLIST_SUB+=	SHARED_V8=""
-.endif
+CONFLICTS=	node-0.[0-79]* node-devel-0.[0-9]*
 
-do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} tools/waf-light ${WAF_ARGS} build)
+ONLY_FOR_ARCHS=	i386 amd64
+MAKE_JOBS_SAFE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm
+PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
+REINPLACE_ARGS=	-i ''
 
-do-install:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} tools/waf-light ${WAF_ARGS} install)
+post-patch:
+	@${RM} ${WRKSRC}/tools/wafadmin/Node.py.orig
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/node_modules/
 	${TOUCH} ${PREFIX}/lib/node_modules/.keepme
-	${INSTALL_MAN} ${WRKSRC}/doc/node.1 ${MANPREFIX}/man/man1/
+	${CHMOD} ${MANMODE} ${PREFIX}/man/man1/node.1
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Note: If you need npm (Node Package Manager), please install www/npm."
 	@${ECHO_MSG}
diff --git a/www/node/distinfo b/www/node/distinfo
index cc5fc50203bd..bc790225c279 100644
--- a/www/node/distinfo
+++ b/www/node/distinfo
@@ -1,2 +1,2 @@
-SHA256 (node-v0.6.19.tar.gz) = 4e33292477b01dfcf50bc628d580fd5af3e5ff807490ec46472b84100fb52fbb
-SIZE (node-v0.6.19.tar.gz) = 10222697
+SHA256 (node-v0.8.6.tar.gz) = dbd42800e69644beff5c2cf11a9d4cf6dfbd644a9a36ffdd5e8c6b8db9240854
+SIZE (node-v0.8.6.tar.gz) = 11468801
diff --git a/www/node/files/patch-SConstruct b/www/node/files/patch-SConstruct
deleted file mode 100644
index b14bb95ffc1c..000000000000
--- a/www/node/files/patch-SConstruct
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/v8/SConstruct.orig	2011-04-06 19:17:46.000000000 +0800
-+++ deps/v8/SConstruct	2011-05-12 20:48:13.000000000 +0800
-@@ -178,7 +178,7 @@ LIBRARY_FLAGS = {
-       }
-     },
-     'os:freebsd': {
--      'CPPPATH' : ['/usr/local/include'],
-+      'CPPPATH' : [join(root_dir, 'src'), '/usr/local/include'],
-       'LIBPATH' : ['/usr/local/lib'],
-       'CCFLAGS':      ['-ansi'],
-       'LIBS': ['execinfo']
diff --git a/www/node/files/patch-gyp-common.py b/www/node/files/patch-gyp-common.py
new file mode 100644
index 000000000000..d1adc6171f25
--- /dev/null
+++ b/www/node/files/patch-gyp-common.py
@@ -0,0 +1,14 @@
+--- tools/gyp/pylib/gyp/common.py.orig	2012-02-02 03:37:12.000000000 +0800
++++ tools/gyp/pylib/gyp/common.py	2012-02-08 01:20:58.000000000 +0800
+@@ -352,7 +352,10 @@
+     'freebsd7': 'freebsd',
+     'freebsd8': 'freebsd',
+   }
+-  flavor = flavors.get(sys.platform, 'linux')
++  if 'freebsd' in sys.platform:
++      flavor = 'freebsd'
++  else:
++    flavor = flavors.get(sys.platform, 'linux')
+   return params.get('flavor', flavor)
+ 
+ 
diff --git a/www/node/files/patch-tools-install.py b/www/node/files/patch-tools-install.py
new file mode 100644
index 000000000000..f5ad2f8868fb
--- /dev/null
+++ b/www/node/files/patch-tools-install.py
@@ -0,0 +1,11 @@
+--- tools/install.py.orig	2012-08-11 15:59:08.000000000 +0800
++++ tools/install.py	2012-08-11 15:59:36.000000000 +0800
+@@ -191,7 +191,7 @@
+           'deps/uv/include/uv-private/uv-unix.h',
+           'deps/uv/include/uv-private/uv-win.h'],
+           'include/node/uv-private/')
+-  action(['doc/node.1'], 'share/man/man1/')
++  action(['doc/node.1'], 'man/man1/')
+   action(['out/Release/node'], 'bin/node')
+ 
+   # install unconditionally, checking if the platform supports dtrace doesn't
diff --git a/www/node/files/patch-wafadmin-Node.py b/www/node/files/patch-wafadmin-Node.py
index f9b3dd646e96..1041bd074d67 100644
--- a/www/node/files/patch-wafadmin-Node.py
+++ b/www/node/files/patch-wafadmin-Node.py
@@ -1,5 +1,5 @@
---- tools/wafadmin/Node.py.orig	2011-04-02 11:21:17.000000000 +0800
-+++ tools/wafadmin/Node.py	2011-04-02 11:22:37.000000000 +0800
+--- tools/wafadmin/Node.py.orig	2011-08-03 16:32:55.000000000 +0800
++++ tools/wafadmin/Node.py	2011-08-03 16:56:11.000000000 +0800
 @@ -349,6 +349,12 @@
  		if self == from_node: return '.'
  		if from_node.parent == self: return '..'
diff --git a/www/node/files/patch-wscript b/www/node/files/patch-wscript
deleted file mode 100644
index 1a5ea060d4da..000000000000
--- a/www/node/files/patch-wscript
+++ /dev/null
@@ -1,12 +0,0 @@
---- wscript.orig	2012-05-16 13:28:07.000000000 +0800
-+++ wscript	2012-05-16 13:33:24.000000000 +0800
-@@ -642,8 +642,7 @@
-   #
-   cmd = 'cp -r ' + sh_escape(srcdir)  + '/* ' + sh_escape(blddir)
-   if not sys.platform.startswith('win32'):
--    make = ('if [ -z "$NODE_MAKE" ]; then NODE_MAKE=make; fi; '
--            '$NODE_MAKE -C ' + sh_escape(blddir))
-+    make = 'gmake -C ' + sh_escape(blddir)
-     flags = arch_cflags(bld)
-     if flags: make += ' CFLAGS=\'%s\'' % ' '.join(flags) # don't escape
-   else:
diff --git a/www/node/pkg-plist b/www/node/pkg-plist
index 55ca2854f8d8..bea030b610c6 100644
--- a/www/node/pkg-plist
+++ b/www/node/pkg-plist
@@ -2,12 +2,10 @@ bin/node
 bin/node-waf
 include/node/ares.h
 include/node/ares_version.h
-include/node/c-ares/ares.h
-include/node/c-ares/ares_version.h
-include/node/config.h
+include/node/eio-emul.h
+include/node/ev-emul.h
 include/node/node.h
 include/node/node_buffer.h
-include/node/node_config.h
 include/node/node_object_wrap.h
 include/node/node_version.h
 include/node/uv-private/eio.h
@@ -17,12 +15,13 @@ include/node/uv-private/tree.h
 include/node/uv-private/uv-unix.h
 include/node/uv-private/uv-win.h
 include/node/uv.h
-%%SHARED_V8%%include/node/v8-debug.h
-%%SHARED_V8%%include/node/v8-preparser.h
-%%SHARED_V8%%include/node/v8-profiler.h
-%%SHARED_V8%%include/node/v8-testing.h
-%%SHARED_V8%%include/node/v8.h
-%%SHARED_V8%%include/node/v8stdint.h
+include/node/v8-debug.h
+include/node/v8-preparser.h
+include/node/v8-profiler.h
+include/node/v8-testing.h
+include/node/v8.h
+include/node/v8stdint.h
+lib/dtrace/node.d
 lib/node/wafadmin/Build.py
 lib/node/wafadmin/Configure.py
 lib/node/wafadmin/Constants.py
@@ -77,8 +76,6 @@ lib/node_modules/.keepme
 @dirrm lib/node/wafadmin/Tools
 @dirrm lib/node/wafadmin
 @dirrm lib/node
+@dirrm lib/dtrace
 @dirrm include/node/uv-private
-@dirrm include/node/ev
-@dirrm include/node/c-ares
 @dirrm include/node
-@exec mkdir -p %D/include/node/ev