Upgrade to version R12B-5.

8 files changed, 92 insertions, 82 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 80b315a4b123..790f4b87e569 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r12b4
-PORTREVISION=	1
+PORTVERSION=	r12b5
 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_R12B-4
+DISTNAME=	otp_src_R12B-5
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -77,9 +76,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R12B-4.tar.gz
+ERLANG_MAN=	otp_doc_man_R12B-5.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R12B-4.tar.gz
+ERLANG_DOCS=	otp_doc_html_R12B-5.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index e0f7d7c7489a..98331bc4c3eb 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,53 +1,55 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.6.4
+ERTS_VSN=	5.6.5
 TOOLS_VSN=	2.6.2
 OTP_LIBS=	appmon-2.1.9 \
-		asn1-1.6 \
-		common_test-1.3.3 \
-		compiler-4.5.4 \
-		cosEvent-2.1.3 \
-		cosEventDomain-1.1.3 \
-		cosFileTransfer-1.1.5 \
-		cosNotification-1.1.7 \
-		cosProperty-1.1.6 \
-		cosTime-1.1.3 \
-		cosTransactions-1.2.4 \
-		crypto-1.5.2.1 \
-		debugger-3.1.1.3 \
-		dialyzer-1.8.2 \
+		asn1-1.6.2 \
+		common_test-1.3.4 \
+		compiler-4.5.5 \
+		cosEvent-2.1.4 \
+		cosEventDomain-1.1.4 \
+		cosFileTransfer-1.1.6 \
+		cosNotification-1.1.9 \
+		cosProperty-1.1.7 \
+		cosTime-1.1.4 \
+		cosTransactions-1.2.5 \
+		crypto-1.5.3 \
+		debugger-3.1.1.4 \
+		dialyzer-1.8.3 \
 		docbuilder-0.9.8.4 \
-		edoc-0.7.6 \
-		erl_interface-3.5.8 \
+		edoc-0.7.6.2 \
+		erl_interface-3.5.9 \
 		et-1.3 \
+		eunit-2.0 \
 		gs-1.5.9 \
-		hipe-3.6.8 \
-		ic-4.2.18 \
-		inets-5.0.10 \
+		hipe-3.6.9 \
+		ic-4.2.19 \
+		inets-5.0.12 \
 		inviso-0.6 \
-		jinterface-1.4.1 \
-		kernel-2.12.4 \
-		megaco-3.8.1 \
-		mnesia-4.4.5 \
+		jinterface-1.4.2 \
+		kernel-2.12.5 \
+		megaco-3.9.1.1 \
+		mnesia-4.4.7 \
 		observer-0.9.7.4 \
 		odbc-2.10.3 \
-		orber-3.6.9 \
-		os_mon-2.1.7 \
+		orber-3.6.10 \
+		os_mon-2.1.8 \
 		otp_mibs-1.0.4.1 \
 		parsetools-1.4.5 \
-		percept-0.7.2 \
+		percept-0.7.3 \
 		pman-2.6 \
-		runtime_tools-1.7.2 \
-		sasl-2.1.5.3 \
-		snmp-4.11.1 \
-		ssh-1.0 \
-		ssl-3.9 \
-		stdlib-1.15.4 \
-		syntax_tools-1.5.5 \
-		test_server-3.2.3 \
+		public_key-0.1 \
+		runtime_tools-1.7.3 \
+		sasl-2.1.5.4 \
+		snmp-4.12 \
+		ssh-1.0.2 \
+		ssl-3.10 \
+		stdlib-1.15.5 \
+		syntax_tools-1.5.6 \
+		test_server-3.2.4 \
 		toolbar-1.3.0.1 \
 		tools-2.6.2 \
 		tv-2.1.4.2 \
-		typer-0.1.4 \
+		typer-0.1.5 \
 		webtool-0.8.3.2 \
 		xmerl-1.1.10
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index dc3690e0a0d2..09dfb47c25f9 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -177,6 +177,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	et_viewer.3 \
 	etop.3 \
 	ets.3 \
+	eunit.3 \
 	file.3 \
 	file_sorter.3 \
 	filelib.3 \
@@ -274,6 +275,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	prettypr.3 \
 	proc_lib.3 \
 	proplists.3 \
+	public_key.3 \
 	qlc.3 \
 	queue.3 \
 	random.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index b22549804bd9..503500709da4 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-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
