pkgsrc-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

erlang configuration error

I get a configuration error with lang/erlang in a pbulk (http://pkg.triaxx.org/pub/pkgsrc/reports/NetBSD/x86_64/9.0/www/20210112.1416/meta/report.html). The relevant error message was:

=== Running configure in /var/pkgsrc/work/lang/erlang/work/otp-OTP-22.2.8/make ===
./configure '--with-ssl=/usr' '--enable-threads' '--enable-kernel-poll' '--without-javac' '--enable-hipe' '--without-odbc' '--without-dynamic-trace' '--prefix=/usr/pkg' '--mandir=/usr/pkg/man' '--enable-option-checking=yes' CFLAGS='-O2 -DMMAP_MAP_FIXED -D_NETBSD_SOURCE -D_FORTIFY_SOURCE=2 -I/usr/include' LDFLAGS='-L/usr/lib -Wl,-R/usr/lib -Wl,-R/usr/pkg/lib' --disable-option-checking --cache-file=/dev/null --srcdir="/var/pkgsrc/work/lang/erlang/work/otp-OTP-22.2.8/make"
configure: error: cannot find required auxiliary files: install-sh config.guess config.sub
ERROR: /var/pkgsrc/work/lang/erlang/work/otp-OTP-22.2.8/make/configure failed!

I first tried an update to the last release (22.2.8 -> 23.2.1) but the error was the same. Actually, the auxiliary files (install-sh config.guess config.sub) was in ${WRKSRC}/erts/autoconf and all configure scripts are supposed to use them but several configure.in files seemed to be broken. I tried to fix them but I am not an autotools guru.

I never touch lang/erlang before and I am not sure I done everything that should be done. I wouldn't want to break something.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/erlang/Makefile,v
retrieving revision 1.101
diff -u -r1.101 Makefile
--- Makefile	31 Aug 2020 18:09:47 -0000	1.101
+++ Makefile	14 Jan 2021 16:59:19 -0000
@@ -2,7 +2,6 @@
 
 DISTNAME=	erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
 PKGNAME=	${DISTNAME:S/OTP-/erlang-/}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=erlang/}
 GITHUB_PROJECT=	otp
Index: Makefile.versions
===================================================================
RCS file: /cvsroot/pkgsrc/lang/erlang/Makefile.versions,v
retrieving revision 1.49
diff -u -r1.49 Makefile.versions
--- Makefile.versions	20 Mar 2020 16:05:34 -0000	1.49
+++ Makefile.versions	14 Jan 2021 16:59:19 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile.versions,v 1.49 2020/03/20 16:05:34 nia Exp $
 
-DIST_VERSION_MAJOR=		22
+DIST_VERSION_MAJOR=		23
 DIST_VERSION_MINOR=		2
 # Only set when sources for patch level releases are published on erlang.org
-DIST_VERSION_PATCH=		8
+DIST_VERSION_PATCH=		1
 
 .include "versions.mk"
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/erlang/PLIST,v
retrieving revision 1.41
diff -u -r1.41 PLIST
--- PLIST	20 Mar 2020 16:05:34 -0000	1.41
+++ PLIST	14 Jan 2021 16:59:20 -0000
@@ -13,6 +13,7 @@
 lib/erlang/bin/dialyzer
 lib/erlang/bin/epmd
 lib/erlang/bin/erl
+lib/erlang/bin/erl_call
 lib/erlang/bin/erlc
 lib/erlang/bin/escript
 lib/erlang/bin/no_dot_erlang.boot
@@ -31,6 +32,7 @@
 lib/erlang/erts-${VERSION.erts}/bin/dyn_erl
 lib/erlang/erts-${VERSION.erts}/bin/epmd
 lib/erlang/erts-${VERSION.erts}/bin/erl
+lib/erlang/erts-${VERSION.erts}/bin/erl_call
 lib/erlang/erts-${VERSION.erts}/bin/erl.src
 lib/erlang/erts-${VERSION.erts}/bin/erl_child_setup
 lib/erlang/erts-${VERSION.erts}/bin/erlc
