Upgrade to version R11B-4.

10 files changed, 55 insertions, 154 deletions

diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index d9ffbf5ada8b..f0300f81b85d 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r11b3
-PORTREVISION=	4
+PORTVERSION=	r11b4
 PORTEPOCH=	1
 CATEGORIES=	lang parallel
 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_R11B-3
+DISTNAME=	otp_src_R11B-4
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -26,6 +25,7 @@ COMMENT=	A functional programming language from Ericsson
 CONFLICTS?=	erlang-lite-r[0-9]*
 
 SUB_FILES=	pkg-message
+SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
 
 # The Java applications that are part of the Erlang distribution are
 # not strictly necessary - it is included for completeness sake. A
@@ -50,10 +50,6 @@ USE_TK_RUN=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not build on sparc64
-.endif
-
 .if ${OSVERSION} < 502102
 WITHOUT_ODBC=	yes
 .endif
@@ -67,23 +63,20 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R11B-3.tar.gz
+ERLANG_MAN=	otp_doc_man_R11B-4.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R11B-3.tar.gz
+ERLANG_DOCS=	otp_doc_html_R11B-4.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
+ONLY_FOR_ARCHS=	i386 amd64
 REINPLACE_ARGS=	-i
 
 CONFIGURE_TARGET=	# Empty
 CONFIGURE_ARGS+=	--enable-threads
-.if ${ARCH} == "i386"
-CONFIGURE_ARGS+=	--enable-hipe
-.endif
 NOPRECIOUSMAKEVARS=	yes # Prevent exporting of "ARCH"
 
 CFLAGS+=	-I${LOCALBASE}/include
@@ -103,11 +96,6 @@ MAN3PREFIX=	${TARGETDIR}/lib/erlang
 MAN4PREFIX=	${TARGETDIR}/lib/erlang
 MAN6PREFIX=	${TARGETDIR}/lib/erlang
 
-# Workaround for a ./configure recursion bug which leads to INSTALL being
-# set to "../../../../[...]"
-post-patch:
-	@cd ${WRKSRC} && ${CAT} ${FILESDIR}/post-patch-configure | ${PATCH}
-
 pre-configure:
 # Check if ${JAVAC} exists.
 .if !defined(WITHOUT_JAVA)
diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib
index 593422b3c250..9659e8e2d9a0 100644
--- a/lang/erlang14/Makefile.lib
+++ b/lang/erlang14/Makefile.lib
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.5.3
-TOOLS_VSN=	2.5.3
-OTP_LIBS=	appmon-2.1.7 \
-		asn1-1.4.4.12 \
-		compiler-4.4.3 \
+ERTS_VSN=	5.5.4
+TOOLS_VSN=	2.5.4
+OTP_LIBS=	appmon-2.1.8 \
+		asn1-1.4.4.14 \
+		compiler-4.4.4 \
 		cosEvent-2.1 \
 		cosEventDomain-1.1 \
 		cosFileTransfer-1.1.2 \
-		cosNotification-1.1.3 \
-		cosProperty-1.1.1 \
+		cosNotification-1.1.4 \
+		cosProperty-1.1.2 \
 		cosTime-1.1 \
-		cosTransactions-1.2 \
-		crypto-1.5 \
-		debugger-3.1 \
-		dialyzer-1.5.1 \
-		edoc-0.7.1 \
+		cosTransactions-1.2.1 \
+		crypto-1.5.1 \
+		debugger-3.1.1 \
+		dialyzer-1.6.0 \
+		edoc-0.7.2 \
 		erl_interface-3.5.5.3 \
 		et-1.0 \
-		gs-1.5.5 \
-		hipe-3.6.1 \
-		ic-4.2.11 \
-		inets-4.7.8 \
-		inviso-0.1 \
+		gs-1.5.6 \
+		hipe-3.6.2 \
+		ic-4.2.12 \
+		inets-4.7.11 \
+		inviso-0.2.1 \
 		jinterface-1.3 \
