Update Erlang/OTP to R16B02.

R16B02 is the second maintenance release for the R16B major release.
You can find the README file for the release at
  http://www.erlang.org/download/otp_src_R16B02.readme


R16B01 is the first maintenance release for the R16B major release.
You can find the README file for the release at
  http://www.erlang.org/download/otp_src_R16B01.readme

Highlights for R16B01:

   OTP-10279  == erts ==

	      Support for migration of memory carriers between memory
	      allocator instances has been introduced.

	      By default this feature is not enabled and do not effect the
	      characteristics of the system. When enabled it has the
	      following impact on the characteristics of the system:

	      -- Reduced memory footprint when the memory load is unevenly
	      distributed between scheduler specific allocator instances.

	      -- Depending on the default allocaton strategy used on a
	      specific allocator there might or might not be a slight
	      performance loss.

	      -- When enabled on the fix_alloc allocator, a different
	      strategy for management of fix blocks will be used.

	      -- The information returned from
	      erlang:system_info({allocator, A}), and
	      erlang:system_info({allocator_sizes, A}) will be slightly
	      different when this feature has been enabled. An mbcs_pool
	      tuple will be present giving information about abandoned
	      carriers, and in the fix_alloc case no fix_types tuple will
	      be present.

	      For more information, see the documentation of the +M<S>acul
	      command line argument.

   OTP-11009  == ssl public_key crypto common_test dialyzer ssh stdlib snmp
	      inets ==

	      Integrate elliptic curve contribution from Andreas Schultz

	      In order to be able to support elliptic curve cipher suites
	      in SSL/TLS, additions to handle elliptic curve infrastructure
	      has been added to public_key and crypto.

	      This also has resulted in a rewrite of the crypto API to gain
	      consistency and remove unnecessary overhead. All OTP
	      applications using crypto has been updated to use the new
	      API.

	      Impact: Elliptic curve cryptography (ECC) offers equivalent
	      security with smaller key sizes than other public key
	      algorithms. Smaller key sizes result in savings for power,
	      memory, bandwidth, and computational cost that make ECC
	      especially attractive for constrained environments.

   OTP-11159  == erts ==

	      Lift static limitation (FD_SETSIZE) for file descriptors on
	      Mac OS X. (Thanks to Anthony Ramine)

11 files changed, 138 insertions, 185 deletions

diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index 1e1d44c8c08..cd00b723080 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,66 +1,66 @@
-# $NetBSD: Makefile.versions,v 1.16 2013/06/08 06:48:24 asau Exp $
+# $NetBSD: Makefile.versions,v 1.17 2013/10/20 18:37:49 asau Exp $
 
-ERLANG_VERSION=			16.1
-DIST_VERSION_MAJOR=		R16B
+ERLANG_VERSION=			16.1.2
+DIST_VERSION_MAJOR=		R16B02
 #DIST_VERSION_MINOR=		1
 
 _VERSIONS=					\
 	appmon			2.1.14.2	\
-	asn1			2.0.1		\
-	common_test		1.7.1		\
-	compiler		4.9.1		\
-	cosEvent		2.1.13		\
+	asn1			2.0.3		\
+	common_test		1.7.3		\
+	compiler		4.9.3		\
+	cosEvent		2.1.14		\
 	cosEventDomain		1.1.13		\
-	cosFileTransfer		1.1.14		\
-	cosNotification		1.1.19		\
+	cosFileTransfer		1.1.15		\
+	cosNotification		1.1.20		\
 	cosProperty		1.1.16		\
 	cosTime			1.1.13		\
 	cosTransactions		1.2.13		\
-	crypto			2.3		\
-	debugger		3.2.10		\
-	dialyzer		2.6		\
-	diameter		1.4.1		\
+	crypto			3.1		\
+	debugger		3.2.12		\
+	dialyzer		2.6.1		\
+	diameter		1.4.3		\
 	docbuilder		0.9.8.10	\
