Update erlang, erland-doc and erlang-man to 12.0, aka R12B-0.

This builds again on x86_64 platforms, is@ will test further.

This release supports new language extensions bitstring and binary
comprehensions.

Other major changes are listed on <http://www.erlang.org/doc/highlights.html>.
See <http://www.erlang.org/download/otp_src_R12B-0.readme> for full detail.

6 files changed, 311 insertions, 247 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index aff463fb252..ad80d16c595 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2008/01/03 15:58:45 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/01/04 14:05:05 ghen Exp $
 
-DISTNAME=		otp_src_${DIST_VERSION}
+DISTNAME=		otp_src_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR}
 PKGNAME=		erlang-${ERLANG_VERSION}
-PKGREVISION=		2
 CATEGORIES=		lang
 MASTER_SITES=		http://www.erlang.org/download/
 
@@ -26,8 +25,6 @@ SUBST_MESSAGE.target=	Fixing target name.
 
 PLIST_SRC=		PLIST.common
 
-NOT_FOR_PLATFORM=	NetBSD-*-x86_64
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "DragonFly"
diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index c2940db79e0..11c8a12b213 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,58 +1,62 @@
-# $NetBSD: Makefile.versions,v 1.5 2007/07/28 14:27:10 obache Exp $
+# $NetBSD: Makefile.versions,v 1.6 2008/01/04 14:05:05 ghen Exp $
 
-ERLANG_VERSION=			11.5
-DIST_VERSION=			R11B-5
+ERLANG_VERSION=			12.0
+DIST_VERSION_MAJOR=		R12B
+DIST_VERSION_MINOR=		0
 
-_VERSIONS= \
-	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.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
+_VERSIONS=					\
+	appmon			2.1.9		\
+	asn1			1.5		\
+	common_test		1.3.0		\
+	compiler		4.5		\
+	cosEvent		2.1.2		\
+	cosEventDomain		1.1.2		\
+	cosFileTransfer		1.1.4		\
+	cosNotification		1.1.6		\
+	cosProperty		1.1.5		\
+	cosTime			1.1.2		\
+	cosTransactions		1.2.3		\
+	crypto			1.5.1.1		\
+	debugger		3.1.1.1		\
+	dialyzer		1.7.1		\
+	docbuilder		0.9.7		\
+	edoc			0.7.4		\
+	erl_interface		3.5.5.3		\
+	erts			5.6		\
+	et			1.3		\
+	gs			1.5.7		\
+	hipe			3.6.4		\
+	ic			4.2.16		\
+	inets			5.0		\
+	inviso			0.6		\
+	jinterface		1.4		\
+	kernel			2.12		\
+	megaco			3.7		\
+	mnesia			4.4		\
+	observer		0.9.7.4		\
+	odbc			2.0.9		\
+	orber			3.6.8		\
+	os_mon			2.1.3		\
+	otp_mibs		1.0.4.1		\
+	parsetools		1.4.2		\
+	percept			0.5.0		\
+	pman			2.6		\
+	runtime_tools		1.7		\
+	sasl			2.1.5.2		\
+	snmp			4.10		\
+	ssh			0.9.9.3		\
+	ssl			3.9		\
+	stdlib			1.15		\
+	syntax_tools		1.5.3		\
+	test_server		3.2.0		\
+	toolbar			1.3.0.1		\
+	tools			2.6		\
+	tv			2.1.4.1		\
+	typer			0.1.1		\
+	webtool			0.8.3.2		\
+	xmerl			1.1.6
+
+PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}
 
 .for name version in ${_VERSIONS}
 VERSION.${name}=${version}
diff --git a/lang/erlang/PLIST.common b/lang/erlang/PLIST.common
index d4d7e22ee8e..054cc1c9a60 100644
--- a/lang/erlang/PLIST.common
+++ b/lang/erlang/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.6 2007/08/03 11:01:37 obache Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2008/01/04 14:05:05 ghen Exp $
 bin/dialyzer
 bin/epmd
 bin/erl
@@ -23,7 +23,6 @@ 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/dialyzer
 lib/erlang/erts-${VERSION.erts}/bin/epmd
