[149599] trunk/dports
ciserlohn at macports.org
ciserlohn at macports.org
Mon Jun 27 13:48:59 PDT 2016
Revision: 149599
https://trac.macports.org/changeset/149599
Author: ciserlohn at macports.org
Date: 2016-06-27 13:48:58 -0700 (Mon, 27 Jun 2016)
Log Message:
-----------
nodejs, nodejs-devel, nodejs4, nodejs5, nodejs6: new naming scheme
- Rename nodejs to nodejs4.
- Rename nodejs-devel to nodejs6.
- New port nodejs5.
- Update to the latest versions (4.4.6, 5.12.0, 6.2.2).
- Remove ssl variant. Always build with ssl support enabled.
- Remove python2.6 and python2.7 variants. Always use python2.7 as python2.6 is EOL.
- Remove dtrace variant. It does nothing and was only for legacy compatibility.
- Update all dependent ports.
Modified Paths:
--------------
trunk/dports/databases/rethinkdb/Portfile
trunk/dports/devel/jake/Portfile
trunk/dports/devel/nodejs/Portfile
trunk/dports/devel/nodejs-devel/Portfile
trunk/dports/devel/nodejs4/Portfile
trunk/dports/devel/nodejs5/Portfile
trunk/dports/devel/nodejs6/Portfile
trunk/dports/devel/nodejs6/files/patch-common.gypi.diff
trunk/dports/devel/npm/Portfile
trunk/dports/devel/npm-devel/Portfile
trunk/dports/lang/coffee-script/Portfile
trunk/dports/www/nodejuice/Portfile
Added Paths:
-----------
trunk/dports/devel/nodejs4/
trunk/dports/devel/nodejs5/
trunk/dports/devel/nodejs6/
trunk/dports/devel/nodejs6/files/patch-src-util.h.diff
Modified: trunk/dports/databases/rethinkdb/Portfile
===================================================================
--- trunk/dports/databases/rethinkdb/Portfile 2016-06-27 20:48:37 UTC (rev 149598)
+++ trunk/dports/databases/rethinkdb/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -6,6 +6,7 @@
name rethinkdb
version 1.11.1
+revision 1
categories databases
platforms darwin
maintainers nomaintainer
@@ -28,7 +29,7 @@
depends_lib port:boost \
port:v8 \
- path:bin/node:nodejs \
+ path:bin/node:nodejs4 \
port:protobuf-cpp
# nodejs only supports Intel processors and is not universal
Modified: trunk/dports/devel/jake/Portfile
===================================================================
--- trunk/dports/devel/jake/Portfile 2016-06-27 20:48:37 UTC (rev 149598)
+++ trunk/dports/devel/jake/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -5,6 +5,7 @@
PortGroup github 1.0
github.setup mde jake 0.3.8 v
+revision 1
platforms darwin
categories devel
maintainers ryandesign openmaintainer
@@ -18,7 +19,7 @@
checksums rmd160 f8726a5035bb4e9584120fc72c9f6b5fbc248067 \
sha256 bc61698f3b956826e0c5b115fd8061cd52504882861fe1edc74396ee08f51a24
-depends_lib path:bin/node:nodejs
+depends_lib path:bin/node:nodejs4
use_configure no
Modified: trunk/dports/devel/nodejs/Portfile
===================================================================
--- trunk/dports/devel/nodejs/Portfile 2016-06-27 20:48:37 UTC (rev 149598)
+++ trunk/dports/devel/nodejs/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -2,242 +2,10 @@
# $Id$
PortSystem 1.0
-PortGroup compiler_blacklist_versions 1.0
-
+replaced_by nodejs4
+PortGroup obsolete 1.0
name nodejs
version 4.4.3
-
+revision 1
categories devel net
-platforms darwin
license {MIT BSD}
-maintainers ciserlohn
-
-description Evented I/O for V8 JavaScript
-
-long_description Node's goal is to provide an easy way to build scalable network programs in JavaScript. \
- Node is similar in design to and influenced by systems like Ruby's Event \
- Machine or Python's Twisted. Node takes the event model a bit further-it \
- presents the event loop as a language construct instead of as a library.
-
-conflicts nodejs-devel
-
-homepage http://nodejs.org/
-master_sites ${homepage}dist/v${version}
-
-checksums rmd160 7077518fabdb87f0d3a11a7907c38c4b109f9973 \
- sha256 8e67b95721aab7bd721179da2fe5dd97f9acc1306c15c9712ee103bcd6381638
-
-distname node-v${version}
-
-depends_build port:pkgconfig
-
-depends_lib port:icu
-
-proc rec_glob {basedir pattern} {
- set files [glob -directory $basedir -nocomplain -type f $pattern]
- foreach dir [glob -directory $basedir -nocomplain -type d *] {
- eval lappend files [rec_glob $dir $pattern]
- }
- return $files
-}
-
-configure.python ${prefix}/bin/python2.7
-
-patchfiles patch-common.gypi.diff patch-tools-gyp-pylib-gyp-generator-make.py.diff
-
-post-patch {
- foreach f [concat ${worksrcpath}/configure \
- ${worksrcpath}/tools/gyp/gyp \
- ${worksrcpath}/deps/cares/gyp_cares \
- ${worksrcpath}/deps/v8/build/gyp_v8 \
- ${worksrcpath}/deps/v8/tools/mingw-generate-makefiles.sh \
- [rec_glob ${worksrcpath} *.py]] {
- reinplace "s|/usr/bin/env python|${configure.python}|" ${f}
- }
- foreach gypfile [rec_glob ${worksrcpath} *.gyp*] {
- reinplace "s|'python'|'${configure.python}'|" ${gypfile}
- }
- reinplace "s|python|${configure.python}|" ${worksrcpath}/deps/v8/build/toolchain.gypi
- reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${worksrcpath}/tools/doc/node_modules/marked/bin/marked
-}
-
-configure.args --without-ssl
-configure.args-append --without-npm
-configure.args-append --with-intl=system-icu
-
-# TODO: Remove after 2015-12-27.
-variant python25 requires python27 description {Legacy variant} {}
-
-variant python26 conflicts python27 description {Use python 2.6} {
- depends_lib-append port:python26
- configure.python ${prefix}/bin/python2.6
-}
-
-variant python27 conflicts python26 description {Use python 2.7} {
- depends_lib-append port:python27
- configure.python ${prefix}/bin/python2.7
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
-
-variant ssl description {Add secure socket layer support} {
- depends_build-append port:pkgconfig
- depends_lib-append path:lib/libssl.dylib:openssl
- configure.args-delete --without-ssl
- configure.args-append --shared-openssl
- configure.args-append --shared-openssl-includes=${prefix}/include/openssl
- configure.args-append --shared-openssl-libpath=${prefix}/lib
-}
-
-# TODO: Remove after 2016-07-08
-variant dtrace description {Legacy variant} {}
-
-default_variants +ssl
-
-# V8 only supports ARM and IA-32 processors
-supported_archs i386 x86_64
-
-universal_variant no
-
-# "V8 doesn't like cache."
-configure.ccache no
-
-test.run yes
-
-use_parallel_build no
-
-switch $build_arch {
- i386 {
- configure.args-append --dest-cpu=ia32
- }
- x86_64 {
- configure.args-append --dest-cpu=x64
- }
-}
-
-build.args-append CC=${configure.cc} \
- CXX=${configure.cxx} \
- CXX.host=${configure.cxx} \
- CPP=${configure.cpp} \
- CFLAGS="${configure.cflags}" \
- CXXFLAGS="${configure.cxxflags}" \
- LDFLAGS="${configure.ldflags}" \
- PYTHON=${configure.python} \
- V=1
-
-destroot {
- set bindir ${destroot}${prefix}/bin
- set libdir ${destroot}${prefix}/lib
- set libndir ${libdir}/node
- set libddir ${libdir}/dtrace
- set incdir ${destroot}${prefix}/include/node
- set docdir ${destroot}${prefix}/share/doc/${name}
-
- xinstall -d ${bindir}
- xinstall -d ${libdir}
- xinstall -d ${libndir}
- xinstall -d ${libddir}
- xinstall -d ${incdir}
- xinstall -d ${docdir}
-
-# install binaries
- xinstall -m 755 -W ${worksrcpath} \
- out/Release/node \
- ${bindir}
-
-# install headers
- xinstall -m 644 -W ${worksrcpath} \
- src/async-wrap-inl.h \
- src/async-wrap.h \
- src/base-object-inl.h \
- src/base-object.h \
- src/env-inl.h \
- src/env.h \
- src/handle_wrap.h \
- src/node.h \
- src/node_buffer.h \
- src/node_constants.h \
- src/node_counters.h \
- src/node_crypto.h \
- src/node_crypto_bio.h \
- src/node_crypto_clienthello-inl.h \
- src/node_crypto_clienthello.h \
- src/node_crypto_groups.h \
- src/node_dtrace.h \
- src/node_file.h \
- src/node_http_parser.h \
- src/node_i18n.h \
- src/node_internals.h \
- src/node_javascript.h \
- src/node_object_wrap.h \
- src/node_root_certs.h \
- src/node_stat_watcher.h \
- src/node_version.h \
- src/node_watchdog.h \
- src/node_wrap.h \
- src/pipe_wrap.h \
- src/spawn_sync.h \
- src/stream_wrap.h \
- src/string_bytes.h \
- src/tcp_wrap.h \
- src/tls_wrap.h \
- src/tree.h \
- src/tty_wrap.h \
- src/udp_wrap.h \
- src/util-inl.h \
- src/util.h \
- src/v8abbr.h \
- deps/v8/include/v8-debug.h \
- deps/v8/include/v8-profiler.h \
- deps/v8/include/v8-testing.h \
- deps/v8/include/v8.h \
- deps/v8/include/v8-platform.h \
- deps/v8/include/v8-util.h \
- deps/v8/include/v8config.h \
- deps/uv/include/uv.h \
- deps/uv/include/uv-unix.h \
- deps/uv/include/uv-darwin.h \
- deps/uv/include/tree.h \
- deps/uv/include/uv-threadpool.h \
- deps/uv/include/pthread-fixes.h \
- deps/cares/include/ares.h \
- deps/cares/include/ares_version.h \
- deps/cares/include/nameser.h \
- ${incdir}
-
-# install dtrace script
- xinstall -m 644 -W ${worksrcpath} \
- src/node.d \
- ${libddir}
-
-# install manpage
- xinstall -m 644 -W ${worksrcpath} \
- doc/node.1 \
- ${destroot}${prefix}/share/man/man1
-
-# install docs
- xinstall -m 644 -W ${worksrcpath} \
- AUTHORS \
- CHANGELOG.md \
- COLLABORATOR_GUIDE.md \
- CONTRIBUTING.md \
- GOVERNANCE.md \
- LICENSE \
- README.md \
- ${docdir}
-}
-
-compiler.blacklist *gcc* {clang < 300}
-
-if {${os.major} < 10} {
- pre-fetch {
- ui_error "${name} ${version} requires Mac OS X 10.6 or greater."
- return -code error "incompatible Mac OS X version"
- }
-}
-
-livecheck.url ${homepage}dist/
-livecheck.type regex
-livecheck.regex {v(4\.\d+\.\d+)}
Modified: trunk/dports/devel/nodejs-devel/Portfile
===================================================================
--- trunk/dports/devel/nodejs-devel/Portfile 2016-06-27 20:48:37 UTC (rev 149598)
+++ trunk/dports/devel/nodejs-devel/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -2,239 +2,10 @@
# $Id$
PortSystem 1.0
-PortGroup compiler_blacklist_versions 1.0
-
+replaced_by nodejs6
+PortGroup obsolete 1.0
name nodejs-devel
version 5.11.0
-
+revision 1
categories devel net
-platforms darwin
license {MIT BSD}
-maintainers ciserlohn
-
-description Evented I/O for V8 JavaScript
-
-long_description Node's goal is to provide an easy way to build scalable network programs in JavaScript. \
- Node is similar in design to and influenced by systems like Ruby's Event \
- Machine or Python's Twisted. Node takes the event model a bit further-it \
- presents the event loop as a language construct instead of as a library.
-
-conflicts nodejs
-
-homepage http://nodejs.org/
-master_sites ${homepage}dist/v${version}
-
-checksums rmd160 ad0742f1c144d23eaf053c73a7d508807f741f8a \
- sha256 ef41b01a9e49de5a5d160071166f911d0bc9ff6a0bd0e88ea4863df572d95e91
-
-distname node-v${version}
-
-depends_build port:pkgconfig
-
-depends_lib port:icu
-
-proc rec_glob {basedir pattern} {
- set files [glob -directory $basedir -nocomplain -type f $pattern]
- foreach dir [glob -directory $basedir -nocomplain -type d *] {
- eval lappend files [rec_glob $dir $pattern]
- }
- return $files
-}
-
-configure.python ${prefix}/bin/python2.7
-
-patchfiles patch-common.gypi.diff patch-tools-gyp-pylib-gyp-generator-make.py.diff
-
-post-patch {
- foreach f [concat ${worksrcpath}/configure \
- ${worksrcpath}/tools/gyp/gyp \
- ${worksrcpath}/deps/cares/gyp_cares \
- ${worksrcpath}/deps/v8/build/gyp_v8 \
- ${worksrcpath}/deps/v8/tools/mingw-generate-makefiles.sh \
- [rec_glob ${worksrcpath} *.py]] {
- reinplace "s|/usr/bin/env python|${configure.python}|" ${f}
- }
- foreach gypfile [rec_glob ${worksrcpath} *.gyp*] {
- reinplace "s|'python'|'${configure.python}'|" ${gypfile}
- }
- reinplace "s|python|${configure.python}|" ${worksrcpath}/deps/v8/build/toolchain.gypi
- reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${worksrcpath}/tools/doc/node_modules/marked/bin/marked
-}
-
-configure.args --without-ssl
-configure.args-append --without-npm
-configure.args-append --with-intl=system-icu
-
-# TODO: Remove after 2015-12-27.
-variant python25 requires python27 description {Legacy variant} {}
-
-variant python26 conflicts python27 description {Use python 2.6} {
- depends_lib-append port:python26
- configure.python ${prefix}/bin/python2.6
-}
-
-variant python27 conflicts python26 description {Use python 2.7} {
- depends_lib-append port:python27
- configure.python ${prefix}/bin/python2.7
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
-
-variant ssl description {Add secure socket layer support} {
- depends_build-append port:pkgconfig
- depends_lib-append path:lib/libssl.dylib:openssl
- configure.args-delete --without-ssl
- configure.args-append --shared-openssl
- configure.args-append --shared-openssl-includes=${prefix}/include/openssl
- configure.args-append --shared-openssl-libpath=${prefix}/lib
-}
-
-default_variants +ssl
-
-# V8 only supports ARM and IA-32 processors
-supported_archs i386 x86_64
-
-universal_variant no
-
-# "V8 doesn't like cache."
-configure.ccache no
-
-test.run yes
-
-use_parallel_build no
-
-switch $build_arch {
- i386 {
- configure.args-append --dest-cpu=ia32
- }
- x86_64 {
- configure.args-append --dest-cpu=x64
- }
-}
-
-build.args-append CC=${configure.cc} \
- CXX=${configure.cxx} \
- CXX.host=${configure.cxx} \
- CPP=${configure.cpp} \
- CFLAGS="${configure.cflags}" \
- CXXFLAGS="${configure.cxxflags}" \
- LDFLAGS="${configure.ldflags}" \
- PYTHON=${configure.python} \
- V=1
-
-destroot {
- set bindir ${destroot}${prefix}/bin
- set libdir ${destroot}${prefix}/lib
- set libndir ${libdir}/node
- set libddir ${libdir}/dtrace
- set incdir ${destroot}${prefix}/include/node
- set docdir ${destroot}${prefix}/share/doc/${name}
-
- xinstall -d ${bindir}
- xinstall -d ${libdir}
- xinstall -d ${libndir}
- xinstall -d ${libddir}
- xinstall -d ${incdir}
- xinstall -d ${docdir}
-
-# install binaries
- xinstall -m 755 -W ${worksrcpath} \
- out/Release/node \
- ${bindir}
-
-# install headers
- xinstall -m 644 -W ${worksrcpath} \
- src/async-wrap-inl.h \
- src/async-wrap.h \
- src/base-object-inl.h \
- src/base-object.h \
- src/env-inl.h \
- src/env.h \
- src/handle_wrap.h \
- src/node.h \
- src/node_buffer.h \
- src/node_constants.h \
- src/node_counters.h \
- src/node_crypto.h \
- src/node_crypto_bio.h \
- src/node_crypto_clienthello-inl.h \
- src/node_crypto_clienthello.h \
- src/node_crypto_groups.h \
- src/node_dtrace.h \
- src/node_file.h \
- src/node_http_parser.h \
- src/node_i18n.h \
- src/node_internals.h \
- src/node_javascript.h \
- src/node_object_wrap.h \
- src/node_root_certs.h \
- src/node_stat_watcher.h \
- src/node_version.h \
- src/node_watchdog.h \
- src/node_wrap.h \
- src/pipe_wrap.h \
- src/spawn_sync.h \
- src/stream_wrap.h \
- src/string_bytes.h \
- src/tcp_wrap.h \
- src/tls_wrap.h \
- src/tree.h \
- src/tty_wrap.h \
- src/udp_wrap.h \
- src/util-inl.h \
- src/util.h \
- src/v8abbr.h \
- deps/v8/include/v8-debug.h \
- deps/v8/include/v8-profiler.h \
- deps/v8/include/v8-testing.h \
- deps/v8/include/v8.h \
- deps/v8/include/v8-platform.h \
- deps/v8/include/v8-util.h \
- deps/v8/include/v8config.h \
- deps/uv/include/uv.h \
- deps/uv/include/uv-unix.h \
- deps/uv/include/uv-darwin.h \
- deps/uv/include/tree.h \
- deps/uv/include/uv-threadpool.h \
- deps/uv/include/pthread-fixes.h \
- deps/cares/include/ares.h \
- deps/cares/include/ares_version.h \
- deps/cares/include/nameser.h \
- ${incdir}
-
-# install dtrace script
- xinstall -m 644 -W ${worksrcpath} \
- src/node.d \
- ${libddir}
-
-# install manpage
- xinstall -m 644 -W ${worksrcpath} \
- doc/node.1 \
- ${destroot}${prefix}/share/man/man1
-
-# install docs
- xinstall -m 644 -W ${worksrcpath} \
- AUTHORS \
- CHANGELOG.md \
- COLLABORATOR_GUIDE.md \
- CONTRIBUTING.md \
- GOVERNANCE.md \
- LICENSE \
- README.md \
- ${docdir}
-}
-
-compiler.blacklist *gcc* {clang < 300}
-
-if {${os.major} < 10} {
- pre-fetch {
- ui_error "${name} ${version} requires Mac OS X 10.6 or greater."
- return -code error "incompatible Mac OS X version"
- }
-}
-
-livecheck.url ${homepage}dist/
-livecheck.type regex
-livecheck.regex {v(\d+\.\d+\.\d+)}
Modified: trunk/dports/devel/nodejs4/Portfile
===================================================================
--- trunk/dports/devel/nodejs/Portfile 2016-06-24 00:39:38 UTC (rev 149527)
+++ trunk/dports/devel/nodejs4/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -4,8 +4,8 @@
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
-name nodejs
-version 4.4.3
+name nodejs4
+version 4.4.6
categories devel net
platforms darwin
@@ -19,19 +19,21 @@
Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
-conflicts nodejs-devel
+conflicts nodejs5 nodejs6
homepage http://nodejs.org/
master_sites ${homepage}dist/v${version}
-checksums rmd160 7077518fabdb87f0d3a11a7907c38c4b109f9973 \
- sha256 8e67b95721aab7bd721179da2fe5dd97f9acc1306c15c9712ee103bcd6381638
+checksums rmd160 e3b5004a2bf8a79969647cbce4fffcd43352d455 \
+ sha256 45eab3d415616e5831ba5961b67cec5423e1f9c175ca7e331de7f560c2998d9f
distname node-v${version}
depends_build port:pkgconfig
-depends_lib port:icu
+depends_lib port:icu \
+ port:python27 \
+ path:lib/libssl.dylib:openssl
proc rec_glob {basedir pattern} {
set files [glob -directory $basedir -nocomplain -type f $pattern]
@@ -43,7 +45,8 @@
configure.python ${prefix}/bin/python2.7
-patchfiles patch-common.gypi.diff patch-tools-gyp-pylib-gyp-generator-make.py.diff
+patchfiles patch-common.gypi.diff \
+ patch-tools-gyp-pylib-gyp-generator-make.py.diff
post-patch {
foreach f [concat ${worksrcpath}/configure \
@@ -61,41 +64,12 @@
reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${worksrcpath}/tools/doc/node_modules/marked/bin/marked
}
-configure.args --without-ssl
configure.args-append --without-npm
configure.args-append --with-intl=system-icu
+configure.args-append --shared-openssl
+configure.args-append --shared-openssl-includes=${prefix}/include/openssl
+configure.args-append --shared-openssl-libpath=${prefix}/lib
-# TODO: Remove after 2015-12-27.
-variant python25 requires python27 description {Legacy variant} {}
-
-variant python26 conflicts python27 description {Use python 2.6} {
- depends_lib-append port:python26
- configure.python ${prefix}/bin/python2.6
-}
-
-variant python27 conflicts python26 description {Use python 2.7} {
- depends_lib-append port:python27
- configure.python ${prefix}/bin/python2.7
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
-
-variant ssl description {Add secure socket layer support} {
- depends_build-append port:pkgconfig
- depends_lib-append path:lib/libssl.dylib:openssl
- configure.args-delete --without-ssl
- configure.args-append --shared-openssl
- configure.args-append --shared-openssl-includes=${prefix}/include/openssl
- configure.args-append --shared-openssl-libpath=${prefix}/lib
-}
-
-# TODO: Remove after 2016-07-08
-variant dtrace description {Legacy variant} {}
-
-default_variants +ssl
-
# V8 only supports ARM and IA-32 processors
supported_archs i386 x86_64
Modified: trunk/dports/devel/nodejs5/Portfile
===================================================================
--- trunk/dports/devel/nodejs-devel/Portfile 2016-06-24 00:39:38 UTC (rev 149527)
+++ trunk/dports/devel/nodejs5/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -4,8 +4,8 @@
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
-name nodejs-devel
-version 5.11.0
+name nodejs5
+version 5.12.0
categories devel net
platforms darwin
@@ -19,19 +19,21 @@
Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
-conflicts nodejs
+conflicts nodejs4 nodejs6
homepage http://nodejs.org/
master_sites ${homepage}dist/v${version}
-checksums rmd160 ad0742f1c144d23eaf053c73a7d508807f741f8a \
- sha256 ef41b01a9e49de5a5d160071166f911d0bc9ff6a0bd0e88ea4863df572d95e91
+checksums rmd160 c5fd1aa1c8b440ddc41647f2d90119a0796e3cca \
+ sha256 250c12a561d7319e71e142ee92ab682494c7823d81ce24703c80eb52bdf9ba42
distname node-v${version}
depends_build port:pkgconfig
-depends_lib port:icu
+depends_lib port:icu \
+ port:python27 \
+ path:lib/libssl.dylib:openssl
proc rec_glob {basedir pattern} {
set files [glob -directory $basedir -nocomplain -type f $pattern]
@@ -43,7 +45,8 @@
configure.python ${prefix}/bin/python2.7
-patchfiles patch-common.gypi.diff patch-tools-gyp-pylib-gyp-generator-make.py.diff
+patchfiles patch-common.gypi.diff \
+ patch-tools-gyp-pylib-gyp-generator-make.py.diff
post-patch {
foreach f [concat ${worksrcpath}/configure \
@@ -61,38 +64,12 @@
reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${worksrcpath}/tools/doc/node_modules/marked/bin/marked
}
-configure.args --without-ssl
configure.args-append --without-npm
configure.args-append --with-intl=system-icu
+configure.args-append --shared-openssl
+configure.args-append --shared-openssl-includes=${prefix}/include/openssl
+configure.args-append --shared-openssl-libpath=${prefix}/lib
-# TODO: Remove after 2015-12-27.
-variant python25 requires python27 description {Legacy variant} {}
-
-variant python26 conflicts python27 description {Use python 2.6} {
- depends_lib-append port:python26
- configure.python ${prefix}/bin/python2.6
-}
-
-variant python27 conflicts python26 description {Use python 2.7} {
- depends_lib-append port:python27
- configure.python ${prefix}/bin/python2.7
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
-
-variant ssl description {Add secure socket layer support} {
- depends_build-append port:pkgconfig
- depends_lib-append path:lib/libssl.dylib:openssl
- configure.args-delete --without-ssl
- configure.args-append --shared-openssl
- configure.args-append --shared-openssl-includes=${prefix}/include/openssl
- configure.args-append --shared-openssl-libpath=${prefix}/lib
-}
-
-default_variants +ssl
-
# V8 only supports ARM and IA-32 processors
supported_archs i386 x86_64
@@ -237,4 +214,4 @@
livecheck.url ${homepage}dist/
livecheck.type regex
-livecheck.regex {v(\d+\.\d+\.\d+)}
+livecheck.regex {v(5\.\d+\.\d+)}
Modified: trunk/dports/devel/nodejs6/Portfile
===================================================================
--- trunk/dports/devel/nodejs-devel/Portfile 2016-06-24 00:39:38 UTC (rev 149527)
+++ trunk/dports/devel/nodejs6/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -4,8 +4,8 @@
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
-name nodejs-devel
-version 5.11.0
+name nodejs6
+version 6.2.2
categories devel net
platforms darwin
@@ -19,19 +19,21 @@
Machine or Python's Twisted. Node takes the event model a bit further-it \
presents the event loop as a language construct instead of as a library.
-conflicts nodejs
+conflicts nodejs4 nodejs5
homepage http://nodejs.org/
master_sites ${homepage}dist/v${version}
-checksums rmd160 ad0742f1c144d23eaf053c73a7d508807f741f8a \
- sha256 ef41b01a9e49de5a5d160071166f911d0bc9ff6a0bd0e88ea4863df572d95e91
+checksums rmd160 c38620098c473bc79ea750d97f427860cd465034 \
+ sha256 b6baee57a0ede496c7c7765001f7495ad74c8dfe8c34f1a6fb2cd5d8d526ffce
distname node-v${version}
depends_build port:pkgconfig
-depends_lib port:icu
+depends_lib port:icu \
+ port:python27 \
+ path:lib/libssl.dylib:openssl
proc rec_glob {basedir pattern} {
set files [glob -directory $basedir -nocomplain -type f $pattern]
@@ -43,7 +45,9 @@
configure.python ${prefix}/bin/python2.7
-patchfiles patch-common.gypi.diff patch-tools-gyp-pylib-gyp-generator-make.py.diff
+patchfiles patch-common.gypi.diff \
+ patch-tools-gyp-pylib-gyp-generator-make.py.diff \
+ patch-src-util.h.diff
post-patch {
foreach f [concat ${worksrcpath}/configure \
@@ -61,38 +65,12 @@
reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${worksrcpath}/tools/doc/node_modules/marked/bin/marked
}
-configure.args --without-ssl
configure.args-append --without-npm
configure.args-append --with-intl=system-icu
+configure.args-append --shared-openssl
+configure.args-append --shared-openssl-includes=${prefix}/include/openssl
+configure.args-append --shared-openssl-libpath=${prefix}/lib
-# TODO: Remove after 2015-12-27.
-variant python25 requires python27 description {Legacy variant} {}
-
-variant python26 conflicts python27 description {Use python 2.6} {
- depends_lib-append port:python26
- configure.python ${prefix}/bin/python2.6
-}
-
-variant python27 conflicts python26 description {Use python 2.7} {
- depends_lib-append port:python27
- configure.python ${prefix}/bin/python2.7
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
-
-variant ssl description {Add secure socket layer support} {
- depends_build-append port:pkgconfig
- depends_lib-append path:lib/libssl.dylib:openssl
- configure.args-delete --without-ssl
- configure.args-append --shared-openssl
- configure.args-append --shared-openssl-includes=${prefix}/include/openssl
- configure.args-append --shared-openssl-libpath=${prefix}/lib
-}
-
-default_variants +ssl
-
# V8 only supports ARM and IA-32 processors
supported_archs i386 x86_64
@@ -228,9 +206,9 @@
compiler.blacklist *gcc* {clang < 300}
-if {${os.major} < 10} {
+if {${os.major} < 11} {
pre-fetch {
- ui_error "${name} ${version} requires Mac OS X 10.6 or greater."
+ ui_error "${name} ${version} requires Mac OS X 10.7 or greater."
return -code error "incompatible Mac OS X version"
}
}
Modified: trunk/dports/devel/nodejs6/files/patch-common.gypi.diff
===================================================================
--- trunk/dports/devel/nodejs-devel/files/patch-common.gypi.diff 2016-06-24 00:39:38 UTC (rev 149527)
+++ trunk/dports/devel/nodejs6/files/patch-common.gypi.diff 2016-06-27 20:48:58 UTC (rev 149599)
@@ -4,7 +4,7 @@
'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings
'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
'PREBINDING': 'NO', # No -Wl,-prebind
-- 'MACOSX_DEPLOYMENT_TARGET': '10.5', # -mmacosx-version-min=10.5
+- 'MACOSX_DEPLOYMENT_TARGET': '10.7', # -mmacosx-version-min=10.7
'USE_HEADERMAP': 'NO',
'OTHER_CFLAGS': [
'-fno-strict-aliasing',
Added: trunk/dports/devel/nodejs6/files/patch-src-util.h.diff
===================================================================
--- trunk/dports/devel/nodejs6/files/patch-src-util.h.diff (rev 0)
+++ trunk/dports/devel/nodejs6/files/patch-src-util.h.diff 2016-06-27 20:48:58 UTC (rev 149599)
@@ -0,0 +1,22 @@
+--- src/util.h.orig 2016-06-26 22:18:07.000000000 +0200
++++ src/util.h 2016-06-26 22:19:02.000000000 +0200
+@@ -10,19 +10,11 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+
+-#ifdef __APPLE__
+-#include <tr1/type_traits>
+-#else
+ #include <type_traits> // std::remove_reference
+-#endif
+
+ namespace node {
+
+-#ifdef __APPLE__
+-template <typename T> using remove_reference = std::tr1::remove_reference<T>;
+-#else
+ template <typename T> using remove_reference = std::remove_reference<T>;
+-#endif
+
+ #define FIXED_ONE_BYTE_STRING(isolate, string) \
+ (node::OneByteString((isolate), (string), sizeof(string) - 1))
Modified: trunk/dports/devel/npm/Portfile
===================================================================
--- trunk/dports/devel/npm/Portfile 2016-06-27 20:48:37 UTC (rev 149598)
+++ trunk/dports/devel/npm/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -5,6 +5,7 @@
name npm
version 2.15.3
+revision 1
categories devel
platforms darwin
@@ -31,7 +32,7 @@
worksrcdir "package"
-depends_lib path:bin/node:nodejs
+depends_lib path:bin/node:nodejs4
use_configure no
Modified: trunk/dports/devel/npm-devel/Portfile
===================================================================
--- trunk/dports/devel/npm-devel/Portfile 2016-06-27 20:48:37 UTC (rev 149598)
+++ trunk/dports/devel/npm-devel/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -5,6 +5,7 @@
name npm-devel
version 3.8.8
+revision 1
categories devel
platforms darwin
@@ -33,7 +34,7 @@
worksrcdir "package"
-depends_lib path:bin/node:nodejs
+depends_lib path:bin/node:nodejs4
use_configure no
Modified: trunk/dports/lang/coffee-script/Portfile
===================================================================
--- trunk/dports/lang/coffee-script/Portfile 2016-06-27 20:48:37 UTC (rev 149598)
+++ trunk/dports/lang/coffee-script/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -5,6 +5,7 @@
PortGroup github 1.0
github.setup jashkenas coffee-script 1.3.3
+revision 1
platforms darwin
categories lang
maintainers ryandesign openmaintainer
@@ -24,7 +25,7 @@
checksums rmd160 22cf20180c06c92f5fdc223180ba94bb96b6ff7b \
sha256 21b6782b23e09e768ff8b440eeddb0c42c7ad94990d120a348bfd4ffaf6511e0
-depends_lib path:bin/node:nodejs
+depends_lib path:bin/node:nodejs4
patchfiles patch-Cakefile.diff patch-prefix.diff
Modified: trunk/dports/www/nodejuice/Portfile
===================================================================
--- trunk/dports/www/nodejuice/Portfile 2016-06-27 20:48:37 UTC (rev 149598)
+++ trunk/dports/www/nodejuice/Portfile 2016-06-27 20:48:58 UTC (rev 149599)
@@ -5,6 +5,7 @@
PortGroup github 1.0
github.setup stephenlb nodejuice 1.5.0
+revision 1
categories www
platforms darwin
maintainers nomaintainer
@@ -21,7 +22,7 @@
fetch.type git
git.branch 26785a38446d824818d3ff7a1e0a10e69f2686de
-depends_lib path:bin/node:nodejs
+depends_lib path:bin/node:nodejs4
# Need to patch the nodejuice bash script to chdir to share/nodejuice
patchfiles nodejuice.patch
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160627/a6bfc748/attachment-0001.html>
More information about the macports-changes
mailing list