-	edoc			0.7.12		\
+	edoc			0.7.12.1	\
 	eldap			1.0.1		\
-	erl_docgen		0.3.4		\
-	erl_interface		3.7.11		\
-	erts			5.10.1		\
-	et			1.4.4.3		\
-	eunit			2.2.4		\
+	erl_docgen		0.3.4.1		\
+	erl_interface		3.7.14		\
+	erts			5.10.3		\
+	et			1.4.4.5		\
+	eunit			2.2.5		\
 	gs			1.5.15.2	\
-	hipe			3.10.1		\
-	ic			4.3.1		\
-	inets			5.9.4		\
+	hipe			3.10.2.1	\
+	ic			4.3.3		\
+	inets			5.9.6		\
 	jinterface		1.5.8		\
-	kernel			2.16.1		\
-	megaco			3.16.0.3	\
-	mnesia			4.8		\
-	observer		1.3		\
-	odbc			2.10.15		\
-	orber			3.6.25		\
-	os_mon			2.2.11		\
+	kernel			2.16.3		\
+	megaco			3.17.0.2	\
+	mnesia			4.10		\
+	observer		1.3.1.1		\
+	odbc			2.10.17		\
+	orber			3.6.26.1	\
+	os_mon			2.2.13		\
 	otp_mibs		1.0.8		\
-	parsetools		2.0.9		\
-	percept			0.8.8		\
+	parsetools		2.0.10		\
+	percept			0.8.8.2		\
 	pman			2.7.1.4		\
-	public_key		0.18		\
-	reltool			0.6.3		\
-	runtime_tools		1.8.10		\
-	sasl			2.3.1		\
-	snmp			4.23.1		\
-	ssh			2.1.4		\
-	ssl			5.2.1		\
-	stdlib			1.19.1		\
+	public_key		0.20		\
+	reltool			0.6.4.1		\
+	runtime_tools		1.8.12		\
+	sasl			2.3.3		\
+	snmp			4.24.2		\
+	ssh			2.1.8		\
+	ssl			5.3.1		\
+	stdlib			1.19.3		\
 	syntax_tools		1.6.11		\
-	test_server		3.6.1		\
+	test_server		3.6.3		\
 	toolbar			1.4.2.3		\
-	tools			2.6.10		\
+	tools			2.6.12		\
 	tv			2.1.4.10	\
 	typer			0.9.5		\
 	webtool			0.8.9.2		\
-	wx			1.0		\
-	xmerl			1.3.3
+	wx			1.1		\
+	xmerl			1.3.4
 
 PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}
 
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index 9a600598ab1..8dab3d1995d 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2013/07/05 12:42:48 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.15 2013/10/20 18:37:49 asau Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -141,13 +141,10 @@ lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_check.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_constructed_ber_bin_v2.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_constructed_per.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_eval_ext.beam
-lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_eval_per.beam
-lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_eval_uper.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_func.beam
 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_per.beam
-lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_per_rt2ct.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_imm.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_name.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_parser2.beam
@@ -169,13 +166,10 @@ lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_check.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_constructed_ber_bin_v2.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_constructed_per.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_eval_ext.erl
-lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_eval_per.erl
-lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_eval_uper.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_func.erl
 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_per.erl
-lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen_per_rt2ct.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_imm.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_name.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_parser2.erl
@@ -1658,9 +1652,11 @@ lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/registry/reg_stat.c
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/registry/reg_tabstat.c
 lib/erlang/lib/erts-${VERSION.erts}/ebin/erl_prim_loader.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/erlang.beam
+lib/erlang/lib/erts-${VERSION.erts}/ebin/erts.app
 lib/erlang/lib/erts-${VERSION.erts}/ebin/erts_internal.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/init.beam
 lib/erlang/lib/erts-${VERSION.erts}/ebin/otp_ring0.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_zip.beam
@@ -1670,6 +1666,8 @@ lib/erlang/lib/erts-${VERSION.erts}/src/erlang.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/erts_internal.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/init.erl
 lib/erlang/lib/erts-${VERSION.erts}/src/otp_ring0.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_zip.erl