@@ -52,10 +51,10 @@ lib/erlang/erts-${VERSION.erts}/include/internal/erl_printf_format.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread.mk
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread_header_config.h
-lib/erlang/erts-${VERSION.erts}/include/internal/i386/atomic.h
-lib/erlang/erts-${VERSION.erts}/include/internal/i386/ethread.h
-lib/erlang/erts-${VERSION.erts}/include/internal/i386/rwlock.h
-lib/erlang/erts-${VERSION.erts}/include/internal/i386/spinlock.h
+lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}/atomic.h
+lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}/ethread.h
+lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}/rwlock.h
+lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}/spinlock.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ppc32/atomic.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ppc32/ethread.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ppc32/rwlock.h
@@ -154,9 +153,62 @@ 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/common_test-${VERSION.common_test}/ebin/ct.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_cover.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_event.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_framework.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_ftp.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_gen_conn.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_line.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_logs.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master_event.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master_logs.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master_status.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_repeat.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_rpc.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_run.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_snmp.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_telnet.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_telnet_client.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_testspec.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_util.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/rx.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/unix_telnet.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/vts.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/include/ct.hrl
+lib/erlang/lib/common_test-${VERSION.common_test}/include/ct_event.hrl
+lib/erlang/lib/common_test-${VERSION.common_test}/install.sh
+lib/erlang/lib/common_test-${VERSION.common_test}/priv/run_test.in
+lib/erlang/lib/common_test-${VERSION.common_test}/priv/vts.tool
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_cover.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_event.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_framework.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_ftp.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_gen_conn.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_line.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_logs.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_master.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_master_event.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_master_logs.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_master_status.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_repeat.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_rpc.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_run.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_snmp.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_telnet.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_telnet_client.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_testspec.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_util.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_util.hrl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/rx.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/unix_telnet.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/vts.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_asm.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_block.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_bool.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_bsm.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_clean.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_dead.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_dict.beam
@@ -165,7 +217,9 @@ lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_flatten.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_jump.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_listing.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_opcodes.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_trim.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_type.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_utils.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_validator.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/cerl.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/cerl_clauses.beam
@@ -195,16 +249,20 @@ lib/erlang/lib/compiler-${VERSION.compiler}/ebin/v3_life.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_asm.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_block.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_bool.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_bsm.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_clean.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_dead.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_dict.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_disasm.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_disasm.hrl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_flatten.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_jump.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_listing.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_opcodes.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_opcodes.hrl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_trim.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_type.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_utils.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_validator.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/cerl.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/cerl_clauses.erl
@@ -1078,6 +1136,7 @@ lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer.hrl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_analysis_callgraph.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_callgraph.erl
+lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_callgraph.hrl
 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
@@ -1193,8 +1252,8 @@ 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/edoc_generate
 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
@@ -1631,7 +1690,6 @@ 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
@@ -1667,7 +1725,6 @@ 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
@@ -1818,7 +1875,6 @@ lib/erlang/lib/inets-${VERSION.inets}/ebin/ftp_progress.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/ftp_response.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/ftp_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http.beam
-lib/erlang/lib/inets-${VERSION.inets}/ebin/http_base_64.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_chunk.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_cookie.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_request.beam
@@ -1827,7 +1883,9 @@ lib/erlang/lib/inets-${VERSION.inets}/ebin/http_transport.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_uri.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_util.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpc_handler.beam
+lib/erlang/lib/inets-${VERSION.inets}/ebin/httpc_handler_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpc_manager.beam
+lib/erlang/lib/inets-${VERSION.inets}/ebin/httpc_profile_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpc_request.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpc_response.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpc_sup.beam
@@ -1853,6 +1911,7 @@ 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_service.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_actions.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_alias.beam
@@ -2004,7 +2063,6 @@ lib/erlang/lib/inets-${VERSION.inets}/src/ftp_progress.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/ftp_response.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/ftp_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http.erl
-lib/erlang/lib/inets-${VERSION.inets}/src/http_base_64.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_chunk.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_cookie.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_internal.hrl
@@ -2014,8 +2072,10 @@ lib/erlang/lib/inets-${VERSION.inets}/src/http_transport.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_uri.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_util.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpc_handler.erl
+lib/erlang/lib/inets-${VERSION.inets}/src/httpc_handler_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpc_internal.hrl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpc_manager.erl
+lib/erlang/lib/inets-${VERSION.inets}/src/httpc_profile_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpc_request.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpc_response.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/httpc_sup.erl
@@ -2041,6 +2101,7 @@ 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_service.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/mod_actions.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/mod_alias.erl
@@ -2159,13 +2220,13 @@ lib/erlang/lib/kernel-${VERSION.kernel}/ebin/user_drv.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/user_sup.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/wrap_log_reader.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/zlib.beam
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/c_src/Makefile
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/c_src/uds_drv.c
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/Makefile
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_server.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_dist.app
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/Makefile
 lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_dist.erl
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_server.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/c_src/uds_drv.c
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/c_src/Makefile
 lib/erlang/lib/kernel-${VERSION.kernel}/include/file.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/include/inet.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/application.erl
