Mon Nov 18 20:46:02 2019 UTC ()
erlang: Update to 22.1.7

Potential Incompatibilities

    Mnesia: Transactions with sticky locks could with async_asym transactions be committed in the wrong order, since asym transactions are spawned on the remote nodes. To fix this bug the communication protocol between mnesia nodes had to be updated, thus mnesia will no longer be able to connect to nodes earlier than mnesia-4.14 ,first realeased in OTP-19.0.
    Stdlib: Debugging of time-outs in gen_statem has been improved. Starting a time-out is now logged in sys:log and sys:trace. Running time-outs are visible in server crash logs, and with sys:get_status. Due to this system events {start_timer, Action, State} and {insert_timout, Event, State} have been added, which may surprise tools that rely on the format of these events. New features: The EventContent of a running time-out can be updated with {TimeoutType, update, NewEventContent}. Running time-outs can be cancelled with {TimeoutType, cancel} which is more readable than using Time = infinity.{rel, Name, Vsn, RelApps, Opts}.

Highlights

Compiler:

    erlc can now automatically use a compile server to avoid starting an Erlang system for each file to be compiled in a multi-file project. See the documentation for how to enable it.

Standard libraries:

    SSL: Basic support for TLS 1.3 Client for experimental use. For more information see the Standards Compliance chapter of the User's Guide.
    crypto: The Message Authentication Codes (MAC) CMAC, HMAC and Poly1305 are unified into common functions in the New Crypto API. See the manual for CRYPTO. cipher_info/1 functions returns maps with information about the hash or cipher in the argument.


(nia)
diff -r1.1 -r0 pkgsrc/lang/erlang/MESSAGE
diff -r1.96 -r1.97 pkgsrc/lang/erlang/Makefile
diff -r1.45 -r1.46 pkgsrc/lang/erlang/Makefile.versions
diff -r1.38 -r1.39 pkgsrc/lang/erlang/PLIST
diff -r1.75 -r1.76 pkgsrc/lang/erlang/distinfo
diff -r1.10 -r1.11 pkgsrc/lang/erlang/options.mk
diff -r1.14 -r1.15 pkgsrc/lang/erlang/versions.mk
diff -r1.1 -r0 pkgsrc/lang/erlang/patches/patch-erts_emulator_nifs_common_net__nif.c
diff -r0 -r1.1 pkgsrc/lang/erlang/patches/patch-erts_emulator_nifs_common_prim__net__nif.c

File Deleted: pkgsrc/lang/erlang/Attic/MESSAGE

cvs diff -r1.96 -r1.97 pkgsrc/lang/erlang/Makefile (expand / switch to context diff)
--- pkgsrc/lang/erlang/Makefile 2019/11/03 18:11:51 1.96
+++ pkgsrc/lang/erlang/Makefile 2019/11/18 20:46:01 1.97
@@ -1,47 +1,36 @@
-# $NetBSD: Makefile,v 1.96 2019/11/03 18:11:51 rillig Exp $
+# $NetBSD: Makefile,v 1.97 2019/11/18 20:46:01 nia Exp $
 
-DISTNAME=		OTP-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
-PKGNAME=		${DISTNAME:S/OTP-/erlang-/}
-PKGREVISION=		1
-CATEGORIES=		lang
-MASTER_SITES=		https://github.com/erlang/otp/archive/
+DISTNAME=	erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
+PKGNAME=	${DISTNAME:S/OTP-/erlang-/}
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_GITHUB:=erlang/}
+GITHUB_PROJECT=	otp
+GITHUB_TAG=	OTP-${PKGVERSION_NOREV}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://www.erlang.org/
-COMMENT=		Concurrent functional programming language
-LICENSE=		apache-2.0
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://www.erlang.org/
+COMMENT=	Concurrent functional programming language
+LICENSE=	apache-2.0
 
-EXTRACT_USING=		bsdtar
-DIST_SUBDIR=		erlang
+EXTRACT_USING=	bsdtar
 
-WRKSRC=			${WRKDIR}/otp-${DISTNAME}
-GNU_CONFIGURE=		yes
+WRKSRC=		${WRKDIR}/otp-${GITHUB_TAG}
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	autoconf awk gmake perl:run flex
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_ARCH:M*armv6*) || !empty(MACHINE_ARCH:M*armv7*)
+MAKE_FLAGS+=	ARCH=arm
+.endif
+
 USE_GNU_CONFIGURE_HOST=	${USE_CROSS_COMPILE}
 OVERRIDE_DIRDEPTH=	4
