Attachment 171996 Details for Bug 210737 – patch from a git commit

patch from a git commit

nodejs-remove-5.x.diff (text/plain), 14.09 KB, created by Bradley T. Hughes on 2016-07-01 07:44:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bradley T. Hughes

Created: 2016-07-01 07:44:25 UTC

Size: 14.09 KB

patch

obsolete

>commit 1aff6a5c671233b69f9f30adbbb5cfee9a32fe70
>Author: Bradley T. Hughes <bradleythughes@fastmail.fm>
>Date:   Fri Jul 1 06:54:44 2016 +0000
>
>    www/node5: remove node.js 5.x, upstream support has ended
>    
>    Upstream expects all users of node 5.x to have migrated to 6.x by now.
>    Add MOVED entry to help users migrate to www/node.
>
>diff --git MOVED MOVED
>index 79af1e3..3051ab0 100644
>--- MOVED
>+++ MOVED
>@@ -8380,3 +8380,4 @@ sysutils/syslog-ng34||2016-06-30|Has expired: EOL, no longer supported by bababi
> devel/jenkins2|devel/jenkins|2016-06-30|Has expired: Use devel/jenkins
> www/p5-WWW-Google-Notebook||2016-06-30|Has expired: Google Notebook has shut down
> sysutils/syslog-ng-incubator03||2016-06-30|Has expired: EOL, no longer supported by bababit.hu
>+www/node5|www/node|2016-07-01|Has expired: upstream support has ended, use www/node instead
>diff --git UPDATING UPDATING
>index 985c8a0..91cf411 100644
>--- UPDATING
>+++ UPDATING
>@@ -5,6 +5,14 @@ they are unavoidable.
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20160701:
>+  AFFECTS: users of www/node5
>+  AUTHOR: bradleythughes@fastmail.fm
>+
>+  Node.js v5.x has reached end of life and has been removed. Users that
>+  have not yet moved to v6.x should do so now by switching to the www/node
>+  port.
>+
> 20160627:
>   AFFECTS: users of sysutils/rsyslog7
>   AUTHOR: brd@FreeBSD.org
>diff --git www/node5/Makefile www/node5/Makefile
>deleted file mode 100644
>index b997723..0000000
>--- www/node5/Makefile
>+++ /dev/null
>@@ -1,106 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	node
>-PORTVERSION=	5.12.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)
>-
>-LICENSE=	MIT
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>-
>-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
>-
>-OPTIONS_DEFINE=	BUNDLED_SSL DOCS
>-OPTIONS_SUB=	yes
>-
>-BUNDLED_SSL_DESC=	Use node.js's bundled OpenSSL implementation
>-BUNDLED_SSL_USE_OFF=	OPENSSL=yes
>-
>-USES=		compiler execinfo gmake python:2 pkgconfig localbase
>-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} \
>-		--with-intl=system-icu \
>-		--without-npm \
>-		--shared-libuv \
>-		--shared-zlib
>-PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
>-REINPLACE_ARGS=	-i ''
>-MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
>-
>-LIB_DEPENDS+=	libicui18n.so:devel/icu \
>-		libuv.so:devel/libuv
>-
>-.include <bsd.port.options.mk>
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_SSL)
>-
>-.if ${OSVERSION} < 1100085
>-# node.js requires openssl 1.0.2, use the port since base isn't new enough
>-WITH_OPENSSL_PORT=yes
>-.endif
>-
>-CONFIGURE_ARGS+=	--shared-openssl
>-
>-.endif
>-
>-.include <bsd.port.pre.mk>
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_SSL)
>-.if !empty(SSL_DEFAULT:Mlibressl*)
>-IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
>-.endif
>-.endif
>-
>-.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
>-
>-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-configure:
>-	# Post-process Makefile and *.mk files created by node-gyp and remove
>-	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
>-	# before all -I../deps/* for bundled code. This can cause build
>-	# breakages if the dependency is installed in ${LOCALBASE}. The
>-	# USES+=localbase above will ensure that we pick up includes for real
>-	# external dependencies.
>-	${FIND} ${WRKSRC}/out -type f -print0 \
>-		| ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"
>-
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
>-
>-.include <bsd.port.post.mk>
>diff --git www/node5/distinfo www/node5/distinfo
>deleted file mode 100644
>index 825f148..0000000
>--- www/node5/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1466756973
>-SHA256 (node-v5.12.0.tar.gz) = 250c12a561d7319e71e142ee92ab682494c7823d81ce24703c80eb52bdf9ba42
>-SIZE (node-v5.12.0.tar.gz) = 22836343
>diff --git www/node5/files/patch-deps_v8_src_compiler_instruction.h www/node5/files/patch-deps_v8_src_compiler_instruction.h
>deleted file mode 100644
>index b675eb7..0000000
>--- www/node5/files/patch-deps_v8_src_compiler_instruction.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- deps/v8/src/compiler/instruction.h.orig	2016-04-21 17:45:24 UTC
>-+++ deps/v8/src/compiler/instruction.h
>-@@ -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 www/node5/files/patch-deps_v8_src_compiler_js-type-feedback.h www/node5/files/patch-deps_v8_src_compiler_js-type-feedback.h
>deleted file mode 100644
>index 85f3c2a..0000000
>--- www/node5/files/patch-deps_v8_src_compiler_js-type-feedback.h
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- deps/v8/src/compiler/js-type-feedback.h.orig	2016-04-21 17:45:24 UTC
>-+++ deps/v8/src/compiler/js-type-feedback.h
>-@@ -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 www/node5/files/patch-deps_v8_src_log-utils.h www/node5/files/patch-deps_v8_src_log-utils.h
>deleted file mode 100644
>index c681953..0000000
>--- www/node5/files/patch-deps_v8_src_log-utils.h
>+++ /dev/null
>@@ -1,12 +0,0 @@
>---- 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 www/node5/files/patch-deps_v8_src_zone-containers.h www/node5/files/patch-deps_v8_src_zone-containers.h
>deleted file mode 100644
>index 0ee3160..0000000
>--- www/node5/files/patch-deps_v8_src_zone-containers.h
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- deps/v8/src/zone-containers.h.orig	2016-04-21 17:45:25 UTC
>-+++ deps/v8/src/zone-containers.h
>-@@ -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 www/node5/pkg-descr www/node5/pkg-descr
>deleted file mode 100644
>index 079aa9b..0000000
>--- www/node5/pkg-descr
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-node - evented I/O for V8 javascript
>-
>-WWW: http://nodejs.org/
>diff --git www/node5/pkg-message www/node5/pkg-message
>deleted file mode 100644
>index 87d7ce8..0000000
>--- www/node5/pkg-message
>+++ /dev/null
>@@ -1 +0,0 @@
>-Note: If you need npm (Node Package Manager), please install www/npm.
>diff --git www/node5/pkg-plist www/node5/pkg-plist
>deleted file mode 100644
>index ab60e78..0000000
>--- www/node5/pkg-plist
>+++ /dev/null
>@@ -1,119 +0,0 @@
>-bin/node
>-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/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

Flags:

bhughes: maintainer-approval+

Actions: View

Attachments on bug 210737: 171996