@@ -2257,18 +2318,21 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_ber_bin_drv_media_gateway_co
 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_drv_media_gateway_control_v3.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_bin_media_gateway_control_v3.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_ber_media_gateway_control_v3.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
@@ -2276,6 +2340,7 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_name_resolver_prev3b.
 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_name_resolver_v3.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
@@ -2283,12 +2348,14 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_binary_transformer_prev3b.be
 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_binary_transformer_v3.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_compact_text_encoder_v3.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
@@ -2307,24 +2374,28 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_per_bin_drv_media_gateway_co
 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_drv_media_gateway_control_v3.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_bin_media_gateway_control_v3.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_per_media_gateway_control_v3.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_pretty_text_encoder_v3.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_sdp.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_stats.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_sup.beam
@@ -2341,6 +2412,7 @@ 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_parser_v3.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
@@ -2350,6 +2422,7 @@ lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_udp.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_udp_server.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_udp_sup.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/ebin/megaco_user_default.beam
+lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/meas.sh.skel
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_meas.beam
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_meas.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/examples/meas/megaco_codec_mstone1.beam
@@ -2373,6 +2446,7 @@ 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_message_v3.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
@@ -2391,6 +2465,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_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_v3.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_drv_media_gateway_control_v3.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_prev3a.hrl
@@ -2402,6 +2478,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_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_v2.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_v3.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_bin_media_gateway_control_v3.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_prev3a.hrl
@@ -2413,6 +2491,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_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_v2.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_v3.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_ber_media_gateway_control_v3.hrl
 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
@@ -2420,6 +2500,7 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_name_resolver_p
 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_name_resolver_v3.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
@@ -2427,6 +2508,7 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_binary_transformer_pre
 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_binary_transformer_v3.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
@@ -2437,6 +2519,8 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gate
 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
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_v2.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_v3.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_drv_media_gateway_control_v3.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_encoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_prev3a.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_prev3a.hrl
@@ -2448,10 +2532,11 @@ 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_v1.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_v2.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_v3.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_bin_media_gateway_control_v3.hrl
 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
@@ -2460,6 +2545,8 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_cont
 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/binary/megaco_per_media_gateway_control_v3.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/binary/megaco_per_media_gateway_control_v3.hrl
 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
@@ -2496,17 +2583,20 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_compact_text_encoder_pre
 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_compact_text_encoder_v3.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_pretty_text_encoder_v3.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_gen_v3.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_mini_decoder.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_mini_parser.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_mini_parser.hrl
@@ -2526,50 +2616,15 @@ lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v1.yrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v2.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v2.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v2.yrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v3.erl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v3.hrl
+lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_parser_v3.yrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_scanner.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/text/megaco_text_tokens.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/udp/megaco_udp.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/udp/megaco_udp.hrl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/udp/megaco_udp_server.erl
 lib/erlang/lib/megaco-${VERSION.megaco}/src/udp/megaco_udp_sup.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne.app
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne.appup
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_catalog.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_compiler.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_constraint.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_cost.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_exec.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_lc.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_lib.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_op.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_optimizer.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_pp.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_slg.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_sup.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_transform.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin/mnemosyne_unify.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/examples/subscriber.beam
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/examples/subscriber.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/examples/subscriber.hrl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/include/mnemosyne.hrl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_catalog.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_compiler.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_constraint.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_cost.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_debug.hrl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_exec.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_internal_form.hrl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_lc.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_lib.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_op.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_optimizer.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_pp.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_slg.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_sup.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_transform.erl
-lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src/mnemosyne_unify.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia.app
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia.appup
 lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin/mnesia.beam
