5 files changed, 59 insertions, 77 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 4f33be393e77..e99378f6b7a4 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r13b
+PORTVERSION=	r13b01
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
@@ -15,7 +15,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_R13B
+DISTNAME=	otp_src_R13B01
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -75,9 +75,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R13B.tar.gz
+ERLANG_MAN=	otp_doc_man_R13B01.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R13B.tar.gz
+ERLANG_DOCS=	otp_doc_html_R13B01.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index c3b7c8266624..d7fa39d64a86 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,58 +1,58 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.7.1
+ERTS_VSN=	5.7.2
 TOOLS_VSN=	2.6.4
 OTP_LIBS=	appmon-2.1.10.1 \
 		asn1-1.6.10 \
-		common_test-1.4.1 \
-		compiler-4.6.1 \
-		cosEvent-2.1.5 \
-		cosEventDomain-1.1.5 \
-		cosFileTransfer-1.1.7 \
-		cosNotification-1.1.10 \
-		cosProperty-1.1.8 \
-		cosTime-1.1.5 \
-		cosTransactions-1.2.6 \
+		common_test-1.4.2 \
+		compiler-4.6.2 \
+		cosEvent-2.1.6 \
+		cosEventDomain-1.1.6 \
+		cosFileTransfer-1.1.8 \
+		cosNotification-1.1.11 \
+		cosProperty-1.1.9 \
+		cosTime-1.1.6 \
+		cosTransactions-1.2.7 \
 		crypto-1.6 \
 		debugger-3.2 \
-		dialyzer-1.9.1 \
+		dialyzer-1.9.2 \
 		docbuilder-0.9.8.5 \
 		edoc-0.7.6.3 \
-		erl_interface-3.6.1 \
-		erts-5.7.1 \
+		erl_interface-3.6.2 \
+		erts-5.7.2 \
 		et-1.3.1 \
-		eunit-2.1 \
+		eunit-2.1.2 \
 		gs-1.5.10 \
-		hipe-3.7.1 \
-		ic-4.2.20 \
-		inets-5.0.13 \
+		hipe-3.7.2 \
+		ic-4.2.21 \
+		inets-5.1 \
 		inviso-0.6 \
 		jinterface-1.5.1 \
-		kernel-2.13.1 \
-		megaco-3.10.1 \
-		mnesia-4.4.9 \
-		observer-0.9.8 \
-		odbc-2.10.4 \
-		orber-3.6.12 \
-		os_mon-2.2.1 \
+		kernel-2.13.2 \
+		megaco-3.11 \
+		mnesia-4.4.10 \
+		observer-0.9.8.1 \
+		odbc-2.10.5 \
+		orber-3.6.13 \
+		os_mon-2.2.2 \
 		otp_mibs-1.0.5 \
-		parsetools-1.4.7 \
-		percept-0.8.1 \
+		parsetools-2.0 \
+		percept-0.8.2 \
 		pman-2.7 \
 		public_key-0.2 \
-		reltool-0.2.1 \
+		reltool-0.2.2 \
 		runtime_tools-1.8 \
 		sasl-2.1.6 \
-		snmp-4.13.1 \
-		ssh-1.1.2 \
-		ssl-3.10.1 \
-		stdlib-1.16.1 \
-		syntax_tools-1.6 \
-		test_server-3.3.1 \
+		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 \
 		toolbar-1.4 \
 		tools-2.6.4 \
 		tv-2.1.4.3 \
-		typer-0.1.7 \
+		typer-0.1.7.1 \
 		webtool-0.8.4 \
-		wx-0.98.1 \
-		xmerl-1.1.12
+		wx-0.98.2 \
+		xmerl-1.2
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index 38a62a69437d..dce52f0548a6 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -181,6 +181,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	etop.3 \
 	ets.3 \
 	eunit.3 \
+	eunit_surefire.3 \
 	file.3 \
 	file_sorter.3 \
 	filelib.3 \
@@ -227,6 +228,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	inviso_rt_meta.3 \
 	io.3 \
 	io_lib.3 \
+	leex.3 \
 	lib.3 \
 	lists.3 \
 	lname.3 \
@@ -236,6 +238,8 @@ MAN3=	CosEventChannelAdmin.3 \
 	math.3 \
 	megaco.3 \
 	megaco_codec_meas.3 \
+	megaco_codec_mstone1.3 \
+	megaco_codec_mstone2.3 \
 	megaco_codec_transform.3 \
 	megaco_edist_compress.3 \
 	megaco_encoder.3 \
