Attachment #114460 for bug #156120

View | Details | Raw Unified | Return to bug 156120
Collapse All | Expand All

Lines 2-12 Link Here

(-)/usr/ports/www/node/Makefile (-2 / +2 lines)
2	# Date created: 2010-04-12	2	# Date created: 2010-04-12
3	# Whom: Jin-Sih Lin <linpct@gmail.com>	3	# Whom: Jin-Sih Lin <linpct@gmail.com>
4	#	4	#
5	# $FreeBSD: ports/www/node/Makefile,v 1.21 2011/03/18 13:55:50 araujo Exp $	5	# $FreeBSD: ports/www/node/Makefile,v 1.22 2011/03/27 12:02:05 dhn Exp $
6	#	6	#
7		7
8	PORTNAME= node	8	PORTNAME= node
9	PORTVERSION= 0.4.4	9	PORTVERSION= 0.4.5
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://nodejs.org/dist/	11	MASTER_SITES= http://nodejs.org/dist/
12	DISTNAME= ${PORTNAME}-v${PORTVERSION}	12	DISTNAME= ${PORTNAME}-v${PORTVERSION}

Lines 1-2 Link Here

(-)/usr/ports/www/node/distinfo (-2 / +2 lines)
1	SHA256 (node-v0.4.4.tar.gz) = ea4430909601340cb3e8adb15569facfeca4e1d59129f1932254535bb4bf3e17	1	SHA256 (node-v0.4.5.tar.gz) = 63fa6acd7dbf1ea816dc5fd64ba4d066f85380396571d29934b8b9141dc2a0ee
2	SIZE (node-v0.4.4.tar.gz) = 4995935	2	SIZE (node-v0.4.5.tar.gz) = 5001301

Lines 1-6 Link Here

(-)/usr/ports/www/node/files/patch-man-and-pkgconfig-path (-4 / +4 lines)
1	--- wscript.orig 2011-03-03 03:10:26.000000000 -0300	1	--- wscript.orig 2011-04-02 11:24:56.000000000 +0800
2	+++ wscript 2011-02-03 05:46:45.000000000 -0200	2	+++ wscript 2011-04-02 11:25:54.000000000 +0800
3	@@ -878,8 +878,6 @@	3	@@ -905,8 +905,6 @@
4		4
5	# Only install the man page if it exists.	5	# Only install the man page if it exists.
6	# Do 'make doc install' to build and install it.	6	# Do 'make doc install' to build and install it.
Lines 9-15 Link Here
9		9
10	bld.install_files('${PREFIX}/bin/', 'tools/node-waf', chmod=0755)	10	bld.install_files('${PREFIX}/bin/', 'tools/node-waf', chmod=0755)
11	bld.install_files('${LIBDIR}/node/wafadmin', 'tools/wafadmin/*.py')	11	bld.install_files('${LIBDIR}/node/wafadmin', 'tools/wafadmin/*.py')
12	@@ -891,7 +889,7 @@	12	@@ -918,7 +916,7 @@
13	node_conf.target = 'tools/nodejs.pc'	13	node_conf.target = 'tools/nodejs.pc'
14	node_conf.dict = subflags(node)	14	node_conf.dict = subflags(node)
15		15




--- deps/v8/src/platform-freebsd.cc.orig	2011-02-05 15:15:52.000000000 +0800
+++ deps/v8/src/platform-freebsd.cc	2011-02-05 15:34:20.000000000 +0800
@@ -526,6 +526,16 @@
     return result;
   }
 
+  virtual bool TryLock() {
+    int result = pthread_mutex_trylock(&mutex_);
+    // Return false if the lock is busy and locking failed.
+    if (result == EBUSY) {
+      return false;
+    }
+    ASSERT(result == 0);  // Verify no other errors.
+    return true;
+  }
+
  private:
   pthread_mutex_t mutex_;   // Pthread mutex for POSIX platforms.
 };
@@ -604,7 +614,7 @@
   TickSample sample;
 
   // We always sample the VM state.
-  sample.state = VMState::current_state();
+  // sample.state = VMState::current_state();
 
   // If profiling, we extract the current pc and sp.
   if (active_sampler_->IsProfiling()) {

Lines 1-5 Link Here

(-)/usr/ports/www/node/files/patch-wafadmin-Node.py (-2 / +2 lines)
1	--- tools/wafadmin/Node.py.orig 2010-10-25 05:45:39.000000000 +0800	1	--- tools/wafadmin/Node.py.orig 2011-04-02 11:21:17.000000000 +0800
2	+++ tools/wafadmin/Node.py 2010-10-27 18:30:12.000000000 +0800	2	+++ tools/wafadmin/Node.py 2011-04-02 11:22:37.000000000 +0800
3	@@ -349,6 +349,12 @@	3	@@ -349,6 +349,12 @@
4	if self == from_node: return '.'	4	if self == from_node: return '.'
5	if from_node.parent == self: return '..'	5	if from_node.parent == self: return '..'

Return to bug 156120

Lines 1-28 Link Here

(-)/usr/ports/www/node/files/patch-platform-freebsd (-28 lines)
1	--- deps/v8/src/platform-freebsd.cc.orig 2011-02-05 15:15:52.000000000 +0800
2	+++ deps/v8/src/platform-freebsd.cc 2011-02-05 15:34:20.000000000 +0800
3	@@ -526,6 +526,16 @@
4	return result;
5	}
6
7	+ virtual bool TryLock() {
8	+ int result = pthread_mutex_trylock(&mutex_);
9	+ // Return false if the lock is busy and locking failed.
10	+ if (result == EBUSY) {
11	+ return false;
12	+ }
13	+ ASSERT(result == 0); // Verify no other errors.
14	+ return true;
15	+ }
16	+
17	private:
18	pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms.
19	};
20	@@ -604,7 +614,7 @@
21	TickSample sample;
22
23	// We always sample the VM state.
24	- sample.state = VMState::current_state();
25	+ // sample.state = VMState::current_state();
26
27	// If profiling, we extract the current pc and sp.
28	if (active_sampler_->IsProfiling()) {