Upgrade to version r13b04.

Obtained from:	vanilla (with additional SCTP fix)

15 files changed, 96 insertions, 176 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 155eb450ac2f..aba3f55e4a1c 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r13b03
-PORTREVISION=	1
+PORTVERSION=	r13b04
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/        \
@@ -15,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_R13B03
+DISTNAME=	otp_src_R13B04
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -82,9 +81,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R13B03.tar.gz
+ERLANG_MAN=	otp_doc_man_R13B04.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R13B03.tar.gz
+ERLANG_DOCS=	otp_doc_html_R13B04.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index f81304e71d5f..c57f8d2c6b91 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.7.4
-TOOLS_VSN=	2.6.5
-OTP_LIBS=	appmon-2.1.10.2 \
-		asn1-1.6.12 \
-		common_test-1.4.6 \
-		compiler-4.6.4 \
-		cosEvent-2.1.7 \
-		cosEventDomain-1.1.7 \
-		cosFileTransfer-1.1.9 \
-		cosNotification-1.1.12 \
-		cosProperty-1.1.10 \
-		cosTime-1.1.7 \
-		cosTransactions-1.2.8 \
-		crypto-1.6.3 \
-		debugger-3.2.1 \
-		dialyzer-2.1.0 \
-		docbuilder-0.9.8.6 \
-		edoc-0.7.6.5 \
-		erl_docgen-0.1 \
-		erl_interface-3.6.4 \
-		erts-5.7.4 \
-		et-1.3.3 \
-		eunit-2.1.4 \
+ERTS_VSN=	5.7.5
+TOOLS_VSN=	2.6.5.1
+OTP_LIBS=	appmon-2.1.11 \
+		asn1-1.6.13 \
+		common_test-1.4.7 \
+		compiler-4.6.5 \
+		cosEvent-2.1.8 \
+		cosEventDomain-1.1.8 \
+		cosFileTransfer-1.1.10 \
+		cosNotification-1.1.13 \
+		cosProperty-1.1.11 \
+		cosTime-1.1.8 \
+		cosTransactions-1.2.9 \
+		crypto-1.6.4 \
+		debugger-3.2.2 \
+		dialyzer-2.2.0 \
+		docbuilder-0.9.8.7 \
+		edoc-0.7.6.6 \
+		erl_docgen-0.2 \
+		erl_interface-3.6.5 \
+		erts-5.7.5 \
+		et-1.4 \
+		eunit-2.1.5 \
 		gs-1.5.11 \
-		hipe-3.7.4 \
-		ic-4.2.23 \
-		inets-5.2 \
+		hipe-3.7.5 \
+		ic-4.2.24 \
+		inets-5.3 \
 		inviso-0.6.1 \
-		jinterface-1.5.2 \
-		kernel-2.13.4 \
-		megaco-3.13 \
-		mnesia-4.4.12 \
-		observer-0.9.8.1 \
-		odbc-2.10.6 \
-		orber-3.6.14 \
-		os_mon-2.2.4 \
+		jinterface-1.5.3 \
+		kernel-2.13.5 \
+		megaco-3.14 \
+		mnesia-4.4.13 \
+		observer-0.9.8.2 \
+		odbc-2.10.7 \
+		orber-3.6.15 \
+		os_mon-2.2.5 \
 		otp_mibs-1.0.6 \
-		parsetools-2.0.1 \
-		percept-0.8.3 \
+		parsetools-2.0.2 \
+		percept-0.8.4 \
 		pman-2.7.1 \
-		public_key-0.4 \
-		reltool-0.5.2 \
-		runtime_tools-1.8.2 \
-		sasl-2.1.8 \
-		snmp-4.15 \
-		ssh-1.1.7 \
-		ssl-3.10.7 \
-		stdlib-1.16.4 \
-		syntax_tools-1.6.4 \
-		test_server-3.3.5 \
+		public_key-0.5 \
+		reltool-0.5.3 \
+		runtime_tools-1.8.3 \
+		sasl-2.1.9 \
+		snmp-4.16 \
+		ssh-1.1.8 \
+		ssl-3.10.8 \
+		stdlib-1.16.5 \
+		syntax_tools-1.6.5 \
+		test_server-3.3.6 \
 		toolbar-1.4.1 \
