Upgrade to version R14B01.

7 files changed, 49 insertions, 126 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 0494ec3cce7f..0d30e987a32f 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r14b
+PORTVERSION=	r14b01
 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_R14B
+DISTNAME=	otp_src_R14B01
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg			\
 		${ERLANG_DOCS}:erlangorg		\
@@ -42,7 +42,7 @@ SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
 
 OPTIONS=	JAVA	"Enable Java applications"	on \
 		X11	"Enable X11 support"		on \
-		WX	"Enable WX Extensions"		on \
+		WX	"Enable WX extensions"		on \
 		ODBC	"Enable ODBC"			on \
 		SMP	"Enable SMP"			on
 
@@ -96,9 +96,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R14B.tar.gz
+ERLANG_MAN=	otp_doc_man_R14B01.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R14B.tar.gz
+ERLANG_DOCS=	otp_doc_html_R14B01.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index e6ab89aa1c50..afd3cd8c0cca 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.8.1
-TOOLS_VSN=	2.6.6.1
+ERTS_VSN=	5.8.2
+TOOLS_VSN=	2.6.6.2
 OTP_LIBS=	appmon-2.1.13 \
-		asn1-1.6.14.1 \
-		common_test-1.5.1 \
-		compiler-4.7.1 \
+		asn1-1.6.15 \
+		common_test-1.5.2 \
+		compiler-4.7.2 \
 		cosEvent-2.1.9 \
 		cosEventDomain-1.1.9 \
 		cosFileTransfer-1.1.10 \
-		cosNotification-1.1.14 \
+		cosNotification-1.1.15 \
 		cosProperty-1.1.12 \
 		cosTime-1.1.9 \
 		cosTransactions-1.2.10 \
-		crypto-2.0.1 \
-		debugger-3.2.4 \
-		dialyzer-2.3.1 \
-		docbuilder-0.9.8.8 \
-		edoc-0.7.6.7 \
-		erl_docgen-0.2.2 \
-		erl_interface-3.7.1 \
-		erts-5.8.1 \
-		et-1.4.1 \
-		eunit-2.1.5 \
+		crypto-2.0.2 \
+		debugger-3.2.5 \
+		dialyzer-2.4.0 \
+		docbuilder-0.9.8.9 \
+		edoc-0.7.6.8 \
+		erl_docgen-0.2.3 \
+		erl_interface-3.7.2 \
+		erts-5.8.2 \
+		et-1.4.2 \
+		eunit-2.1.6 \
 		gs-1.5.13 \
-		hipe-3.7.7 \
+		hipe-3.7.8 \
 		ic-4.2.25 \
-		inets-5.5 \
+		inets-5.5.1 \
 		inviso-0.6.2 \
-		jinterface-1.5.3.1 \
-		kernel-2.14.1 \
+		jinterface-1.5.3.2 \
+		kernel-2.14.2 \
 		megaco-3.15 \
-		mnesia-4.4.15 \
-		observer-0.9.8.3 \
-		odbc-2.10.8 \
-		orber-3.6.17 \
+		mnesia-4.4.16 \
+		observer-0.9.8.4 \
+		odbc-2.10.9 \
+		orber-3.6.18 \
 		os_mon-2.2.5 \
 		otp_mibs-1.0.6 \
-		parsetools-2.0.4 \
+		parsetools-2.0.5 \
 		percept-0.8.4 \
 		pman-2.7.1 \
-		public_key-0.8 \
+		public_key-0.10 \
 		reltool-0.5.4 \
 		runtime_tools-1.8.4.1 \
 		sasl-2.1.9.2 \
 		snmp-4.18 \
-		ssh-2.0.1 \
-		ssl-4.0.1 \
-		stdlib-1.17.1 \
-		syntax_tools-1.6.6 \
-		test_server-3.4.1 \
+		ssh-2.0.3 \
+		ssl-4.1.1 \
+		stdlib-1.17.2 \
+		syntax_tools-1.6.7 \
+		test_server-3.4.2 \
 		toolbar-1.4.1 \
-		tools-2.6.6.1 \
+		tools-2.6.6.2 \
 		tv-2.1.4.6 \
 		typer-0.1.7.5 \
 		webtool-0.8.7 \
-		wx-0.98.7 \
-		xmerl-1.2.6
+		wx-0.98.8 \
+		xmerl-1.2.7
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index ad5b90e5e138..5d4f380d41e8 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-MAN1=	epmd.1 \
+MAN1=	ct_run.1 \
+	epmd.1 \
 	erl.1 \
 	erl_call.1 \
 	erlc.1 \
 	erlsrv.1 \
 	escript.1 \
 	run_erl.1 \
