aboutsummaryrefslogtreecommitdiff
path: root/lang/erlang14/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/erlang14/files')
-rw-r--r--lang/erlang14/files/epmd.sh.in26
-rw-r--r--lang/erlang14/files/patch-erts-emulator-Makefile.in14
-rw-r--r--lang/erlang14/files/patch-erts_configure14
-rw-r--r--lang/erlang14/files/patch-erts_emulator_beam_erl__process__dump.c27
-rw-r--r--lang/erlang14/files/patch-erts_emulator_beam_erl__time__sup.c15
-rw-r--r--lang/erlang14/files/patch-erts_emulator_drivers_common_inet__drv.c40
-rw-r--r--lang/erlang14/files/patch-erts_etc_unix_Install.src11
-rw-r--r--lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in14
-rw-r--r--lang/erlang14/files/patch-lib_erl__interface_src_connect_ei__resolve.c15
-rw-r--r--lang/erlang14/files/patch-lib_et_src_et__contents__viewer.erl13
-rw-r--r--lang/erlang14/files/patch-lib_et_src_et__viewer.erl15
-rw-r--r--lang/erlang14/files/patch-lib_gs_src_tool__utils.erl87
-rw-r--r--lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c10
-rw-r--r--lang/erlang14/files/patch-lib_sasl_src_rb.erl14
-rw-r--r--lang/erlang14/files/patch-lib_snmp_src_misc_snmp__config.erl14
-rw-r--r--lang/erlang14/files/patch-lib_stdlib_src_calendar.erl29
-rw-r--r--lang/erlang14/files/pkg-message.in15
17 files changed, 0 insertions, 373 deletions
diff --git a/lang/erlang14/files/epmd.sh.in b/lang/erlang14/files/epmd.sh.in
deleted file mode 100644
index ea57aa23cdc0..000000000000
--- a/lang/erlang14/files/epmd.sh.in
+++ /dev/null
@@ -1,26 +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"}
-
-. %%RC_SUBR%%
-
-name=epmd
-rcvar=`set_rcvar`
-
-prefix=%%PREFIX%%
-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_configure b/lang/erlang14/files/patch-erts_configure
deleted file mode 100644
index 6197cc8876ac..000000000000
--- a/lang/erlang14/files/patch-erts_configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- erts/configure.orig
-+++ erts/configure
-@@ -10620,7 +10620,7 @@
-
-
-
--if test "x$enable_sctp" == "xyes" ; then
-+if test "x$enable_sctp" = "xyes" ; then
- echo "$as_me:$LINENO: checking for netinet/sctp.h" >&5
- echo $ECHO_N "checking for netinet/sctp.h... $ECHO_C" >&6
- if test "${ac_cv_header_netinet_sctp_h+set}" = set; then
diff --git a/lang/erlang14/files/patch-erts_emulator_beam_erl__process__dump.c b/lang/erlang14/files/patch-erts_emulator_beam_erl__process__dump.c
deleted file mode 100644
index cdccf8671ff6..000000000000
--- a/lang/erlang14/files/patch-erts_emulator_beam_erl__process__dump.c
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/beam/erl_process_dump.c.orig
-+++ erts/emulator/beam/erl_process_dump.c
-@@ -399,9 +399,11 @@
- static void
- dump_externally(int to, void *to_arg, Eterm term)
- {
-- byte sbuf[1024]; /* encode and hope for the best ... */
-- byte* s;
-- byte* p;
-+ byte *sbuf, *s, *p;
-+ unsigned size;
-+
-+ size = encode_size_struct(term, TERM_TO_BINARY_DFLAGS);
-+ sbuf = (byte *) erts_alloc(ERTS_ALC_T_TMP, size);
-
- s = p = sbuf;
- erts_to_external_format(NULL, term, &p, NULL, NULL);
-@@ -409,4 +411,6 @@
- while (s < p) {
- erts_print(to, to_arg, "%02X", *s++);
- }
-+
-+ erts_free(ERTS_ALC_T_TMP, (void *) sbuf);
- }
diff --git a/lang/erlang14/files/patch-erts_emulator_beam_erl__time__sup.c b/lang/erlang14/files/patch-erts_emulator_beam_erl__time__sup.c
deleted file mode 100644
index 1e84d40d27ec..000000000000
--- a/lang/erlang14/files/patch-erts_emulator_beam_erl__time__sup.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/beam/erl_time_sup.c.orig
-+++ erts/emulator/beam/erl_time_sup.c
-@@ -648,6 +648,9 @@
- t.tm_sec = *second;
- t.tm_isdst = isdst;
- the_clock = mktime(&t);
-+ if (the_clock == -1) {
-+ return 0;
-+ }
- #ifdef HAVE_GMTIME_R
- gmtime_r(&the_clock, (tm = &tmbuf));
- #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 006a6ea66121..000000000000
--- a/lang/erlang14/files/patch-erts_emulator_drivers_common_inet__drv.c
+++ /dev/null
@@ -1,40 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/drivers/common/inet_drv.c.orig
-+++ erts/emulator/drivers/common/inet_drv.c
-@@ -3460,9 +3460,14 @@
- /* 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 defined (__FreeBSD__)
-+ /* In FreeBSD, sctp_bindx belongs to libc - see sctp_bindx(3) */
-+ inet_init_sctp();
-+ add_driver_entry(&sctp_inet_driver_entry);
-+# else
-+# ifndef LIBSCTP
-+# error LIBSCTP not defined
-+# endif
- if (erts_sys_ddll_open_noext(STRINGIFY(LIBSCTP), &h_libsctp) == 0) {
- void *ptr;
- if (erts_sys_ddll_sym(h_libsctp, "sctp_bindx", &ptr) == 0) {
-@@ -3471,6 +3476,7 @@
- add_driver_entry(&sctp_inet_driver_entry);
- }
- }
-+# endif
- # endif
- #endif /* _OSE_ */
- /* remove the dummy inet driver */
-@@ -8997,7 +9003,7 @@
- rflag = add_flag ? SCTP_BINDX_ADD_ADDR : SCTP_BINDX_REM_ADDR;
-
- /* Invoke the call: */
-- if (p_sctp_bindx(desc->s, addrs, n, rflag) < 0)
-+ if (sctp_bindx(desc->s, addrs, n, rflag) < 0)
- return ctl_error(sock_errno(), rbuf, rsize);
-
- desc->state = INET_STATE_BOUND;
diff --git a/lang/erlang14/files/patch-erts_etc_unix_Install.src b/lang/erlang14/files/patch-erts_etc_unix_Install.src
deleted file mode 100644
index 68cbe91a4bdc..000000000000
--- a/lang/erlang14/files/patch-erts_etc_unix_Install.src
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- erts/etc/unix/Install.src.orig
-+++ erts/etc/unix/Install.src
-@@ -148,4 +148,4 @@
- ./misc/format_man_pages $ERL_ROOT
- fi
-
--
-+exit 0
diff --git a/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in
deleted file mode 100644
index 81e0ce9e83b3..000000000000
--- a/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/crypto/c_src/Makefile.in.orig Thu Oct 7 12:11:06 2004
-+++ lib/crypto/c_src/Makefile.in Thu Oct 7 12:11:07 2004
-@@ -121,7 +121,7 @@
- release_spec: opt
- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj
- $(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-- $(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj
-+ $(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj
- $(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj
- $(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib
-
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__contents__viewer.erl b/lang/erlang14/files/patch-lib_et_src_et__contents__viewer.erl
deleted file mode 100644
index 683358dbf6da..000000000000
--- a/lang/erlang14/files/patch-lib_et_src_et__contents__viewer.erl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- lib/et/src/et_contents_viewer.erl.orig Sat Jul 24 15:04:01 2004
-+++ lib/et/src/et_contents_viewer.erl Sat Jul 24 15:04:31 2004
-@@ -346,7 +346,6 @@
- '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__viewer.erl b/lang/erlang14/files/patch-lib_et_src_et__viewer.erl
deleted file mode 100644
index 8cc3212e49e2..000000000000
--- a/lang/erlang14/files/patch-lib_et_src_et__viewer.erl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- lib/et/src/et_viewer.erl.orig Sat Jul 24 15:02:18 2004
-+++ lib/et/src/et_viewer.erl Sat Jul 24 15:04:38 2004
-@@ -982,8 +982,7 @@
- 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_odbc_c_src_odbcserver.c b/lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c
deleted file mode 100644
index 985785bd8e26..000000000000
--- a/lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/odbc/c_src/odbcserver.c.orig Sat Jun 25 17:34:20 2005
-+++ lib/odbc/c_src/odbcserver.c Sat Jun 25 17:34:33 2005
-@@ -107,6 +107,7 @@
- #include <sys/socket.h>
- #include <sys/uio.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- #endif
-
- #include "ei.h"
diff --git a/lang/erlang14/files/patch-lib_sasl_src_rb.erl b/lang/erlang14/files/patch-lib_sasl_src_rb.erl
deleted file mode 100644
index 79b3961b0f00..000000000000
--- a/lang/erlang14/files/patch-lib_sasl_src_rb.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/sasl/src/rb.erl.orig
-+++ lib/sasl/src/rb.erl
-@@ -414,7 +414,7 @@
- Ref = make_ref(),
- case (catch {Ref,binary_to_term(Bin)}) of
- {'EXIT',_} ->
-- {error, "Inclomplete erlang term in log"};
-+ {error, "Incomplete erlang term in log"};
- {Ref,Term} ->
- {ok, Term}
- end
diff --git a/lang/erlang14/files/patch-lib_snmp_src_misc_snmp__config.erl b/lang/erlang14/files/patch-lib_snmp_src_misc_snmp__config.erl
deleted file mode 100644
index 732aef70634f..000000000000
--- a/lang/erlang14/files/patch-lib_snmp_src_misc_snmp__config.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/snmp/src/misc/snmp_config.erl.orig
-+++ lib/snmp/src/misc/snmp_config.erl
-@@ -1722,7 +1722,7 @@
- "%% {\"standard inform\", \"std_inform\", inform}.\n"
- "%%\n\n",
- Hdr = header() ++ Comment,
-- Conf = [{"stadard_trap", "std_trap", NotifyType}],
-+ Conf = [{"standard trap", "std_trap", NotifyType}],
- write_agent_notify_config(Dir, Hdr, Conf).
-
- write_agent_notify_config(Dir, Hdr, Conf)
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 1b8961341722..000000000000
--- a/lang/erlang14/files/pkg-message.in
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-This package requires a properly configured nsswitch.conf on FreeBSD
-5.x, else nameserver queries (and the distribution protocol) will
-not work.
-
-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
-===========================================================================
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 14:49:59 +0000