@@ -44,6 +46,7 @@
 lib/erlang/erts-${VERSION.erts}/bin/start_erl.src
 lib/erlang/erts-${VERSION.erts}/bin/to_erl
 lib/erlang/erts-${VERSION.erts}/bin/typer
+lib/erlang/erts-${VERSION.erts}/bin/yielding_c_fun
 lib/erlang/erts-${VERSION.erts}/include/driver_int.h
 lib/erlang/erts-${VERSION.erts}/include/erl_driver.h
 lib/erlang/erts-${VERSION.erts}/include/erl_drv_nif.h
@@ -121,6 +124,7 @@
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_ber_bin_v2.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_check.beam
+lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_jer.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_per.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_imm.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_name.beam
@@ -146,6 +150,7 @@
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen_ber_bin_v2.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen_check.erl
+lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen_jer.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen_per.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_imm.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_name.erl
@@ -187,6 +192,7 @@
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_slave.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_snmp.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_ssh.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_suite.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_telnet.beam
 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
@@ -204,6 +210,7 @@
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/unix_telnet.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}/include/ct_property_test.hrl
 lib/erlang/lib/common_test-${VERSION.common_test}/priv/ct_default.css
 lib/erlang/lib/common_test-${VERSION.common_test}/priv/jquery-latest.js
 lib/erlang/lib/common_test-${VERSION.common_test}/priv/jquery.tablesorter.min.js
@@ -239,6 +246,7 @@
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_slave.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_snmp.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_ssh.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_suite.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_telnet.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_telnet_client.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_testspec.erl
@@ -258,10 +266,11 @@
 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
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_call_types.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_clean.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_dict.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_digraph.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_disasm.beam
-lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_except.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_flatten.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_jump.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_kernel_to_ssa.beam
@@ -269,6 +278,7 @@
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_opcodes.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_peep.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_ssa.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_ssa_bool.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_ssa_bsm.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_ssa_codegen.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_ssa_dead.beam
@@ -281,6 +291,7 @@
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_ssa_share.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_ssa_type.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_trim.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_types.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_utils.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_validator.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_z.beam
@@ -304,6 +315,7 @@
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_core_fold.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_core_fold_lists.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_core_inline.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_core_prepare.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_pre_attributes.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/v3_core.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/v3_kernel.beam
@@ -311,11 +323,12 @@
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_a.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_asm.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_block.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_call_types.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_clean.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_dict.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_digraph.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_disasm.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_disasm.hrl
-lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_except.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_flatten.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_jump.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_kernel_to_ssa.erl
@@ -325,6 +338,7 @@
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_peep.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_ssa.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_ssa.hrl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_ssa_bool.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_ssa_bsm.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_ssa_codegen.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_ssa_dead.erl
@@ -338,6 +352,8 @@
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_ssa_share.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_ssa_type.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_trim.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_types.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_types.hrl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_utils.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_validator.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_z.erl
@@ -361,6 +377,7 @@
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_core_fold.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_core_fold_lists.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_core_inline.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_core_prepare.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_pre_attributes.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/v3_core.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/v3_kernel.erl
@@ -468,6 +485,7 @@
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_callgraph.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_cl.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_cl_parse.beam
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_clean_core.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_codeserver.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_contracts.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_coordinator.beam
@@ -492,6 +510,7 @@
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_callgraph.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_cl.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_cl_parse.erl
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_clean_core.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_codeserver.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_contracts.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_coordinator.erl
@@ -694,6 +713,7 @@
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/ebin/docgen_edoc_xml_cb.beam
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/ebin/docgen_otp_specs.beam
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/ebin/docgen_xmerl_xml_cb.beam
+lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/ebin/docgen_xml_to_chunk.beam
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/ebin/erl_docgen.app
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/ebin/erl_docgen.appup
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/bin/codeline_preprocessing.escript
@@ -703,9 +723,7 @@
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/application.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/appref.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/book.dtd
-lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/bookinsidecover.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/chapter.dtd
-lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/cites.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/common.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/common.entities.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/common.header.dtd
@@ -715,11 +733,8 @@
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/comref.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/cref.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/erlref.dtd
-lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/fascicules.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/fileref.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/part.dtd
-lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/report.dtd
-lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/terms.dtd
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/xhtml-special.ent
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/xhtml-symbol.ent
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/priv/dtd/xhtml1-frameset.dtd
@@ -743,17 +758,15 @@
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/src/docgen_edoc_xml_cb.erl
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/src/docgen_otp_specs.erl
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/src/docgen_xmerl_xml_cb.erl
+lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/src/docgen_xml_to_chunk.erl
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/bin/erl_call
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/ebin/erl_interface.app
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/ebin/erl_interface.appup
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/include/ei.h
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/include/ei_connect.h
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/include/eicode.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/include/erl_interface.h
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/lib/libei.a
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/lib/libei_st.a
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/lib/liberl_interface.a
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/lib/liberl_interface_st.a
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/INSTALL
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/Makefile
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/Makefile.in
@@ -778,6 +791,7 @@
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/decode/decode_double.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/decode/decode_fun.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/decode/decode_intlist.c
+lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/decode/decode_iodata.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/decode/decode_list_header.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/decode/decode_long.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/decode/decode_longlong.c
@@ -818,33 +832,11 @@
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/epmd/epmd_port.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/epmd/epmd_publish.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/epmd/epmd_unpublish.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/decode_term.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/encode_term.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_config.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_connect.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_connect.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_error.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_error.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_eterm.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_eterm.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_fix_alloc.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_fix_alloc.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_format.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_format.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_global.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_internal.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_malloc.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_malloc.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_marshal.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_marshal.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_resolve.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_timeout.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/erl_timeout.h
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/global_names.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/global_register.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/global_unregister.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/global_whereis.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/legacy/portability.h
+lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/global/global_names.c
+lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/global/global_register.c
+lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/global/global_unregister.c
+lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/global/global_whereis.c
+lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/misc/ei_cmp_nc.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/misc/ei_compat.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/misc/ei_decode_term.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/misc/ei_decode_term.h
@@ -875,7 +867,6 @@
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/misc/show_msg.h
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/prog/ei_fake_prog.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/prog/erl_call.c
-lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/prog/erl_fake_prog.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/prog/erl_start.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/prog/erl_start.h
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/registry/hash.h
@@ -930,8 +921,9 @@
 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_socket.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/socket_registry.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/zlib.beam
 lib/erlang/lib/erts-${VERSION.erts}/src/atomics.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/counters.erl
