Update erlang to 11.5, aka R11B-5.

Pkgsrc changes:
* Drop dependency on X11.
  GS (Graphic System) doesn't use X11 directly, using `wish' command.
  Wish command will be picked up from PATH, to use GS, install wish command
  from x11/tk.
  (closes PR 35373, PR 36418)
* FIxed to install crypto library correctly.
  (closes PR 36616)

Changes list is too long. See attached URL for more detail.

Bug fix release : otp_src_R11B-5
Build date      : 2007-06-12
http://www.erlang.org/download/otp_src_R11B-5.readme

Bug fix release : otp_src_R11B-4
Build date      : 2007-03-28
http://www.erlang.org/download/otp_src_R11B-4.readme

Bug fix release : otp_src_R11B-3
Build date      : 2007-01-30
http://www.erlang.org/download/otp_src_R11B-3.readme

Bug fix release : otp_src_R11B-2
Build date      : 2006-11-07
http://www.erlang.org/download/otp_src_R11B-2.readme

Bug fix release : otp_src_R11B-1
Build date      : 2006-08-29
http://www.erlang.org/download/otp_src_R11B-1.readme

10 files changed, 329 insertions, 124 deletions

diff --git a/lang/erlang/MESSAGE b/lang/erlang/MESSAGE
new file mode 100644
index 00000000000..286889b9612
--- /dev/null
+++ b/lang/erlang/MESSAGE
@@ -0,0 +1,6 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/07/28 14:27:09 obache Exp $
+
+To use GS (Graphic System), please install x11/tk.
+
+===========================================================================
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 0d71a4ed15c..619b7d6580f 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/02/26 15:47:43 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2007/07/28 14:27:10 obache Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION}
 PKGNAME=		erlang-${ERLANG_VERSION}
@@ -34,5 +34,4 @@ PLIST_SRC+=		PLIST.common_end
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index 29323b07c09..c2940db79e0 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,58 +1,60 @@
-# $NetBSD: Makefile.versions,v 1.4 2007/07/08 14:12:13 uebayasi Exp $
+# $NetBSD: Makefile.versions,v 1.5 2007/07/28 14:27:10 obache Exp $
 
-ERLANG_VERSION=			11.0
-DIST_VERSION=			R11B-0
+ERLANG_VERSION=			11.5
+DIST_VERSION=			R11B-5
 
 _VERSIONS= \
-	appmon			2.1.6 \
-	asn1			1.4.4.10 \
-	compiler		4.4 \
-	cosEvent		2.1 \
-	cosEventDomain		1.1 \
-	cosFileTransfer		1.1.2 \
-	cosNotification		1.1.3 \
-	cosProperty		1.1.1 \
-	cosTime			1.1 \
-	cosTransactions		1.2 \
-	crypto			1.5 \
-	debugger		3.1 \
-	dialyzer		1.4.1 \
-	edoc			0.6.9 \
-	erl_interface		3.5.5 \
-	erts			5.5 \
-	esdl			0.95.0630 \
-	et			1.0 \
-	gs			1.5.5 \
-	hipe			3.5.5 \
-	ic			4.2.11 \
-	inets			4.7.4 \
-	inviso			0.1 \
+	appmon			2.1.9 \
+	asn1			1.4.5 \
+	compiler		4.4.5 \
+	cosEvent		2.1.1 \
+	cosEventDomain		1.1.1 \
+	cosFileTransfer		1.1.3 \
+	cosNotification		1.1.5 \
+	cosProperty		1.1.4 \
+	cosTime			1.1.1 \
+	cosTransactions		1.2.2 \
+	crypto			1.5.1.1 \
+	debugger		3.1.1.1 \
+	dialyzer		1.7.0 \
+	docbuilder		0.9 \
+	edoc			0.7.3 \
+	erl_interface		3.5.5.3 \
+	erts			5.5.5 \
+	et			1.0.0.1 \
+	gs			1.5.7 \
+	hipe			3.6.3 \
+	ic			4.2.13 \
+	inets			4.7.16 \
+	inviso			0.4 \
 	jinterface		1.3 \
-	kernel			2.11 \
-	megaco			3.3.5 \
-	mnemosyne		1.2.6 \
-	mnesia			4.3.1 \
-	mnesia_session		1.1.6 \
-	odbc			2.0.6 \
-	observer		0.9.7 \
-	orber			3.6.3 \
-	os_mon			2.1 \
-	otp_mibs		1.0.4 \
-	parsetools		1.4 \
-	pman			2.5.2 \
-	runtime_tools		1.6 \
-	sasl			2.1.2 \
-	snmp			4.7.4 \
-	ssh			0.9.2 \
-	ssl			3.0.12 \
-	stdlib			1.14 \
-	syntax_tools		1.5.0 \
-	toolbar			1.3 \
-	tools			2.5 \
-	tv			2.1.3 \
-	webtool			0.8.3 \
-	xmerl			1.0.5
+	kernel			2.11.5 \
+	megaco			3.6.0.1 \
+	mnemosyne		1.2.7.1 \
+	mnesia			4.3.5 \
+	mnesia_session		1.1.6.1 \
+	observer		0.9.7.4 \
+	odbc			2.0.8 \
+	orber			3.6.6 \
+	os_mon			2.1.2.1 \
+	otp_mibs		1.0.4.1 \
+	parsetools		1.4.1.1 \
+	pman			2.6 \
+	runtime_tools		1.6.6 \
+	sasl			2.1.5.1 \
+	snmp			4.9.3 \
+	ssh			0.9.9.1 \
+	ssl			3.1.1.1 \
+	stdlib			1.14.5 \
+	syntax_tools		1.5.3 \
+	toolbar			1.3.0.1 \
+	tools			2.5.5 \
+	tv			2.1.4.1 \
+	typer			0.1.0.1 \
+	webtool			0.8.3.1 \
+	xmerl			1.1.4
 
 .for name version in ${_VERSIONS}