@@ -3385,6 +3383,7 @@ lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/runtime_tools.app
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/runtime_tools.appup
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/runtime_tools.beam
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/runtime_tools_sup.beam
+lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/system_information.beam
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/ttb_autostart.beam
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/dist.d
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/dist.systemtap
@@ -3424,6 +3423,7 @@ lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/observer_backend.erl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/percept_profile.erl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/runtime_tools.erl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/runtime_tools_sup.erl
+lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/system_information.erl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/ttb_autostart.erl
 lib/erlang/lib/sasl-${VERSION.sasl}/ebin/alarm_handler.beam
 lib/erlang/lib/sasl-${VERSION.sasl}/ebin/erlsrv.beam
@@ -3510,11 +3510,15 @@ lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_error.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_error_io.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_error_logger.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_error_report.beam
-lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_general_db.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_local_db.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib_data.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib_data_tttn.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib_lib.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib_storage.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib_storage_dets.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib_storage_ets.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib_storage_mnesia.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_misc_sup.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mpd.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_net_if.beam
@@ -3661,12 +3665,16 @@ lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_error.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_error_io.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_error_logger.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_error_report.erl
-lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_general_db.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_internal.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_local_db.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib_data.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib_data_tttn.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib_lib.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib_storage.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib_storage_dets.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib_storage_ets.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib_storage_mnesia.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_misc_sup.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mpd.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_net_if.erl
@@ -3806,6 +3814,11 @@ lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_userreg.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_xfer.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/sshc_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/sshd_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_connection.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_handshake.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_record.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_v1.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/inet_tls_dist.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl.app
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl.appup
@@ -3813,23 +3826,27 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_alert.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_app.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_certificate.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_certificate_db.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_cipher.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_dist_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_handshake.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_manager.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_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_socket.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_ssl2.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_ssl3.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_tls1.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_tls_dist_proxy.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_v2.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_v3.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_handshake.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_record.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_v1.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cacerts.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cert.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/key.pem
@@ -3841,33 +3858,47 @@ lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/key.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/ebin/client_server.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/src/Makefile
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/src/client_server.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_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_record.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_record.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_v1.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/inet_tls_dist.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_alert.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_alert.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_app.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_certificate.erl
-lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_certificate_db.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher.hrl
-lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_dist_sup.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
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_manager.erl
+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_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_socket.erl
-lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_ssl2.erl
-lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_ssl3.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_tls1.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_tls_dist_proxy.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_v2.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_v3.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_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_record.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_record.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_v1.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/array.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/base64.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/beam_lib.beam
@@ -4061,7 +4092,6 @@ lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server.appup
 lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server.beam
 lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server_ctrl.beam
 lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server_gl.beam
-lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server_h.beam
 lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server_io.beam
 lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server_node.beam
 lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server_sup.beam
@@ -4071,7 +4101,6 @@ lib/erlang/lib/test_server-${VERSION.test_server}/src/erl2html2.erl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server.erl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_ctrl.erl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_gl.erl
-lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_h.erl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_internal.hrl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_io.erl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_node.erl
@@ -4285,6 +4314,7 @@ lib/erlang/lib/wx-${VERSION.wx}/ebin/wxChoice.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxChoicebook.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxClientDC.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxClipboard.beam
+lib/erlang/lib/wx-${VERSION.wx}/ebin/wxClipboardTextEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxCloseEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxColourData.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxColourDialog.beam
@@ -4616,6 +4646,7 @@ lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxChoice.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxChoicebook.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxClientDC.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxClipboard.erl
+lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxClipboardTextEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxCloseEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxColourData.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxColourDialog.erl
@@ -4903,12 +4934,23 @@ lib/erlang/releases/RELEASES
 lib/erlang/releases/RELEASES.src
 lib/erlang/releases/start_erl.data
 lib/erlang/usr/include/driver_int.h