@@ -951,8 +943,9 @@
 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_socket.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/socket_registry.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/zlib.erl
 lib/erlang/lib/et-${VERSION.et}/ebin/et.app
 lib/erlang/lib/et-${VERSION.et}/ebin/et.appup
@@ -1169,14 +1162,12 @@
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_auth_mnesia.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_auth_plain.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_auth_server.beam
-lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_browser.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_cgi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_dir.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_disk_log.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_esi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_get.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_head.beam
-lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_htaccess.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_log.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_range.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_responsecontrol.beam
@@ -1369,14 +1360,12 @@
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_auth_mnesia.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_auth_plain.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_auth_server.erl
-lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_browser.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_cgi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_dir.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_disk_log.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_esi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_get.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_head.erl
-lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_htaccess.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_log.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_range.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_responsecontrol.erl
@@ -1412,6 +1401,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erl_epmd.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erl_reply.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erl_signal_handler.beam
+lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erpc.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/error_handler.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/error_logger.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erts_debug.beam
@@ -1420,6 +1410,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/file_server.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/gen_sctp.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/gen_tcp.beam
+lib/erlang/lib/kernel-${VERSION.kernel}/ebin/gen_tcp_socket.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/gen_udp.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/global.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/global_group.beam
@@ -1469,6 +1460,7 @@
 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