-		kernel-2.11.3 \
-		megaco-3.5.1 \
-		mnemosyne-1.2.6 \
-		mnesia-4.3.3 \
+		kernel-2.11.4 \
+		megaco-3.5.3 \
+		mnemosyne-1.2.7 \
+		mnesia-4.3.4 \
 		mnesia_session-1.1.6 \
-		observer-0.9.7.2 \
+		observer-0.9.7.3 \
 		odbc-2.0.7 \
-		orber-3.6.4 \
+		orber-3.6.5 \
 		os_mon-2.1.2 \
 		otp_mibs-1.0.4 \
 		parsetools-1.4.1 \
-		pman-2.5.2 \
-		runtime_tools-1.6.2 \
-		sasl-2.1.4 \
-		snmp-4.8.4 \
-		ssh-0.9.6 \
+		pman-2.5.3 \
+		runtime_tools-1.6.5 \
+		sasl-2.1.5 \
+		snmp-4.9.2 \
+		ssh-0.9.9 \
 		ssl-3.1 \
-		stdlib-1.14.3 \
-		syntax_tools-1.5.2 \
+		stdlib-1.14.4 \
+		syntax_tools-1.5.3 \
 		toolbar-1.3 \
-		tools-2.5.3 \
-		tv-2.1.3 \
+		tools-2.5.4 \
+		tv-2.1.4 \
 		typer-0.1.0 \
 		webtool-0.8.3 \
-		xmerl-1.1
+		xmerl-1.1.2
diff --git a/lang/erlang14/Makefile.man b/lang/erlang14/Makefile.man
index 8decab9547f1..c02e94f5d015 100644
--- a/lang/erlang14/Makefile.man
+++ b/lang/erlang14/Makefile.man
@@ -5,6 +5,7 @@ MAN1=	epmd.1 \
 	erl_call.1 \
 	erlc.1 \
 	erlsrv.1 \
+	escript.1 \
 	run_erl.1 \
 	start.1 \
 	start_erl.1 \
@@ -84,6 +85,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	asn1ct.3 \
 	asn1rt.3 \
 	auth.3 \
+	base64.3 \
 	beam_lib.3 \
 	c.3 \
 	calendar.3 \
@@ -173,6 +175,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	gb_trees.3 \
 	gen_event.3 \
 	gen_fsm.3 \
+	gen_sctp.3 \
 	gen_server.3 \
 	gen_tcp.3 \
 	gen_udp.3 \
@@ -201,6 +204,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	inviso_lfm.3 \
 	inviso_lfm_tpfreader.3 \
 	inviso_rt.3 \
+	inviso_rt_meta.3 \
 	io.3 \
 	io_lib.3 \
 	lib.3 \
@@ -280,6 +284,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	snmp_user_based_sm_mib.3 \
 	snmp_view_based_acm_mib.3 \
 	snmpa.3 \
+	snmpa_conf.3 \
 	snmpa_error.3 \
 	snmpa_error_io.3 \
 	snmpa_error_logger.3 \
@@ -291,6 +296,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	snmpa_supervisor.3 \
 	snmpc.3 \
 	snmpm.3 \
+	snmpm_conf.3 \
 	snmpm_mpd.3 \
 	snmpm_network_interface.3 \
 	snmpm_user.3 \