-USE_TOOLS+=		autoconf awk gmake perl:run flex
 
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 
 PTHREAD_OPTS+=		require native
 CONFIGURE_ARGS+=	--enable-threads
-
-.include "../../mk/bsd.prefs.mk"
-
-# have gcc without the necessary atomic ops?
-.if !empty(MACHINE_PLATFORM:MNetBSD-[56].*)
-
-# a machine without native ethread implementation?
-.  if	empty(MACHINE_PLATFORM:M*i386)	&&\
-	empty(MACHINE_PLATFORM:M*sparc)	&&\
-	empty(MACHINE_PLATFORM:M*sparc64) &&\
-	empty(MACHINE_PLATFORM:M*powerpc) &&\
-	empty(MACHINE_PLATFORM:M*x86_64)
-
-CONFIGURE_ARGS+=	--disable-native-ethr-impls\
-			--disable-smp-require-native-atomics
-
-.  endif
-.endif
 
 MAKE_ENV+=		DESTDIR=${DESTDIR}
 

cvs diff -r1.45 -r1.46 pkgsrc/lang/erlang/Makefile.versions (expand / switch to context diff)
--- pkgsrc/lang/erlang/Makefile.versions 2019/11/03 19:03:57 1.45
+++ pkgsrc/lang/erlang/Makefile.versions 2019/11/18 20:46:01 1.46
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.versions,v 1.45 2019/11/03 19:03:57 rillig Exp $
+# $NetBSD: Makefile.versions,v 1.46 2019/11/18 20:46:01 nia Exp $
 
 DIST_VERSION_MAJOR=		22
-DIST_VERSION_MINOR=		0
+DIST_VERSION_MINOR=		1
 # Only set when sources for patch level releases are published on erlang.org
 DIST_VERSION_PATCH=		7
 

cvs diff -r1.38 -r1.39 pkgsrc/lang/erlang/PLIST (expand / switch to context diff)
--- pkgsrc/lang/erlang/PLIST 2019/08/01 11:43:00 1.38
+++ pkgsrc/lang/erlang/PLIST 2019/11/18 20:46:01 1.39
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2019/08/01 11:43:00 nia Exp $
+@comment $NetBSD: PLIST,v 1.39 2019/11/18 20:46:01 nia Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -191,8 +191,6 @@
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_telnet_client.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_testspec.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_util.beam
-lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_webtool.beam
-lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_webtool_sup.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/cth_conn_log.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/cth_log_redirect.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/cth_surefire.beam
@@ -204,7 +202,6 @@
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/test_server_node.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/test_server_sup.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/unix_telnet.beam
-lib/erlang/lib/common_test-${VERSION.common_test}/ebin/vts.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/include/ct.hrl
 lib/erlang/lib/common_test-${VERSION.common_test}/include/ct_event.hrl
 lib/erlang/lib/common_test-${VERSION.common_test}/priv/ct_default.css
@@ -247,8 +244,6 @@
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_testspec.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_util.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_util.hrl
-lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_webtool.erl
-lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_webtool_sup.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/cth_conn_log.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/cth_log_redirect.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/cth_surefire.erl
@@ -260,7 +255,6 @@
 lib/erlang/lib/common_test-${VERSION.common_test}/src/test_server_node.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/test_server_sup.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/unix_telnet.erl
-lib/erlang/lib/common_test-${VERSION.common_test}/src/vts.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_a.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_asm.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_block.beam
@@ -402,10 +396,10 @@
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/hash.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/hmac.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/info.o
+lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/mac.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/math.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/otp_test_engine.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/pkey.o
-lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/poly1305.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/rand.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/rsa.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/srp.o
@@ -929,12 +923,12 @@
 lib/erlang/lib/erts-${VERSION.erts}/ebin/erts_internal.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/erts_literal_area_collector.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/init.beam
-lib/erlang/lib/erts-${VERSION.erts}/ebin/net.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/persistent_term.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/prim_buffer.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/prim_eval.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/prim_file.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/prim_inet.beam
+lib/erlang/lib/erts-${VERSION.erts}/ebin/prim_net.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/prim_zip.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/socket.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/zlib.beam
@@ -949,13 +943,13 @@
 lib/erlang/lib/erts-${VERSION.erts}/src/erts_internal.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/erts_literal_area_collector.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/init.erl
-lib/erlang/lib/erts-${VERSION.erts}/src/net.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/persistent_term.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/prim_buffer.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/prim_eval.S
 lib/erlang/lib/erts-${VERSION.erts}/src/prim_eval.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/prim_file.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/prim_inet.erl
