Upgrade to version R11B-4.

6 files changed, 1 insertions, 94 deletions

diff --git a/lang/erlang14/files/patch-erts_configure b/lang/erlang14/files/patch-erts_configure
deleted file mode 100644
index 0f927a7..0000000
--- 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 a1bccae..0000000
--- 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 f329d35..0000000
--- 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 03c4189..0000000
--- 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 6abe1f5..1b89613 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 355f449..0000000
--- 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" ;;