+lib/erlang/lib/kernel-${VERSION.kernel}/ebin/pg.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/pg2.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/ram_file.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/raw_file_io.beam
@@ -1480,6 +1472,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/raw_file_io_raw.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/rpc.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/seq_trace.beam
+lib/erlang/lib/kernel-${VERSION.kernel}/ebin/socket.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/standard_error.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/user.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/user_drv.beam
@@ -1496,6 +1489,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_server.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/include/dist.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/include/dist_util.hrl
+lib/erlang/lib/kernel-${VERSION.kernel}/include/eep48.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/include/file.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/include/inet.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/include/inet_sctp.hrl
@@ -1524,6 +1518,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_epmd.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_reply.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_signal_handler.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/src/erpc.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/error_handler.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/error_logger.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erts_debug.erl
@@ -1533,6 +1528,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/src/file_server.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/gen_sctp.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/gen_tcp.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/src/gen_tcp_socket.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/gen_udp.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/global.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/global_group.erl
@@ -1590,6 +1586,7 @@
 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
+lib/erlang/lib/kernel-${VERSION.kernel}/src/pg.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/pg2.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/ram_file.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/raw_file_io.erl
@@ -1601,6 +1598,7 @@
 lib/erlang/lib/kernel-${VERSION.kernel}/src/raw_file_io_raw.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/rpc.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/seq_trace.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/src/socket.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/standard_error.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/user.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/user_drv.erl
@@ -1724,8 +1722,11 @@
 lib/erlang/lib/megaco-${VERSION.megaco}/src/app/megaco.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/app/megaco_internal.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/MEDIA-GATEWAY-CONTROL-prev3a.asn
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/MEDIA-GATEWAY-CONTROL-prev3b.asn
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/MEDIA-GATEWAY-CONTROL-prev3c.asn
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/MEDIA-GATEWAY-CONTROL-v1.asn
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/MEDIA-GATEWAY-CONTROL-v2.asn
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/MEDIA-GATEWAY-CONTROL-v3.asn
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3a.hrl
@@ -1876,6 +1877,7 @@
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia_monitor.beam
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia_recover.beam
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia_registry.beam
+lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia_rpc.beam
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia_schema.beam
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia_snmp_hook.beam
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia_sp.beam
@@ -1930,6 +1932,7 @@
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_monitor.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_recover.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_registry.erl
+lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_rpc.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_schema.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_snmp_hook.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_sp.erl
@@ -2054,6 +2057,7 @@
 lib/erlang/lib/os_mon-${VERSION.os_mon}/ebin/os_mon.app
 lib/erlang/lib/os_mon-${VERSION.os_mon}/ebin/os_mon.appup
 lib/erlang/lib/os_mon-${VERSION.os_mon}/ebin/os_mon.beam
+lib/erlang/lib/os_mon-${VERSION.os_mon}/ebin/os_mon_mib.beam
 lib/erlang/lib/os_mon-${VERSION.os_mon}/ebin/os_mon_sysinfo.beam
 lib/erlang/lib/os_mon-${VERSION.os_mon}/ebin/os_sup.beam
 lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/cpu_sup
@@ -2066,6 +2070,7 @@
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/memsup.hrl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/nteventlog.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/os_mon.erl
+lib/erlang/lib/os_mon-${VERSION.os_mon}/src/os_mon_mib.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/os_mon_sysinfo.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/os_sup.erl
 lib/erlang/lib/parsetools-${VERSION.parsetools}/ebin/leex.beam
@@ -2104,6 +2109,7 @@
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/pubkey_cert.beam
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/pubkey_cert_records.beam
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/pubkey_crl.beam
+lib/erlang/lib/public_key-${VERSION.public_key}/ebin/pubkey_ocsp.beam
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/pubkey_pbe.beam
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/pubkey_pem.beam
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/pubkey_ssh.beam
@@ -2117,6 +2123,7 @@
 lib/erlang/lib/public_key-${VERSION.public_key}/src/pubkey_cert_records.erl
 lib/erlang/lib/public_key-${VERSION.public_key}/src/pubkey_crl.erl
 lib/erlang/lib/public_key-${VERSION.public_key}/src/pubkey_moduli.hrl
+lib/erlang/lib/public_key-${VERSION.public_key}/src/pubkey_ocsp.erl
 lib/erlang/lib/public_key-${VERSION.public_key}/src/pubkey_pbe.erl
 lib/erlang/lib/public_key-${VERSION.public_key}/src/pubkey_pem.erl
 lib/erlang/lib/public_key-${VERSION.public_key}/src/pubkey_ssh.erl