@@ -2655,52 +2710,6 @@ lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_subscr.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_sup.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_text.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_tm.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_CheckpointDef.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_SystemInfo.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_TableDef.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_TableInfo.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_connector.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_connector_impl.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_corba_connector.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_corba_connector_impl.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_corba_session.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_corba_session_impl.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_session.app
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_session.appup
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_session.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_session_impl.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_session_lib.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_session_sup.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/mnesia_session_top_sup.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/oe_mnesia_corba_session.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin/oe_mnesia_session.beam
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/include/mnesia.hrl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/include/mnesia_corba_session.idl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/include/mnesia_session.idl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/info
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_CheckpointDef.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_SystemInfo.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_TableDef.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_TableInfo.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_connector.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_connector.hrl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_connector_impl.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_corba_connector.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_corba_connector.hrl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_corba_connector_impl.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_corba_session.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_corba_session.hrl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_corba_session_impl.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_session.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_session.hrl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_session_impl.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_session_lib.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_session_sup.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/mnesia_session_top_sup.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/oe_mnesia_corba_session.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/oe_mnesia_corba_session.hrl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/oe_mnesia_session.erl
-lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src/oe_mnesia_session.hrl
 lib/erlang/lib/observer-${VERSION.observer}/ebin/crashdump_translate.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/crashdump_viewer.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/crashdump_viewer_html.beam
@@ -2777,7 +2786,6 @@ lib/erlang/lib/orber-${VERSION.orber}/ebin/CosNaming_NamingContext_NotEmpty.beam
 lib/erlang/lib/orber-${VERSION.orber}/ebin/CosNaming_NamingContext_NotFound.beam
 lib/erlang/lib/orber-${VERSION.orber}/ebin/OrberApp_IFR.beam
 lib/erlang/lib/orber-${VERSION.orber}/ebin/OrberApp_IFR_impl.beam
-lib/erlang/lib/orber-${VERSION.orber}/ebin/OrberCSIv2.beam
 lib/erlang/lib/orber-${VERSION.orber}/ebin/any.beam
 lib/erlang/lib/orber-${VERSION.orber}/ebin/cdr_decode.beam
 lib/erlang/lib/orber-${VERSION.orber}/ebin/cdr_encode.beam
@@ -2881,7 +2889,6 @@ lib/erlang/lib/orber-${VERSION.orber}/src/CORBA.hrl
 lib/erlang/lib/orber-${VERSION.orber}/src/OrberApp.hrl
 lib/erlang/lib/orber-${VERSION.orber}/src/OrberApp_IFR.hrl
 lib/erlang/lib/orber-${VERSION.orber}/src/OrberApp_IFR_impl.erl
-lib/erlang/lib/orber-${VERSION.orber}/src/OrberCSIv2.hrl
 lib/erlang/lib/orber-${VERSION.orber}/src/any.erl
 lib/erlang/lib/orber-${VERSION.orber}/src/cdr_decode.erl
 lib/erlang/lib/orber-${VERSION.orber}/src/cdr_encode.erl
@@ -2968,9 +2975,9 @@ 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.c
 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
@@ -3154,7 +3161,9 @@ lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_mib_lib.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
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_net_if_filter.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_network_interface.beam
+lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_network_interface_filter.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_notification_filter.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_set.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_set_lib.beam
@@ -3294,7 +3303,9 @@ lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_mib_lib.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
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_net_if_filter.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_network_interface.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_network_interface_filter.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_notification_filter.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_set.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_set_lib.erl
@@ -3310,6 +3321,7 @@ lib/erlang/lib/snmp-${VERSION.snmp}/src/agent/snmpa_vacm.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/app/snmp.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/app/snmp_app.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/app/snmp_app_sup.erl
+lib/erlang/lib/snmp-${VERSION.snmp}/src/app/snmp_internal.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/compiler/snmpc.erl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/compiler/snmpc.hrl
 lib/erlang/lib/snmp-${VERSION.snmp}/src/compiler/snmpc_lib.erl