+VERSION.${name}=${version}
 PLIST_SUBST+=	VERSION.${name}=${version}
 .endfor
diff --git a/lang/erlang/PLIST.common b/lang/erlang/PLIST.common
index f1c3b322500..b72c8122ed2 100644
--- a/lang/erlang/PLIST.common
+++ b/lang/erlang/PLIST.common
@@ -1,15 +1,18 @@
-@comment $NetBSD: PLIST.common,v 1.4 2006/08/17 16:16:30 ghen Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2007/07/28 14:27:10 obache Exp $
 bin/dialyzer
 bin/epmd
 bin/erl
 bin/erlc
+bin/escript
 bin/run_erl
 bin/to_erl
+bin/typer
 lib/erlang/Install
 lib/erlang/bin/dialyzer
 lib/erlang/bin/epmd
 lib/erlang/bin/erl
 lib/erlang/bin/erlc
+lib/erlang/bin/escript
 lib/erlang/bin/run_erl
 lib/erlang/bin/start
 lib/erlang/bin/start.boot
@@ -18,16 +21,17 @@ lib/erlang/bin/start_clean.boot
 lib/erlang/bin/start_erl
 lib/erlang/bin/start_sasl.boot
 lib/erlang/bin/to_erl
+lib/erlang/bin/typer
 lib/erlang/erts-${VERSION.erts}/bin/beam
 lib/erlang/erts-${VERSION.erts}/bin/beam.hybrid
 lib/erlang/erts-${VERSION.erts}/bin/child_setup
-lib/erlang/erts-${VERSION.erts}/bin/child_setup.hybrid
 lib/erlang/erts-${VERSION.erts}/bin/dialyzer
 lib/erlang/erts-${VERSION.erts}/bin/epmd
 lib/erlang/erts-${VERSION.erts}/bin/erl
 lib/erlang/erts-${VERSION.erts}/bin/erl.src
 lib/erlang/erts-${VERSION.erts}/bin/erlc
 lib/erlang/erts-${VERSION.erts}/bin/erlexec
+lib/erlang/erts-${VERSION.erts}/bin/escript
 lib/erlang/erts-${VERSION.erts}/bin/heart
 lib/erlang/erts-${VERSION.erts}/bin/inet_gethost
 lib/erlang/erts-${VERSION.erts}/bin/run_erl
@@ -35,6 +39,7 @@ lib/erlang/erts-${VERSION.erts}/bin/start
 lib/erlang/erts-${VERSION.erts}/bin/start.src
 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}/include/driver_int.h
 lib/erlang/erts-${VERSION.erts}/include/erl_driver.h
 lib/erlang/erts-${VERSION.erts}/include/erl_fixed_size_int_types.h
@@ -121,7 +126,6 @@ lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1rt_check.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1rt_driver_handler.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1rt_per_bin.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1rt_per_bin_rt2ct.beam
-lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1rt_per_v1.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/examples/P-Record.asn
 lib/erlang/lib/asn1-${VERSION.asn1}/priv/lib/asn1_erl_drv.so
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1.app.src
@@ -150,7 +154,6 @@ lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1rt_check.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1rt_driver_handler.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1rt_per_bin.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1rt_per_bin_rt2ct.erl
-lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1rt_per_v1.erl
 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_bool.beam
@@ -994,6 +997,9 @@ lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto.beam
 lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto_app.beam
 lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto_server.beam
 lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto_sup.beam
+lib/erlang/lib/crypto-${VERSION.crypto}/priv/lib/crypto_drv.so
+lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/Makefile
+lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/crypto_drv.o
 lib/erlang/lib/crypto-${VERSION.crypto}/src/crypto.erl
 lib/erlang/lib/crypto-${VERSION.crypto}/src/crypto_app.erl
 lib/erlang/lib/crypto-${VERSION.crypto}/src/crypto_server.erl
@@ -1057,13 +1063,16 @@ 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_codeserver.beam
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_contracts.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_dataflow.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_dep.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_gui.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_icode.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_options.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_plt.beam
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_succ_typings.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_typesig.beam
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_utils.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/plt/dialyzer_init_plt
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer.hrl
@@ -1072,6 +1081,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_codeserver.erl
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_contracts.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_dataflow.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_dep.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_gui.erl
@@ -1079,7 +1089,91 @@ lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_icode.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_init_plt
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_options.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_plt.erl
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_succ_typings.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_typesig.erl
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_utils.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/application.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/appref.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/book.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/bookinsidecover.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/chapter.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/cites.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/common.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/common.entities.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/common.header.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/common.image.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/common.refs.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/common.table.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/comref.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/cref.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/erlref.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/fascicules.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/fileref.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/part.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/report.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/terms.dtd
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd/xhtml-lat1.ent
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_edoc_xml_cb.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_gen.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_html_layout.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_html_ref.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_html_util.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_html_util_iso.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_main.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_pretty_format.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_application2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_appref2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_chapter2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_cite2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_comref2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_cref2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_erlref2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_fileref2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_first2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_index2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_part2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_refs2kwic.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_report2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_tr_term2html.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_transform.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_util.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_xmerl_tree_cb.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_xmerl_xml_cb.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docb_xml_check.beam
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docbuilder.app
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin/docbuilder.appup
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/etc/note.gif
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/etc/warning.gif
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_edoc_xml_cb.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_gen.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_html_layout.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_html_ref.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_html_util.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_html_util_iso.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_main.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_pretty_format.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_application2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_appref2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_chapter2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_cite2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_comref2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_cref2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_erlref2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_fileref2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_first2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_index2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_part2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_refs2kwic.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_report2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_tr_term2html.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_transform.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_util.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_util.hrl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_xmerl_tree_cb.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_xmerl_xml_cb.erl
+lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src/docb_xml_check.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/ebin/edoc.app
 lib/erlang/lib/edoc-${VERSION.edoc}/ebin/edoc.appup
 lib/erlang/lib/edoc-${VERSION.edoc}/ebin/edoc.beam
