4 files changed, 58 insertions, 57 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 9598d8ff8b1e..6b49de2aabda 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r14b03
+PORTVERSION=	r14b04
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -16,7 +16,7 @@ MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://www.erlang.se/publications/:publications		\
 		http://www.sics.se/~joe/thesis/:joe			\
 		${MASTER_SITE_LOCAL:S/$/:local/:S,%SUBDIR%/,olgeni/,}
-DISTNAME=	otp_src_R14B03
+DISTNAME=	otp_src_R14B04
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg			\
 		${ERLANG_DOCS}:erlangorg		\
@@ -40,10 +40,10 @@ CONFLICTS?=	erlang-lite-r[0-9]*
 SUB_FILES=	pkg-message
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
 
-OPTIONS=	JAVA	"Enable Java applications"	on \
-		X11	"Enable X11 support"		on \
-		WX	"Enable WX extensions"		on \
-		ODBC	"Enable ODBC"			on \
+OPTIONS=	JAVA	"Enable Java applications"	off \
+		X11	"Enable X11 support"		off \
+		WX	"Enable WX extensions"		off \
+		ODBC	"Enable ODBC"			off \
 		SMP	"Enable SMP"			on
 
 .include <bsd.port.pre.mk>
@@ -96,9 +96,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R14B03.tar.gz
+ERLANG_MAN=	otp_doc_man_R14B04.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R14B03.tar.gz
+ERLANG_DOCS=	otp_doc_html_R14B04.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index 5c7a725dccd4..5e5c5474cff3 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,60 +1,60 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.8.4
+ERTS_VSN=	5.8.5
 TOOLS_VSN=	2.6.6.4
 OTP_LIBS=	appmon-2.1.13 \
-		asn1-1.6.17 \
-		common_test-1.5.4 \
-		compiler-4.7.4 \
+		asn1-1.6.18 \
+		common_test-1.5.5 \
+		compiler-4.7.5 \
 		cosEvent-2.1.11 \
 		cosEventDomain-1.1.11 \
-		cosFileTransfer-1.1.11 \
+		cosFileTransfer-1.1.12 \
 		cosNotification-1.1.17 \
 		cosProperty-1.1.14 \
 		cosTime-1.1.11 \
 		cosTransactions-1.2.11 \
-		crypto-2.0.3 \
+		crypto-2.0.4 \
 		debugger-3.2.6 \
-		dialyzer-2.4.3 \
-		diameter-0.9 \
-		docbuilder-0.9.8.10 \
-		edoc-0.7.8 \
-		erl_docgen-0.2.5 \
-		erl_interface-3.7.4 \
-		erts-5.8.4 \
-		et-1.4.3 \
-		eunit-2.1.7 \
-		gs-1.5.13 \
-		hipe-3.8 \
-		ic-4.2.26 \
-		inets-5.6 \
+		dialyzer-2.4.4 \
+		diameter-0.10 \
+		docbuilder-0.9.8.11 \
+		edoc-0.7.9 \
+		erl_docgen-0.2.6 \
+		erl_interface-3.7.5 \
+		erts-5.8.5 \
+		et-1.4.4 \
+		eunit-2.2.1 \
+		gs-1.5.14 \
+		hipe-3.8.1 \
+		ic-4.2.27 \
+		inets-5.7.1 \
 		inviso-0.6.2 \
 		jinterface-1.5.4 \
-		kernel-2.14.4 \
-		megaco-3.15.1 \
-		mnesia-4.4.19 \
-		observer-0.9.9 \
-		odbc-2.10.10 \
-		orber-3.6.21 \
-		os_mon-2.2.6 \
+		kernel-2.14.5 \
+		megaco-3.15.1.1 \
+		mnesia-4.5 \
+		observer-0.9.10 \
+		odbc-2.10.11 \
+		orber-3.6.22 \
+		os_mon-2.2.7 \
 		otp_mibs-1.0.6 \
-		parsetools-2.0.5 \
-		percept-0.8.5 \
+		parsetools-2.0.6 \
+		percept-0.8.6 \
 		pman-2.7.1 \
-		public_key-0.12 \
-		reltool-0.5.6 \
-		runtime_tools-1.8.5 \
-		sasl-2.1.9.4 \
-		snmp-4.20 \
-		ssh-2.0.7 \
-		ssl-4.1.5 \
-		stdlib-1.17.4 \
+		public_key-0.13 \
+		reltool-0.5.7 \
+		runtime_tools-1.8.6 \
+		sasl-2.1.10 \
+		snmp-4.21.1 \
+		ssh-2.0.8 \
+		ssl-4.1.6 \
+		stdlib-1.17.5 \
 		syntax_tools-1.6.7.1 \
-		test_server-3.4.4 \
-		toolbar-1.4.1 \
-		tools-2.6.6.4 \
+		test_server-3.4.5 \
+		toolbar-1.4.2 \
+		tools-2.6.6.5 \
 		tv-2.1.4.7 \
-		typer-0.9.1 \
-		webtool-0.8.8 \
-		wx-0.98.10 \
-		xmerl-1.2.9
+		typer-0.9.2 \
+		webtool-0.8.9 \
+		wx-0.99 \
+		xmerl-1.2.10
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index 7f6a5bf311c7..3cc1e56e6630 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -484,6 +484,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	wxListCtrl.3 \
 	wxListEvent.3 \
 	wxListItem.3 \
+	wxListItemAttr.3 \
 	wxListView.3 \
 	wxListbook.3 \
 	wxLogNull.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index abdc7b297707..556ecfa17ef5 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-SHA256 (erlang/otp_src_R14B03.tar.gz) = ae0d7c90e860a8be27248114d5c6441a316d44f7e31493d4bae8e7db0cae651d
-SIZE (erlang/otp_src_R14B03.tar.gz) = 70620709
-SHA256 (erlang/otp_doc_man_R14B03.tar.gz) = 78882849e69ab7449a75accbdaa85015209114a93e60cb6781e03f2af592a4e5
-SIZE (erlang/otp_doc_man_R14B03.tar.gz) = 1116113
-SHA256 (erlang/otp_doc_html_R14B03.tar.gz) = d05031cc9f3e3af63b891737f9f203c7ab862adf490d67f7d7e3a9d245667958
-SIZE (erlang/otp_doc_html_R14B03.tar.gz) = 28691748
+SHA256 (erlang/otp_src_R14B04.tar.gz) = 099b35910e635b9148ac90f70fd9dd592920ed02406eb26c349efd8d1e959b6e
+SIZE (erlang/otp_src_R14B04.tar.gz) = 70773703
+SHA256 (erlang/otp_doc_man_R14B04.tar.gz) = 8514511e8a8ac3f3f67db06f333548edf283d9a8afcbc9e9eeca7b1af9a107da
+SIZE (erlang/otp_doc_man_R14B04.tar.gz) = 1117663
+SHA256 (erlang/otp_doc_html_R14B04.tar.gz) = 6bbae85c77878b047440eba11fe3639e60bd853a954027aa65ac280c89af4c37
+SIZE (erlang/otp_doc_html_R14B04.tar.gz) = 28809234
 SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
 SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
 SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b