+lib/erlang/lib/erts-${VERSION.erts}/src/prim_net.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/prim_zip.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/socket.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/zlib.erl
@@ -1147,6 +1141,7 @@
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_file.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_instance_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_log.beam
+lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_logger.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_manager.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_misc_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_request.beam
@@ -1355,6 +1350,7 @@
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_instance_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_internal.hrl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_log.erl
+lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_logger.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_manager.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_misc_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_request.erl
@@ -1409,6 +1405,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/dist_ac.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/dist_util.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erl_boot_server.beam
+lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erl_compile_server.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erl_ddll.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erl_distribution.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erl_epmd.beam
@@ -1467,6 +1464,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/logger_simple_h.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/logger_std_h.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/logger_sup.beam
+lib/erlang/lib/kernel-${VERSION.kernel}/ebin/net.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/net_adm.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/net_kernel.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/os.beam
@@ -1518,6 +1516,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/src/dist_ac.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/dist_util.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_boot_server.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_compile_server.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_ddll.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_distribution.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_epmd.erl
@@ -1586,6 +1585,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/src/logger_simple_h.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/logger_std_h.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/logger_sup.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/src/net.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/net_adm.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/net_kernel.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/os.erl
@@ -1691,6 +1691,7 @@
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_udp.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_udp_server.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_udp_sup.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_user.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_user_default.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/meas.sh.skel
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_meas.beam
@@ -1786,6 +1787,7 @@
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_trans_sender.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_trans_sup.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_transport.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_user.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_user_default.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/flex/megaco_flex_scanner.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/flex/megaco_flex_scanner_drv.c
@@ -2077,6 +2079,7 @@
 lib/erlang/lib/parsetools-${VERSION.parsetools}/src/yecc.erl
 lib/erlang/lib/parsetools-${VERSION.parsetools}/src/yeccparser.erl
 lib/erlang/lib/parsetools-${VERSION.parsetools}/src/yeccscan.erl
+lib/erlang/lib/public_key-${VERSION.public_key}/asn1/CMSAesRsaesOaep.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/InformationFramework.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/OTP-PKIX.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/OTP-PUB-KEY.asn1config
@@ -2587,7 +2590,6 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_system_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_transport.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_transport.hrl
-lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_userauth.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_xfer.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_xfer.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/sshc_sup.erl

cvs diff -r1.75 -r1.76 pkgsrc/lang/erlang/distinfo (expand / switch to context diff)
--- pkgsrc/lang/erlang/distinfo 2019/08/08 11:42:23 1.75
+++ pkgsrc/lang/erlang/distinfo 2019/11/18 20:46:01 1.76
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.75 2019/08/08 11:42:23 jperkin Exp $
+$NetBSD: distinfo,v 1.76 2019/11/18 20:46:01 nia Exp $
 
-SHA1 (erlang/OTP-22.0.7.tar.gz) = 6d011f6814d08ae2bce0055a203f85ab7930e915
-RMD160 (erlang/OTP-22.0.7.tar.gz) = 1719401953c5ed5870336a3d5bb3019f0a30020f
-SHA512 (erlang/OTP-22.0.7.tar.gz) = cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9
-Size (erlang/OTP-22.0.7.tar.gz) = 54814307 bytes
+SHA1 (erlang-22.1.7.tar.gz) = 92559d0cfb2747627c6a96f0eaf8ebad599dc00e
+RMD160 (erlang-22.1.7.tar.gz) = f233669997e442956b1bd74ae90ac6dd2e5f7b05
+SHA512 (erlang-22.1.7.tar.gz) = 72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05
+Size (erlang-22.1.7.tar.gz) = 54969082 bytes
 SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3
 SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd
 SHA1 (patch-erts_aclocal.m4) = 3812a0feda06eb7c6ff02b5ac7125284ad5df2cb
 SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = e34674aea2fa5092b5215944cb5639738df647bb
-SHA1 (patch-erts_emulator_nifs_common_net__nif.c) = a4507a72aa43ef337715add257971c6422d0b9cb
+SHA1 (patch-erts_emulator_nifs_common_prim__net__nif.c) = 39a3c134f17ede852a736494f035c8ce01b0ed4b
 SHA1 (patch-erts_emulator_sys_unix_sys__uds.c) = a165f977221acc8aba2ef30ca23d149a10af060a
 SHA1 (patch-erts_etc_unix_run__erl.c) = dbcd6819949874da19daa554335567c444d7abe2
 SHA1 (patch-erts_lib__src_common_erl__printf.c) = 31ab5c501d62f021e7570a925dcc75d38605ae41