@@ -1098,12 +1192,16 @@ lib/erlang/lib/edoc-${VERSION.edoc}/ebin/edoc_tags.beam
 lib/erlang/lib/edoc-${VERSION.edoc}/ebin/edoc_types.beam
 lib/erlang/lib/edoc-${VERSION.edoc}/ebin/edoc_wiki.beam
 lib/erlang/lib/edoc-${VERSION.edoc}/ebin/otpsgml_layout.beam
+lib/erlang/lib/edoc-${VERSION.edoc}/include/edoc_doclet.hrl
 lib/erlang/lib/edoc-${VERSION.edoc}/priv/edoc_generate
+lib/erlang/lib/edoc-${VERSION.edoc}/priv/edoc.dtd
+lib/erlang/lib/edoc-${VERSION.edoc}/priv/erlang.png
 lib/erlang/lib/edoc-${VERSION.edoc}/priv/stylesheet.css
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc.hrl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_data.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_doclet.erl
+lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_doclet.hrl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_extract.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_layout.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_lib.erl
@@ -1115,6 +1213,7 @@ lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_run.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_scanner.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_tags.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_types.erl
+lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_types.hrl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/edoc_wiki.erl
 lib/erlang/lib/edoc-${VERSION.edoc}/src/otpsgml_layout.erl
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/bin/erl_call
@@ -1401,7 +1500,6 @@ lib/erlang/lib/gs-${VERSION.gs}/ebin/gstk_widgets.beam
 lib/erlang/lib/gs-${VERSION.gs}/ebin/gstk_window.beam
 lib/erlang/lib/gs-${VERSION.gs}/ebin/tcl2erl.beam
 lib/erlang/lib/gs-${VERSION.gs}/ebin/tool_file_dialog.beam
-lib/erlang/lib/gs-${VERSION.gs}/ebin/tool_genfd.beam
 lib/erlang/lib/gs-${VERSION.gs}/ebin/tool_utils.beam
 lib/erlang/lib/gs-${VERSION.gs}/examples/ebin/ball.beam
 lib/erlang/lib/gs-${VERSION.gs}/examples/ebin/browser.beam
@@ -1435,6 +1533,7 @@ lib/erlang/lib/gs-${VERSION.gs}/examples/src/line_demo.erl
 lib/erlang/lib/gs-${VERSION.gs}/examples/src/man.erl
 lib/erlang/lib/gs-${VERSION.gs}/examples/src/menu_demo.erl
 lib/erlang/lib/gs-${VERSION.gs}/examples/src/rubber.erl
+lib/erlang/lib/gs-${VERSION.gs}/priv/bitmap/fup.bm
 lib/erlang/lib/gs-${VERSION.gs}/priv/gs-xdefaults
 lib/erlang/lib/gs-${VERSION.gs}/priv/gstk.tcl
 lib/erlang/lib/gs-${VERSION.gs}/src/gs.app.src
@@ -1479,9 +1578,7 @@ lib/erlang/lib/gs-${VERSION.gs}/src/gstk_widgets.erl
 lib/erlang/lib/gs-${VERSION.gs}/src/gstk_window.erl
 lib/erlang/lib/gs-${VERSION.gs}/src/tcl2erl.erl
 lib/erlang/lib/gs-${VERSION.gs}/src/tool_file_dialog.erl
-lib/erlang/lib/gs-${VERSION.gs}/src/tool_genfd.erl
 lib/erlang/lib/gs-${VERSION.gs}/src/tool_utils.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_binary_pattern_match.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_cconv.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_closurean.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_hipe_primops.hrl
@@ -1493,10 +1590,8 @@ lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_pmatch.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_prettypr.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_to_icode.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_typean.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_typesig.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/cerl/erl_bif_types.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/cerl/erl_types.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_binary_pattern_match.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_cconv.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_closurean.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_hipeify.beam
@@ -1507,7 +1602,6 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_pmatch.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_prettypr.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_to_icode.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_typean.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_typesig.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_bif_types.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_types.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.app
@@ -1522,21 +1616,27 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dot.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gen_cfg.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gensym.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_binary_pass.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_bincomp.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_callgraph.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_cfg.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_coordinator.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ebb.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_exceptions.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_fp.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_heap_test.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_inline_bifs.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_instruction_counter.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_liveness.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_mulret.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_pp.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_primops.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_range.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_range_an.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_split_arith.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_const_prop.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_copy_prop.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_struct_reuse.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_type.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_main.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arch.beam
@@ -1551,21 +1651,28 @@ lib/erlang/lib/hipe-${VERSION.hipe}/flow/liveness.inc
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_beam_to_icode.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_binary_pass.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_bincomp.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_callgraph.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_cfg.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_coordinator.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ebb.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_exceptions.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_fp.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_heap_test.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_inline_bifs.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_instruction_counter.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_liveness.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_mulret.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_pp.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_primops.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_primops.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_range.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_range_an.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_split_arith.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_const_prop.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_copy_prop.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_struct_reuse.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.hrl
 lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.erl
@@ -1731,6 +1838,7 @@ lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_cgi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_conf.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_esi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_example.beam
+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_manager.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_misc_sup.beam
@@ -1743,6 +1851,7 @@ lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_util.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets.app
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets.appup
+lib/erlang/lib/inets-${VERSION.inets}/ebin/inets.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_app.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_actions.beam
@@ -1918,6 +2027,7 @@ lib/erlang/lib/inets-${VERSION.inets}/src/httpd_cgi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_conf.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_esi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_example.erl
+lib/erlang/lib/inets-${VERSION.inets}/src/httpd_file.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_instance_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_manager.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_misc_sup.erl
@@ -1928,6 +2038,7 @@ lib/erlang/lib/inets-${VERSION.inets}/src/httpd_script_env.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_socket.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpd_util.erl
+lib/erlang/lib/inets-${VERSION.inets}/src/inets.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_internal.hrl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_sup.erl
@@ -1967,10 +2078,14 @@ lib/erlang/lib/inviso-${VERSION.inviso}/ebin/inviso.beam
 lib/erlang/lib/inviso-${VERSION.inviso}/ebin/inviso_c.beam
 lib/erlang/lib/inviso-${VERSION.inviso}/ebin/inviso_lfm.beam
 lib/erlang/lib/inviso-${VERSION.inviso}/ebin/inviso_lfm_tpfreader.beam