@@ -2521,16 +2528,19 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_acceptor.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_acceptor_sup.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_agent.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_app.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_auth.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_bits.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_channel.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_channel_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_cli.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_client_channel.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_client_key_api.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_connection.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_connection_handler.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_connection_sup.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_controller.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_daemon_channel.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_dbg.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_file.beam
@@ -2540,7 +2550,6 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_no_io.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_options.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_server_channel.beam
-lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_server_channel_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_server_key_api.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sftp.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sftpd.beam
@@ -2550,6 +2559,10 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_subsystem_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_system_sup.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_tcpip_forward_acceptor.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_tcpip_forward_acceptor_sup.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_tcpip_forward_client.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_tcpip_forward_srv.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_transport.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_xfer.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/sshc_sup.beam
@@ -2558,11 +2571,14 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_acceptor.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_acceptor_sup.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_agent.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_agent.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_app.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_auth.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_auth.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_bits.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_channel.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_channel_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_cli.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_client_channel.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_client_key_api.erl
@@ -2570,6 +2586,7 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_connection.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_connection_handler.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_connection_sup.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_controller.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_daemon_channel.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_dbg.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_file.erl
@@ -2579,7 +2596,6 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_no_io.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_options.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_server_channel.erl
-lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_server_channel_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_server_key_api.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sftp.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sftpd.erl
@@ -2589,6 +2605,10 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_subsystem_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_system_sup.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_tcpip_forward_acceptor.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_tcpip_forward_acceptor_sup.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_tcpip_forward_client.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_tcpip_forward_srv.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_xfer.erl
@@ -2597,10 +2617,13 @@
 lib/erlang/lib/ssh-${VERSION.ssh}/src/sshd_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_connection_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_gen_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_handshake.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_listener_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_packet_demux.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_record.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_server_session_cache_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_server_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_socket.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_v1.beam
@@ -2616,7 +2639,6 @@
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_cipher.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_cipher_format.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_config.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_connection_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_crl.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_crl_cache.beam
@@ -2626,6 +2648,7 @@
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_dist_admin_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_dist_connection_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_dist_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_gen_statem.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_handshake.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_listen_tracker_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_logger.beam
@@ -2633,17 +2656,21 @@
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_pem_cache.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_pkix_db.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_record.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_server_session_cache.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_server_session_cache_db.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_server_session_cache_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session_cache.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session_cache_api.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_srp_primes.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_sup.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_v3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_bloom_filter.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_client_ticket_store.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection_1_3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_dtls_connection.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_gen_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_handshake.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_handshake_1_3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_record.beam
@@ -2669,12 +2696,15 @@
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_connection.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_connection_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_gen_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_handshake.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_handshake.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_listener_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_packet_demux.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_record.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_record.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_server_session_cache_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_server_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_socket.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_v1.erl
@@ -2691,7 +2721,6 @@
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher_format.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_config.erl
-lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_crl.erl
@@ -2702,6 +2731,7 @@
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_dist_admin_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_dist_connection_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_dist_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_gen_statem.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_handshake.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_handshake.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_internal.hrl
@@ -2712,19 +2742,23 @@
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_pkix_db.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_record.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_record.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_server_session_cache.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_server_session_cache_db.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_server_session_cache_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_session.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_session_cache.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_session_cache_api.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_srp.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_srp_primes.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_sup.erl
-lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_v3.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_bloom_filter.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_client_ticket_store.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection_1_3.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_dtls_connection.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_gen_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_handshake.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_handshake.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_handshake_1_3.erl
@@ -2811,6 +2845,7 @@
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/sets.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/shell.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/shell_default.beam
+lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/shell_docs.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/slave.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/sofs.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/stdlib.app
@@ -2894,6 +2929,7 @@
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/orddict.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/ordsets.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/otp_internal.erl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/src/otp_internal.hrl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/pool.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/proc_lib.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/proplists.erl
@@ -2906,6 +2942,7 @@
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/sets.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/shell.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/shell_default.erl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/src/shell_docs.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/slave.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/sofs.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/string.erl
@@ -3704,14 +3741,11 @@
 lib/erlang/usr/include/erl_drv_nif.h
 lib/erlang/usr/include/erl_fixed_size_int_types.h
 lib/erlang/usr/include/erl_int_sizes_config.h