-		tools-2.6.5 \
+                tools-2.6.5.1 \
 		tv-2.1.4.4 \
-		typer-0.1.7.3 \
-		webtool-0.8.5 \
-		wx-0.98.4 \
-		xmerl-1.2.3
+		typer-0.1.7.4 \
+		webtool-0.8.6 \
+		wx-0.98.5 \
+		xmerl-1.2.4
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index f1a997405d83..3fdac66edef3 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -204,7 +204,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	glu.3 \
 	gs.3 \
 	heart.3 \
-	http.3 \
+	httpc.3 \
 	httpd.3 \
 	httpd_conf.3 \
 	httpd_socket.3 \
@@ -230,6 +230,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	inviso_rt_meta.3 \
 	io.3 \
 	io_lib.3 \
+	lcnt.3 \
 	leex.3 \
 	lib.3 \
 	lists.3 \
@@ -601,6 +602,7 @@ MAN6=	common_test.6 \
 	os_mon.6 \
 	runtime_tools.6 \
 	sasl.6 \
+	snmp.6 \
 	ssl.6 \
 	stdlib.6 \
 	test_server.6
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index d0907d3d50e7..8b7eb917fe5d 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R13B03.tar.gz) = 411fcb29f0819973f71e28f6b56d9948
-SHA256 (erlang/otp_src_R13B03.tar.gz) = e7c46c8b2778f22064a3b369c1a1b572a1cc0e8a2198166858d4b9a1b488d662
-SIZE (erlang/otp_src_R13B03.tar.gz) = 57524485
-MD5 (erlang/otp_doc_man_R13B03.tar.gz) = 1fe80b110061ef73614824fb06d4d6eb
-SHA256 (erlang/otp_doc_man_R13B03.tar.gz) = c06967938826be25babaaecce8673738aef2093e8bbd66e5f66335455d5ae9f7
-SIZE (erlang/otp_doc_man_R13B03.tar.gz) = 1108822
-MD5 (erlang/otp_doc_html_R13B03.tar.gz) = ade1a4d5dcfe3732dc953f7cf9664b37
-SHA256 (erlang/otp_doc_html_R13B03.tar.gz) = 7be572da5856a659e747c79493980da0d88b285f3f56638aa46cb11f1fb8a0e0
-SIZE (erlang/otp_doc_html_R13B03.tar.gz) = 26682590
+MD5 (erlang/otp_src_R13B04.tar.gz) = ca6da4921e438891967900aa6a084341
+SHA256 (erlang/otp_src_R13B04.tar.gz) = e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43
+SIZE (erlang/otp_src_R13B04.tar.gz) = 59060560
+MD5 (erlang/otp_doc_man_R13B04.tar.gz) = 681aaef70affc64743f4e8c0675034af
+SHA256 (erlang/otp_doc_man_R13B04.tar.gz) = 3646198b64bbea0f3760987d20d3392b0b5b2955394a917b92a2c6664a310dd6
+SIZE (erlang/otp_doc_man_R13B04.tar.gz) = 1033584
+MD5 (erlang/otp_doc_html_R13B04.tar.gz) = d69ce51bfabbdd0808461d86dfc95689
+SHA256 (erlang/otp_doc_html_R13B04.tar.gz) = fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa
+SIZE (erlang/otp_doc_html_R13B04.tar.gz) = 27440785
diff --git a/lang/erlang/files/patch-erts_configure b/lang/erlang/files/patch-erts_configure
deleted file mode 100644
index 6197cc8876ac..000000000000
--- a/lang/erlang/files/patch-erts_configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- erts/configure.orig
-+++ erts/configure
-@@ -10620,7 +10620,7 @@
- 
- 
- 
--if test "x$enable_sctp" == "xyes" ; then
-+if test "x$enable_sctp" = "xyes" ; then
-     echo "$as_me:$LINENO: checking for netinet/sctp.h" >&5
- echo $ECHO_N "checking for netinet/sctp.h... $ECHO_C" >&6
- if test "${ac_cv_header_netinet_sctp_h+set}" = set; then
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 77edc5f5d4ac..1841e34f3b68 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,28 @@ $FreeBSD$
 
 --- erts/emulator/drivers/common/inet_drv.c.orig
 +++ erts/emulator/drivers/common/inet_drv.c