+lib/erlang/usr/include/ei.h
+lib/erlang/usr/include/ei_connect.h
+lib/erlang/usr/include/eicode.h
 lib/erlang/usr/include/erl_driver.h
 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/include/erlang.idl
+lib/erlang/usr/include/ic.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
+lib/erlang/usr/lib/libic.a
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index c4def4af603..e231728d3e7 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.32 2013/06/25 10:06:34 jperkin Exp $
+$NetBSD: distinfo,v 1.33 2013/10/20 18:37:49 asau Exp $
 
-SHA1 (erlang/otp_src_R16B.tar.gz) = a538c64a4fd9ed16a29f981321f0830a3da02bae
-RMD160 (erlang/otp_src_R16B.tar.gz) = e786a8c7ba578ed9612cd7e46565f48b7435390b
-Size (erlang/otp_src_R16B.tar.gz) = 67097626 bytes
+SHA1 (erlang/otp_src_R16B02.tar.gz) = 16accc21afaebf2bd9507c5a2610aecf8d6f8243
+RMD160 (erlang/otp_src_R16B02.tar.gz) = d10ad82b3bddf16d1cf52babd56965537b64faeb
+Size (erlang/otp_src_R16B02.tar.gz) = 66023455 bytes
 SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3
 SHA1 (patch-ai) = 203d1208b3a8a6aa248cfe0e16c9c19ae25fe0ad
 SHA1 (patch-am) = 11ff769b6954f950d6447e69b033cdc0bfa767e9
 SHA1 (patch-ao) = a4ee17b0a81415d541cb55d76b3c1ecc3148c2c2
 SHA1 (patch-ay) = 7d1a7f79e8c3ea909b2f4476d9ff271ed1318234