-	run_test.1 \
 	start.1 \
 	start_erl.1 \
 	start_webtool.1 \
@@ -558,6 +558,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	wxStyledTextCtrl.3 \
 	wxStyledTextEvent.3 \
 	wxSysColourChangedEvent.3 \
+	wxSystemSettings.3 \
 	wxTextAttr.3 \
 	wxTextCtrl.3 \
 	wxTextDataObject.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 01bab8fd77de..68b1e5a40766 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,27 +1,18 @@
-MD5 (erlang/otp_src_R14B.tar.gz) = 5292a04556d17ad528d570e02357dfbb
-SHA256 (erlang/otp_src_R14B.tar.gz) = b35af03c69c40c0e4758ee011f71e28ce92783368afec764ce46e6e54cb05d9f
-SIZE (erlang/otp_src_R14B.tar.gz) = 59800980
-MD5 (erlang/otp_doc_man_R14B.tar.gz) = 011530a24fbcc194be9bd01f779325a2
-SHA256 (erlang/otp_doc_man_R14B.tar.gz) = 4c43ef799c29ef488959ffdfb8a8fc1d1e7756c2c7dccb4cc81061de5ac40c8a
-SIZE (erlang/otp_doc_man_R14B.tar.gz) = 1067515
-MD5 (erlang/otp_doc_html_R14B.tar.gz) = 2294757773a0cf4c036f602fbb9fc4fb
-SHA256 (erlang/otp_doc_html_R14B.tar.gz) = 0189a784a4ea0c192c857835b20fa97a0c9f85054ae5b9868061574f329842a5
-SIZE (erlang/otp_doc_html_R14B.tar.gz) = 27735095
-MD5 (erlang/armstrong_thesis_2003.pdf) = 2196a214fd7eccc6292adb96602f5827
+SHA256 (erlang/otp_src_R14B01.tar.gz) = 88349fa9f112e21b09726434ee5f4013d3ed3fb1d0f2623f22689dc20886f2f8
+SIZE (erlang/otp_src_R14B01.tar.gz) = 64846537
+SHA256 (erlang/otp_doc_man_R14B01.tar.gz) = 167dab262d9ed568e363b611764d0e3f8f3db4793d731af0063a54cb9b50f9be
+SIZE (erlang/otp_doc_man_R14B01.tar.gz) = 1075792
+SHA256 (erlang/otp_doc_html_R14B01.tar.gz) = 6c16435fb589c4eb777af273f3b789844764331e4bf72fe727612da59ac2c97b
+SIZE (erlang/otp_doc_html_R14B01.tar.gz) = 28332965
 SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
 SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
-MD5 (erlang/bjarnelic.pdf) = 155051a1a6a7d544ac9698ba95b89a21
 SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b
 SIZE (erlang/bjarnelic.pdf) = 488043
-MD5 (erlang/erlang-book-part1.pdf) = cb3919d82ebeba9ac7cb63bd8826408d
 SHA256 (erlang/erlang-book-part1.pdf) = ef2fb9d15d35f3b1b602c8578e48618597477f9cfab2d103dc2e22372c46ca0a
 SIZE (erlang/erlang-book-part1.pdf) = 883639
-MD5 (erlang/master_thesis_patterns.pdf) = 6cd8d41d6df817a11011c5ec3757dba1
 SHA256 (erlang/master_thesis_patterns.pdf) = b390fd59060fb944c78bceed781c7ad3795d4f9fbe86d391bccc479828552b43
 SIZE (erlang/master_thesis_patterns.pdf) = 422457
-MD5 (erlang/mnesia_overview.pdf) = d90dc66d367615965630f3778f1fc691
 SHA256 (erlang/mnesia_overview.pdf) = f07f9edd4ba865a1c50647dd6fa4a8f49277f8f3bef4d521c06fd90293717032
 SIZE (erlang/mnesia_overview.pdf) = 150266
-MD5 (erlang/programming_rules.pdf) = 8996d996fea086fa74f48ddf9161dadb
 SHA256 (erlang/programming_rules.pdf) = b95f8851004832b044e064c12976a422613ece897e98308a27ee8b66738b4502
 SIZE (erlang/programming_rules.pdf) = 77025
diff --git a/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c b/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c
index 655d49087df7..889102cce13e 100644
--- a/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c
+++ b/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- erts/emulator/drivers/common/inet_drv.c.orig
 +++ erts/emulator/drivers/common/inet_drv.c