+lib/erlang/lib/inviso-${VERSION.inviso}/ebin/inviso_tool.beam
+lib/erlang/lib/inviso-${VERSION.inviso}/ebin/inviso_tool_lib.beam
 lib/erlang/lib/inviso-${VERSION.inviso}/src/inviso.erl
 lib/erlang/lib/inviso-${VERSION.inviso}/src/inviso_c.erl
 lib/erlang/lib/inviso-${VERSION.inviso}/src/inviso_lfm.erl
 lib/erlang/lib/inviso-${VERSION.inviso}/src/inviso_lfm_tpfreader.erl
+lib/erlang/lib/inviso-${VERSION.inviso}/src/inviso_tool.erl
+lib/erlang/lib/inviso-${VERSION.inviso}/src/inviso_tool_lib.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application_controller.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application_master.beam
@@ -1998,6 +2113,7 @@ lib/erlang/lib/kernel-${VERSION.kernel}/ebin/erts_debug.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/file.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/file_io_server.beam
 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_udp.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/global.beam
@@ -2017,6 +2133,7 @@ lib/erlang/lib/kernel-${VERSION.kernel}/ebin/inet_gethost_native.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/inet_hosts.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/inet_parse.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/inet_res.beam
+lib/erlang/lib/kernel-${VERSION.kernel}/ebin/inet_sctp.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/inet_tcp.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/inet_tcp_dist.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/inet_udp.beam
@@ -2028,7 +2145,6 @@ lib/erlang/lib/kernel-${VERSION.kernel}/ebin/kernel_config.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/old_file_server.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/os.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/otp_ring0.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/packages.beam
@@ -2083,6 +2199,7 @@ lib/erlang/lib/kernel-${VERSION.kernel}/src/erts_debug.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/file.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/file_io_server.erl
 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_udp.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/global.erl
@@ -2107,6 +2224,7 @@ lib/erlang/lib/kernel-${VERSION.kernel}/src/inet_int.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/inet_parse.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/inet_res.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/inet_res.hrl
+lib/erlang/lib/kernel-${VERSION.kernel}/src/inet_sctp.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/inet_tcp.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/inet_tcp_dist.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/inet_udp.erl
@@ -2117,7 +2235,6 @@ lib/erlang/lib/kernel-${VERSION.kernel}/src/net.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/net_address.hrl
 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/old_file_server.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/os.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/otp_ring0.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/packages.erl
@@ -2137,39 +2254,47 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco.appup
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_drv_media_gateway_control_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_drv_media_gateway_control_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_drv_media_gateway_control_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_drv_media_gateway_control_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_drv_media_gateway_control_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_encoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_media_gateway_control_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_media_gateway_control_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_media_gateway_control_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_media_gateway_control_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_media_gateway_control_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_encoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_media_gateway_control_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_media_gateway_control_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_media_gateway_control_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_media_gateway_control_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_media_gateway_control_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_encoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_encoder_lib.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_name_resolver_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_name_resolver_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_name_resolver_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_name_resolver_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_name_resolver_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_term_id.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_term_id_gen.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_transformer_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_transformer_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_transformer_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_transformer_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_transformer_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_compact_text_encoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_compact_text_encoder_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_compact_text_encoder_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_compact_text_encoder_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_compact_text_encoder_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_compact_text_encoder_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_config.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_digit_map.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_edist_compress.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_encoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_erl_dist_encoder.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_erl_dist_encoder_mc.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_filter.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_flex_scanner.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_flex_scanner_handler.beam
@@ -2179,21 +2304,25 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_misc_sup.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_monitor.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_drv_media_gateway_control_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_drv_media_gateway_control_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_drv_media_gateway_control_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_drv_media_gateway_control_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_drv_media_gateway_control_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_encoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_media_gateway_control_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_media_gateway_control_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_media_gateway_control_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_media_gateway_control_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_media_gateway_control_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_encoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_media_gateway_control_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_media_gateway_control_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_media_gateway_control_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_media_gateway_control_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_media_gateway_control_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_pretty_text_encoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_pretty_text_encoder_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_pretty_text_encoder_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_pretty_text_encoder_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_pretty_text_encoder_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_pretty_text_encoder_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_sdp.beam
@@ -2209,9 +2338,11 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_text_mini_decoder.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_text_mini_parser.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_text_parser_prev3a.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_text_parser_prev3b.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_text_parser_prev3c.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_text_parser_v1.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_text_parser_v2.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_text_scanner.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_timer.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_trans_sender.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_trans_sup.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_transport.beam
@@ -2221,9 +2352,17 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_udp_sup.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_user_default.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_meas.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_meas.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_mstone1.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_mstone1.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_mstone2.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_mstone2.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_mstone_lib.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_mstone_lib.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_transform.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_transform.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/mstone1.sh.skel
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/time_test.tgz
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/trans.sh.skel
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/simple/megaco_simple_mg.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/simple/megaco_simple_mg.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/simple/megaco_simple_mgc.beam
@@ -2231,11 +2370,14 @@ lib/erlang/lib/megaco-${VERSION.megaco}/examples/simple/megaco_simple_mgc.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/include/megaco.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/include/megaco_message_prev3a.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/include/megaco_message_prev3b.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/include/megaco_message_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/include/megaco_message_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/include/megaco_message_v2.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/include/megaco_sdp.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/priv/lib/megaco_flex_scanner_drv.so
 lib/erlang/lib/megaco-${VERSION.megaco}/priv/lib/megaco_flex_scanner_drv_mt.so
