7 files changed, 67 insertions, 88 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 252635012826..4215752c4072 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r11b2
-PORTREVISION=	2
+PORTVERSION=	r11b3
 PORTEPOCH=	1
 CATEGORIES=	lang parallel
 MASTER_SITES=	http://www.erlang.org/download/        \
@@ -15,7 +14,7 @@ MASTER_SITES=	http://www.erlang.org/download/        \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTNAME=	otp_src_R11B-2
+DISTNAME=	otp_src_R11B-3
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -67,9 +66,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R11B-2.tar.gz
+ERLANG_MAN=	otp_doc_man_R11B-3.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R11B-2.tar.gz
+ERLANG_DOCS=	otp_doc_html_R11B-3.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index 3f8751174ac0..593422b3c250 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.5.2
-TOOLS_VSN=	2.5.2
-OTP_LIBS=	appmon-2.1.6 \
-		asn1-1.4.4.11 \
-		compiler-4.4.2 \
+ERTS_VSN=	5.5.3
+TOOLS_VSN=	2.5.3
+OTP_LIBS=	appmon-2.1.7 \
+		asn1-1.4.4.12 \
+		compiler-4.4.3 \
 		cosEvent-2.1 \
 		cosEventDomain-1.1 \
 		cosFileTransfer-1.1.2 \
@@ -14,37 +14,38 @@ OTP_LIBS=	appmon-2.1.6 \
 		cosTransactions-1.2 \
 		crypto-1.5 \
 		debugger-3.1 \
-		dialyzer-1.5.0 \
-		edoc-0.6.9 \
-		erl_interface-3.5.5.2 \
+		dialyzer-1.5.1 \
+		edoc-0.7.1 \
+		erl_interface-3.5.5.3 \
 		et-1.0 \
 		gs-1.5.5 \
-		hipe-3.6.0 \
+		hipe-3.6.1 \
 		ic-4.2.11 \
-		inets-4.7.6 \
+		inets-4.7.8 \
 		inviso-0.1 \
 		jinterface-1.3 \
-		kernel-2.11.2 \
-		megaco-3.5 \
+		kernel-2.11.3 \
+		megaco-3.5.1 \
 		mnemosyne-1.2.6 \
 		mnesia-4.3.3 \
 		mnesia_session-1.1.6 \
-		observer-0.9.7.1 \
-		odbc-2.0.6 \
-		orber-3.6.3 \
-		os_mon-2.1.1 \
+		observer-0.9.7.2 \
+		odbc-2.0.7 \
+		orber-3.6.4 \
+		os_mon-2.1.2 \
 		otp_mibs-1.0.4 \
-		parsetools-1.4 \
+		parsetools-1.4.1 \
 		pman-2.5.2 \
-		runtime_tools-1.6.1 \
+		runtime_tools-1.6.2 \
 		sasl-2.1.4 \
-		snmp-4.8.2 \
-		ssh-0.9.5 \
-		ssl-3.0.12 \
-		stdlib-1.14.2 \
-		syntax_tools-1.5.0 \
+		snmp-4.8.4 \
+		ssh-0.9.6 \
+		ssl-3.1 \
+		stdlib-1.14.3 \
+		syntax_tools-1.5.2 \
 		toolbar-1.3 \
-		tools-2.5.2 \
+		tools-2.5.3 \
 		tv-2.1.3 \
+		typer-0.1.0 \
 		webtool-0.8.3 \
-		xmerl-1.0.5
+		xmerl-1.1
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index df2c5f512f67..8decab9547f1 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
 MAN1=	epmd.1 \
-	driver_entry.1 \
 	erl.1 \
 	erl_call.1 \
-	erl_driver.1 \
 	erlc.1 \
 	erlsrv.1 \
 	run_erl.1 \
@@ -114,13 +112,23 @@ MAN3=	CosEventChannelAdmin.3 \
 	digraph_utils.3 \
 	disk_log.3 \
 	disksup.3 \
