Upgrade to version R10B-9.

6 files changed, 40 insertions, 75 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 2390840607ca..7106805d1404 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r10b8
+PORTVERSION=	r10b9
 PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	lang parallel
 MASTER_SITES=	http://www.erlang.org/download/        \
 		ftp://ftp.erlang.org/pub/download/     \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTNAME=	otp_src_R10B-8
+DISTNAME=	otp_src_R10B-9
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -41,9 +40,9 @@ LIB_DEPENDS+=           iodbc.3:${PORTSDIR}/databases/libiodbc
 JAVABINDIR?=	${LOCALBASE}/jdk1.4.2/bin
 JAVAPORT?=	${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14
 
-ERLANG_MAN=     otp_doc_man_R10B-8.tar.gz
+ERLANG_MAN=     otp_doc_man_R10B-9.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R10B-8.tar.gz
+ERLANG_DOCS=	otp_doc_html_R10B-9.tar.gz
 .endif
 
 USE_GMAKE=	yes
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index 4b90c5ccd98e..357a1647a7cc 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.4.10
+ERTS_VSN=	5.4.12
 OTP_LIBS=	appmon-2.1.5 \
-		asn1-1.4.4.8 \
-		compiler-4.3.10 \
+		asn1-1.4.4.9 \
+		compiler-4.3.11 \
 		cosEvent-2.1 \
 		cosEventDomain-1.1 \
 		cosFileTransfer-1.1.2 \
-		cosNotification-1.1.1 \
+		cosNotification-1.1.2 \
 		cosProperty-1.1.1 \
 		cosTime-1.1 \
 		cosTransactions-1.2 \
 		crypto-1.4 \
-		debugger-3.0 \
-		edoc-0.6.7 \
+		debugger-3.0.1 \
+		edoc-0.6.8 \
 		erl_interface-3.5.4 \
 		et-1.0 \
 		gs-1.5.4 \
-		hipe-3.5.3 \
+		hipe-3.5.4 \
 		ic-4.2.9 \
-		inets-4.6.1 \
+		inets-4.6.2 \
 		jinterface-1.3 \
-		kernel-2.10.11 \
-		megaco-3.2 \
+		kernel-2.10.12 \
+		megaco-3.2.3 \
 		mnemosyne-1.2.5.1 \
 		mnesia-4.2.3 \
 		mnesia_session-1.1.5 \
 		observer-0.9.6.2 \
-		odbc-2.0.4 \
+		odbc-2.0.5 \
 		orber-3.6.2 \
-		os_mon-1.7.4 \
+		os_mon-1.8 \
 		otp_mibs-1.0.4 \
 		parsetools-1.3.2 \
 		pman-2.5.2 \
 		runtime_tools-1.5.1.1 \
-		sasl-2.1 \
-		snmp-4.5 \
+		sasl-2.1.1 \
+		snmp-4.6.1 \
 		ssh-0.9 \
-		ssl-3.0.9 \
-		stdlib-1.13.10 \
-		syntax_tools-1.4.2 \
+		ssl-3.0.10 \
+		stdlib-1.13.11 \
+		syntax_tools-1.4.3 \
 		toolbar-1.2.1 \
 		tools-2.4.6 \
 		tv-2.1.2 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index dca947df761f..2e8ecd13c2c6 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R10B-8.tar.gz) = 75cd5ad53b66baad9ebc802b8a1f6043
