Upgrade to version R14B03.

5 files changed, 60 insertions, 85 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 34f7e37562c0..5e2c9a9acdb9 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r14b02
+PORTVERSION=	r14b03
 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_R14B02
+DISTNAME=	otp_src_R14B03
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg			\
 		${ERLANG_DOCS}:erlangorg		\
@@ -96,9 +96,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R14B02.tar.gz
+ERLANG_MAN=	otp_doc_man_R14B03.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R14B02.tar.gz
+ERLANG_DOCS=	otp_doc_html_R14B03.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index 8891199af701..5c7a725dccd4 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,59 +1,60 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.8.3
-TOOLS_VSN=	2.6.6.3
+ERTS_VSN=	5.8.4
+TOOLS_VSN=	2.6.6.4
 OTP_LIBS=	appmon-2.1.13 \
-		asn1-1.6.16 \
-		common_test-1.5.3 \
-		compiler-4.7.3 \
-		cosEvent-2.1.10 \
-		cosEventDomain-1.1.10 \
-		cosFileTransfer-1.1.10 \
-		cosNotification-1.1.16 \
-		cosProperty-1.1.13 \
-		cosTime-1.1.10 \
-		cosTransactions-1.2.10 \
-		crypto-2.0.2.1 \
+		asn1-1.6.17 \
+		common_test-1.5.4 \
+		compiler-4.7.4 \
+		cosEvent-2.1.11 \
+		cosEventDomain-1.1.11 \
+		cosFileTransfer-1.1.11 \
+		cosNotification-1.1.17 \
+		cosProperty-1.1.14 \
+		cosTime-1.1.11 \
+		cosTransactions-1.2.11 \
+		crypto-2.0.3 \
 		debugger-3.2.6 \
-		dialyzer-2.4.2 \
-		docbuilder-0.9.8.9 \
-		edoc-0.7.7 \
-		erl_docgen-0.2.4 \
-		erl_interface-3.7.3 \
-		erts-5.8.3 \
-		et-1.4.2 \
-		eunit-2.1.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.7.9 \
+		hipe-3.8 \
 		ic-4.2.26 \
-		inets-5.5.2 \
+		inets-5.6 \
 		inviso-0.6.2 \
 		jinterface-1.5.4 \
-		kernel-2.14.3 \
+		kernel-2.14.4 \
 		megaco-3.15.1 \
-		mnesia-4.4.17 \
+		mnesia-4.4.19 \
 		observer-0.9.9 \
 		odbc-2.10.10 \
-		orber-3.6.20 \
-		os_mon-2.2.5 \
+		orber-3.6.21 \
+		os_mon-2.2.6 \
 		otp_mibs-1.0.6 \
 		parsetools-2.0.5 \
 		percept-0.8.5 \
 		pman-2.7.1 \
-		public_key-0.11 \
-		reltool-0.5.5 \
+		public_key-0.12 \
+		reltool-0.5.6 \
 		runtime_tools-1.8.5 \
-		sasl-2.1.9.3 \
-		snmp-4.19 \
-		ssh-2.0.4 \
-		ssl-4.1.4 \
-		stdlib-1.17.3 \
-		syntax_tools-1.6.7 \
-		test_server-3.4.3 \
+		sasl-2.1.9.4 \
+		snmp-4.20 \
+		ssh-2.0.7 \
+		ssl-4.1.5 \
+		stdlib-1.17.4 \
+		syntax_tools-1.6.7.1 \
+		test_server-3.4.4 \
 		toolbar-1.4.1 \
-		tools-2.6.6.3 \
-		tv-2.1.4.6 \
-		typer-0.9 \
-		webtool-0.8.7 \
-		wx-0.98.9 \
-		xmerl-1.2.8
+		tools-2.6.6.4 \
+		tv-2.1.4.7 \
+		typer-0.9.1 \
+		webtool-0.8.8 \
+		wx-0.98.10 \
+		xmerl-1.2.9
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index 0312a91849da..7f6a5bf311c7 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 MAN1=	ct_run.1 \
+	diameter_compile.1 \
 	epmd.1 \
 	erl.1 \
 	erl_call.1 \
@@ -123,6 +124,11 @@ MAN3=	CosEventChannelAdmin.3 \
 	debugger.3 \
 	dets.3 \
 	dialyzer.3 \
+	diameter.3 \
+	diameter_app.3 \
+	diameter_sctp.3 \
+	diameter_tcp.3 \
+	diameter_transport.3 \
 	dict.3 \
 	digraph.3 \
 	digraph_utils.3 \
@@ -597,6 +603,7 @@ MAN3=	CosEventChannelAdmin.3 \
 MAN4=	app.4 \
 	appup.4 \
 	config.4 \
+	diameter_dict.4 \
 	rel.4 \
 	relup.4 \
 	script.4
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 9a8367000b15..abdc7b297707 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-SHA256 (erlang/otp_src_R14B02.tar.gz) = 849d050b59821e9f2831fee2e3267d84b410eee860a55f6fc9320cc00b5205bd
-SIZE (erlang/otp_src_R14B02.tar.gz) = 66133818
-SHA256 (erlang/otp_doc_man_R14B02.tar.gz) = d254dea54fa7af38df8ac52889bb080548ea2335257eaf7dfc628c73b63b57ff
-SIZE (erlang/otp_doc_man_R14B02.tar.gz) = 1080313
-SHA256 (erlang/otp_doc_html_R14B02.tar.gz) = 36d1052dbf1ab7d7858e270ad9ab5b5ad2988849e4629e69ae141a6f6d69f455
-SIZE (erlang/otp_doc_html_R14B02.tar.gz) = 28435253
+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/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
 SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
 SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b
diff --git a/lang/erlang/files/patch-erts_epmd_src_epmd__srv.c b/lang/erlang/files/patch-erts_epmd_src_epmd__srv.c
deleted file mode 100644
index bd4fb7f76bde..000000000000
--- a/lang/erlang/files/patch-erts_epmd_src_epmd__srv.c
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$FreeBSD$
-
---- erts/epmd/src/epmd_srv.c.orig
-+++ erts/epmd/src/epmd_srv.c
-@@ -736,6 +736,7 @@
-   for (i = 0; i < g->max_conn; i++) {
-     if (g->conn[i].open == EPMD_FALSE) {
-       struct sockaddr_in si;
-+      struct sockaddr_in di;
- #ifdef HAVE_SOCKLEN_T
-       socklen_t st;
- #else
-@@ -756,12 +757,16 @@
-       /* Determine if connection is from localhost */
-       if (getpeername(s->fd,(struct sockaddr*) &si,&st) ||
- 	  st < sizeof(si)) {
--	  /* Failure to get peername is regarder as non local host */
-+	  /* Failure to get peername is regarded as non local host */
- 	  s->local_peer = EPMD_FALSE;
-       } else {
-+	  /* Only 127.x.x.x and connections from the host's IP address
-+	     allowed, no false positives */
- 	  s->local_peer =
--	      ((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) ==
--	       0x7F000000U); /* Only 127.x.x.x allowed, no false positives */
-+	      (((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) ==
-+	       0x7F000000U) ||
-+	       (getsockname(s->fd,(struct sockaddr*) &di,&st) ?
-+	       EPMD_FALSE : si.sin_addr.s_addr == di.sin_addr.s_addr));
-       }
-       dbg_tty_printf(g,2,(s->local_peer) ? "Local peer connected" :
- 		     "Non-local peer connected");