+	driver_entry.3 \
+	edoc.3 \
+	edoc_doclet.3 \
+	edoc_extract.3 \
+	edoc_layout.3 \
+	edoc_lib.3 \
+	edoc_run.3 \
 	ei.3 \
 	ei_connect.3 \
 	epp.3 \
+	epp_dodger.3 \
 	eprof.3 \
 	erl_boot_server.3 \
+	erl_comment_scan.3 \
 	erl_connect.3 \
 	erl_ddll.3 \
+	erl_driver.3 \
 	erl_error.3 \
 	erl_eterm.3 \
 	erl_eval.3 \
@@ -134,10 +142,15 @@ MAN3=	CosEventChannelAdmin.3 \
 	erl_marshal.3 \
 	erl_parse.3 \
 	erl_pp.3 \
+	erl_prettypr.3 \
 	erl_prim_loader.3 \
+	erl_recomment.3 \
 	erl_scan.3 \
 	erl_set_memory_block.3 \
+	erl_syntax.3 \
+	erl_syntax_lib.3 \
 	erl_tar.3 \
+	erl_tidy.3 \
 	erlang.3 \
 	erlang_mode.3 \
 	error_handler.3 \
@@ -177,6 +190,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	ic.3 \
 	ic_c_protocol.3 \
 	ic_clib.3 \
+	igor.3 \
 	inet.3 \
 	init.3 \
 	instrument.3 \
@@ -238,6 +252,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	pg2.3 \
 	pman.3 \
 	pool.3 \
+	prettypr.3 \
 	proc_lib.3 \
 	proplists.3 \
 	qlc.3 \
@@ -310,6 +325,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	xmerl_scan.3 \
 	xmerl_xpath.3 \
 	xmerl_xs.3 \
+	xmerl_xsd.3 \
 	xref.3 \
 	yecc.3 \
 	zip.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 55410c57ebfc..ebeab9fbec1d 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R11B-2.tar.gz) = 7d7cca1d2f392a8a317cb4c0bd904726
-SHA256 (erlang/otp_src_R11B-2.tar.gz) = 3dd483ee568c31655361474aa54a28cf11575c3b1b984f0b7a6980e083a8e44b
-SIZE (erlang/otp_src_R11B-2.tar.gz) = 11244153
-MD5 (erlang/otp_doc_man_R11B-2.tar.gz) = c81023f591c1bace836de3aa874f3c2a
-SHA256 (erlang/otp_doc_man_R11B-2.tar.gz) = 643fb8210a2059b2c283c17601a0d5893f5cf409f05ed4852fbf2b0607693ac9
-SIZE (erlang/otp_doc_man_R11B-2.tar.gz) = 632153
-MD5 (erlang/otp_doc_html_R11B-2.tar.gz) = e2c45ced77ec63b9b1dd95c8f5396f7d
-SHA256 (erlang/otp_doc_html_R11B-2.tar.gz) = 588514c6b96b33dbaffd40aa5b51b9c0be65d02b6e81644c53b4c705a866db47
-SIZE (erlang/otp_doc_html_R11B-2.tar.gz) = 4739895
+MD5 (erlang/otp_src_R11B-3.tar.gz) = 2806e5a2f26cb1b20f3ea1a6f3ec0276
+SHA256 (erlang/otp_src_R11B-3.tar.gz) = 7024ca196a5e4a2d80363de1af78051b36de47833e848b812656d552baa5dde2
+SIZE (erlang/otp_src_R11B-3.tar.gz) = 11420612
+MD5 (erlang/otp_doc_man_R11B-3.tar.gz) = 645ef1ded84b470e9c05a4757dce88cf
+SHA256 (erlang/otp_doc_man_R11B-3.tar.gz) = ec3ff0f2979ba91d485b37a232ad7d2186829f2948a9f7adcd6067890e55f928
+SIZE (erlang/otp_doc_man_R11B-3.tar.gz) = 694238
+MD5 (erlang/otp_doc_html_R11B-3.tar.gz) = 85bc43e52fa5066577ef412c80848dc0
+SHA256 (erlang/otp_doc_html_R11B-3.tar.gz) = 01f1625b4d004b2b30c298d12e286ddbf512d316207fb8859ca598f98c553fb2
+SIZE (erlang/otp_doc_html_R11B-3.tar.gz) = 4852262
diff --git a/lang/erlang/files/patch-erts_configure b/lang/erlang/files/patch-erts_configure
index e53372908e06..0f927a742ef3 100644
--- a/lang/erlang/files/patch-erts_configure
+++ b/lang/erlang/files/patch-erts_configure
@@ -3,10 +3,10 @@ $FreeBSD$
 
 --- erts/configure.orig
 +++ erts/configure