@@ -310,6 +314,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	snmp_view_based_acm_mib.3 \
 	snmpa.3 \
 	snmpa_conf.3 \
+	snmpa_discovery_handler.3 \
 	snmpa_error.3 \
 	snmpa_error_io.3 \
 	snmpa_error_logger.3 \
@@ -334,7 +339,6 @@ MAN3=	CosEventChannelAdmin.3 \
 	ssh_sftp.3 \
 	ssh_sftpd.3 \
 	ssl.3 \
-	ssl_pkix.3 \
 	string.3 \
 	supervisor.3 \
 	supervisor_bridge.3 \
@@ -379,6 +383,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	wxCheckListBox.3 \
 	wxChildFocusEvent.3 \
 	wxChoice.3 \
+	wxChoicebook.3 \
 	wxClientDC.3 \
 	wxClipboard.3 \
 	wxCloseEvent.3 \
@@ -452,6 +457,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	wxListEvent.3 \
 	wxListItem.3 \
 	wxListView.3 \
+	wxListbook.3 \
 	wxMDIChildFrame.3 \
 	wxMDIClientWindow.3 \
 	wxMDIParentFrame.3 \
@@ -538,9 +544,11 @@ MAN3=	CosEventChannelAdmin.3 \
 	wxToggleButton.3 \
 	wxToolBar.3 \
 	wxToolTip.3 \
+	wxToolbook.3 \
 	wxTopLevelWindow.3 \
 	wxTreeCtrl.3 \
 	wxTreeEvent.3 \
+	wxTreebook.3 \
 	wxUpdateUIEvent.3 \
 	wxWindow.3 \
 	wxWindowCreateEvent.3 \
@@ -551,6 +559,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	wx_object.3 \
 	xmerl.3 \
 	xmerl_eventp.3 \
+	xmerl_sax_parser.3 \
 	xmerl_scan.3 \
 	xmerl_xpath.3 \
 	xmerl_xs.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index c95814b01be8..e5a372fe6900 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R13B.tar.gz) = 6d8c256468a198458b9f08ba6aa1a384
-SHA256 (erlang/otp_src_R13B.tar.gz) = 2f13d77f8e29ad630934a0125048b829c83b0bc58f719d7a9a19769576424884
-SIZE (erlang/otp_src_R13B.tar.gz) = 54412183
-MD5 (erlang/otp_doc_man_R13B.tar.gz) = 9265ebf3b1041be6ae18e323b0933601
-SHA256 (erlang/otp_doc_man_R13B.tar.gz) = e2a85964e5b381354c143284e537ad8f7db98cfe99ed89803349332e4d7fb84e
-SIZE (erlang/otp_doc_man_R13B.tar.gz) = 952365
-MD5 (erlang/otp_doc_html_R13B.tar.gz) = a14b1111550ce2bce65090de5cf3b0ff
-SHA256 (erlang/otp_doc_html_R13B.tar.gz) = cd54556497a02f272492288a293af3f150e2afef91e6eb38e9d735d2d4701d28
-SIZE (erlang/otp_doc_html_R13B.tar.gz) = 6267472
+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
diff --git a/lang/erlang/files/patch-erts_emulator_beam_erl__process__dump.c b/lang/erlang/files/patch-erts_emulator_beam_erl__process__dump.c
deleted file mode 100644
index cdccf8671ff6..000000000000
--- a/lang/erlang/files/patch-erts_emulator_beam_erl__process__dump.c
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/beam/erl_process_dump.c.orig
-+++ erts/emulator/beam/erl_process_dump.c
-@@ -399,9 +399,11 @@
- static void
- dump_externally(int to, void *to_arg, Eterm term)
- {
--    byte sbuf[1024]; /* encode and hope for the best ... */
--    byte* s; 
--    byte* p;
-+    byte *sbuf, *s, *p;
-+    unsigned size;
-+
-+    size = encode_size_struct(term, TERM_TO_BINARY_DFLAGS);
-+    sbuf = (byte *) erts_alloc(ERTS_ALC_T_TMP, size);
- 
-     s = p = sbuf;
-     erts_to_external_format(NULL, term, &p, NULL, NULL);
-@@ -409,4 +411,6 @@
-     while (s < p) {
- 	erts_print(to, to_arg, "%02X", *s++);
-     }
-+
-+    erts_free(ERTS_ALC_T_TMP, (void *) sbuf);
- }