+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-v1.asn
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/MEDIA-GATEWAY-CONTROL-v2.asn
@@ -2243,6 +2385,8 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gate
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3b.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3b.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3c.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.erl
@@ -2252,6 +2396,8 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_prev3a.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_prev3b.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_prev3b.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_prev3c.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_v2.erl
@@ -2261,6 +2407,8 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_cont
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3a.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3b.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3b.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3c.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_v2.erl
@@ -2269,18 +2417,22 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_encoder_lib.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_name_resolver_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_name_resolver_prev3b.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_name_resolver_prev3c.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_name_resolver_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_name_resolver_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_term_id.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_term_id_gen.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_transformer_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_transformer_prev3b.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_transformer_prev3c.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_transformer_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_transformer_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_prev3a.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_prev3b.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_prev3b.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_prev3c.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_v2.erl
@@ -2290,6 +2442,8 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_prev3a.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_prev3b.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_prev3b.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_prev3c.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_v2.erl
@@ -2297,19 +2451,22 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_prev3a.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_prev3b.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_prev3b.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_prev3c.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_v2.hrl
-lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_config.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_digit_map.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_edist_compress.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_erl_dist_encoder.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_erl_dist_encoder_mc.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_filter.erl
-lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_internal.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_message_internal.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_messenger.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_messenger_misc.erl
@@ -2318,6 +2475,7 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_monitor.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_sdp.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_stats.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_sup.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/engine/megaco_timer.erl
 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
@@ -2335,15 +2493,18 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/tcp/megaco_tcp_sup.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_compact_text_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_compact_text_encoder_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_compact_text_encoder_prev3b.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_compact_text_encoder_prev3c.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_compact_text_encoder_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_compact_text_encoder_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_pretty_text_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_pretty_text_encoder_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_pretty_text_encoder_prev3b.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_pretty_text_encoder_prev3c.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_pretty_text_encoder_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_pretty_text_encoder_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_gen_prev3a.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_gen_prev3b.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_gen_prev3c.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_gen_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_gen_v2.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_mini_decoder.erl
@@ -2356,6 +2517,9 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_prev3a.yrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_prev3b.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_prev3b.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_prev3b.yrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_prev3c.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_prev3c.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_prev3c.yrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v1.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v1.yrl
@@ -2802,11 +2966,13 @@ lib/erlang/lib/os_mon-${VERSION.os_mon}/include/OTP-OS-MON-MIB.hrl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/mibs/OTP-OS-MON-MIB.funcs
 lib/erlang/lib/os_mon-${VERSION.os_mon}/mibs/OTP-OS-MON-MIB.mib
 lib/erlang/lib/os_mon-${VERSION.os_mon}/mibs/v1/OTP-OS-MON-MIB.mib.v1
+lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/memsup
 lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/mibs/OTP-OS-MON-MIB.bin
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/cpu_sup.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/disksup.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/memsup.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/memsup.hrl
+lib/erlang/lib/os_mon-${VERSION.os_mon}/src/memsup.c
 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
@@ -2849,8 +3015,6 @@ lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_buf_utils.beam
 lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_main.beam
 lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_module_info.beam
 lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_options.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_osdepend.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_primitive.beam
 lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_process.beam
 lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_relay.beam
 lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_relay_server.beam
@@ -2861,7 +3025,6 @@ lib/erlang/lib/pman-${VERSION.pman}/priv/pman.gif
 lib/erlang/lib/pman-${VERSION.pman}/priv/pman.tool
 lib/erlang/lib/pman-${VERSION.pman}/src/assert.hrl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman.hrl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf.hrl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf_buffer.erl
@@ -2872,8 +3035,6 @@ lib/erlang/lib/pman-${VERSION.pman}/src/pman_main.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_module_info.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_options.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_options.hrl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_osdepend.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_primitive.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_process.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_relay.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_relay_server.erl
@@ -2882,6 +3043,7 @@ lib/erlang/lib/pman-${VERSION.pman}/src/pman_tool.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_win.erl
 lib/erlang/lib/pman-${VERSION.pman}/src/pman_win.hrl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/dbg.beam
+lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/erts_alloc_config.beam
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/inviso_as_lib.beam
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/inviso_autostart.beam
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/ebin/inviso_autostart_server.beam
@@ -2897,6 +3059,7 @@ lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/include/observer_backend.h
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_file_drv.so
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_ip_drv.so
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/dbg.erl
+lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/erts_alloc_config.erl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/inviso_as_lib.erl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/inviso_autostart.erl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/inviso_autostart_server.erl
@@ -2962,6 +3125,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmp_generic.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmp_generic_mnesia.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmp_index.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmp_log.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmp_mini_mib.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmp_misc.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmp_note_store.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmp_notification_mib.beam
@@ -2979,6 +3143,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_agent.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_agent_sup.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_app.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_authentication_service.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_conf.beam
 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
@@ -2999,6 +3164,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_set_mechanism.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_supervisor.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_svbl.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_symbolic_store.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_target_cache.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_trap.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_usm.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_vacm.beam
@@ -3009,6 +3175,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpc_mib_to_hrl.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpc_misc.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpc_tok.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpm.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpm_conf.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpm_config.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpm_misc_sup.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpm_mpd.beam
@@ -3029,6 +3196,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/examples/ex2/snmp_ex2_manager.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/examples/ex2/snmp_ex2_manager.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/examples/ex2/snmp_ex2_simple_standard_test.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/examples/ex2/snmp_ex2_simple_standard_test.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/include/INET-ADDRESS-MIB.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/include/OTP-SNMPEA-MIB.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/include/RFC1213-MIB.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/include/SNMP-COMMUNITY-MIB.hrl
@@ -3045,6 +3213,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/include/SNMPv2-TM.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/include/STANDARD-MIB.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/include/snmp_tables.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/include/snmp_types.hrl
+lib/erlang/lib/snmp-${VERSION.snmp}/mibs/INET-ADDRESS-MIB.mib
 lib/erlang/lib/snmp-${VERSION.snmp}/mibs/OTP-SNMPEA-MIB.mib
 lib/erlang/lib/snmp-${VERSION.snmp}/mibs/RFC1213-MIB.mib
 lib/erlang/lib/snmp-${VERSION.snmp}/mibs/SNMP-COMMUNITY-MIB.mib
