7 files changed, 49 insertions, 91 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 7e02b13f8c66..5138e2d2e2e9 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r13b01
-PORTREVISION=	6
+PORTVERSION=	r13b02
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 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_R13B01
+DISTNAME=	otp_src_R13B02
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -76,9 +75,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R13B01.tar.gz
+ERLANG_MAN=	otp_doc_man_R13B02.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R13B01.tar.gz
+ERLANG_DOCS=	otp_doc_html_R13B02.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index d7fa39d64a86..cef3a5765e83 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.7.2
+ERTS_VSN=	5.7.3
 TOOLS_VSN=	2.6.4
 OTP_LIBS=	appmon-2.1.10.1 \
-		asn1-1.6.10 \
-		common_test-1.4.2 \
-		compiler-4.6.2 \
+		asn1-1.6.11 \
+		common_test-1.4.5 \
+		compiler-4.6.3 \
 		cosEvent-2.1.6 \
 		cosEventDomain-1.1.6 \
 		cosFileTransfer-1.1.8 \
@@ -13,46 +13,46 @@ OTP_LIBS=	appmon-2.1.10.1 \
 		cosProperty-1.1.9 \
 		cosTime-1.1.6 \
 		cosTransactions-1.2.7 \
-		crypto-1.6 \
+		crypto-1.6.1 \
 		debugger-3.2 \
-		dialyzer-1.9.2 \
+		dialyzer-2.0.0 \
 		docbuilder-0.9.8.5 \
-		edoc-0.7.6.3 \
-		erl_interface-3.6.2 \
-		erts-5.7.2 \
-		et-1.3.1 \
-		eunit-2.1.2 \
+		edoc-0.7.6.4 \
+		erl_interface-3.6.3 \
+		erts-5.7.3 \
+		et-1.3.2 \
+		eunit-2.1.3 \
 		gs-1.5.10 \
-		hipe-3.7.2 \
-		ic-4.2.21 \
-		inets-5.1 \
+		hipe-3.7.3 \
+		ic-4.2.22 \
+		inets-5.1.3 \
 		inviso-0.6 \
 		jinterface-1.5.1 \
-		kernel-2.13.2 \
-		megaco-3.11 \
-		mnesia-4.4.10 \
+		kernel-2.13.3 \
+		megaco-3.11.3 \
+		mnesia-4.4.11 \
 		observer-0.9.8.1 \
 		odbc-2.10.5 \
 		orber-3.6.13 \
-		os_mon-2.2.2 \
+		os_mon-2.2.3 \
 		otp_mibs-1.0.5 \
 		parsetools-2.0 \
 		percept-0.8.2 \
 		pman-2.7 \
-		public_key-0.2 \
-		reltool-0.2.2 \
-		runtime_tools-1.8 \
-		sasl-2.1.6 \
-		snmp-4.13.3 \
-		ssh-1.1.3 \
-		ssl-3.10.3 \
-		stdlib-1.16.2 \
-		syntax_tools-1.6.2 \
-		test_server-3.3.2 \
+		public_key-0.3 \
+		reltool-0.5 \
+		runtime_tools-1.8.1 \
+		sasl-2.1.7 \
+		snmp-4.13.5 \
+		ssh-1.1.6 \
+		ssl-3.10.4 \
+		stdlib-1.16.3 \
+		syntax_tools-1.6.3 \
+		test_server-3.3.4 \
 		toolbar-1.4 \
 		tools-2.6.4 \
 		tv-2.1.4.3 \
-		typer-0.1.7.1 \
+		typer-0.1.7.2 \
 		webtool-0.8.4 \
-		wx-0.98.2 \
-		xmerl-1.2
+		wx-0.98.3 \
+		xmerl-1.2.1
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index dce52f0548a6..8962d682659c 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -214,6 +214,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	ic_clib.3 \
 	igor.3 \
 	inet.3 \
+	inet_res.3 \
 	inets.3 \
 	init.3 \
 	init_stub.3 \
@@ -364,7 +365,9 @@ MAN3=	CosEventChannelAdmin.3 \
 	wxArtProvider.3 \
 	wxAuiDockArt.3 \
 	wxAuiManager.3 \
+	wxAuiManagerEvent.3 \
 	wxAuiNotebook.3 \
+	wxAuiNotebookEvent.3 \
 	wxAuiPaneInfo.3 \
 	wxAuiTabArt.3 \
 	wxBitmap.3 \
@@ -443,6 +446,8 @@ MAN3=	CosEventChannelAdmin.3 \
 	wxGridSizer.3 \
 	wxHelpEvent.3 \
 	wxHtmlEasyPrinting.3 \
+	wxHtmlLinkEvent.3 \
+	wxHtmlWindow.3 \
 	wxIcon.3 \
 	wxIconBundle.3 \
 	wxIconizeEvent.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index e5a372fe6900..537397009613 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R13B01.tar.gz) = b3db581de6c13e1ec93d74e54a7b4231
