Enforce using the system libtool on OSX. Fixes build + modules.

4 files changed, 36 insertions, 5 deletions

diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile
index fb3ba9025e7..8e2469f847b 100644
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/13 20:11:05 fhajny Exp $
+# $NetBSD: Makefile,v 1.7 2013/06/26 11:53:02 jperkin Exp $
 #
 
 DISTNAME=	node-v0.10.11
@@ -56,5 +56,9 @@ CHECK_INTERPRETER_SKIP+=	lib/node_modules/npm/*
 .if ${OPSYS} == "NetBSD"
 BUILD_DEPENDS+=	lockf-[0-9]*:../../sysutils/lockf
 .endif
+
+pre-install:
+	${FIND} ${WRKSRC}/deps/npm -name '*.orig' | ${XARGS} ${RM} -f
+
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo
index a425e83909c..84a7e817fc7 100644
--- a/lang/nodejs/distinfo
+++ b/lang/nodejs/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.7 2013/06/13 20:11:05 fhajny Exp $
+$NetBSD: distinfo,v 1.8 2013/06/26 11:53:02 jperkin Exp $
 
 SHA1 (node-v0.10.11.tar.gz) = 4f646bb3418d1c177ce28cdbc61e71de35b38aea
 RMD160 (node-v0.10.11.tar.gz) = f350f22336b3ba987137f568b443f30e7b511428
 Size (node-v0.10.11.tar.gz) = 13498163 bytes
 SHA1 (patch-common.gypi) = 0cffd29138431c982d9030b414cc26acd9407fbc
 SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f
+SHA1 (patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py) = 78d6ddd37ae30e869e0da666a78baad86a638c50
 SHA1 (patch-deps_uv_common.gypi) = 13bc664b182f00f9674f87f4bd47e7e77f6e9e0d
 SHA1 (patch-deps_uv_src_unix_netbsd.c) = c1d58eabed1c396b8d9455e3d54c88907ffd7bed
 SHA1 (patch-deps_uv_src_unix_thread.c) = 13172adf2407eb40362cb4480a768816a7d98961
 SHA1 (patch-deps_v8_tools_gyp_v8.gyp) = 8602b7858d2d238a165554dfb1feaeec31babfe9
 SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 132008f362ea696e43a4d19bf9d8a0ac754ef55c
-SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = eeb68e590c19d0be530d0294a4157c23db1c26a0
+SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = c0f30e45f36213bd256e36eb4deae10a0530ef78
 SHA1 (patch-tools_install.py) = 8f19cef5b4c90a752dd2c7550e9b70aa78d3c292
diff --git a/lang/nodejs/patches/patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py b/lang/nodejs/patches/patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py
new file mode 100644
index 00000000000..2c6ec6a6485
--- /dev/null
+++ b/lang/nodejs/patches/patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py,v 1.1 2013/06/26 11:53:02 jperkin Exp $
+
+Ensure we use the system libtool on OSX.
+
+--- deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py.orig	2013-06-13 17:35:30.000000000 +0000
++++ deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
+@@ -161,7 +161,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
+ 
+ LINK_COMMANDS_MAC = """\
+ quiet_cmd_alink = LIBTOOL-STATIC $@
+-cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
++cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
+ 
+ quiet_cmd_link = LINK($(TOOLSET)) $@
+ cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
diff --git a/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_generator_make.py b/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_generator_make.py
index b0e2be5c07f..abe8f9ed1e8 100644
--- a/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_generator_make.py
+++ b/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_generator_make.py
@@ -1,8 +1,19 @@
-$NetBSD: patch-tools_gyp_pylib_gyp_generator_make.py,v 1.1 2013/05/22 15:17:07 mspo Exp $
+$NetBSD: patch-tools_gyp_pylib_gyp_generator_make.py,v 1.2 2013/06/26 11:53:02 jperkin Exp $
 
 Add support for NetBSD and DragonFly.
---- tools/gyp/pylib/gyp/generator/make.py.orig	2013-03-28 19:07:52.000000000 +0000
+Ensure we use the system libtool on OSX.
+
+--- tools/gyp/pylib/gyp/generator/make.py.orig	2013-06-13 17:35:30.000000000 +0000
 +++ tools/gyp/pylib/gyp/generator/make.py
+@@ -161,7 +161,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
+ 
+ LINK_COMMANDS_MAC = """\
+ quiet_cmd_alink = LIBTOOL-STATIC $@
+-cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
++cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
+ 
+ quiet_cmd_link = LINK($(TOOLSET)) $@
+ cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
 @@ -1984,7 +1984,7 @@ def GenerateOutput(target_list, target_d
          'flock_index': 2,
          'extra_commands': SHARED_HEADER_SUN_COMMANDS,