@@ -3081,6 +3250,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/priv/conf/agent/vacm.conf
 lib/erlang/lib/snmp-${VERSION.snmp}/priv/conf/manager/agents.conf
 lib/erlang/lib/snmp-${VERSION.snmp}/priv/conf/manager/manager.conf
 lib/erlang/lib/snmp-${VERSION.snmp}/priv/conf/manager/users.conf
+lib/erlang/lib/snmp-${VERSION.snmp}/priv/mibs/INET-ADDRESS-MIB.bin
 lib/erlang/lib/snmp-${VERSION.snmp}/priv/mibs/OTP-SNMPEA-MIB.bin
 lib/erlang/lib/snmp-${VERSION.snmp}/priv/mibs/RFC1213-MIB.bin
 lib/erlang/lib/snmp-${VERSION.snmp}/priv/mibs/SNMP-COMMUNITY-MIB.bin
@@ -3112,11 +3282,13 @@ lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_agent_sup.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_app.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_atl.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_authentication_service.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_conf.erl
 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
@@ -3132,6 +3304,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_set_mechanism.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_supervisor.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_svbl.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_symbolic_store.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_target_cache.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_trap.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_usm.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_vacm.erl
@@ -3150,7 +3323,9 @@ lib/erlang/lib/snmp-${VERSION.snmp}/src/compiler/snmpc_misc.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/compiler/snmpc_tok.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/manager/snmpm.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/manager/snmpm_atl.hrl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/manager/snmpm_conf.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/manager/snmpm_config.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/manager/snmpm_internal.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/manager/snmpm_misc_sup.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/manager/snmpm_mpd.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/manager/snmpm_net_if.erl
@@ -3166,6 +3341,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/src/misc/snmp_conf.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/misc/snmp_config.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/misc/snmp_debug.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/misc/snmp_log.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/misc/snmp_mini_mib.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/misc/snmp_misc.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/misc/snmp_note_store.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/misc/snmp_pdus.erl
@@ -3189,6 +3365,7 @@ lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_no_io.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_rsa.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sftp.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sftpd.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sftpd_file.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_ssh.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sshd.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_tcp.beam
@@ -3214,6 +3391,7 @@ lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_no_io.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_rsa.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sftp.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sftpd.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sftpd_file.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_ssh.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sshd.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_tcp.erl
@@ -3306,14 +3484,6 @@ lib/erlang/lib/ssl-${VERSION.ssl}/pkix/SSL-PKIX.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/mk_ssl_pkix_oid.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/ssl_pkix_oid.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/priv/bin/ssl_esock
-lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/Makefile
-lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/debuglog.o
-lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock.o
-lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_openssl.o
-lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_osio.o
-lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_poll.o
-lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_posix_str.o
-lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_utils.o
 lib/erlang/lib/ssl-${VERSION.ssl}/src/inet_ssl_dist.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_app.erl
@@ -3327,6 +3497,7 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_pkix.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_prim.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_server.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_sup.erl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/base64.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/beam_lib.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/c.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/calendar.beam
@@ -3355,6 +3526,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/erl_scan.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/erl_tar.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/error_logger_file_h.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/error_logger_tty_h.beam
+lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/escript.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/ets.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/eval_bits.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/file_sorter.beam
@@ -3373,7 +3545,6 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/io_lib_fread.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/io_lib_pretty.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/lib.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/lists.beam
-lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/lists_sort.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/log_mf_h.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/math.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/ms_transform.beam
@@ -3409,6 +3580,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/include/erl_compile.hrl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/include/ms_transform.hrl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/include/qlc.hrl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/include/zip.hrl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/src/base64.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/beam_lib.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/c.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/calendar.erl
@@ -3439,6 +3611,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/src/erl_scan.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/erl_tar.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/error_logger_file_h.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/error_logger_tty_h.erl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/src/escript.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/ets.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/eval_bits.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/file_sorter.erl
@@ -3457,7 +3630,6 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/src/io_lib_fread.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/io_lib_pretty.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/lib.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/lists.erl
-lib/erlang/lib/stdlib-${VERSION.stdlib}/src/lists_sort.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/log_mf_h.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/math.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/ms_transform.erl
@@ -3496,6 +3668,7 @@ lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/igor.beam
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/prettypr.beam
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/syntax_tools.app
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/syntax_tools.appup
+lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/examples/demo.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/epp_dodger.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_comment_scan.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_prettypr.erl
@@ -3505,6 +3678,24 @@ lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_syntax_lib.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_tidy.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/igor.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/prettypr.erl
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer.app
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer.appup
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer.beam
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer_generator.beam
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer_info.beam
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer_map.beam
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer_options.beam
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer_parse.beam
+lib/erlang/lib/typer-${VERSION.typer}/ebin/typer_preprocess.beam
+lib/erlang/lib/typer-${VERSION.typer}/src/typer.erl
+lib/erlang/lib/typer-${VERSION.typer}/src/typer.hrl
+lib/erlang/lib/typer-${VERSION.typer}/src/typer_generator.erl
+lib/erlang/lib/typer-${VERSION.typer}/src/typer_info.erl
+lib/erlang/lib/typer-${VERSION.typer}/src/typer_map.erl
+lib/erlang/lib/typer-${VERSION.typer}/src/typer_options.erl
+lib/erlang/lib/typer-${VERSION.typer}/src/typer_parse.erl
+lib/erlang/lib/typer-${VERSION.typer}/src/typer_parse.yrl
+lib/erlang/lib/typer-${VERSION.typer}/src/typer_preprocess.erl
 lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/canvasbutton.beam
 lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/toolbar.app
 lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/toolbar.appup