-@@ -5305,12 +5305,15 @@
+@@ -3490,17 +3490,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);
+-#   ifndef LIBSCTP
+-#     error LIBSCTP not defined
+-#   endif
+-    if (erts_sys_ddll_open_noext(STRINGIFY(LIBSCTP), &h_libsctp, NULL) == 0) {
+-	void *ptr;
+-	if (erts_sys_ddll_sym(h_libsctp, "sctp_bindx", &ptr) == 0) {
+-	    p_sctp_bindx = ptr;
+-	    inet_init_sctp();
+-	    add_driver_entry(&sctp_inet_driver_entry);
+-	}
+-    }
++    p_sctp_bindx = sctp_bindx;
++    inet_init_sctp();
++    add_driver_entry(&sctp_inet_driver_entry);
+ #  endif
+ #endif /* _OSE_ */
+     /* remove the dummy inet driver */
+@@ -5305,12 +5297,15 @@
  	    if (pmtud_enable)			cflags |= SPP_PMTUD_ENABLE;
  	    if (pmtud_disable)			cflags |= SPP_PMTUD_DISABLE;
  
@@ -19,7 +40,7 @@ $FreeBSD$
  
  	    arg.pap.spp_flags  = cflags;
  #	    endif
-@@ -6211,13 +6214,15 @@
+@@ -6211,13 +6206,15 @@
  	    
  	    if (ap.spp_flags & SPP_PMTUD_DISABLE)
  		{ i = LOAD_ATOM (spec, i, am_pmtud_disable);         n++; }