+MD5 (erlang/otp_src_R12B-5.tar.gz) = 250fc48242a098073474e563c3f23e76
+SHA256 (erlang/otp_src_R12B-5.tar.gz) = 0ece696091eaf2af633f61f5f1fc9988efe650a3a0e6a129016681ff7900acab
+SIZE (erlang/otp_src_R12B-5.tar.gz) = 47472816
+MD5 (erlang/otp_doc_man_R12B-5.tar.gz) = 6231cb172847040395cc34b20781aa3b
+SHA256 (erlang/otp_doc_man_R12B-5.tar.gz) = f7acb458b72ffa8f9b1f45501bed85d3d9fb691c601f3f6997856c501e2f0659
+SIZE (erlang/otp_doc_man_R12B-5.tar.gz) = 822321
+MD5 (erlang/otp_doc_html_R12B-5.tar.gz) = fb0c5454bbd865e881b6712295f6d41f
+SHA256 (erlang/otp_doc_html_R12B-5.tar.gz) = db131a347217ab434ca4c483abb61dc01989e0db43e1fe6982c3067f60cf91d7
+SIZE (erlang/otp_doc_html_R12B-5.tar.gz) = 5713089
diff --git a/lang/erlang/files/patch-erts-emulator-Makefile.in b/lang/erlang/files/patch-erts-emulator-Makefile.in
index 9910f98f5f1c..02371ab44deb 100644
--- a/lang/erlang/files/patch-erts-emulator-Makefile.in
+++ b/lang/erlang/files/patch-erts-emulator-Makefile.in
@@ -3,17 +3,6 @@ $FreeBSD$
 
 --- erts/emulator/Makefile.in.orig
 +++ erts/emulator/Makefile.in
-@@ -265,8 +265,10 @@
- endif
- WITH_SCTP=@WITH_SCTP@
- ifdef WITH_SCTP
-+ifneq ($(findstring freebsd,$(TARGET)),freebsd)
- LIBS += -lsctp
- endif
-+endif
- 
- ORG_THR_LIBS=@EMU_THR_LIBS@
- THR_LIB_NAME=@EMU_THR_LIB_NAME@
 @@ -544,7 +546,7 @@
  endif
  
diff --git a/lang/erlang/files/patch-erts_configure b/lang/erlang/files/patch-erts_configure
index 5c4b25a5b0c9..6197cc8876ac 100644
--- a/lang/erlang/files/patch-erts_configure
+++ b/lang/erlang/files/patch-erts_configure
@@ -12,11 +12,3 @@ $FreeBSD$
      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
-@@ -10679,7 +10679,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsctp  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
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
new file mode 100644
index 000000000000..006a6ea66121
--- /dev/null
+++ b/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c
@@ -0,0 +1,40 @@
+
+$FreeBSD$
+
+--- erts/emulator/drivers/common/inet_drv.c.orig
++++ erts/emulator/drivers/common/inet_drv.c
+@@ -3460,9 +3460,14 @@
+     /* 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 defined (__FreeBSD__)
++    /* In FreeBSD, sctp_bindx belongs to libc - see sctp_bindx(3) */
++    inet_init_sctp();
++    add_driver_entry(&sctp_inet_driver_entry);
++#   else
++#     ifndef LIBSCTP
++#       error LIBSCTP not defined
++#     endif
+     if (erts_sys_ddll_open_noext(STRINGIFY(LIBSCTP), &h_libsctp) == 0) {
+ 	void *ptr;
+ 	if (erts_sys_ddll_sym(h_libsctp, "sctp_bindx", &ptr) == 0) {
+@@ -3471,6 +3476,7 @@
+ 	    add_driver_entry(&sctp_inet_driver_entry);
+ 	}
+     }
++#   endif
+ #  endif
+ #endif /* _OSE_ */
+     /* remove the dummy inet driver */
+@@ -8997,7 +9003,7 @@
+ 	    rflag = add_flag ? SCTP_BINDX_ADD_ADDR : SCTP_BINDX_REM_ADDR;
+ 
+ 	    /* Invoke the call: */
+-	    if (p_sctp_bindx(desc->s, addrs, n, rflag) < 0)
++	    if (sctp_bindx(desc->s, addrs, n, rflag) < 0)
+ 		return ctl_error(sock_errno(), rbuf, rsize);
+ 
+ 	    desc->state = INET_STATE_BOUND;
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
deleted file mode 100644
index a06769e90cbe..000000000000
--- a/lang/erlang/files/patch-lib_os__mon_c__src_memsup.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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;