-SHA256 (erlang/otp_src_R10B-8.tar.gz) = 57368bad1ad62d405f80c2ab42ce1420c92a17277921b58b0152b3b731528139
-SIZE (erlang/otp_src_R10B-8.tar.gz) = 9941183
-MD5 (erlang/otp_doc_man_R10B-8.tar.gz) = c0760f24ae789fda248e978430aefe38
-SHA256 (erlang/otp_doc_man_R10B-8.tar.gz) = a4d2d22f699636f5a61184c0fd4650c4319db6a4692a9b392b6fb841418956fa
-SIZE (erlang/otp_doc_man_R10B-8.tar.gz) = 596195
-MD5 (erlang/otp_doc_html_R10B-8.tar.gz) = d4d3f448c311cd3fc3a44e06e4145bcb
-SHA256 (erlang/otp_doc_html_R10B-8.tar.gz) = 0bc3d3458a2dd4b4c517e0027a642f4a83e6e24e2e547ec9984132031cd13073
-SIZE (erlang/otp_doc_html_R10B-8.tar.gz) = 4622925
+MD5 (erlang/otp_src_R10B-9.tar.gz) = 05791e9097f36202eb705df2a1db6500
+SHA256 (erlang/otp_src_R10B-9.tar.gz) = 60bf7045805310f8b5ccc3b0472d7c25e190171d2773bc38d6ef051c6006f5ce
+SIZE (erlang/otp_src_R10B-9.tar.gz) = 9961340
+MD5 (erlang/otp_doc_man_R10B-9.tar.gz) = 051cd9893b36313f20a420bc2491905c
+SHA256 (erlang/otp_doc_man_R10B-9.tar.gz) = de2139727d429a7abf64b8e53575e89d33c6f31087ffc3369539cd860c832223
+SIZE (erlang/otp_doc_man_R10B-9.tar.gz) = 600937
+MD5 (erlang/otp_doc_html_R10B-9.tar.gz) = 108bc01be67aaa2edde9a0331ef9bc71
+SHA256 (erlang/otp_doc_html_R10B-9.tar.gz) = 198eea5c9f731da9312ae63e187237123a32a4b5696782e3e5518f521ec3d3bb
+SIZE (erlang/otp_doc_html_R10B-9.tar.gz) = 4656131
diff --git a/lang/erlang/files/patch-lib_kernel_src_application__controller.erl b/lang/erlang/files/patch-lib_kernel_src_application__controller.erl
deleted file mode 100644
index 2c9afc934e5c..000000000000
--- a/lang/erlang/files/patch-lib_kernel_src_application__controller.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/kernel/src/application_controller.erl.orig
-+++ lib/kernel/src/application_controller.erl
-@@ -1398,7 +1398,7 @@
-     FName = atom_to_list(Name) ++ ".app",
-     case code:where_is_file(FName) of
- 	non_existing ->
--	    {error, {file:format_error({error,enoent}), FName}};
-+	    {error, {file:format_error(enoent), FName}};
- 	FullName ->
- 	    case file:consult(FullName) of
- 		{ok, [Application]} ->
diff --git a/lang/erlang/files/patch-lib_odbc_configure b/lang/erlang/files/patch-lib_odbc_configure
index fdb9d50eac0a..f74d6e1e696f 100644
--- a/lang/erlang/files/patch-lib_odbc_configure
+++ b/lang/erlang/files/patch-lib_odbc_configure
@@ -1,11 +1,14 @@
---- lib/odbc/configure.orig	Sat Jun 25 18:33:21 2005
-+++ lib/odbc/configure	Sat Jun 25 18:33:51 2005
-@@ -1096,7 +1096,7 @@
+
+$FreeBSD$
+
+--- lib/odbc/configure.orig
++++ lib/odbc/configure
+@@ -1005,7 +1005,7 @@
  	       echo $ac_n "checking for odbc in standard locations""... $ac_c" 1>&6
- echo "configure:1098: checking for odbc in standard locations" >&5
- 	         for dir in /opt/local/pgm/odbc /usr/local/odbc /usr/odbc \
--		     /usr
-+		     /usr /usr/local
+ echo "configure:1007: checking for odbc in standard locations" >&5
+ 	         for dir in /usr/local/odbc /usr/odbc \
+-		     /usr /opt/local/pgm/odbc 
++		     /usr /opt/local/pgm/odbc /usr/local
  		 do   
  		    if test -f "$dir/include/sql.h"; then
  		      is_odbc_std_location=yes	   
diff --git a/lang/erlang/files/patch-lib_ssl_src_ssl__prim.erl b/lang/erlang/files/patch-lib_ssl_src_ssl__prim.erl
deleted file mode 100644
index 94d8323434c0..000000000000
--- a/lang/erlang/files/patch-lib_ssl_src_ssl__prim.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- lib/ssl/src/ssl_prim.erl.orig
-+++ lib/ssl/src/ssl_prim.erl
-@@ -107,7 +107,7 @@
- peername(St) when record(St, st), St#st.status =:= open  ->
-     case ssl_server:peername_prim(ssl_server_prim, St#st.fd) of
- 	{ok, {Address, Port}} ->
--	    {ok, At} = inet:getaddr(Address, inet),
-+	    {ok, At} = inet_parse:ipv4_address(Address),
- 	    {ok, {At, Port}};
- 	Error ->
- 	    Error
-@@ -119,7 +119,7 @@
- sockname(St) when record(St, st), St#st.status =:= open  ->
-     case ssl_server:sockname_prim(ssl_server_prim, St#st.fd) of
- 	{ok, {Address, Port}} ->
--	    {ok, At} = inet:getaddr(Address, inet),
-+	    {ok, At} = inet_parse:ipv4_address(Address),
- 	    {ok, {At, Port}};
- 	Error ->
- 	    Error