diff options
| -rw-r--r-- | www/node-devel/Makefile | 12 | ||||
| -rw-r--r-- | www/node-devel/distinfo | 4 | ||||
| -rw-r--r-- | www/node-devel/files/patch-gyp-common.py | 8 | ||||
| -rw-r--r-- | www/node-devel/files/patch-tools-install.py | 20 | ||||
| -rw-r--r-- | www/node-devel/files/patch-uv-bsd.h | 11 | ||||
| -rw-r--r-- | www/node-devel/files/patch-wafadmin-Node.py | 15 | ||||
| -rw-r--r-- | www/node-devel/pkg-plist | 55 |
7 files changed, 40 insertions, 85 deletions
diff --git a/www/node-devel/Makefile b/www/node-devel/Makefile index 1f4acd09989a..8021dcb24ac8 100644 --- a/www/node-devel/Makefile +++ b/www/node-devel/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: node -# Date created: 2010-04-12 -# Whom: Jin-Sih Lin <linpct@gmail.com> # # $FreeBSD$ # PORTNAME= node -PORTVERSION= 0.9.0 +PORTVERSION= 0.9.1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= -devel @@ -22,20 +19,17 @@ MAN1= node.1 HAS_CONFIGURE= yes USE_LDCONFIG= yes USE_PYTHON= 2.7 +USE_OPENSSL= yes USE_GMAKE= yes CONFLICTS= node-0.[0-9]* ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_SAFE= yes -CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} --without-npm +CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} --without-npm --shared-openssl --shared-zlib PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' -post-patch: - @${RM} ${WRKSRC}/tools/wafadmin/Node.py.orig - @${REINPLACE_CMD} -e 's|share/man/man1/|man/man1|' ${WRKSRC}/tools/installer.js - post-install: ${MKDIR} ${PREFIX}/lib/node_modules/ ${TOUCH} ${PREFIX}/lib/node_modules/.keepme diff --git a/www/node-devel/distinfo b/www/node-devel/distinfo index 6c77926030e8..3c567d1471ea 100644 --- a/www/node-devel/distinfo +++ b/www/node-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (node-v0.9.0.tar.gz) = 4d2e5d7c8b345f6e401eed7d06b4bbc6cb012aefc34b46e7c3aedb4a0fccd258 -SIZE (node-v0.9.0.tar.gz) = 11827167 +SHA256 (node-v0.9.1.tar.gz) = 12bc0deb1a0c3fdcd5c54ffd241c1e291d372620944c3f97388d38f460f222b9 +SIZE (node-v0.9.1.tar.gz) = 11451518 diff --git a/www/node-devel/files/patch-gyp-common.py b/www/node-devel/files/patch-gyp-common.py index d1adc6171f25..f5664c7085b8 100644 --- a/www/node-devel/files/patch-gyp-common.py +++ b/www/node-devel/files/patch-gyp-common.py @@ -1,8 +1,8 @@ ---- 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', +--- tools/gyp/pylib/gyp/common.py.orig 2012-09-03 09:45:35.000000000 +0800 ++++ tools/gyp/pylib/gyp/common.py 2012-09-03 09:46:36.000000000 +0800 +@@ -366,7 +366,10 @@ 'freebsd8': 'freebsd', + 'freebsd9': 'freebsd', } - flavor = flavors.get(sys.platform, 'linux') + if 'freebsd' in sys.platform: diff --git a/www/node-devel/files/patch-tools-install.py b/www/node-devel/files/patch-tools-install.py new file mode 100644 index 000000000000..41a9a3d40e1f --- /dev/null +++ b/www/node-devel/files/patch-tools-install.py @@ -0,0 +1,20 @@ +--- tools/install.py.orig 2012-08-29 04:51:31.000000000 +0800 ++++ tools/install.py 2012-09-04 13:26:40.000000000 +0800 +@@ -135,7 +135,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 +@@ -143,7 +143,7 @@ + # with dtrace support now (oracle's "unbreakable" linux) + action(['src/node.d'], 'lib/dtrace/') + +- if variables.get('node_install_npm'): npm_files(action) ++ if 'true' == variables.get('node_install_npm'): npm_files(action) + + def run(args): + global dst_dir, node_prefix, target_defaults, variables diff --git a/www/node-devel/files/patch-uv-bsd.h b/www/node-devel/files/patch-uv-bsd.h new file mode 100644 index 000000000000..81a4b0db9707 --- /dev/null +++ b/www/node-devel/files/patch-uv-bsd.h @@ -0,0 +1,11 @@ +--- deps/uv/include/uv-private/uv-bsd.h.orig 2012-09-03 09:42:53.000000000 +0800 ++++ deps/uv/include/uv-private/uv-bsd.h 2012-09-03 09:43:18.000000000 +0800 +@@ -23,7 +23,7 @@ + #define UV_BSD_H + + #define UV_PLATFORM_FS_EVENT_FIELDS \ +- uv__io_t event_watcher; \ ++ ev_io event_watcher; \ + int fflags; \ + int fd; \ + diff --git a/www/node-devel/files/patch-wafadmin-Node.py b/www/node-devel/files/patch-wafadmin-Node.py deleted file mode 100644 index 1041bd074d67..000000000000 --- a/www/node-devel/files/patch-wafadmin-Node.py +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 '..' - -+ from_node_path = from_node.abspath() -+ from_node_realpath = os.path.realpath(from_node_path) -+ if from_node_path != from_node_realpath: -+ from_node = self.__class__.bld.root.find_dir(from_node_realpath) -+ return self.relpath_gen(from_node) -+ - # up_path is '../../../' and down_path is 'dir/subdir/subdir/file' - ancestor = self.find_ancestor(from_node) - lst = [] diff --git a/www/node-devel/pkg-plist b/www/node-devel/pkg-plist index bea030b610c6..bff53f897866 100644 --- a/www/node-devel/pkg-plist +++ b/www/node-devel/pkg-plist @@ -1,7 +1,4 @@ bin/node -bin/node-waf -include/node/ares.h -include/node/ares_version.h include/node/eio-emul.h include/node/ev-emul.h include/node/node.h @@ -22,60 +19,8 @@ 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 -lib/node/wafadmin/Environment.py -lib/node/wafadmin/Logs.py -lib/node/wafadmin/Node.py -lib/node/wafadmin/Options.py -lib/node/wafadmin/Runner.py -lib/node/wafadmin/Scripting.py -lib/node/wafadmin/Task.py -lib/node/wafadmin/TaskGen.py -lib/node/wafadmin/Tools/__init__.py -lib/node/wafadmin/Tools/ar.py -lib/node/wafadmin/Tools/cc.py -lib/node/wafadmin/Tools/ccroot.py -lib/node/wafadmin/Tools/compiler_cc.py -lib/node/wafadmin/Tools/compiler_cxx.py -lib/node/wafadmin/Tools/compiler_d.py -lib/node/wafadmin/Tools/config_c.py -lib/node/wafadmin/Tools/cxx.py -lib/node/wafadmin/Tools/d.py -lib/node/wafadmin/Tools/dmd.py -lib/node/wafadmin/Tools/gas.py -lib/node/wafadmin/Tools/gcc.py -lib/node/wafadmin/Tools/gdc.py -lib/node/wafadmin/Tools/gnu_dirs.py -lib/node/wafadmin/Tools/gob2.py -lib/node/wafadmin/Tools/gxx.py -lib/node/wafadmin/Tools/icc.py -lib/node/wafadmin/Tools/icpc.py -lib/node/wafadmin/Tools/intltool.py -lib/node/wafadmin/Tools/libtool.py -lib/node/wafadmin/Tools/misc.py -lib/node/wafadmin/Tools/nasm.py -lib/node/wafadmin/Tools/node_addon.py -lib/node/wafadmin/Tools/osx.py -lib/node/wafadmin/Tools/preproc.py -lib/node/wafadmin/Tools/python.py -lib/node/wafadmin/Tools/suncc.py -lib/node/wafadmin/Tools/suncxx.py -lib/node/wafadmin/Tools/unittestw.py -lib/node/wafadmin/Tools/winres.py -lib/node/wafadmin/Tools/xlc.py -lib/node/wafadmin/Tools/xlcxx.py -lib/node/wafadmin/Utils.py -lib/node/wafadmin/__init__.py -lib/node/wafadmin/ansiterm.py -lib/node/wafadmin/pproc.py -lib/node/wafadmin/py3kfixes.py lib/node_modules/.keepme @dirrm lib/node_modules -@dirrm lib/node/wafadmin/Tools -@dirrm lib/node/wafadmin -@dirrm lib/node @dirrm lib/dtrace @dirrm include/node/uv-private @dirrm include/node |