-SHA1 (patch-erts_emulator_sys_common_erl__mseg.c) = 087b9c33bfd2b58c5e961b6d8a1c10be09358936
-SHA1 (patch-lib_os__mon_c__src_ferrule.c) = ba09f2546613e8184cc9a400ec6571839cbd4be5
-SHA1 (patch-lib_os__mon_c__src_memsup.c) = 1a6ae70dff9e6468c9c84d3fe1964dab6624a8c3
-SHA1 (patch-lib_os__mon_c__src_mod__syslog.c) = cf50d11f9448a6a7f7327ca9ba18772270eb6080
-SHA1 (patch-lib_wx_configure) = 995744de7390813683257050f19c51e87a3bb58f
-SHA1 (patch-lib_wx_configure.in) = f38d2ed003dfd1d069f6a08a73e7971c135759d8
+SHA1 (patch-configure) = 8bf08197747cbca07fcb7edba6782389787d7a1f
+SHA1 (patch-configure.in) = 4a36245a6a6b6dc4804cbb899c7e824ec1fe61e0
diff --git a/lang/erlang/patches/patch-configure b/lang/erlang/patches/patch-configure
new file mode 100644
index 00000000000..76a33cae383
--- /dev/null
+++ b/lang/erlang/patches/patch-configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure,v 1.1 2013/10/20 18:37:49 asau Exp $
+
+--- configure.orig	2013-10-17 22:17:44.000000000 +0000
++++ configure
+@@ -3576,7 +3576,7 @@ fi
+ rm -f $ERL_TOP/lib/SKIP-APPLICATIONS
+ for app in `cd lib && ls -d *`; do
+     var=`eval echo \\$with_$app`
+-    if test X${var} == Xno; then
++    if test X${var} = Xno; then
+        echo "$app" >> $ERL_TOP/lib/SKIP-APPLICATIONS
+      fi
+ done
diff --git a/lang/erlang/patches/patch-configure.in b/lang/erlang/patches/patch-configure.in
new file mode 100644
index 00000000000..5a1811cdbb1
--- /dev/null
+++ b/lang/erlang/patches/patch-configure.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure.in,v 1.1 2013/10/20 18:37:49 asau Exp $
+
+--- configure.in.orig	2013-09-16 18:12:18.000000000 +0000
++++ configure.in
+@@ -394,7 +394,7 @@ AC_SUBST(NATIVE_LIBS_ENABLED)
+ rm -f $ERL_TOP/lib/SKIP-APPLICATIONS
+ for app in `cd lib && ls -d *`; do
+     var=`eval echo \\$with_$app`
+-    if test X${var} == Xno; then
++    if test X${var} = Xno; then
+        echo "$app" >> $ERL_TOP/lib/SKIP-APPLICATIONS
+      fi
+ done
diff --git a/lang/erlang/patches/patch-erts_emulator_sys_common_erl__mseg.c b/lang/erlang/patches/patch-erts_emulator_sys_common_erl__mseg.c
deleted file mode 100644
index 486215a98c8..00000000000
--- a/lang/erlang/patches/patch-erts_emulator_sys_common_erl__mseg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-erts_emulator_sys_common_erl__mseg.c,v 1.1 2013/06/08 06:48:24 asau Exp $
-
---- erts/emulator/sys/common/erl_mseg.c.orig	2013-02-25 19:21:31.000000000 +0000
-+++ erts/emulator/sys/common/erl_mseg.c
-@@ -439,7 +439,7 @@ mseg_destroy(ErtsMsegAllctr_t *ma, MemKi
- }
- 
- #if HAVE_MSEG_RECREATE
--#if defined(__NetBsd__)
-+#if defined(__NetBSD__)
- #define MREMAP_FLAGS  (0)
- #else
- #define MREMAP_FLAGS  (MREMAP_MAYMOVE)
diff --git a/lang/erlang/patches/patch-lib_os__mon_c__src_ferrule.c b/lang/erlang/patches/patch-lib_os__mon_c__src_ferrule.c
deleted file mode 100644
index 7009b8476b6..00000000000
--- a/lang/erlang/patches/patch-lib_os__mon_c__src_ferrule.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_os__mon_c__src_ferrule.c,v 1.1 2013/06/25 10:06:34 jperkin Exp $
-
-Avoid -Werror=return-type errors.
-
---- lib/os_mon/c_src/ferrule.c.orig	2013-02-25 19:21:31.000000000 +0000
-+++ lib/os_mon/c_src/ferrule.c
-@@ -50,7 +50,7 @@
- #define		FDS_STDIN	0
- #define		FDS_PIPE	1
- 
--main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- /*	usage: ferrule ownpath */
- {
-     int		i, pipe_fd;
diff --git a/lang/erlang/patches/patch-lib_os__mon_c__src_memsup.c b/lang/erlang/patches/patch-lib_os__mon_c__src_memsup.c
deleted file mode 100644
index 4a42fc0faa2..00000000000
--- a/lang/erlang/patches/patch-lib_os__mon_c__src_memsup.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_os__mon_c__src_memsup.c,v 1.1 2013/01/11 13:28:36 joerg Exp $
-
---- lib/os_mon/c_src/memsup.c.orig	2013-01-11 11:51:56.000000000 +0000
-+++ lib/os_mon/c_src/memsup.c
-@@ -116,6 +116,9 @@
- #if !defined (__OpenBSD__) && !defined (__NetBSD__) 
- #include <vm/vm_param.h>
- #endif
-+#if defined (__NetBSD__)
-+#include <sys/vmmeter.h>
-+#endif
- #if defined (__FreeBSD__) || defined(__DragonFly__)
- #include <sys/vmmeter.h>
- #endif
diff --git a/lang/erlang/patches/patch-lib_os__mon_c__src_mod__syslog.c b/lang/erlang/patches/patch-lib_os__mon_c__src_mod__syslog.c
deleted file mode 100644
index 5330b189738..00000000000
--- a/lang/erlang/patches/patch-lib_os__mon_c__src_mod__syslog.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-lib_os__mon_c__src_mod__syslog.c,v 1.1 2013/06/25 10:06:34 jperkin Exp $
-
-Avoid -Werror=return-type errors.
-
---- lib/os_mon/c_src/mod_syslog.c.orig	2013-02-25 19:21:31.000000000 +0000
-+++ lib/os_mon/c_src/mod_syslog.c
-@@ -47,7 +47,7 @@
- #define		TRUE		1
- #define		WAIT		1
- 
--main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- /*	usage: mod_syslog mode ownpath syslogconf */
- {
-     int	syslogd_pid, n_lines_copied=0;
-@@ -128,6 +128,9 @@ main(int argc, char *argv[])
-        make_exit(PIPE_NOT_FOUND);
-        else */
-     make_exit(OK);
-+
-+    /* NOTREACHED */
-+    return 0;
- }
- 
- void	make_exit(int exit_code)
diff --git a/lang/erlang/patches/patch-lib_wx_configure b/lang/erlang/patches/patch-lib_wx_configure
deleted file mode 100644
index 23ff8408f19..00000000000
--- a/lang/erlang/patches/patch-lib_wx_configure
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-lib_wx_configure,v 1.2 2013/06/08 06:48:24 asau Exp $
-
---- lib/wx/configure.orig	2013-02-25 19:21:31.000000000 +0000
-+++ lib/wx/configure
-@@ -3199,7 +3199,7 @@ fi
- 
- 
- 
--if test  X"$MIXED_CYGWIN_VC" == X"yes" -o X"$MIXED_MSYS_VC" == X"yes"; then
-+if test  X"$MIXED_CYGWIN_VC" = X"yes" -o X"$MIXED_MSYS_VC" = X"yes"; then
-    CFLAGS="-Owx"
- fi
- 
-@@ -5195,7 +5195,7 @@ fi
- if test "$cross_compiling" = "yes"; then
-     echo "Cross compilation of the wx driver is not supported yet, wx will NOT be usable" > ./CONF_INFO
-     WXERL_CAN_BUILD_DRIVER=false
--elif test  X"$MIXED_CYGWIN_VC" == X"no" -a X"$MIXED_MSYS_VC" == X"no"; then
-+elif test  X"$MIXED_CYGWIN_VC" = X"no" -a X"$MIXED_MSYS_VC" = X"no"; then
-     WX_VERSION=`wx-config --version`
-     case $WX_VERSION in
-          2.8.*)
diff --git a/lang/erlang/patches/patch-lib_wx_configure.in b/lang/erlang/patches/patch-lib_wx_configure.in
deleted file mode 100644
index 00c5a25e8c8..00000000000
--- a/lang/erlang/patches/patch-lib_wx_configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-lib_wx_configure.in,v 1.2 2013/06/08 06:48:24 asau Exp $
-
---- lib/wx/configure.in.orig	2013-02-25 19:21:31.000000000 +0000
-+++ lib/wx/configure.in
-@@ -71,7 +71,7 @@ WXERL_CAN_BUILD_DRIVER=true
- 
- LM_WINDOWS_ENVIRONMENT
- 
--if test  X"$MIXED_CYGWIN_VC" == X"yes" -o X"$MIXED_MSYS_VC" == X"yes"; then
-+if test  X"$MIXED_CYGWIN_VC" = X"yes" -o X"$MIXED_MSYS_VC" = X"yes"; then
-    CFLAGS="-Owx"
- fi
- 
-@@ -336,7 +336,7 @@ dnl
- if test "$cross_compiling" = "yes"; then
-     echo "Cross compilation of the wx driver is not supported yet, wx will NOT be usable" > ./CONF_INFO
-     WXERL_CAN_BUILD_DRIVER=false
--elif test  X"$MIXED_CYGWIN_VC" == X"no" -a X"$MIXED_MSYS_VC" == X"no"; then
-+elif test  X"$MIXED_CYGWIN_VC" = X"no" -a X"$MIXED_MSYS_VC" = X"no"; then
-     WX_VERSION=`wx-config --version`
-     case $WX_VERSION in
-          2.8.*)