@@ -3364,6 +3376,7 @@ 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_sftpd_file_api.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
@@ -3390,6 +3403,7 @@ 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_sftpd_file_api.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
@@ -3397,104 +3411,127 @@ lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_tcp_wrap.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_transport.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_userauth.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_xfer.erl
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/PKIX1Algorithms88.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/PKIX1Explicit88.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/PKIX1Implicit88.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/PKIXAttributeCertificate.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/SSL-PKIX.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/OTP-PKIX.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/inet_ssl_dist.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl.app
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl.appup
 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_base64.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_broker.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_broker_sup.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_debug.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_pem.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_pkix.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_pkix_oid.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_prim.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_record.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_server.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session.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_sup.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/Makefile
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_tls1.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/ebin/make_certs.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
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/req.cnf
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/req.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/ca.cnf
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/cert.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt.attr
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/Makefile
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/newcerts/01.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/private/RAND
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/private/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/cert.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/req.cnf
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/serial
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/private/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/private/RAND
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/ca.cnf
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/serial.old
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/ca.cnf
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/cert.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.attr
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.attr.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/serial
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt.attr
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.old
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/newcerts/01.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/newcerts/02.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/private/RAND
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/private/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/cert.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/req.cnf
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/req.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/newcerts/01.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/newcerts/02.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/serial
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.attr.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/ca.cnf
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/private/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/private/RAND
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/serial.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.attr
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cacerts.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cert.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/req.cnf
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/req.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/cacerts.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/cert.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/cert.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/req.cnf
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/req.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/rnd/RAND
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/src/make_certs.erl
-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}/include/PKIX1Algorithms88.hrl
-lib/erlang/lib/ssl-${VERSION.ssl}/include/PKIX1Explicit88.hrl
-lib/erlang/lib/ssl-${VERSION.ssl}/include/PKIX1Implicit88.hrl
-lib/erlang/lib/ssl-${VERSION.ssl}/include/PKIXAttributeCertificate.hrl
-lib/erlang/lib/ssl-${VERSION.ssl}/include/SSL-PKIX.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/ebin/client_server.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/include/OTP-PKIX.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/include/ssl_pkix.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/pkix/OTP-PKIX.asn1config
+lib/erlang/lib/ssl-${VERSION.ssl}/pkix/OTP-PKIX.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/pkix/OTP-PKIX.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Algorithms88.asn1
-lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Algorithms88.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Algorithms88.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Explicit88.asn1
-lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Explicit88.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Explicit88.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Implicit88.asn1
-lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Implicit88.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIX1Implicit88.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIXAttributeCertificate.asn1
-lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIXAttributeCertificate.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/PKIXAttributeCertificate.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/SSL-PKIX.asn1
-lib/erlang/lib/ssl-${VERSION.ssl}/pkix/SSL-PKIX.erl
-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}/src/inet_ssl_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_base64.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_broker.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_broker_int.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_broker_sup.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_debug.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_int.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_pem.erl
 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_record.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_record.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_server.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_session.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_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_tls1.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
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/c.beam
@@ -3578,6 +3615,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/array.erl
 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
@@ -3676,24 +3714,25 @@ 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/test_server-${VERSION.test_server}/ebin/erl2html2.beam
+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_h.beam
+lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server_line.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
+lib/erlang/lib/test_server-${VERSION.test_server}/ebin/vxworks_client.beam
+lib/erlang/lib/test_server-${VERSION.test_server}/include/test_server.hrl
+lib/erlang/lib/test_server-${VERSION.test_server}/include/test_server_line.hrl
+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_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_line.erl
+lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_node.erl
+lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_sup.erl
+lib/erlang/lib/test_server-${VERSION.test_server}/src/vxworks_client.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
@@ -3844,6 +3883,25 @@ lib/erlang/lib/tv-${VERSION.tv}/src/tv_pw_window.erl
 lib/erlang/lib/tv-${VERSION.tv}/src/tv_rec_edit.erl
 lib/erlang/lib/tv-${VERSION.tv}/src/tv_table_owner.erl
 lib/erlang/lib/tv-${VERSION.tv}/src/tv_utils.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_options.hrl