@@ -3670,10 +3861,13 @@ lib/erlang/lib/webtool-${VERSION.webtool}/src/webtool_sup.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl.app
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl.appup
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl.beam
+lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_b64Bin.beam
+lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_b64Bin_scan.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_eventp.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_html.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_lib.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_otpsgml.beam
+lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_regexp.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_scan.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_sgml.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_simple.beam
@@ -3688,16 +3882,22 @@ lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xpath_parse.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xpath_pred.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xpath_scan.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xs.beam
+lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xsd.beam
+lib/erlang/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xsd_type.beam
 lib/erlang/lib/xmerl-${VERSION.xmerl}/include/xmerl.hrl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/include/xmerl_xlink.hrl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/include/xmerl_xpath.hrl
+lib/erlang/lib/xmerl-${VERSION.xmerl}/include/xmerl_xsd.hrl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl.app.src
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl.appup.src
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl.erl
+lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_b64Bin.erl
+lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_b64Bin_scan.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_eventp.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_html.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_lib.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_otpsgml.erl
+lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_regexp.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_scan.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_sgml.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_simple.erl
@@ -3712,6 +3912,8 @@ lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_xpath_parse.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_xpath_pred.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_xpath_scan.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_xs.erl
+lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_xsd.erl
+lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_xsd_type.erl
 lib/erlang/misc/format_man_pages
 lib/erlang/misc/makewhatis
 lib/erlang/releases/R11B/start.boot
diff --git a/lang/erlang/PLIST.common_end b/lang/erlang/PLIST.common_end
index 4d9bfd70d31..4c43c50da55 100644
--- a/lang/erlang/PLIST.common_end
+++ b/lang/erlang/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.4 2006/08/17 16:16:30 ghen Exp $
+@comment $NetBSD: PLIST.common_end,v 1.5 2007/07/28 14:27:10 obache Exp $
 @dirrm lib/erlang/usr/lib
 @dirrm lib/erlang/usr/include/obsolete
 @dirrm lib/erlang/usr/include
@@ -18,6 +18,9 @@
 @dirrm lib/erlang/lib/webtool-${VERSION.webtool}/priv
 @dirrm lib/erlang/lib/webtool-${VERSION.webtool}/ebin
 @dirrm lib/erlang/lib/webtool-${VERSION.webtool}
+@dirrm lib/erlang/lib/typer-${VERSION.typer}/src
+@dirrm lib/erlang/lib/typer-${VERSION.typer}/ebin
+@dirrm lib/erlang/lib/typer-${VERSION.typer}
 @dirrm lib/erlang/lib/tv-${VERSION.tv}/src
 @dirrm lib/erlang/lib/tv-${VERSION.tv}/priv
 @dirrm lib/erlang/lib/tv-${VERSION.tv}/ebin
@@ -34,6 +37,7 @@
 @dirrm lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin
 @dirrm lib/erlang/lib/toolbar-${VERSION.toolbar}
 @dirrm lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src
+@dirrm lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/examples
 @dirrm lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin
 @dirrm lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}
 @dirrm lib/erlang/lib/stdlib-${VERSION.stdlib}/src
@@ -42,7 +46,6 @@
 @dirrm lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin
 @dirrm lib/erlang/lib/stdlib-${VERSION.stdlib}
 @dirrm lib/erlang/lib/ssl-${VERSION.ssl}/src
-@dirrm lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj
 @dirrm lib/erlang/lib/ssl-${VERSION.ssl}/priv/bin
 @dirrm lib/erlang/lib/ssl-${VERSION.ssl}/priv
 @dirrm lib/erlang/lib/ssl-${VERSION.ssl}/pkix
@@ -123,6 +126,7 @@
 @dirrm lib/erlang/lib/otp_mibs-${VERSION.otp_mibs}
 @dirrm lib/erlang/lib/os_mon-${VERSION.os_mon}/src
 @dirrm lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/mibs
+@dirrm lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin
 @dirrm lib/erlang/lib/os_mon-${VERSION.os_mon}/priv
 @dirrm lib/erlang/lib/os_mon-${VERSION.os_mon}/mibs/v1
 @dirrm lib/erlang/lib/os_mon-${VERSION.os_mon}/mibs
@@ -171,6 +175,7 @@
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/src/flex
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/src/engine
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/src/binary
+@dirrm lib/erlang/lib/megaco-${VERSION.megaco}/src/app
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/src
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/priv/lib
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/priv
@@ -244,6 +249,7 @@
 @dirrm lib/erlang/lib/hipe-${VERSION.hipe}/cerl
 @dirrm lib/erlang/lib/hipe-${VERSION.hipe}
 @dirrm lib/erlang/lib/gs-${VERSION.gs}/src
+@dirrm lib/erlang/lib/gs-${VERSION.gs}/priv/bitmap
 @dirrm lib/erlang/lib/gs-${VERSION.gs}/priv
 @dirrm lib/erlang/lib/gs-${VERSION.gs}/examples/src
 @dirrm lib/erlang/lib/gs-${VERSION.gs}/examples/ebin
@@ -283,8 +289,14 @@
 @dirrm lib/erlang/lib/erl_interface-${VERSION.erl_interface}
 @dirrm lib/erlang/lib/edoc-${VERSION.edoc}/src
 @dirrm lib/erlang/lib/edoc-${VERSION.edoc}/priv