-@@ -6895,7 +6895,9 @@
+@@ -7069,7 +7069,9 @@
  
  echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6
- echo "configure:6898: checking for unreliable floating point execptions" >&5
+ echo "configure:7072: checking for unreliable floating point execptions" >&5
 -if test "$cross_compiling" = yes; then
 +if test "${ARCH}" = amd64; then
 +  erl_ok=reliable
diff --git a/lang/erlang/files/patch-erts_emulator_beam_utils.c b/lang/erlang/files/patch-erts_emulator_beam_utils.c
deleted file mode 100644
index 58e675168a85..000000000000
--- a/lang/erlang/files/patch-erts_emulator_beam_utils.c
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/beam/utils.c.orig
-+++ erts/emulator/beam/utils.c
-@@ -2999,15 +2999,16 @@
- static void
- ptimer_timeout(ErtsSmpPTimer *ptimer)
- {
--    if (!(ptimer->timer.flags & ERTS_PTMR_FLG_CANCELLED)) {
- 	if (is_internal_pid(ptimer->timer.id)) {
- 	    Process *p;
--	    p = erts_pid2proc(NULL,
--			      0,
--			      ptimer->timer.id,
--			      ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS);
-+	    p = erts_pid2proc_opt(NULL,
-+				  0,
-+				  ptimer->timer.id,
-+				  ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS,
-+				  ERTS_P2P_FLG_ALLOW_OTHER_X);
- 	    if (p) {
--		if (!(ptimer->timer.flags & ERTS_PTMR_FLG_CANCELLED)) {
-+		if (!p->is_exiting
-+		    && !(ptimer->timer.flags & ERTS_PTMR_FLG_CANCELLED)) {
- 		    ASSERT(*ptimer->timer.timer_ref == ptimer);
- 		    *ptimer->timer.timer_ref = NULL;
- 		    (*ptimer->timer.timeout_func)(p);
-@@ -3028,7 +3029,6 @@
- 		erts_smp_io_unlock();
- 	    }
- 	}
--    }
-     free_ptimer(ptimer);
- }
- 
diff --git a/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl b/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl
index 53c869623278..1836f29dc22b 100644
--- a/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl
+++ b/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl
@@ -3,13 +3,12 @@ $FreeBSD$
 
 --- lib/dialyzer/src/dialyzer_cl_parse.erl.orig
 +++ lib/dialyzer/src/dialyzer_cl_parse.erl
-@@ -155,8 +155,7 @@
-   put(dialyzer_options_from, byte_code),
-   put(dialyzer_options_libs, ?DEFAULT_LIBS),
- 
--  InitPltDir = filename:join([code:lib_dir(dialyzer),
--			      "plt","dialyzer_init_plt"]),
-+  InitPltDir = filename:join([os:getenv ("HOME"), ".dialyzer_init_plt"]),
-   put(dialyzer_init_plt, InitPltDir),
-   put(dialyzer_warnings, []).
+@@ -159,7 +159,7 @@
+   throw({dialyzer_cl_parse_error, Msg}).
  
+ init() ->
+-  InitPlt = filename:join([code:lib_dir(dialyzer), "plt","dialyzer_init_plt"]),
++  InitPlt = filename:join([os:getenv ("HOME"), "plt","dialyzer_init_plt"]),
+   put(dialyzer_init_plt, InitPlt),
+   put(dialyzer_only_check_init_plt, false),
+   put(dialyzer_options_gui, true),