-lib/erlang/usr/include/erl_interface.h
 lib/erlang/usr/include/erl_memory_trace_parser.h
 lib/erlang/usr/include/erl_nif.h
 lib/erlang/usr/include/erl_nif_api_funcs.h
 lib/erlang/usr/lib/libei.a
 lib/erlang/usr/lib/libei_st.a
-lib/erlang/usr/lib/liberl_interface.a
-lib/erlang/usr/lib/liberl_interface_st.a
 lib/erlang/usr/lib/liberts.a
 lib/erlang/usr/lib/liberts_r.a
 @pkgdir lib/erlang/lib/ssh-${VERSION.ssh}/include
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/erlang/distinfo,v
retrieving revision 1.82
diff -u -r1.82 distinfo
--- distinfo	5 Dec 2020 12:22:51 -0000	1.82
+++ distinfo	14 Jan 2021 16:59:20 -0000
@@ -1,19 +1,22 @@
 $NetBSD: distinfo,v 1.82 2020/12/05 12:22:51 nia Exp $
 
-SHA1 (erlang-22.2.8.tar.gz) = ea13d421086ede18d7de88c871d4b0d35b89c415
-RMD160 (erlang-22.2.8.tar.gz) = 21b8f03a3076364118e24f96b257b656b081d455
-SHA512 (erlang-22.2.8.tar.gz) = ed65067e1cff82eb17e0ea758dac93f860ec4e2b661690cffa6bd43575de23f8dfbd570e13e548faef2ee51c6482faca35e21ea69ac0c585f61105f930df483d
-Size (erlang-22.2.8.tar.gz) = 55747601 bytes
+SHA1 (erlang-23.2.1.tar.gz) = b89dec86e41ce0cb696caab8420f652b339b0b25
+RMD160 (erlang-23.2.1.tar.gz) = 48cf6d47dd0a7512fc6cc29b28cd92c0e89aee2f
+SHA512 (erlang-23.2.1.tar.gz) = 444c19fac295a979321ccde1f516156a25faa79d66437ddf7bc0a197f3fb8d2ddd6c056d565f9b6bc47e8444b8feda790c4844dbe95ec0b300428fb22c4e0531
+Size (erlang-23.2.1.tar.gz) = 56580525 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_prim__net__nif.c) = 39a3c134f17ede852a736494f035c8ce01b0ed4b
 SHA1 (patch-erts_emulator_sys_common_erl__poll.c) = 28aeaba3c6313ce68741c3ca5541491c05c58431
-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
 SHA1 (patch-lib_crypto_c__src_Makefile.in) = 0ab1db36c03999524e933d60f913ff5608b0622e
+SHA1 (patch-lib_crypto_configure.in) = b2fc48b762989dab1b327f5b201a3009435a99d9
+SHA1 (patch-lib_megaco_configure.in) = 6b509596dc537d5928519c721d4517bd0c6397af
+SHA1 (patch-lib_odbc_configure.in) = a1edd26a8e9f82ba4b1fb8f02d0a9f9bbb99024a
+SHA1 (patch-lib_snmp_configure.in) = 079cf3e559ee494f76f0b139a620eace70ef1eb1
 SHA1 (patch-lib_tools_c__src_Makefile.in) = 4fa1ef2ace4fc64efdb6b3acd24decf031ae778d
-SHA1 (patch-make_configure.in) = 1eedad3b26f6070e2b0a0fba06e850c796885932
+SHA1 (patch-make_configure.in) = 9d3468a06afe4623c71d35dcf08863eb24571ea8
 SHA1 (patch-make_output.mk.in) = d7b3da58bfb471d52c41242e2a03d1598ce24e62
Index: versions.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/erlang/versions.mk,v
retrieving revision 1.18
diff -u -r1.18 versions.mk
--- versions.mk	20 Mar 2020 16:05:34 -0000	1.18
+++ versions.mk	14 Jan 2021 16:59:20 -0000
@@ -1,3 +1,3 @@
-# $NetBSD: versions.mk,v 1.18 2020/03/20 16:05:34 nia Exp $
+# $NetBSD$
 # Do not edit, regenerate using 'make versions'