+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/webtool-${VERSION.webtool}/ebin/webtool.app
 lib/erlang/lib/webtool-${VERSION.webtool}/ebin/webtool.appup
 lib/erlang/lib/webtool-${VERSION.webtool}/ebin/webtool.beam
@@ -3913,15 +3971,15 @@ 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
-lib/erlang/releases/R11B/start.script
-lib/erlang/releases/R11B/start_all_example.rel
-lib/erlang/releases/R11B/start_clean.boot
-lib/erlang/releases/R11B/start_clean.rel
-lib/erlang/releases/R11B/start_clean.script
-lib/erlang/releases/R11B/start_sasl.boot
-lib/erlang/releases/R11B/start_sasl.rel
-lib/erlang/releases/R11B/start_sasl.script
+lib/erlang/releases/${VERSION}/start.boot
+lib/erlang/releases/${VERSION}/start.script
+lib/erlang/releases/${VERSION}/start_all_example.rel
+lib/erlang/releases/${VERSION}/start_clean.boot
+lib/erlang/releases/${VERSION}/start_clean.rel
+lib/erlang/releases/${VERSION}/start_clean.script
+lib/erlang/releases/${VERSION}/start_sasl.boot
+lib/erlang/releases/${VERSION}/start_sasl.rel
+lib/erlang/releases/${VERSION}/start_sasl.script
 lib/erlang/releases/RELEASES
 lib/erlang/releases/RELEASES.src
 lib/erlang/releases/start_erl.data
diff --git a/lang/erlang/PLIST.common_end b/lang/erlang/PLIST.common_end
index 4c43c50da55..623deda55da 100644
--- a/lang/erlang/PLIST.common_end
+++ b/lang/erlang/PLIST.common_end
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST.common_end,v 1.5 2007/07/28 14:27:10 obache Exp $
+@comment $NetBSD: PLIST.common_end,v 1.6 2008/01/04 14:05:05 ghen Exp $
 @dirrm lib/erlang/usr/lib
 @dirrm lib/erlang/usr/include/obsolete
 @dirrm lib/erlang/usr/include
 @dirrm lib/erlang/usr
-@dirrm lib/erlang/releases/R11B
+@dirrm lib/erlang/releases/${VERSION}
 @dirrm lib/erlang/releases
 @dirrm lib/erlang/misc
 @dirrm lib/erlang/lib/xmerl-${VERSION.xmerl}/src
@@ -36,6 +36,10 @@
 @dirrm lib/erlang/lib/toolbar-${VERSION.toolbar}/src
 @dirrm lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin
 @dirrm lib/erlang/lib/toolbar-${VERSION.toolbar}
+@dirrm lib/erlang/lib/test_server-${VERSION.test_server}/src
+@dirrm lib/erlang/lib/test_server-${VERSION.test_server}/include
+@dirrm lib/erlang/lib/test_server-${VERSION.test_server}/ebin
+@dirrm lib/erlang/lib/test_server-${VERSION.test_server}
 @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
@@ -154,21 +158,12 @@
 @dirrm lib/erlang/lib/observer-${VERSION.observer}/include
 @dirrm lib/erlang/lib/observer-${VERSION.observer}/ebin
 @dirrm lib/erlang/lib/observer-${VERSION.observer}
-@dirrm lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/src
-@dirrm lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/include
-@dirrm lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}/ebin
-@dirrm lib/erlang/lib/mnesia_session-${VERSION.mnesia_session}
 @dirrm lib/erlang/lib/mnesia-${VERSION.mnesia}/src
 @dirrm lib/erlang/lib/mnesia-${VERSION.mnesia}/include
 @dirrm lib/erlang/lib/mnesia-${VERSION.mnesia}/examples/bench
 @dirrm lib/erlang/lib/mnesia-${VERSION.mnesia}/examples
 @dirrm lib/erlang/lib/mnesia-${VERSION.mnesia}/ebin
 @dirrm lib/erlang/lib/mnesia-${VERSION.mnesia}
