5 files changed, 50 insertions, 40 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index e714f5295322..faa8429dfe00 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r12b3
+PORTVERSION=	r12b4
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/        \
@@ -14,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_R12B-3
+DISTNAME=	otp_src_R12B-4
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -76,9 +76,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R12B-3.tar.gz
+ERLANG_MAN=	otp_doc_man_R12B-4.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R12B-3.tar.gz
+ERLANG_DOCS=	otp_doc_html_R12B-4.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index f1aacd6ae1bf..e0f7d7c7489a 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.6.3
-TOOLS_VSN=	2.6.1
+ERTS_VSN=	5.6.4
+TOOLS_VSN=	2.6.2
 OTP_LIBS=	appmon-2.1.9 \
-		asn1-1.5.2 \
-		common_test-1.3.2 \
-		compiler-4.5.3 \
+		asn1-1.6 \
+		common_test-1.3.3 \
+		compiler-4.5.4 \
 		cosEvent-2.1.3 \
 		cosEventDomain-1.1.3 \
 		cosFileTransfer-1.1.5 \
@@ -13,41 +13,41 @@ OTP_LIBS=	appmon-2.1.9 \
 		cosProperty-1.1.6 \
 		cosTime-1.1.3 \
 		cosTransactions-1.2.4 \
-		crypto-1.5.2 \
+		crypto-1.5.2.1 \
 		debugger-3.1.1.3 \
-		dialyzer-1.8.1 \
+		dialyzer-1.8.2 \
 		docbuilder-0.9.8.4 \
 		edoc-0.7.6 \
-		erl_interface-3.5.7 \
+		erl_interface-3.5.8 \
 		et-1.3 \
 		gs-1.5.9 \
-		hipe-3.6.7 \
+		hipe-3.6.8 \
 		ic-4.2.18 \
-		inets-5.0.9 \
+		inets-5.0.10 \
 		inviso-0.6 \
 		jinterface-1.4.1 \
-		kernel-2.12.3 \
-		megaco-3.8 \
-		mnesia-4.4.3 \
+		kernel-2.12.4 \
+		megaco-3.8.1 \
+		mnesia-4.4.5 \
 		observer-0.9.7.4 \
-		odbc-2.10.2 \
+		odbc-2.10.3 \
 		orber-3.6.9 \
-		os_mon-2.1.6 \
+		os_mon-2.1.7 \
 		otp_mibs-1.0.4.1 \
 		parsetools-1.4.5 \
 		percept-0.7.2 \
 		pman-2.6 \
 		runtime_tools-1.7.2 \
 		sasl-2.1.5.3 \
-		snmp-4.11 \
-		ssh-0.9.9.6 \
+		snmp-4.11.1 \
+		ssh-1.0 \
 		ssl-3.9 \
-		stdlib-1.15.3 \
+		stdlib-1.15.4 \
 		syntax_tools-1.5.5 \
-		test_server-3.2.2 \
+		test_server-3.2.3 \
 		toolbar-1.3.0.1 \
-		tools-2.6.1 \
+		tools-2.6.2 \
 		tv-2.1.4.2 \
-		typer-0.1.3 \
+		typer-0.1.4 \
 		webtool-0.8.3.2 \
-		xmerl-1.1.9
+		xmerl-1.1.10
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index 4ebef4509d2e..dc3690e0a0d2 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -320,13 +320,9 @@ MAN3=	CosEventChannelAdmin.3 \
 	snmpm_user.3 \
 	sofs.3 \
 	ssh.3 \
-	ssh_cli.3 \
-	ssh_cm.3 \
+	ssh_connection.3 \
 	ssh_sftp.3 \
 	ssh_sftpd.3 \
-	ssh_ssh.3 \
-	ssh_sshd.3 \
-	ssh_transport.3 \
 	ssl.3 \
 	ssl_pkix.3 \
 	string.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 516096668405..b22549804bd9 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R12B-3.tar.gz) = c2e7f0ad54b8fadebde2d94106608d97
-SHA256 (erlang/otp_src_R12B-3.tar.gz) = a8ed977d468454ca8d849ee5fa08ac3d521d76f23649bef531b76bdfa73f8eb2
-SIZE (erlang/otp_src_R12B-3.tar.gz) = 42195557
-MD5 (erlang/otp_doc_man_R12B-3.tar.gz) = 13098954c9d5804bb8394fe7badb3d0d
-SHA256 (erlang/otp_doc_man_R12B-3.tar.gz) = 08e3ed5a285eabe94fef6726bd591e02c42a8425ddcdb6a6d3f38f4a2d517e62
-SIZE (erlang/otp_doc_man_R12B-3.tar.gz) = 809746
-MD5 (erlang/otp_doc_html_R12B-3.tar.gz) = 8865d406c256abbff63eaff62d2216aa
-SHA256 (erlang/otp_doc_html_R12B-3.tar.gz) = 4690829f270a40d6c1849a34e9854ba4f55e1ec1a1e91dbc09e6a0a0a7228005
-SIZE (erlang/otp_doc_html_R12B-3.tar.gz) = 5655205
+MD5 (erlang/otp_src_R12B-4.tar.gz) = ae81edda4a17506af7a9d73abca033b2
+SHA256 (erlang/otp_src_R12B-4.tar.gz) = abe19407b7557fd1e25f08adb8a387c144d994a2134c467fb2dca7fb7dc061f4
+SIZE (erlang/otp_src_R12B-4.tar.gz) = 44405399
+MD5 (erlang/otp_doc_man_R12B-4.tar.gz) = ef8f96d1721a2345cc87b208cde3de06
+SHA256 (erlang/otp_doc_man_R12B-4.tar.gz) = 0a63469e62a3bd3ad35b787ffc938b5e3c0c0cd49d8f744df718c8aabbeb2226
+SIZE (erlang/otp_doc_man_R12B-4.tar.gz) = 814528
+MD5 (erlang/otp_doc_html_R12B-4.tar.gz) = f633cd418d8260af7a11c998aa88072b
+SHA256 (erlang/otp_doc_html_R12B-4.tar.gz) = 00c16e09dbe7510efd4ff121347e08eb4b715ee4c82cafec75fdfeedfc40a923
+SIZE (erlang/otp_doc_html_R12B-4.tar.gz) = 5674796
diff --git a/lang/erlang/files/patch-lib_os__mon_c__src_memsup.c b/lang/erlang/files/patch-lib_os__mon_c__src_memsup.c
new file mode 100644
index 000000000000..a06769e90cbe
--- /dev/null
+++ b/lang/erlang/files/patch-lib_os__mon_c__src_memsup.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/os_mon/c_src/memsup.c.orig
++++ lib/os_mon/c_src/memsup.c
+@@ -404,7 +404,7 @@
+ #endif
+ 
+ #if defined(BSD4_4)
+-static void
++static int
+ get_extended_mem_bsd4(memory_ext *me) {
+     struct vmtotal vt;
+     long pgsz;