diff --git a/lang/erlang14/distinfo b/lang/erlang14/distinfo
index ebeab9fbec1d..51b46365a9a0 100644
--- a/lang/erlang14/distinfo
+++ b/lang/erlang14/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R11B-3.tar.gz) = 2806e5a2f26cb1b20f3ea1a6f3ec0276
-SHA256 (erlang/otp_src_R11B-3.tar.gz) = 7024ca196a5e4a2d80363de1af78051b36de47833e848b812656d552baa5dde2
-SIZE (erlang/otp_src_R11B-3.tar.gz) = 11420612
-MD5 (erlang/otp_doc_man_R11B-3.tar.gz) = 645ef1ded84b470e9c05a4757dce88cf
-SHA256 (erlang/otp_doc_man_R11B-3.tar.gz) = ec3ff0f2979ba91d485b37a232ad7d2186829f2948a9f7adcd6067890e55f928
-SIZE (erlang/otp_doc_man_R11B-3.tar.gz) = 694238
-MD5 (erlang/otp_doc_html_R11B-3.tar.gz) = 85bc43e52fa5066577ef412c80848dc0
-SHA256 (erlang/otp_doc_html_R11B-3.tar.gz) = 01f1625b4d004b2b30c298d12e286ddbf512d316207fb8859ca598f98c553fb2
-SIZE (erlang/otp_doc_html_R11B-3.tar.gz) = 4852262
+MD5 (erlang/otp_src_R11B-4.tar.gz) = 649e6f057e6996f92c8496161d754d8d
+SHA256 (erlang/otp_src_R11B-4.tar.gz) = 6928f44b67982aa8e00a2b053ecc78437fc70e19a2b0131c8f1ee86f02009337
+SIZE (erlang/otp_src_R11B-4.tar.gz) = 11720279
+MD5 (erlang/otp_doc_man_R11B-4.tar.gz) = cc041ceebc4a6615073d8d7e88495610
+SHA256 (erlang/otp_doc_man_R11B-4.tar.gz) = 5852d7d9b7f09f3dda0261fe51c52025eacbdae258a984994b1a2407a065450e
+SIZE (erlang/otp_doc_man_R11B-4.tar.gz) = 712928
+MD5 (erlang/otp_doc_html_R11B-4.tar.gz) = 187cd55de8866a278ed963664819404d
+SHA256 (erlang/otp_doc_html_R11B-4.tar.gz) = fa1f313a0d3f79239ee2930159288419c6c4348d095cf58557ff799712d3a60f
+SIZE (erlang/otp_doc_html_R11B-4.tar.gz) = 4902864
diff --git a/lang/erlang14/files/patch-erts_configure b/lang/erlang14/files/patch-erts_configure
deleted file mode 100644
index 0f927a742ef3..000000000000
--- a/lang/erlang14/files/patch-erts_configure
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- erts/configure.orig
-+++ erts/configure
-@@ -7069,7 +7069,9 @@
- 
- echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6
- echo "configure:7072: checking for unreliable floating point execptions" >&5
--if test "$cross_compiling" = yes; then
-+if test "${ARCH}" = amd64; then
-+  erl_ok=reliable
-+elif test "$cross_compiling" = yes; then
-   erl_ok=unreliable
- else
-   cat > conftest.$ac_ext <<EOF
diff --git a/lang/erlang14/files/patch-lib_inets_src_http__client_httpc__handler.erl b/lang/erlang14/files/patch-lib_inets_src_http__client_httpc__handler.erl
deleted file mode 100644
index a1bccaee7e56..000000000000
--- a/lang/erlang14/files/patch-lib_inets_src_http__client_httpc__handler.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- lib/inets/src/http_client/httpc_handler.erl.orig
-+++ lib/inets/src/http_client/httpc_handler.erl
-@@ -186,7 +186,7 @@
-             case State#state.request of
-                 #request{} -> %% Old request no yet finished
- 		    %% Make sure to use the new value of timers in state
--		    Timers = NewState#state.timers,
-+		    NewTimers = NewState#state.timers,
-                     NewPipeline = queue:in(Request, State#state.pipeline),
- 		    NewSession = 
- 			Session#tcp_session{pipeline_length = 
-@@ -196,7 +196,7 @@
- 		    httpc_manager:insert_session(NewSession),
-                     {reply, ok, State#state{pipeline = NewPipeline,
- 					    session = NewSession,
--					    timers = Timers}};
-+					    timers = NewTimers}};
- 		undefined ->
- 		    %% Note: tcp-message reciving has already been
- 		    %% activated by handle_pipeline/2. Also
diff --git a/lang/erlang14/files/patch-lib_ssh_src_ssh__cli.erl b/lang/erlang14/files/patch-lib_ssh_src_ssh__cli.erl
deleted file mode 100644
index f329d3512bae..000000000000
--- a/lang/erlang14/files/patch-lib_ssh_src_ssh__cli.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- lib/ssh/src/ssh_cli.erl.orig
-+++ lib/ssh/src/ssh_cli.erl
-@@ -161,17 +161,12 @@
- handle_info({ssh_cm, _CM,
- 	     {window_change, _Channel, Width, Height, PixWidth, PixHeight}},
- 	    State) ->
--    erlang:display(?LINE),
-     #state{buf = Buf, pty = Pty, cm = CM, channel = Channel} = State,
--    erlang:display(?LINE),
-     NewPty = Pty#ssh_pty{width = Width, height = Height,
- 			 pixel_width = PixWidth,
- 			 pixel_height = PixHeight},
--    erlang:display(?LINE),
-     {Chars, NewBuf} = io_request({window_change, Pty}, Buf, NewPty),
--    erlang:display(?LINE),
-     write_chars(CM, Channel, Chars),
--    erlang:display(?LINE),
-     {noreply, State#state{pty = NewPty, buf = NewBuf}};
- handle_info({Group, Req}, State) when Group==State#state.group ->
-     ?dbg(?DBG_IO_REQUEST, "io_request: ~w\n", [Req]),
diff --git a/lang/erlang14/files/patch-lib_xmerl_src_xmerl__lib.erl b/lang/erlang14/files/patch-lib_xmerl_src_xmerl__lib.erl
deleted file mode 100644
index 03c41895d45e..000000000000
--- a/lang/erlang14/files/patch-lib_xmerl_src_xmerl__lib.erl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- lib/xmerl/src/xmerl_lib.erl.orig
-+++ lib/xmerl/src/xmerl_lib.erl
-@@ -218,13 +218,11 @@
- 
- expand_content([{H} | T], Pos, Parents, Norm) ->
-     expand_content(H ++ T, Pos, Parents, Norm);
--expand_content([H | T], Pos, Parents, Norm) when is_tuple(H) ->
-+expand_content([H | T], Pos, Parents, Norm) ->
-     [expand_element(H, Pos, Parents, Norm)
-      | expand_content(T, Pos+1, Parents, Norm)];
- expand_content([], _Pos, _Parents, _Norm) ->
--    [];
--expand_content(Content,Pos,Parents,Norm) ->
--    [expand_element(Content, Pos, Parents, Norm)].
-+    [].
- 
- expand_attributes(Attrs) ->
-     expand_attributes(Attrs, 1, []).
diff --git a/lang/erlang14/files/pkg-message.in b/lang/erlang14/files/pkg-message.in
index 6abe1f5611f3..1b8961341722 100644
--- a/lang/erlang14/files/pkg-message.in
+++ b/lang/erlang14/files/pkg-message.in
@@ -7,7 +7,7 @@ Installation tips:
 
 You can find an emacs mode for Erlang here:
 
-    %%LOCALBASE%%/lib/erlang/lib/tools-2.5.2/emacs
+    %%LOCALBASE%%/lib/erlang/lib/tools-%%TOOLS_VSN%%/emacs
 
 You may wish to add the following line to /etc/manpath.config:
 
diff --git a/lang/erlang14/files/post-patch-configure b/lang/erlang14/files/post-patch-configure
deleted file mode 100644
index 355f4493a797..000000000000
--- a/lang/erlang14/files/post-patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri Dec  7 16:13:39 2001
-+++ configure	Fri Dec  7 16:19:33 2001
-@@ -1081,6 +1081,7 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
-+  ac_given_INSTALL="$INSTALL"
-   case "$ac_given_INSTALL" in
-         [/$]*) INSTALL="$ac_given_INSTALL" ;;
-         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;