-@dirrm lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/src
-@dirrm lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/include
-@dirrm lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/examples
-@dirrm lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}/ebin
-@dirrm lib/erlang/lib/mnemosyne-${VERSION.mnemosyne}
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/src/udp
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/src/text
 @dirrm lib/erlang/lib/megaco-${VERSION.megaco}/src/tcp
@@ -342,6 +337,15 @@
 @dirrm lib/erlang/lib/compiler-${VERSION.compiler}/src
 @dirrm lib/erlang/lib/compiler-${VERSION.compiler}/ebin
 @dirrm lib/erlang/lib/compiler-${VERSION.compiler}
+@dirrm lib/erlang/lib/common_test-${VERSION.common_test}/src
+@exec ${MKDIR} %D/lib/erlang/lib/common_test-${VERSION.common_test}/priv/lib
+@dirrm lib/erlang/lib/common_test-${VERSION.common_test}/priv/lib
+@exec ${MKDIR} %D/lib/erlang/lib/common_test-${VERSION.common_test}/priv/bin
+@dirrm lib/erlang/lib/common_test-${VERSION.common_test}/priv/bin
+@dirrm lib/erlang/lib/common_test-${VERSION.common_test}/priv
+@dirrm lib/erlang/lib/common_test-${VERSION.common_test}/include
+@dirrm lib/erlang/lib/common_test-${VERSION.common_test}/ebin
+@dirrm lib/erlang/lib/common_test-${VERSION.common_test}
 @dirrm lib/erlang/lib/asn1-${VERSION.asn1}/src
 @dirrm lib/erlang/lib/asn1-${VERSION.asn1}/priv/lib
 @dirrm lib/erlang/lib/asn1-${VERSION.asn1}/priv
@@ -362,7 +366,7 @@
 @dirrm lib/erlang/erts-${VERSION.erts}/include/internal/x86_64
 @dirrm lib/erlang/erts-${VERSION.erts}/include/internal/sparc32
 @dirrm lib/erlang/erts-${VERSION.erts}/include/internal/ppc32
-@dirrm lib/erlang/erts-${VERSION.erts}/include/internal/i386
+@dirrm lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}
 @dirrm lib/erlang/erts-${VERSION.erts}/include/internal
 @dirrm lib/erlang/erts-${VERSION.erts}/include
 @exec ${MKDIR} %D/lib/erlang/erts-${VERSION.erts}/doc
diff --git a/lang/erlang/PLIST.java b/lang/erlang/PLIST.java
index fea57d31b74..d750cb3d7b7 100644
--- a/lang/erlang/PLIST.java
+++ b/lang/erlang/PLIST.java
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.java,v 1.4 2006/03/29 21:40:12 ghen Exp $
+@comment $NetBSD: PLIST.java,v 1.5 2008/01/04 14:05:05 ghen Exp $
 lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/Any.java
 lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/AnyHelper.java
 lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/AnyHolder.java
@@ -39,6 +39,7 @@ lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpEpmd.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBinary.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBitstr.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBoolean.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangByte.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangChar.java
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 6ebf9fc951c..dc15170cf9a 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2007/10/30 14:02:15 is Exp $
+$NetBSD: distinfo,v 1.13 2008/01/04 14:05:05 ghen Exp $
 
-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 (erlang/otp_src_R12B-0.tar.gz) = e2c6e18d22e34a799fc6bc25fa2d25eedb30bccc
+RMD160 (erlang/otp_src_R12B-0.tar.gz) = cb07ea37f2b56e1ea2fc07c9063b647df7635b2b
+Size (erlang/otp_src_R12B-0.tar.gz) = 41074760 bytes
 SHA1 (patch-aa) = 795bca5194b365ddaff8b10d46246423d44f7bda
 SHA1 (patch-ab) = 1bf4d079f0138d97b0a86a8d75e87fce14586c49
 SHA1 (patch-ae) = fba8ebcba12fae810f1c554b678f0b434e364833