cvs diff -r1.10 -r1.11 pkgsrc/lang/erlang/options.mk (expand / switch to context diff)
--- pkgsrc/lang/erlang/options.mk 2019/05/05 21:09:11 1.10
+++ pkgsrc/lang/erlang/options.mk 2019/11/18 20:46:01 1.11
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2019/05/05 21:09:11 nia Exp $
+# $NetBSD: options.mk,v 1.11 2019/11/18 20:46:01 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.erlang
 PKG_SUPPORTED_OPTIONS=		java erlang-hipe
@@ -68,6 +68,8 @@
 CONFIGURE_ARGS+=	--with-dynamic-trace=systemtap
 .  endif
 PLIST.dtrace=		yes
+.else
+CONFIGURE_ARGS+=	--without-dynamic-trace
 .endif
 
 # Help generate optional PLIST parts:

cvs diff -r1.14 -r1.15 pkgsrc/lang/erlang/versions.mk (expand / switch to context diff)
--- pkgsrc/lang/erlang/versions.mk 2019/11/03 18:11:51 1.14
+++ pkgsrc/lang/erlang/versions.mk 2019/11/18 20:46:01 1.15
@@ -1,3 +1,3 @@
-# $NetBSD: versions.mk,v 1.14 2019/11/03 18:11:51 rillig Exp $
+# $NetBSD: versions.mk,v 1.15 2019/11/18 20:46:01 nia Exp $
 # Do not edit, regenerate using 'make versions'
-_VERSIONS=	compiler 7.4.4 asn1 5.0.9 common_test 1.17.3 crypto 4.5.1 debugger 4.2.7 dialyzer 4.0.3 diameter 2.2.1 edoc 0.11 eldap 1.2.8 erl_docgen 0.9.1 erl_interface 3.12 erts 10.4.4 et 1.6.4 eunit 2.3.7 ftp 1.0.2 hipe 3.19.1 inets 7.0.9 jinterface 1.10 kernel 6.4.1 megaco 3.18.5 mnesia 4.16 observer 2.9.1 odbc 2.12.4 os_mon 2.5 parsetools 2.1.8 public_key 1.6.7 reltool 0.8 runtime_tools 1.13.3 sasl 3.4 snmp 5.3 ssh 4.7.7 ssl 9.3.5 stdlib 3.9.2 syntax_tools 2.2 tftp 1.0.1 tools 3.2 wx 1.8.8 xmerl 1.3.21 
+_VERSIONS=	compiler 7.4.9 erts 10.5.5 asn1 5.0.9 common_test 1.18 crypto 4.6.2 debugger 4.2.7 dialyzer 4.1 diameter 2.2.1 edoc 0.11 eldap 1.2.8 erl_docgen 0.10 erl_interface 3.13 et 1.6.4 eunit 2.3.8 ftp 1.0.3 hipe 3.19.1 inets 7.1.1 jinterface 1.10.1 kernel 6.5 megaco 3.18.6 mnesia 4.16.1 observer 2.9.2 odbc 2.12.4 os_mon 2.5.1 parsetools 2.1.8 public_key 1.7 reltool 0.8 runtime_tools 1.14 sasl 3.4.1 snmp 5.4.3 ssh 4.8 ssl 9.4 stdlib 3.10 syntax_tools 2.2.1 tftp 1.0.1 tools 3.2.1 wx 1.8.9 xmerl 1.3.22 

File Deleted: pkgsrc/lang/erlang/patches/Attic/patch-erts_emulator_nifs_common_net__nif.c

File Added: pkgsrc/lang/erlang/patches/Attic/patch-erts_emulator_nifs_common_prim__net__nif.c
$NetBSD: patch-erts_emulator_nifs_common_prim__net__nif.c,v 1.1 2019/11/18 20:46:02 nia Exp $

Using bool as a variable name isn't a good idea since it conflicts with
the keyword. For now, just undefine the keyword.

--- erts/emulator/nifs/common/prim_net_nif.c.orig	2019-11-08 11:19:37.000000000 +0000
+++ erts/emulator/nifs/common/prim_net_nif.c
@@ -209,6 +209,8 @@
 #  define SOCKLEN_T size_t
 #endif
 
+#undef bool
+
 /* Debug stuff... */
 #define NET_NIF_DEBUG_DEFAULT FALSE