diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2004-05-15 15:49:17 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2004-05-15 15:49:17 +0000 |
commit | 6f316ce2e89f972a4f22e1b97e1dda5e9d58cefa (patch) | |
tree | fb8d61358190cc429db453d54fb9920ccfde716f /lang/erlang14/files | |
parent | ea16706c62b542adc8f3b887256bf215bf914db6 (diff) |
Diffstat (limited to 'lang/erlang14/files')
14 files changed, 0 insertions, 362 deletions
diff --git a/lang/erlang14/files/patch-Makefile.in b/lang/erlang14/files/patch-Makefile.in deleted file mode 100644 index 76cd405e8322..000000000000 --- a/lang/erlang14/files/patch-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Sat Jan 24 21:18:56 2004 -+++ Makefile.in Sat Jan 24 21:19:22 2004 -@@ -505,14 +505,9 @@ - # Erlang base public files - # - install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -+ rm -f $(BINDIR)/erl $(BINDIR)/erlc - ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl - ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript - - # - # Directories needed before we can install diff --git a/lang/erlang14/files/patch-aj b/lang/erlang14/files/patch-aj deleted file mode 100644 index 6b8104ce7904..000000000000 --- a/lang/erlang14/files/patch-aj +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- erts/etc/unix/Install.src.orig Wed Mar 5 17:20:07 2003 -+++ erts/etc/unix/Install.src Wed Mar 5 17:21:04 2003 -@@ -119,7 +119,8 @@ - sed -e "s;%EMU%;%EMULATOR%%EMULATOR_NUMBER%;" $ERL_ROOT/erts-%I_VSN%/bin/start_erl.src > start_erl - chmod 755 start_erl - --if [ -d $ERL_ROOT/lib/sasl* ] -+set $ERL_ROOT/lib/sasl* -+if [ -d $1 ] - then - (cd $ERL_ROOT/releases - echo %I_VSN% %I_SYSTEM_VSN% > start_erl.data) -@@ -193,4 +194,4 @@ - ./misc/format_man_pages $ERL_ROOT - fi - -- -+exit 0 diff --git a/lang/erlang14/files/patch-lib_asn1_c__src_Makefile.in b/lang/erlang14/files/patch-lib_asn1_c__src_Makefile.in deleted file mode 100644 index 7ae33c2bc61d..000000000000 --- a/lang/erlang14/files/patch-lib_asn1_c__src_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/asn1/c_src/Makefile.in.orig Sun Aug 31 14:45:35 2003 -+++ lib/asn1/c_src/Makefile.in Sun Aug 31 14:45:42 2003 -@@ -131,7 +131,7 @@ - $(CC) -c $(CFLAGS) -o $(OBJ_FILES) $(C_FILES) - - $(SHARED_OBJ_FILES): $(OBJ_FILES) $(LIBDIR) -- $(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) $(CLIB_FLAGS) $(LIBS) -+ $(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) - - $(LIBDIR): - -mkdir -p $(LIBDIR) diff --git a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__mon.erl b/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__mon.erl deleted file mode 100644 index 68b5cad41d74..000000000000 --- a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__mon.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/debugger/src/dbg_ui_mon.erl.orig Thu Sep 4 22:26:08 2003 -+++ lib/debugger/src/dbg_ui_mon.erl Thu Sep 4 22:26:51 2003 -@@ -379,7 +379,7 @@ - - %% Help Menu - gui_cmd('Debugger', State) -> -- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]), -+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]), - tool_utils:open_help(State#state.gs, HelpFile), - State; - diff --git a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__trace.erl b/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__trace.erl deleted file mode 100644 index b8a009679ad5..000000000000 --- a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__trace.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/debugger/src/dbg_ui_trace.erl.orig Thu Sep 4 22:26:12 2003 -+++ lib/debugger/src/dbg_ui_trace.erl Thu Sep 4 22:26:56 2003 -@@ -352,7 +352,7 @@ - - %% Help menu - gui_cmd('Debugger', State) -> -- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]), -+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]), - tool_utils:open_help(State#state.gs, HelpFile), - State; - diff --git a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__view.erl b/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__view.erl deleted file mode 100644 index 825ccb15044f..000000000000 --- a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__view.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/debugger/src/dbg_ui_view.erl.orig Thu Sep 4 22:26:16 2003 -+++ lib/debugger/src/dbg_ui_view.erl Thu Sep 4 22:29:05 2003 -@@ -165,7 +165,7 @@ - - %% Help menu - gui_cmd('Debugger', State) -> -- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]), -+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]), - tool_utils:open_help(State#state.gs, HelpFile), - State. - diff --git a/lang/erlang14/files/patch-lib_erl__interface_src_decode_decode__longlong.c b/lang/erlang14/files/patch-lib_erl__interface_src_decode_decode__longlong.c deleted file mode 100644 index ce5e84161b1d..000000000000 --- a/lang/erlang14/files/patch-lib_erl__interface_src_decode_decode__longlong.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/erl_interface/src/decode/decode_longlong.c.orig Sun Aug 31 14:00:44 2003 -+++ lib/erl_interface/src/decode/decode_longlong.c Sun Aug 31 14:01:41 2003 -@@ -51,7 +51,7 @@ - int pos, shift = 0; - n = 0; - for (pos = 0; pos < arity; pos++) { -- n |= get8(s) << shift; -+ n |= ((EI_LONGLONG) get8(s)) << shift; - shift += 8; - } - } diff --git a/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl b/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl deleted file mode 100644 index 4f4482bc45b1..000000000000 --- a/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl +++ /dev/null @@ -1,88 +0,0 @@ - -$FreeBSD$ - ---- lib/gs/src/tool_utils.erl.orig Thu Sep 4 23:01:37 2003 -+++ lib/gs/src/tool_utils.erl Fri Sep 5 00:16:20 2003 -@@ -27,6 +27,9 @@ - -export([file_dialog/1]). - -export([notify/2, confirm/2, confirm_yesno/2, request/2]). - -+%% Browser executable list (openURL command line protocol required) -+-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera"]). -+ - %%---------------------------------------------------------------------- - %% open_help(GS, File) - %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -51,7 +54,7 @@ - local -> - Cmd = case os:type() of - {unix,_AnyType} -> -- "netscape -remote \"openURL(file:" ++ File ++ ")\""; -+ unix_url_command("file:" ++ File); - - {win32,_AnyType} -> - "start " ++ filename:nativename(File) -@@ -62,7 +65,7 @@ - remote -> - Cmd = case os:type() of - {unix,_AnyType} -> -- "netscape -remote \"openURL(" ++ File ++ ")\""; -+ unix_url_command(File); - - {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/") -@@ -307,3 +310,54 @@ - [Last]; - insert_newlines(Other) -> - Other. -+ -+%% find_browser(BrowserList) => string() | false -+%% BrowserList - [string()] -+%% Given a list of basenames, find the first available executable. -+ -+find_browser([]) -> -+ false; -+ -+find_browser([H | T]) -> -+ case os:find_executable(H) of -+ false -> -+ find_browser(T); -+ Browser -> -+ Browser -+ end. -+ -+%% unix_url_command(URL) => string() -+%% URL - string() -+%% Open an URL, using a browser which supports the openURL command -+%% line protocol. If no browser is found, the empty string will be -+%% returned. -+ -+unix_url_command(URL) -> -+ Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", -+ -+ case os:getenv("BROWSER") of -+ false -> -+ %% look for a compatible browser -+ case find_browser(?BROWSERS) of -+ false -> -+ ""; -+ Browser -> -+ case regexp:gsub(Template, "BROWSER", Browser) of -+ {ok, Command, 0} -> -+ %% Template does not contain "BROWSER" placeholder -+ ""; -+ {ok, Command, _} -> -+ Command -+ end -+ end; -+ -+ Value -> -+ case regexp:gsub(Template, "BROWSER", Value) of -+ {ok, Command2, 0} -> -+ %% no placeholder -+ ""; -+ {ok, Command2, _} -> -+ Command2 -+ end -+ end. -+ diff --git a/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl b/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl deleted file mode 100644 index 362a217ce495..000000000000 --- a/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl +++ /dev/null @@ -1,19 +0,0 @@ - -$FreeBSD$ - ---- lib/kernel/src/inet_config.erl.orig Mon Jul 7 14:06:28 2003 -+++ lib/kernel/src/inet_config.erl Fri Sep 19 14:21:14 2003 -@@ -78,7 +78,12 @@ - error("can't set lookup to native: ~p", [Reason]) - end; - freebsd -> %% we may have to check version (2.2.2) -- load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd); -+ case os:version() of -+ {Major,_,_} when Major >= 5 -> -+ load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf); -+ _ -> -+ load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd) -+ end; - 'bsd/os' -> - load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos); - linux -> diff --git a/lang/erlang14/files/patch-lib_runtime__tools_c__src_Makefile.in b/lang/erlang14/files/patch-lib_runtime__tools_c__src_Makefile.in deleted file mode 100644 index bb88be4c3948..000000000000 --- a/lang/erlang14/files/patch-lib_runtime__tools_c__src_Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- lib/runtime_tools/c_src/Makefile.in.orig Sun Aug 31 14:46:12 2003 -+++ lib/runtime_tools/c_src/Makefile.in Sun Aug 31 14:47:00 2003 -@@ -107,7 +107,8 @@ - ifdef soname - $(LD) $(LDFLAGS) $(soname) trace_ip_drv.so -o $@ $^ -lc $(LIBS) - else -- $(LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) -+ # $(LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) -+ $(LD) $(LDFLAGS) -o $@ $^ - endif - - $(LIBDIR)/trace_file_drv.so: $(TRACE_FILE_DRV_OBJS) -@@ -115,7 +116,8 @@ - ifdef soname - $(LD) $(LDFLAGS) $(soname) trace_file_drv.so -o $@ $^ -lc $(LIBS) - else -- $(LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) -+ # $(LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) -+ $(LD) $(LDFLAGS) -o $@ $^ - endif - - $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS) diff --git a/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl b/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl deleted file mode 100644 index e91c911ef98d..000000000000 --- a/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/ssl/src/ssl_broker.erl.orig Thu Mar 11 17:58:12 2004 -+++ lib/ssl/src/ssl_broker.erl Thu Mar 11 18:00:07 2004 -@@ -330,6 +330,8 @@ - case gen_tcp:recv(St#st.proxysock, Length, Timeout) of - {ok, Data} -> - {reply, {ok, Data}, St}; -+ {error, timeout} -> -+ {reply, {error, timeout}, St}; - {error, Reason} -> - {reply, {error, Reason}, St#st{status = closing}} - end diff --git a/lang/erlang14/files/patch-lib_stdlib_src_dets__v9.erl b/lang/erlang14/files/patch-lib_stdlib_src_dets__v9.erl deleted file mode 100644 index fefd4c99f680..000000000000 --- a/lang/erlang14/files/patch-lib_stdlib_src_dets__v9.erl +++ /dev/null @@ -1,77 +0,0 @@ - -$FreeBSD$ - ---- lib/stdlib/src/dets_v9.erl.orig Mon Jul 7 14:17:44 2003 -+++ lib/stdlib/src/dets_v9.erl Fri Dec 26 14:58:33 2003 -@@ -212,7 +212,6 @@ - -define(FREELIST_POS, 0). - -define(CLOSED_PROPERLY_POS, 8). - -define(D_POS, 20). ---define(NO_KEYS_POS, (?D_POS + 16)). - - %%% Dets file versions up to 8 are handled in dets_v8. This module - %%% handles version 9, introduced in R8. -@@ -416,7 +415,7 @@ - alloc_part(Head, SegZero, PartPos), - {NewHead, InitSegment, [SegPointer]} = - alloc_seg(Head1, SegZero, SegNo, Part), -- {NewHead, InitSegment, [SegPointer, InitArrPart, ArrPartPointer]}; -+ {NewHead, InitSegment, [InitArrPart, SegPointer, ArrPartPointer]}; - Part -> - alloc_seg(Head, SegZero, SegNo, Part) - end. -@@ -1222,7 +1221,7 @@ - %% Note that space for the array parts and the segments has - %% already been allocated, but the segments have not been - %% initialized on disk. -- NoParts = no_parts(Head#head.m), -+ NoParts = no_parts(Head#head.next), - %% All parts first, ensured by init_segments/6. - Addr = ?BASE + NoParts * 4 * ?SEGPARTSZ, - {Head, [{?FSCK_SEGMENT,Addr,Data,0} | L]}; -@@ -1586,7 +1585,11 @@ - {FLW, FLSize} = free_lists_to_file(H1), - FileSize = FreeListsPointer + FLSize + 4, - ok = dets_utils:write(H, [FLW | <<FileSize:32>>]), -- NoColls = case H1#head.no_collections of -+ FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY), -+ dets_utils:pwrite(H1, [{0, FileHeader}]). -+ -+file_header(Head, FreeListsPointer, ClosedProperly) -> -+ NoColls = case Head#head.no_collections of - undefined -> []; - NC -> NC - end, -@@ -1594,8 +1597,7 @@ - NoColls, - lists:map(fun(X) -> {X,0} end, lists:seq(4,?MAXBUD-1))), - CW = lists:map(fun({_LSz,N}) -> <<N:32>> end, L), -- FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY, CW), -- dets_utils:pwrite(H1, [{0, FileHeader}]). -+ file_header(Head, FreeListsPointer, ClosedProperly, CW). - - file_header(Head, FreeListsPointer, ClosedProperly, NoColls) -> - Cookie = ?MAGIC, -@@ -2356,17 +2358,18 @@ - update_no_keys(Head, Ws, DeltaObjects, DeltaKeys) -> - NoKeys = Head#head.no_keys, - NewNoKeys = NoKeys + DeltaKeys, -+ NewNoObject = Head#head.no_objects + DeltaObjects, -+ NewHead = Head#head{no_objects = NewNoObject, no_keys = NewNoKeys}, - NWs = - if -- NewNoKeys > Head#head.max_no_slots -> -+ NewNoKeys > NewHead#head.max_no_slots -> - Ws; - NoKeys div ?SEGSZP == NewNoKeys div ?SEGSZP -> - Ws; - true -> -- [{?NO_KEYS_POS, <<NewNoKeys:32>>} | Ws] -+ [{0, file_header(NewHead, 0, ?NOT_PROPERLY_CLOSED)} | Ws] - end, -- NewNoObject = Head#head.no_objects + DeltaObjects, -- {Head#head{no_objects = NewNoObject, no_keys = NewNoKeys}, NWs}. -+ {NewHead, NWs}. - - slot_position(S) -> - SegNo = ?SLOT2SEG(S), % S div ?SEGSZP diff --git a/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl b/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl deleted file mode 100644 index 2b26e8e6c039..000000000000 --- a/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- lib/stdlib/src/filelib.erl.orig Thu Mar 11 21:05:33 2004 -+++ lib/stdlib/src/filelib.erl Thu Mar 11 21:06:40 2004 -@@ -84,7 +84,10 @@ - false -> - fold_files(T, Dir, RegExp, Recursive, Fun, Acc0) - end -- end. -+ end; -+ -+fold_files([], _, _, _, _, Acc) -> -+ Acc. - - last_modified(File) -> - case file:read_file_info(File) of 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" ;; |