diff options
Diffstat (limited to 'lang/erlang14/files')
11 files changed, 0 insertions, 281 deletions
diff --git a/lang/erlang14/files/epmd.sh.in b/lang/erlang14/files/epmd.sh.in deleted file mode 100644 index 7782174bb965..000000000000 --- a/lang/erlang14/files/epmd.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: epmd -# REQUIRE: LOGIN -# -# Add the following line to /etc/rc.conf to enable epmd: -# -# epmd_enable="YES" -# - -epmd_enable=${epmd_enable:-"NO"} - -. /etc/rc.subr - -name=epmd -rcvar=`set_rcvar` - -procname=%%PREFIX%%/bin/epmd -start_cmd="%%PREFIX%%/bin/epmd -daemon" -stop_cmd="%%PREFIX%%/bin/epmd -kill >/dev/null" - -load_rc_config ${name} -run_rc_command "$1" diff --git a/lang/erlang14/files/patch-erts-emulator-Makefile.in b/lang/erlang14/files/patch-erts-emulator-Makefile.in deleted file mode 100644 index 02371ab44deb..000000000000 --- a/lang/erlang14/files/patch-erts-emulator-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- erts/emulator/Makefile.in.orig -+++ erts/emulator/Makefile.in -@@ -544,7 +546,7 @@ - endif - - $(OBJDIR)/%.o: beam/%.c -- $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ -+ $(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ - - else - diff --git a/lang/erlang14/files/patch-erts_emulator_drivers_common_inet__drv.c b/lang/erlang14/files/patch-erts_emulator_drivers_common_inet__drv.c deleted file mode 100644 index 889102cce13e..000000000000 --- a/lang/erlang14/files/patch-erts_emulator_drivers_common_inet__drv.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- erts/emulator/drivers/common/inet_drv.c.orig -+++ erts/emulator/drivers/common/inet_drv.c -@@ -3455,17 +3455,9 @@ - /* 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 (erts_sys_ddll_open_noext(STRINGIFY(LIBSCTP), &h_libsctp, NULL) == 0) { -- void *ptr; -- if (erts_sys_ddll_sym(h_libsctp, "sctp_bindx", &ptr) == 0) { -- p_sctp_bindx = ptr; -- inet_init_sctp(); -- add_driver_entry(&sctp_inet_driver_entry); -- } -- } -+ p_sctp_bindx = sctp_bindx; -+ inet_init_sctp(); -+ add_driver_entry(&sctp_inet_driver_entry); - #endif - - /* remove the dummy inet driver */ diff --git a/lang/erlang14/files/patch-erts_epmd_src_epmd__srv.c b/lang/erlang14/files/patch-erts_epmd_src_epmd__srv.c deleted file mode 100644 index bd4fb7f76bde..000000000000 --- a/lang/erlang14/files/patch-erts_epmd_src_epmd__srv.c +++ /dev/null @@ -1,33 +0,0 @@ - -$FreeBSD$ - ---- erts/epmd/src/epmd_srv.c.orig -+++ erts/epmd/src/epmd_srv.c -@@ -736,6 +736,7 @@ - for (i = 0; i < g->max_conn; i++) { - if (g->conn[i].open == EPMD_FALSE) { - struct sockaddr_in si; -+ struct sockaddr_in di; - #ifdef HAVE_SOCKLEN_T - socklen_t st; - #else -@@ -756,12 +757,16 @@ - /* Determine if connection is from localhost */ - if (getpeername(s->fd,(struct sockaddr*) &si,&st) || - st < sizeof(si)) { -- /* Failure to get peername is regarder as non local host */ -+ /* Failure to get peername is regarded as non local host */ - s->local_peer = EPMD_FALSE; - } else { -+ /* Only 127.x.x.x and connections from the host's IP address -+ allowed, no false positives */ - s->local_peer = -- ((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) == -- 0x7F000000U); /* Only 127.x.x.x allowed, no false positives */ -+ (((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) == -+ 0x7F000000U) || -+ (getsockname(s->fd,(struct sockaddr*) &di,&st) ? -+ EPMD_FALSE : si.sin_addr.s_addr == di.sin_addr.s_addr)); - } - dbg_tty_printf(g,2,(s->local_peer) ? "Local peer connected" : - "Non-local peer connected"); diff --git a/lang/erlang14/files/patch-erts_etc_common_erlc.c b/lang/erlang14/files/patch-erts_etc_common_erlc.c deleted file mode 100644 index ae65f91225ca..000000000000 --- a/lang/erlang14/files/patch-erts_etc_common_erlc.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- erts/etc/common/erlc.c.orig -+++ erts/etc/common/erlc.c -@@ -186,6 +186,7 @@ - */ - - PUSH("-noinput"); -+ PUSH2("-smp", "disable"); - PUSH2("-mode", "minimal"); - PUSH2("-boot", "start_clean"); - PUSH3("-s", "erl_compile", "compile_cmdline"); diff --git a/lang/erlang14/files/patch-lib_erl__interface_src_connect_ei__resolve.c b/lang/erlang14/files/patch-lib_erl__interface_src_connect_ei__resolve.c deleted file mode 100644 index d8454c710f69..000000000000 --- a/lang/erlang14/files/patch-lib_erl__interface_src_connect_ei__resolve.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- lib/erl_interface/src/connect/ei_resolve.c.orig -+++ lib/erl_interface/src/connect/ei_resolve.c -@@ -621,7 +621,8 @@ - - return result; - #else -- return gethostbyname_r(name,hostp,buffer,buflen,h_errnop); -+ struct hostent *dummy; -+ return gethostbyname_r(name,hostp,buffer,buflen,&dummy,h_errnop); - #endif - #endif - #endif diff --git a/lang/erlang14/files/patch-lib_et_src_et__gs__contents__viewer.erl b/lang/erlang14/files/patch-lib_et_src_et__gs__contents__viewer.erl deleted file mode 100644 index a747941fac91..000000000000 --- a/lang/erlang14/files/patch-lib_et_src_et__gs__contents__viewer.erl +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- lib/et/src/et_gs_contents_viewer.erl.orig 2010-03-11 16:24:41.000000000 +0800 -+++ lib/et/src/et_gs_contents_viewer.erl 2010-03-11 16:24:53.000000000 +0800 -@@ -347,7 +347,6 @@ handle_info({gs, _Obj, keypress, _, [Key - 'Caps_Lock' -> - {noreply, S}; - _ -> -- io:format("~p: ignored: ~p~n", [?MODULE, KeySym]), - {noreply, S} - end; - handle_info({gs, _Obj, configure, [], [W, H | _]}, S) -> diff --git a/lang/erlang14/files/patch-lib_et_src_et__gs__viewer.erl b/lang/erlang14/files/patch-lib_et_src_et__gs__viewer.erl deleted file mode 100644 index 8f0fe420eae5..000000000000 --- a/lang/erlang14/files/patch-lib_et_src_et__gs__viewer.erl +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- lib/et/src/et_gs_viewer.erl.orig 2010-03-11 16:26:59.000000000 +0800 -+++ lib/et/src/et_gs_viewer.erl 2010-03-11 16:27:16.000000000 +0800 -@@ -855,8 +855,7 @@ close_all_others(S) -> - noreply(S). - - click_error(Click, S) -> -- gs:config(S#state.canvas, beep), -- io:format("~p: ignored: ~p~n", [?MODULE, Click]). -+ gs:config(S#state.canvas, beep). - - %%%---------------------------------------------------------------------- - %%% Clone viewer 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 1a44ce423f9d..000000000000 --- a/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl +++ /dev/null @@ -1,87 +0,0 @@ - -$FreeBSD$ - ---- lib/gs/src/tool_utils.erl.orig -+++ lib/gs/src/tool_utils.erl -@@ -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", "firefox", "seamonkey"]). -+ - %%---------------------------------------------------------------------- - %% open_help(GS, File) - %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -67,7 +70,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "start " ++ filename:nativename(File); -@@ -82,7 +85,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); -@@ -342,3 +345,53 @@ - [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_stdlib_src_calendar.erl b/lang/erlang14/files/patch-lib_stdlib_src_calendar.erl deleted file mode 100644 index 1ab956512316..000000000000 --- a/lang/erlang14/files/patch-lib_stdlib_src_calendar.erl +++ /dev/null @@ -1,29 +0,0 @@ - -$FreeBSD$ - ---- lib/stdlib/src/calendar.erl.orig -+++ lib/stdlib/src/calendar.erl -@@ -215,11 +215,19 @@ - - -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()]. - local_time_to_universal_time_dst(DateTime) -> -- UtDst = erlang:localtime_to_universaltime(DateTime, true), -- Ut = erlang:localtime_to_universaltime(DateTime, false), - %% Reverse check the universal times -- LtDst = erlang:universaltime_to_localtime(UtDst), -- Lt = erlang:universaltime_to_localtime(Ut), -+ {UtDst, LtDst} = -+ try -+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true), -+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)} -+ catch error:badarg -> {error, error} -+ end, -+ {Ut, Lt} = -+ try -+ Ut0 = erlang:localtime_to_universaltime(DateTime, false), -+ {Ut0, erlang:universaltime_to_localtime(Ut0)} -+ catch error:badarg -> {error, error} -+ end, - %% Return the valid universal times - case {LtDst,Lt} of - {DateTime,DateTime} when UtDst =/= Ut -> diff --git a/lang/erlang14/files/pkg-message.in b/lang/erlang14/files/pkg-message.in deleted file mode 100644 index a6f9807b058b..000000000000 --- a/lang/erlang14/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ -=========================================================================== -Installation tips: - -You can find an emacs mode for Erlang here: - - %%LOCALBASE%%/lib/erlang/lib/tools-%%TOOLS_VSN%%/emacs - -You may wish to add the following line to /etc/manpath.config: - -OPTIONAL_MANPATH %%LOCALBASE%%/lib/erlang/man -=========================================================================== |