Attachment #131543 for bug #175625

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

Lines 1-9 Link Here

(-)./Makefile (-4 / +2 lines)
1	#	1	# $FreeBSD: head/www/node-devel/Makefile 306835 2012-11-02 06:57:06Z vanilla $
2	# $FreeBSD: ports/www/node-devel/Makefile,v 1.42 2012/11/17 06:02:43 svnexp Exp $
3	#
4		2
5	PORTNAME= node	3	PORTNAME= node
6	PORTVERSION= 0.9.3	4	PORTVERSION= 0.9.8
7	CATEGORIES= www	5	CATEGORIES= www
8	MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/	6	MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/
9	PKGNAMESUFFIX= -devel	7	PKGNAMESUFFIX= -devel

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (node-v0.9.3.tar.gz) = 7e1750cd47d7b8c13c7cf12457b6a528fa2abf8a10b7c9a35c13ed47cebaab41	1	SHA256 (node-v0.9.8.tar.gz) = b7ad7d9f02d5eaca73a288a261578965c67d3847c2392ee09527acf72549b2e5
2	SIZE (node-v0.9.3.tar.gz) = 12481901	2	SIZE (node-v0.9.8.tar.gz) = 12617530




--- ./deps/openssl/openssl.gyp.orig	2012-10-24 12:21:44.000000000 -0400
+++ ./deps/openssl/openssl.gyp	2012-11-08 19:57:39.000000000 -0500
@@ -3,6 +3,11 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'is_clang': 0,
+    'gcc_version': 0,
+  },
+
   'targets': [
     {
       'target_name': 'openssl',
@@ -674,10 +679,10 @@
             'OPENSSLDIR="/etc/ssl"',
             'TERMIOS',
           ],
-          'cflags': [
-            '-Wno-missing-field-initializers',
-            '-Wno-old-style-declaration',
-          ],
+          'cflags': ['-Wno-missing-field-initializers'],
+        }],
+        ['is_clang==1 or gcc_version>=43', {
+          'cflags': ['-Wno-old-style-declaration'],
         }],
         ['OS=="solaris"', {
           'defines': ['__EXTENSIONS__'],




--- tools/gyp/pylib/gyp/common.py.orig	2012-09-18 08:54:59.000000000 +0800
+++ tools/gyp/pylib/gyp/common.py	2012-09-18 12:14:47.000000000 +0800
@@ -366,7 +366,10 @@
     'freebsd8': 'freebsd',
     'freebsd9': '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)
 
 

Return to bug 175625

Lines 1-29 Link Here

(-)./files/patch-deps__openssl__openssl.gyp (-29 lines)
1	--- ./deps/openssl/openssl.gyp.orig 2012-10-24 12:21:44.000000000 -0400
2	+++ ./deps/openssl/openssl.gyp 2012-11-08 19:57:39.000000000 -0500
3	@@ -3,6 +3,11 @@
4	# found in the LICENSE file.
5
6	{
7	+ 'variables': {
8	+ 'is_clang': 0,
9	+ 'gcc_version': 0,
10	+ },
11	+
12	'targets': [
13	{
14	'target_name': 'openssl',
15	@@ -674,10 +679,10 @@
16	'OPENSSLDIR="/etc/ssl"',
17	'TERMIOS',
18	],
19	- 'cflags': [
20	- '-Wno-missing-field-initializers',
21	- '-Wno-old-style-declaration',
22	- ],
23	+ 'cflags': ['-Wno-missing-field-initializers'],
24	+ }],
25	+ ['is_clang==1 or gcc_version>=43', {
26	+ 'cflags': ['-Wno-old-style-declaration'],
27	}],
28	['OS=="solaris"', {
29	'defines': ['__EXTENSIONS__'],

Lines 1-14 Link Here

(-)./files/patch-gyp-common.py (-14 lines)
1	--- tools/gyp/pylib/gyp/common.py.orig 2012-09-18 08:54:59.000000000 +0800
2	+++ tools/gyp/pylib/gyp/common.py 2012-09-18 12:14:47.000000000 +0800
3	@@ -366,7 +366,10 @@
4	'freebsd8': 'freebsd',
5	'freebsd9': 'freebsd',
6	}
7	- flavor = flavors.get(sys.platform, 'linux')
8	+ if 'freebsd' in sys.platform:
9	+ flavor = 'freebsd'
10	+ else:
11	+ flavor = flavors.get(sys.platform, 'linux')
12	return params.get('flavor', flavor)
13
14