-@@ -3452,17 +3452,9 @@
+@@ -3455,17 +3455,9 @@
      /* Check the size of SCTP AssocID -- currently both this driver and the
         Erlang part require 32 bit: */
      ASSERT(sizeof(sctp_assoc_t)==ASSOC_ID_LEN);
@@ -24,33 +24,3 @@ $FreeBSD$
  #endif
  
      /* remove the dummy inet driver */
-@@ -5293,12 +5285,14 @@
- 	    if (pmtud_enable)			cflags |= SPP_PMTUD_ENABLE;
- 	    if (pmtud_disable)			cflags |= SPP_PMTUD_DISABLE;
- 
-+#	    ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
- 	    sackdelay_enable =eflags& SCTP_FLAG_SACDELAY_ENABLE;
- 	    sackdelay_disable=eflags& SCTP_FLAG_SACDELAY_DISABLE;
- 	    if (sackdelay_enable && sackdelay_disable)
- 		return -1;
- 	    if (sackdelay_enable)		cflags |= SPP_SACKDELAY_ENABLE;
- 	    if (sackdelay_disable)		cflags |= SPP_SACKDELAY_DISABLE;
-+#           endif
- 
- 	    arg.pap.spp_flags  = cflags;
- #	    endif
-@@ -6200,12 +6194,14 @@
- 	    if (ap.spp_flags & SPP_PMTUD_DISABLE)
- 		{ i = LOAD_ATOM (spec, i, am_pmtud_disable);         n++; }
- 	    
-+#	    ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
- 	    if (ap.spp_flags & SPP_SACKDELAY_ENABLE)
- 		{ i = LOAD_ATOM (spec, i, am_sackdelay_enable);      n++; }
- 	    
- 	    if (ap.spp_flags & SPP_SACKDELAY_DISABLE)
- 		{ i = LOAD_ATOM (spec, i, am_sackdelay_disable);     n++; }
- #	    endif
-+#	    endif
- 	    
- 	    PLACE_FOR(spec, i,
- 		      LOAD_NIL_CNT + LOAD_LIST_CNT + 2*LOAD_TUPLE_CNT);
diff --git a/lang/erlang/files/patch-lib_public__key_src_pubkey__cert.erl b/lang/erlang/files/patch-lib_public__key_src_pubkey__cert.erl
deleted file mode 100644
index 414f1f9279b8..000000000000
--- a/lang/erlang/files/patch-lib_public__key_src_pubkey__cert.erl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- lib/public_key/src/pubkey_cert.erl.orig
-+++ lib/public_key/src/pubkey_cert.erl
-@@ -223,10 +223,15 @@
- %%--------------------------------------------------------------------	
- validate_extensions(OtpCert, ValidationState, UserState, VerifyFun) ->
-     TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
--    Extensions = TBSCert#'OTPTBSCertificate'.extensions,
--    validate_extensions(OtpCert, Extensions, ValidationState, no_basic_constraint,
--			is_self_signed(OtpCert), UserState, VerifyFun).
--
-+    case TBSCert#'OTPTBSCertificate'.version of
-+       N when N >= 3 ->
-+           Extensions = TBSCert#'OTPTBSCertificate'.extensions,
-+           validate_extensions(OtpCert, Extensions,
-+                               ValidationState, no_basic_constraint,
-+                               is_self_signed(OtpCert), UserState, VerifyFun);
-+       _ -> %% Extensions not present in versions 1 & 2
-+           {ValidationState, UserState}
-+    end.
- %%--------------------------------------------------------------------
- -spec normalize_general_name({rdnSequence, term()}) -> {rdnSequence, term()}. 
- %%
diff --git a/lang/erlang/files/patch-lib_public__key_src_public__key.erl b/lang/erlang/files/patch-lib_public__key_src_public__key.erl
deleted file mode 100644
index 7db7a1582858..000000000000
--- a/lang/erlang/files/patch-lib_public__key_src_public__key.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/public_key/src/public_key.erl.orig
-+++ lib/public_key/src/public_key.erl
-@@ -576,7 +576,7 @@
- %%--------------------------------------------------------------------
- pem_to_der(CertSource) ->
-     {ok, Bin} = file:read_file(CertSource),
--    pubkey_pem:decode(Bin).
-+    {ok, pubkey_pem:decode(Bin)}.
- 
- decode_private_key(KeyInfo) ->
-     decode_private_key(KeyInfo, no_passwd).