+@dirrm lib/erlang/lib/edoc-${VERSION.edoc}/include
 @dirrm lib/erlang/lib/edoc-${VERSION.edoc}/ebin
 @dirrm lib/erlang/lib/edoc-${VERSION.edoc}
+@dirrm lib/erlang/lib/docbuilder-${VERSION.docbuilder}/src
+@dirrm lib/erlang/lib/docbuilder-${VERSION.docbuilder}/etc
+@dirrm lib/erlang/lib/docbuilder-${VERSION.docbuilder}/ebin
+@dirrm lib/erlang/lib/docbuilder-${VERSION.docbuilder}/dtd
+@dirrm lib/erlang/lib/docbuilder-${VERSION.docbuilder}
 @dirrm lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src
 @dirrm lib/erlang/lib/dialyzer-${VERSION.dialyzer}/plt
 @dirrm lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin
@@ -294,9 +306,7 @@
 @dirrm lib/erlang/lib/debugger-${VERSION.debugger}/ebin
 @dirrm lib/erlang/lib/debugger-${VERSION.debugger}
 @dirrm lib/erlang/lib/crypto-${VERSION.crypto}/src
-@exec ${MKDIR} %D/lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj
 @dirrm lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj
-@exec ${MKDIR} %D/lib/erlang/lib/crypto-${VERSION.crypto}/priv/lib
 @dirrm lib/erlang/lib/crypto-${VERSION.crypto}/priv/lib
 @dirrm lib/erlang/lib/crypto-${VERSION.crypto}/priv
 @dirrm lib/erlang/lib/crypto-${VERSION.crypto}/ebin
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index de4826d03ff..f237b11d1d2 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2007/02/26 15:47:43 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/07/28 14:27:10 obache Exp $
 
-SHA1 (erlang/otp_src_R11B-0.tar.gz) = 83b620810e5eb8440b4b18809558b8c42c9ad5b0
-RMD160 (erlang/otp_src_R11B-0.tar.gz) = cb2c163f9404feea9b56a5adddb3bdd505e0b494
-Size (erlang/otp_src_R11B-0.tar.gz) = 10844070 bytes
-SHA1 (patch-ab) = ced331e223b3b1de88426de5f18fe066ca8be028
-SHA1 (patch-ac) = f584b213db636f3be29fb4f99b9cfb85ee9374ad
-SHA1 (patch-ad) = 180db5c15a1c238773288e842f86c102614ba2a6
+SHA1 (erlang/otp_src_R11B-5.tar.gz) = c03569f0387b04b0afcc5f59983792676fd4382b
+RMD160 (erlang/otp_src_R11B-5.tar.gz) = 67eac12a891df0e8d46b383ea0997f9de3aa6ac6
+Size (erlang/otp_src_R11B-5.tar.gz) = 38332865 bytes
+SHA1 (patch-ab) = 1bf4d079f0138d97b0a86a8d75e87fce14586c49
+SHA1 (patch-ae) = fba8ebcba12fae810f1c554b678f0b434e364833
diff --git a/lang/erlang/patches/patch-ab b/lang/erlang/patches/patch-ab
index 871844ed494..b712f7984df 100644
--- a/lang/erlang/patches/patch-ab
+++ b/lang/erlang/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2003/08/31 01:01:56 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2007/07/28 14:27:10 obache Exp $
 
---- make/otp.mk.in.orig	2003-08-29 11:34:39.000000000 +0100
-+++ make/otp.mk.in	2003-08-29 11:34:56.000000000 +0100
-@@ -155,7 +155,7 @@
+--- make/otp.mk.in.orig	2007-06-11 13:01:44.000000000 +0000
++++ make/otp.mk.in
+@@ -166,7 +166,7 @@ endif
  
  
  $(JAVA_DEST_ROOT)$(JAVA_CLASS_SUBDIR)%.class: %.java
diff --git a/lang/erlang/patches/patch-ac b/lang/erlang/patches/patch-ac
deleted file mode 100644
index ad563f0c765..00000000000
--- a/lang/erlang/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/01/01 18:24:58 kristerw Exp $
-
---- erts/configure.orig	2006-01-01 17:45:43.000000000 +0100
-+++ erts/configure	2006-01-01 17:46:23.000000000 +0100
-@@ -5724,7 +5724,7 @@
-     __asm__ __volatile__("fldcw %0" : : "m"(cw));
- }
- 
--#if defined(__x86_64__)
-+#if defined(__x86_64__) && !defined(__NetBSD__)
- static void unmask_sse2(void)
- {
-     unsigned int mxcsr;
diff --git a/lang/erlang/patches/patch-ad b/lang/erlang/patches/patch-ad
deleted file mode 100644
index c3d929874dd..00000000000
--- a/lang/erlang/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/01 18:24:58 kristerw Exp $
-
---- erts/emulator/sys/unix/sys_float.c.orig	2006-01-01 17:46:42.000000000 +0100
-+++ erts/emulator/sys/unix/sys_float.c	2006-01-01 17:47:07.000000000 +0100
-@@ -52,7 +52,7 @@
-     __asm__ __volatile__("fldcw %0" : : "m"(cw));
- }
- 
--#if defined(__x86_64__)
-+#if defined(__x86_64__) && !defined(__NetBSD__)
- static void unmask_sse2(void)
- {
-     unsigned int mxcsr;
diff --git a/lang/erlang/patches/patch-ae b/lang/erlang/patches/patch-ae
new file mode 100644
index 00000000000..1c00d803b5f
--- /dev/null
+++ b/lang/erlang/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/07/28 14:27:11 obache Exp $
+
+--- lib/crypto/c_src/Makefile.in.orig	2007-06-11 12:59:08.000000000 +0000
++++ lib/crypto/c_src/Makefile.in
+@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targ
+ release_spec: opt
+ 	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
+ 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
+-	$(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj
++	$(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj
+ 	$(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj
+ 	$(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib
+