diff --git a/lang/erlang/files/patch-erts_etc_unix_Install.src b/lang/erlang/files/patch-erts_etc_unix_Install.src
deleted file mode 100644
index 68cbe91a4bdc..000000000000
--- a/lang/erlang/files/patch-erts_etc_unix_Install.src
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- erts/etc/unix/Install.src.orig
-+++ erts/etc/unix/Install.src
-@@ -148,4 +148,4 @@
-     ./misc/format_man_pages $ERL_ROOT
- fi
- 
--
-+exit 0
diff --git a/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in
deleted file mode 100644
index 81e0ce9e83b3..000000000000
--- a/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/crypto/c_src/Makefile.in.orig	Thu Oct  7 12:11:06 2004
-+++ lib/crypto/c_src/Makefile.in	Thu Oct  7 12:11:07 2004
-@@ -121,7 +121,7 @@
- release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
--	$(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj
-+	$(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj
- 	$(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj
- 	$(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib
- 
diff --git a/lang/erlang/files/patch-lib_et_src_et__contents__viewer.erl b/lang/erlang/files/patch-lib_et_src_et__gs__contents__viewer.erl
index 683358dbf6da..a747941fac91 100644
--- a/lang/erlang/files/patch-lib_et_src_et__contents__viewer.erl
+++ b/lang/erlang/files/patch-lib_et_src_et__gs__contents__viewer.erl
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- lib/et/src/et_contents_viewer.erl.orig	Sat Jul 24 15:04:01 2004
-+++ lib/et/src/et_contents_viewer.erl	Sat Jul 24 15:04:31 2004
-@@ -346,7 +346,6 @@
+--- lib/et/src/et_gs_contents_viewer.erl.orig	2010-03-11 16:24:41.000000000 +0800
++++ lib/et/src/et_gs_contents_viewer.erl	2010-03-11 16:24:53.000000000 +0800
+@@ -347,7 +347,6 @@ handle_info({gs, _Obj, keypress, _, [Key
          'Caps_Lock' ->
              {noreply, S};
          _ ->
diff --git a/lang/erlang/files/patch-lib_et_src_et__viewer.erl b/lang/erlang/files/patch-lib_et_src_et__gs__viewer.erl
index 8cc3212e49e2..8f0fe420eae5 100644
--- a/lang/erlang/files/patch-lib_et_src_et__viewer.erl
+++ b/lang/erlang/files/patch-lib_et_src_et__gs__viewer.erl
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- lib/et/src/et_viewer.erl.orig	Sat Jul 24 15:02:18 2004
-+++ lib/et/src/et_viewer.erl	Sat Jul 24 15:04:38 2004
-@@ -982,8 +982,7 @@
+--- lib/et/src/et_gs_viewer.erl.orig	2010-03-11 16:26:59.000000000 +0800
++++ lib/et/src/et_gs_viewer.erl	2010-03-11 16:27:16.000000000 +0800
+@@ -855,8 +855,7 @@ close_all_others(S) ->
      noreply(S).
  
  click_error(Click, S) ->
diff --git a/lang/erlang/files/patch-lib_inets_src_http__client_http.erl b/lang/erlang/files/patch-lib_inets_src_http__client_http.erl
deleted file mode 100644
index 2b2b435bb648..000000000000
--- a/lang/erlang/files/patch-lib_inets_src_http__client_http.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/inets/src/http_client/http.erl.orig
-+++ lib/inets/src/http_client/http.erl
-@@ -293,6 +293,8 @@
-     case {Sync, Stream} of
- 	{true, self} ->
- 	    {error, streaming_error};
-+	{true, {self,once}} ->
-+	    {error, streaming_error};
- 	_ ->
- 	    RecordHeaders = header_record(NewHeaders, #http_request_h{}, 
- 					  Host, Version),
diff --git a/lang/erlang/files/patch-lib_odbc_c_src_odbcserver.c b/lang/erlang/files/patch-lib_odbc_c_src_odbcserver.c
deleted file mode 100644
index 985785bd8e26..000000000000
--- a/lang/erlang/files/patch-lib_odbc_c_src_odbcserver.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/odbc/c_src/odbcserver.c.orig	Sat Jun 25 17:34:20 2005
-+++ lib/odbc/c_src/odbcserver.c	Sat Jun 25 17:34:33 2005
-@@ -107,6 +107,7 @@
- #include <sys/socket.h>
- #include <sys/uio.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- #endif
- 
- #include "ei.h"
diff --git a/lang/erlang/files/patch-lib_sasl_src_rb.erl b/lang/erlang/files/patch-lib_sasl_src_rb.erl
deleted file mode 100644
index 79b3961b0f00..000000000000
--- a/lang/erlang/files/patch-lib_sasl_src_rb.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/sasl/src/rb.erl.orig
-+++ lib/sasl/src/rb.erl
-@@ -414,7 +414,7 @@
- 		    Ref = make_ref(),
- 		    case (catch {Ref,binary_to_term(Bin)}) of
- 			{'EXIT',_} ->
--			    {error, "Inclomplete erlang term in log"};
-+			    {error, "Incomplete erlang term in log"};
- 			{Ref,Term} ->
- 			    {ok, Term}
- 		    end
diff --git a/lang/erlang/files/patch-lib_snmp_src_misc_snmp__config.erl b/lang/erlang/files/patch-lib_snmp_src_misc_snmp__config.erl
deleted file mode 100644
index 732aef70634f..000000000000
--- a/lang/erlang/files/patch-lib_snmp_src_misc_snmp__config.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/snmp/src/misc/snmp_config.erl.orig
-+++ lib/snmp/src/misc/snmp_config.erl
-@@ -1722,7 +1722,7 @@
- "%% {\"standard inform\", \"std_inform\", inform}.\n"
- "%%\n\n",
-     Hdr = header() ++ Comment, 
--    Conf = [{"stadard_trap", "std_trap", NotifyType}],
-+    Conf = [{"standard trap", "std_trap", NotifyType}],
-     write_agent_notify_config(Dir, Hdr, Conf).
- 
- write_agent_notify_config(Dir, Hdr, Conf) 
diff --git a/lang/erlang/files/patch-lib_wx_configure b/lang/erlang/files/patch-lib_wx_configure
deleted file mode 100644
index 8a334f042c0b..000000000000
--- a/lang/erlang/files/patch-lib_wx_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/wx/configure.orig	2009-06-10 10:35:03.000000000 +0800
-+++ lib/wx/configure	2009-06-10 10:35:23.000000000 +0800
-@@ -3210,7 +3210,7 @@
- 	;;
-     *)
- 	DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS"
--	CFLAGS="-g -Wall -O2 -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS"
-+	CFLAGS="-Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS %%CFLAGS%%"
- 	;;
- esac
-