-_VERSIONS=	diameter 2.2.2 asn1 5.0.9 common_test 1.18.1 compiler 7.5.2 crypto 4.6.4 debugger 4.2.8 dialyzer 4.1.1 edoc 0.11 eldap 1.2.8 erl_docgen 0.11 erl_interface 3.13.1 erts 10.6.4 et 1.6.4 eunit 2.4 ftp 1.0.4 hipe 3.19.2 inets 7.1.2 jinterface 1.10.1 kernel 6.5.1 megaco 3.18.7 mnesia 4.16.2 observer 2.9.3 odbc 2.12.4 os_mon 2.5.1 parsetools 2.1.8 public_key 1.7.1 reltool 0.8 runtime_tools 1.14 sasl 3.4.1 snmp 5.4.5 ssh 4.8.2 ssl 9.5.3 stdlib 3.11.2 syntax_tools 2.2.1 tftp 1.0.2 tools 3.3 wx 1.9 xmerl 1.3.23
+_VERSIONS=	erts 11.1.5 asn1 5.0.14 common_test 1.19.1 compiler 7.6.6 crypto 4.8.1 debugger 5.0 dialyzer 4.3 diameter 2.2.3 edoc 0.12 eldap 1.2.8 erl_docgen 1.0.2 erl_interface 4.0.1 et 1.6.4 eunit 2.6 ftp 1.0.5 hipe 4.0.1 inets 7.3.1 jinterface 1.11 kernel 7.2 megaco 3.19.4 mnesia 4.18.1 observer 2.9.5 odbc 2.13.1 os_mon 2.6.1 parsetools 2.2 public_key 1.9.2 reltool 0.8 runtime_tools 1.15.1 sasl 4.0.1 snmp 5.7 ssh 4.10.6 ssl 10.2 stdlib 3.14 syntax_tools 2.4 tftp 1.0.2 tools 3.4.2 wx 1.9.2 xmerl 1.3.26
Index: patches/patch-erts_emulator_sys_unix_sys__uds.c
===================================================================
RCS file: patches/patch-erts_emulator_sys_unix_sys__uds.c
diff -N patches/patch-erts_emulator_sys_unix_sys__uds.c
--- patches/patch-erts_emulator_sys_unix_sys__uds.c	3 Jul 2018 11:01:21 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-erts_emulator_sys_unix_sys__uds.c,v 1.1 2018/07/03 11:01:21 fhajny Exp $
-
-Fix SunOS/C99.
-
---- erts/emulator/sys/unix/sys_uds.c.orig	2018-06-19 07:07:55.000000000 +0000
-+++ erts/emulator/sys/unix/sys_uds.c
-@@ -23,7 +23,11 @@
- #endif
- 
- #if defined(__sun__) && !defined(_XOPEN_SOURCE)
-+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
- #define _XOPEN_SOURCE 500
-+#else
-+#define _XOPEN_SOURCE 600
-+#endif
- #endif
- 
- #include <limits.h>
Index: patches/patch-lib_crypto_configure.in
===================================================================
RCS file: patches/patch-lib_crypto_configure.in
diff -N patches/patch-lib_crypto_configure.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_crypto_configure.in	14 Jan 2021 16:59:20 -0000
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- lib/crypto/configure.in.orig	2020-12-21 07:24:16.000000000 +0000
++++ lib/crypto/configure.in
+@@ -25,12 +25,7 @@ dnl define([AC_CACHE_SAVE], )dnl
+ 
+ AC_INIT(vsn.mk)
+ 
+-if test -z "$ERL_TOP" || test ! -d "$ERL_TOP" ; then
+-  AC_CONFIG_AUX_DIRS(autoconf)
+-else
+-  erl_top=${ERL_TOP}
+-  AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
+-fi
++AC_CONFIG_AUX_DIR($ERL_TOP/erts/autoconf)
+ 
+ if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
+     AC_CANONICAL_HOST
Index: patches/patch-lib_megaco_configure.in
===================================================================
RCS file: patches/patch-lib_megaco_configure.in
diff -N patches/patch-lib_megaco_configure.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_megaco_configure.in	14 Jan 2021 16:59:20 -0000
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- lib/megaco/configure.in.orig	2020-12-21 07:24:16.000000000 +0000
++++ lib/megaco/configure.in
+@@ -25,12 +25,7 @@ dnl define([AC_CACHE_SAVE], )dnl
+ 
+ AC_INIT(vsn.mk)
+ 
+-if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
+-  AC_CONFIG_AUX_DIRS(autoconf)
+-else
+-  erl_top=${ERL_TOP}
+-  AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
+-fi
++AC_CONFIG_AUX_DIR($ERL_TOP/erts/autoconf)
+ 
+ if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
+     AC_CANONICAL_HOST
Index: patches/patch-lib_odbc_configure.in
===================================================================
RCS file: patches/patch-lib_odbc_configure.in
diff -N patches/patch-lib_odbc_configure.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_odbc_configure.in	14 Jan 2021 16:59:20 -0000
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- lib/odbc/configure.in.orig	2020-12-21 07:24:16.000000000 +0000
++++ lib/odbc/configure.in
+@@ -25,12 +25,7 @@ dnl define([AC_CACHE_SAVE], )dnl
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(c_src/odbcserver.c)
+ 
+-if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
+-  AC_CONFIG_AUX_DIRS(autoconf)
+-else
+-  erl_top=${ERL_TOP}
+-  AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
+-fi
++AC_CONFIG_AUX_DIR($ERL_TOP/erts/autoconf)
+ 
+ if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
+     AC_CANONICAL_HOST
Index: patches/patch-lib_snmp_configure.in
===================================================================
RCS file: patches/patch-lib_snmp_configure.in
diff -N patches/patch-lib_snmp_configure.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_snmp_configure.in	14 Jan 2021 16:59:20 -0000
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- lib/snmp/configure.in.orig	2020-12-21 07:24:16.000000000 +0000
++++ lib/snmp/configure.in
+@@ -4,12 +4,7 @@ define([AC_CACHE_SAVE], )dnl
+ 
+ AC_INIT(vsn.mk)
+ 
+-if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
+-  AC_CONFIG_AUX_DIRS(autoconf)
+-else
+-  erl_top=${ERL_TOP}
+-  AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
+-fi
++AC_CONFIG_AUX_DIR($ERL_TOP/erts/autoconf)
+ 
+ if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
+     AC_CANONICAL_HOST
Index: patches/patch-make_configure.in
===================================================================
RCS file: /cvsroot/pkgsrc/lang/erlang/patches/patch-make_configure.in,v
retrieving revision 1.1
diff -u -r1.1 patch-make_configure.in
--- patches/patch-make_configure.in	3 Dec 2020 16:57:05 -0000	1.1
+++ patches/patch-make_configure.in	14 Jan 2021 16:59:20 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-make_configure.in,v 1.1 2020/12/03 16:57:05 adam Exp $
+$NetBSD$
 
---- make/configure.in.orig	2020-12-03 16:05:35.000000000 +0000
+--- make/configure.in.orig	2020-12-21 07:24:16.000000000 +0000
 +++ make/configure.in
-@@ -392,7 +392,7 @@ if test $CROSS_COMPILING = no; then
- 	   }
- 	   [case "$macosx_version" in
- 	       [1-9][0-9].[0-9])
--	          int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\1\2|'`;;
-+                  int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\10\200|'`;;
- 	       [1-9][0-9].[0-9].[0-9])
- 	          int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\2\3|'`;;
- 	       [1-9][0-9].[1-9][0-9])
+@@ -82,7 +82,7 @@ AC_SUBST(ERL_TOP)
+ dnl
+ dnl Aux programs are found in erts/autoconf
+ dnl
+-AC_CONFIG_AUX_DIR(${srcdir}/erts/autoconf)
++AC_CONFIG_AUX_DIR($ERL_TOP/erts/autoconf)
+ 
+ dnl
+ dnl Figure out what we are running on. And in violation of autoconf
Home | Main Index | Thread Index | Old Index