-SHA256 (erlang/otp_src_R13B01.tar.gz) = f0964946f3cdd224500a7a6df1c2ee2bf9ef2d3684ab82c2dd6c22b98986bc80
-SIZE (erlang/otp_src_R13B01.tar.gz) = 54662132
-MD5 (erlang/otp_doc_man_R13B01.tar.gz) = fa8f96159bd9a88aa2fb9e4d79d7affe
-SHA256 (erlang/otp_doc_man_R13B01.tar.gz) = 3d3eb6a1a885008de091738bc3e565d2a308ed0f882cad230a7a07e62d29c60a
-SIZE (erlang/otp_doc_man_R13B01.tar.gz) = 968114
-MD5 (erlang/otp_doc_html_R13B01.tar.gz) = 42cb55bbfa5dc071fd56034615072f7a
-SHA256 (erlang/otp_doc_html_R13B01.tar.gz) = b72f2307499a3df03e7b4f2e6649084083f8a0aec700977ff643a02bec96391f
-SIZE (erlang/otp_doc_html_R13B01.tar.gz) = 6280499
+MD5 (erlang/otp_src_R13B02.tar.gz) = d70bfba6935e52a7759168a35fbcabe7
+SHA256 (erlang/otp_src_R13B02.tar.gz) = 858922bc390da920365bb6845cadee9c57a347a731eaaeefa4925f027513fa7c
+SIZE (erlang/otp_src_R13B02.tar.gz) = 55077522
+MD5 (erlang/otp_doc_man_R13B02.tar.gz) = 975b2c8a1cc2fda017cb5cd3864e32ba
+SHA256 (erlang/otp_doc_man_R13B02.tar.gz) = 15514061f0ebddd40516c50769cc4b08c580d8a74b13717ac81a79c3d5b78674
+SIZE (erlang/otp_doc_man_R13B02.tar.gz) = 978685
+MD5 (erlang/otp_doc_html_R13B02.tar.gz) = 78fc0c139a0297e502a6008bd8166887
+SHA256 (erlang/otp_doc_html_R13B02.tar.gz) = fe50174a89160de1b31c14278732ecb78e73c0ed65bd09441a86a5cbefee6101
+SIZE (erlang/otp_doc_html_R13B02.tar.gz) = 6320796
diff --git a/lang/erlang/files/patch-erts_emulator_sys_unix_sys__float.c b/lang/erlang/files/patch-erts_emulator_sys_unix_sys__float.c
deleted file mode 100644
index a21b4d08e33d..000000000000
--- a/lang/erlang/files/patch-erts_emulator_sys_unix_sys__float.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/sys/unix/sys_float.c.orig
-+++ erts/emulator/sys/unix/sys_float.c
-@@ -57,6 +57,7 @@
- void erts_thread_init_fp_exception(void)
- {
-     unsigned long *fpe = erts_alloc(ERTS_ALC_T_FP_EXCEPTION, sizeof(*fpe));
-+    *fpe = 0;
-     erts_tsd_set(fpe_key, fpe);
- }
- 
diff --git a/lang/erlang/files/patch-lib_compiler_src_beam__utils.erl b/lang/erlang/files/patch-lib_compiler_src_beam__utils.erl
deleted file mode 100644
index fec112220d2f..000000000000
--- a/lang/erlang/files/patch-lib_compiler_src_beam__utils.erl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- lib/compiler/src/beam_utils.erl.orig
-+++ lib/compiler/src/beam_utils.erl
-@@ -650,8 +650,8 @@
-     Regs2 = x_live([Src1,Src2], Regs1),
-     Regs = live_join_label(Fail, D, Regs2),
-     live_opt(Is, Regs, D, [I|Acc]);
--live_opt([{bs_append,Fail,Src1,_,_,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) ->
--    Regs1 = x_live([Src1,Src2], x_dead([Dst], Regs0)),
-+live_opt([{bs_append,Fail,Src1,_,Live,_,Src2,_,Dst}=I|Is], _Regs0, D, Acc) ->
-+    Regs1 = x_dead([Dst], x_live([Src1,Src2], live_call(Live))),
-     Regs = live_join_label(Fail, D, Regs1),
-     live_opt(Is, Regs, D, [I|Acc]);
- live_opt([{bs_private_append,Fail,Src1,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) ->
diff --git a/lang/erlang/files/patch-lib_erl__interface_src_decode_decode__big.c b/lang/erlang/files/patch-lib_erl__interface_src_decode_decode__big.c
deleted file mode 100644
index dd3632543b23..000000000000
--- a/lang/erlang/files/patch-lib_erl__interface_src_decode_decode__big.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- lib/erl_interface/src/decode/decode_big.c.orig
-+++ lib/erl_interface/src/decode/decode_big.c
-@@ -52,7 +52,10 @@
-       u = (unsigned char *) s;
-       for (i = 0; i < b->arity; ++i) {
- 	  dt[i] = u[i*2];
--	  dt[i] |= ((unsigned short) u[(i*2)+1]) << 8;
-+	  if ((i*2 + 1) < digit_bytes)
-+	  {
-+	       dt[i] |= ((unsigned short) u[(i*2)+1]) << 8;
-+	  }
-       }
-   } else {
-       s++; /* skip sign byte */