Attachment 169895 Details for Bug 209215 – patch from a git commit, apply with patch -p1

patch from a git commit, apply with patch -p1

copy-www_node-to-www_node5.diff (text/plain), 15.13 KB, created by Bradley T. Hughes on 2016-05-02 21:26:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bradley T. Hughes

Created: 2016-05-02 21:26:19 UTC

Size: 15.13 KB

patch

obsolete

>commit 83d9e5a8e4fe9d84cade6242daf4bb1137822af5
>Author: Bradley T. Hughes <bradleythughes@fastmail.fm>
>Date:   Thu Apr 28 08:54:47 2016 +0000
>
>    www/node5: copy www/node to www/node5
>    
>    Prepare to change www/node to v6.0.0 by moving v5.x to a new port of its
>    own. Update the CONFLICTS_INSTALL rules for all www/node* ports to take
>    the new port into account.
>    
>    node.js v5.x will only be supported for a few months to give people time
>    to move to v6. This new port is marked as deprecated with an expiration
>    date of July 1, allowing all of May and June to transition. See
>    https://nodejs.org/en/blog/release/v6.0.0/#what-about-node-js-v5
>
>diff --git a/www/node/Makefile b/www/node/Makefile
>index beb15ae..0b0c801 100644
>--- a/www/node/Makefile
>+++ b/www/node/Makefile
>@@ -25,7 +25,7 @@ USES=		compiler execinfo gmake python:2
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>-CONFLICTS_INSTALL=	node4-* node-0.[02-9][0-9]* node-devel-0.[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]*
>+CONFLICTS_INSTALL=	node-[0-9]* node-devel-[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]* node4-[0-9]* node5-[0-9]*
> 
> ONLY_FOR_ARCHS=	i386 amd64
> CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib
>diff --git a/www/node010/Makefile b/www/node010/Makefile
>index 9985f24..9bb9ec9 100644
>--- a/www/node010/Makefile
>+++ b/www/node010/Makefile
>@@ -28,7 +28,7 @@ USES=		compiler execinfo gmake python:2
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>-CONFLICTS_INSTALL=	iojs-[0-9]* node-[0-9]* node-devel-[0-9]* node012-[0-9]*
>+CONFLICTS_INSTALL=	iojs-[0-9]* node-[0-9]* node-devel-[0-9]* node012-[0-9]* node4-[0-9]* node5-[0-9]*
> 
> ONLY_FOR_ARCHS=	i386 amd64
> CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib
>diff --git a/www/node012/Makefile b/www/node012/Makefile
>index 37612d2..13f49e8 100644
>--- a/www/node012/Makefile
>+++ b/www/node012/Makefile
>@@ -28,7 +28,7 @@ USES=		compiler execinfo gmake python:2
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>-CONFLICTS_INSTALL=	node-[0-9]* node-devel-[0-9]* node010-[0-9]* iojs-[0-9]*
>+CONFLICTS_INSTALL=	node-[0-9]* node-devel-[0-9]* node010-[0-9]* iojs-[0-9]* node4-[0-9]* node5-[0-9]*
> 
> ONLY_FOR_ARCHS=	i386 amd64
> CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib
>diff --git a/www/node4/Makefile b/www/node4/Makefile
>index 430a2cf..7a1fada 100644
>--- a/www/node4/Makefile
>+++ b/www/node4/Makefile
>@@ -26,7 +26,7 @@ USES=		compiler execinfo gmake python:2
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>-CONFLICTS_INSTALL=	node-* node-0.[02-9][0-9]* node-devel-0.[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]*
>+CONFLICTS_INSTALL=	node-[0-9]* node-devel-0.[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]* node5-[0-9]*
> 
> ONLY_FOR_ARCHS=	i386 amd64
> CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib
>diff --git a/www/node5/Makefile b/www/node5/Makefile
>new file mode 100644
>index 0000000..076e6b7
>--- /dev/null
>+++ b/www/node5/Makefile
>@@ -0,0 +1,77 @@
>+# $FreeBSD$
>+
>+PORTNAME=	node
>+PORTVERSION=	5.11.0
>+DISTVERSIONPREFIX=	v
>+CATEGORIES=	www
>+MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
>+PKGNAMESUFFIX=  5
>+
>+MAINTAINER=	bradleythughes@fastmail.fm
>+COMMENT=	V8 JavaScript for client and server (5.x)
>+DEPRECATED=	Upstream provides limited support after the release of v6.0.0, see https://nodejs.org/en/blog/release/v6.0.0/#what-about-node-js-v5
>+EXPIRATION_DATE=	2016-07-01
>+
>+LICENSE=	MIT
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+OPTIONS_DEFINE=	BUNDLED_SSL DOCS
>+OPTIONS_DEFAULT=BUNDLED_SSL
>+OPTIONS_SUB=	yes
>+ 
>+BUNDLED_SSL_DESC=	Use node's bundled OpenSSL implementation
>+BUNDLED_SSL_USE_OFF=	OPENSSL=yes
>+BUNDLED_SSL_VARS_OFF=	WITH_OPENSSL_PORT=yes
>+
>+USES=		compiler execinfo gmake python:2
>+HAS_CONFIGURE=	yes
>+USE_LDCONFIG=	yes
>+
>+CONFLICTS_INSTALL=	node-[0-9]* node-devel-[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]* node4-[0-9]*
>+
>+ONLY_FOR_ARCHS=	i386 amd64
>+CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} --without-npm --shared-zlib
>+PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
>+REINPLACE_ARGS=	-i ''
>+MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${COMPILER_TYPE} == clang
>+MAKE_ENV+=	LINK=clang++
>+CFLAGS+=	-Wno-unused-private-field
>+.if ${COMPILER_VERSION} >= 33
>+CFLAGS+=	-Wno-nested-anon-types -Wno-unused-function
>+.if ${COMPILER_VERSION} >= 34
>+CFLAGS+=	-Wno-unused-const-variable
>+.endif
>+.endif
>+.else
>+MAKE_ARGS+=	strictaliasing=off
>+USE_GCC=	yes
>+.endif
>+
>+.if empty(PORT_OPTIONS:MBUNDLED_SSL)
>+CONFIGURE_ARGS+=	--shared-openssl \
>+			--shared-openssl-includes=${OPENSSLINC} \
>+			--shared-openssl-libpath=${OPENSSLLIB}
>+.endif
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
>+		${WRKSRC}/deps/v8/tools/gyp/v8.gyp
>+	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
>+		${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e "s|python -c|${PYTHON_CMD} -c|" \
>+		${WRKSRC}/deps/v8/build/toolchain.gypi
>+	@${REINPLACE_CMD} -e "s|'python',|'${PYTHON_CMD}',|" \
>+		${WRKSRC}/tools/icu/icu-generic.gyp \
>+		${WRKSRC}/deps/v8/build/shim_headers.gypi \
>+		${WRKSRC}/deps/v8/tools/gyp/v8.gyp \
>+		${WRKSRC}/deps/v8/src/d8.gyp \
>+		${WRKSRC}/node.gyp
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
>+
>+.include <bsd.port.post.mk>
>diff --git a/www/node5/distinfo b/www/node5/distinfo
>new file mode 100644
>index 0000000..39f376b
>--- /dev/null
>+++ b/www/node5/distinfo
>@@ -0,0 +1,2 @@
>+SHA256 (node-v5.11.0.tar.gz) = ef41b01a9e49de5a5d160071166f911d0bc9ff6a0bd0e88ea4863df572d95e91
>+SIZE (node-v5.11.0.tar.gz) = 22682857
>diff --git a/www/node5/files/patch-deps_v8_src_compiler_instruction.h b/www/node5/files/patch-deps_v8_src_compiler_instruction.h
>new file mode 100644
>index 0000000..9868d91
>--- /dev/null
>+++ b/www/node5/files/patch-deps_v8_src_compiler_instruction.h
>@@ -0,0 +1,11 @@
>+--- deps/v8/src/compiler/instruction.h.orig	2016-03-16 21:22:58.000000000 +0100
>++++ deps/v8/src/compiler/instruction.h	2016-03-24 23:27:23.004854000 +0100
>+@@ -1011,7 +1011,7 @@ class InstructionBlock final : public Zo
>+ 
>+ typedef ZoneDeque<Constant> ConstantDeque;
>+ typedef std::map<int, Constant, std::less<int>,
>+-                 zone_allocator<std::pair<int, Constant> > > ConstantMap;
>++                 zone_allocator<std::pair<const int, Constant> > > ConstantMap;
>+ 
>+ typedef ZoneDeque<Instruction*> InstructionDeque;
>+ typedef ZoneDeque<ReferenceMap*> ReferenceMapDeque;
>diff --git a/www/node5/files/patch-deps_v8_src_compiler_js-type-feedback.h b/www/node5/files/patch-deps_v8_src_compiler_js-type-feedback.h
>new file mode 100644
>index 0000000..a203b90
>--- /dev/null
>+++ b/www/node5/files/patch-deps_v8_src_compiler_js-type-feedback.h
>@@ -0,0 +1,15 @@
>+--- deps/v8/src/compiler/js-type-feedback.h.orig	2016-03-16 21:22:58.000000000 +0100
>++++ deps/v8/src/compiler/js-type-feedback.h	2016-03-24 22:54:54.529827000 +0100
>+@@ -33,9 +33,10 @@ class JSTypeFeedbackTable : public ZoneO
>+  private:
>+   friend class JSTypeFeedbackSpecializer;
>+   typedef std::map<NodeId, TypeFeedbackId, std::less<NodeId>,
>+-                   zone_allocator<TypeFeedbackId> > TypeFeedbackIdMap;
>++                   zone_allocator<std::pair<const NodeId, TypeFeedbackId> > >
>++      TypeFeedbackIdMap;
>+   typedef std::map<NodeId, FeedbackVectorICSlot, std::less<NodeId>,
>+-                   zone_allocator<FeedbackVectorICSlot> >
>++                   zone_allocator<std::pair<const NodeId, FeedbackVectorICSlot> > >
>+       FeedbackVectorICSlotMap;
>+ 
>+   TypeFeedbackIdMap type_feedback_id_map_;
>diff --git a/www/node5/files/patch-deps_v8_src_log-utils.h b/www/node5/files/patch-deps_v8_src_log-utils.h
>new file mode 100644
>index 0000000..c681953
>--- /dev/null
>+++ b/www/node5/files/patch-deps_v8_src_log-utils.h
>@@ -0,0 +1,12 @@
>+--- deps/v8/src/log-utils.h.orig	2015-12-09 04:12:52 UTC
>++++ deps/v8/src/log-utils.h
>+@@ -5,6 +5,9 @@
>+ #ifndef V8_LOG_UTILS_H_
>+ #define V8_LOG_UTILS_H_
>+ 
>++#include <cstdio>
>++#include <cstdarg>
>++
>+ #include "src/allocation.h"
>+ #include "src/base/platform/mutex.h"
>+ #include "src/flags.h"
>diff --git a/www/node5/files/patch-deps_v8_src_zone-containers.h b/www/node5/files/patch-deps_v8_src_zone-containers.h
>new file mode 100644
>index 0000000..4724e79
>--- /dev/null
>+++ b/www/node5/files/patch-deps_v8_src_zone-containers.h
>@@ -0,0 +1,18 @@
>+--- deps/v8/src/zone-containers.h.orig	2016-03-16 21:22:58.000000000 +0100
>++++ deps/v8/src/zone-containers.h	2016-03-24 23:34:37.741885000 +0100
>+@@ -114,12 +114,12 @@ class ZoneSet : public std::set<K, Compa
>+ // a zone allocator.
>+ template <typename K, typename V, typename Compare = std::less<K>>
>+ class ZoneMap
>+-    : public std::map<K, V, Compare, zone_allocator<std::pair<K, V>>> {
>++    : public std::map<K, V, Compare, zone_allocator<std::pair<const K, V>>> {
>+  public:
>+   // Constructs an empty map.
>+   explicit ZoneMap(Zone* zone)
>+-      : std::map<K, V, Compare, zone_allocator<std::pair<K, V>>>(
>+-            Compare(), zone_allocator<std::pair<K, V>>(zone)) {}
>++      : std::map<K, V, Compare, zone_allocator<std::pair<const K, V>>>(
>++            Compare(), zone_allocator<std::pair<const K, V>>(zone)) {}
>+ };
>+ 
>+ 
>diff --git a/www/node5/pkg-descr b/www/node5/pkg-descr
>new file mode 100644
>index 0000000..079aa9b
>--- /dev/null
>+++ b/www/node5/pkg-descr
>@@ -0,0 +1,3 @@
>+node - evented I/O for V8 javascript
>+
>+WWW: http://nodejs.org/
>diff --git a/www/node5/pkg-message b/www/node5/pkg-message
>new file mode 100644
>index 0000000..87d7ce8
>--- /dev/null
>+++ b/www/node5/pkg-message
>@@ -0,0 +1 @@
>+Note: If you need npm (Node Package Manager), please install www/npm.
>diff --git a/www/node5/pkg-plist b/www/node5/pkg-plist
>new file mode 100644
>index 0000000..66d0273
>--- /dev/null
>+++ b/www/node5/pkg-plist
>@@ -0,0 +1,134 @@
>+bin/node
>+include/node/android-ifaddrs.h
>+include/node/ares.h
>+include/node/ares_build.h
>+include/node/ares_rules.h
>+include/node/ares_version.h
>+include/node/common.gypi
>+include/node/config.gypi
>+include/node/libplatform/libplatform.h
>+include/node/nameser.h
>+include/node/node.h
>+include/node/node_buffer.h
>+include/node/node_internals.h
>+include/node/node_object_wrap.h
>+include/node/node_version.h
>+%%BUNDLED_SSL%%include/node/openssl/aes.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/aix-gcc/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x32/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/asn1.h
>+%%BUNDLED_SSL%%include/node/openssl/asn1_mac.h
>+%%BUNDLED_SSL%%include/node/openssl/asn1t.h
>+%%BUNDLED_SSL%%include/node/openssl/bio.h
>+%%BUNDLED_SSL%%include/node/openssl/blowfish.h
>+%%BUNDLED_SSL%%include/node/openssl/bn.h
>+%%BUNDLED_SSL%%include/node/openssl/buffer.h
>+%%BUNDLED_SSL%%include/node/openssl/camellia.h
>+%%BUNDLED_SSL%%include/node/openssl/cast.h
>+%%BUNDLED_SSL%%include/node/openssl/cmac.h
>+%%BUNDLED_SSL%%include/node/openssl/cms.h
>+%%BUNDLED_SSL%%include/node/openssl/comp.h
>+%%BUNDLED_SSL%%include/node/openssl/conf.h
>+%%BUNDLED_SSL%%include/node/openssl/conf_api.h
>+%%BUNDLED_SSL%%include/node/openssl/crypto.h
>+%%BUNDLED_SSL%%include/node/openssl/des.h
>+%%BUNDLED_SSL%%include/node/openssl/des_old.h
>+%%BUNDLED_SSL%%include/node/openssl/dh.h
>+%%BUNDLED_SSL%%include/node/openssl/dsa.h
>+%%BUNDLED_SSL%%include/node/openssl/dso.h
>+%%BUNDLED_SSL%%include/node/openssl/dtls1.h
>+%%BUNDLED_SSL%%include/node/openssl/e_os2.h
>+%%BUNDLED_SSL%%include/node/openssl/ebcdic.h
>+%%BUNDLED_SSL%%include/node/openssl/ec.h
>+%%BUNDLED_SSL%%include/node/openssl/ecdh.h
>+%%BUNDLED_SSL%%include/node/openssl/ecdsa.h
>+%%BUNDLED_SSL%%include/node/openssl/engine.h
>+%%BUNDLED_SSL%%include/node/openssl/err.h
>+%%BUNDLED_SSL%%include/node/openssl/evp.h
>+%%BUNDLED_SSL%%include/node/openssl/hmac.h
>+%%BUNDLED_SSL%%include/node/openssl/idea.h
>+%%BUNDLED_SSL%%include/node/openssl/krb5_asn.h
>+%%BUNDLED_SSL%%include/node/openssl/kssl.h
>+%%BUNDLED_SSL%%include/node/openssl/lhash.h
>+%%BUNDLED_SSL%%include/node/openssl/md4.h
>+%%BUNDLED_SSL%%include/node/openssl/md5.h
>+%%BUNDLED_SSL%%include/node/openssl/mdc2.h
>+%%BUNDLED_SSL%%include/node/openssl/modes.h
>+%%BUNDLED_SSL%%include/node/openssl/obj_mac.h
>+%%BUNDLED_SSL%%include/node/openssl/objects.h
>+%%BUNDLED_SSL%%include/node/openssl/ocsp.h
>+%%BUNDLED_SSL%%include/node/openssl/opensslconf.h
>+%%BUNDLED_SSL%%include/node/openssl/opensslv.h
>+%%BUNDLED_SSL%%include/node/openssl/ossl_typ.h
>+%%BUNDLED_SSL%%include/node/openssl/pem.h
>+%%BUNDLED_SSL%%include/node/openssl/pem2.h
>+%%BUNDLED_SSL%%include/node/openssl/pkcs12.h
>+%%BUNDLED_SSL%%include/node/openssl/pkcs7.h
>+%%BUNDLED_SSL%%include/node/openssl/pqueue.h
>+%%BUNDLED_SSL%%include/node/openssl/rand.h
>+%%BUNDLED_SSL%%include/node/openssl/rc2.h
>+%%BUNDLED_SSL%%include/node/openssl/rc4.h
>+%%BUNDLED_SSL%%include/node/openssl/ripemd.h
>+%%BUNDLED_SSL%%include/node/openssl/rsa.h
>+%%BUNDLED_SSL%%include/node/openssl/safestack.h
>+%%BUNDLED_SSL%%include/node/openssl/seed.h
>+%%BUNDLED_SSL%%include/node/openssl/sha.h
>+%%BUNDLED_SSL%%include/node/openssl/srp.h
>+%%BUNDLED_SSL%%include/node/openssl/srtp.h
>+%%BUNDLED_SSL%%include/node/openssl/ssl.h
>+%%BUNDLED_SSL%%include/node/openssl/ssl2.h
>+%%BUNDLED_SSL%%include/node/openssl/ssl23.h
>+%%BUNDLED_SSL%%include/node/openssl/ssl3.h
>+%%BUNDLED_SSL%%include/node/openssl/stack.h
>+%%BUNDLED_SSL%%include/node/openssl/symhacks.h
>+%%BUNDLED_SSL%%include/node/openssl/tls1.h
>+%%BUNDLED_SSL%%include/node/openssl/ts.h
>+%%BUNDLED_SSL%%include/node/openssl/txt_db.h
>+%%BUNDLED_SSL%%include/node/openssl/ui.h
>+%%BUNDLED_SSL%%include/node/openssl/ui_compat.h
>+%%BUNDLED_SSL%%include/node/openssl/whrlpool.h
>+%%BUNDLED_SSL%%include/node/openssl/x509.h
>+%%BUNDLED_SSL%%include/node/openssl/x509_vfy.h
>+%%BUNDLED_SSL%%include/node/openssl/x509v3.h
>+include/node/pthread-fixes.h
>+include/node/stdint-msvc2008.h
>+include/node/tree.h
>+include/node/uv-aix.h
>+include/node/uv-bsd.h
>+include/node/uv-darwin.h
>+include/node/uv-errno.h
>+include/node/uv-linux.h
>+include/node/uv-sunos.h
>+include/node/uv-threadpool.h
>+include/node/uv-unix.h
>+include/node/uv-version.h
>+include/node/uv-win.h
>+include/node/uv.h
>+include/node/v8-debug.h
>+include/node/v8-platform.h
>+include/node/v8-profiler.h
>+include/node/v8-testing.h
>+include/node/v8-util.h
>+include/node/v8-version.h
>+include/node/v8.h
>+include/node/v8config.h
>+@(,,444) man/man1/node.1.gz
>+%%PORTDOCS%%%%DOCSDIR%%/gdbinit
>+share/systemtap/tapset/node.stp

Actions: View

Attachments on bug 209215: 169895