summaryrefslogtreecommitdiff
path: root/lang/erlang14/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/erlang14/files')
-rw-r--r--lang/erlang14/files/patch-aj11
-rw-r--r--lang/erlang14/files/patch-erts_configure24
-rw-r--r--lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c14
-rw-r--r--lang/erlang14/files/patch-lib_asn1_c__src_Makefile.in14
-rw-r--r--lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in14
-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/post-patch-configure10
12 files changed, 0 insertions, 240 deletions
diff --git a/lang/erlang14/files/patch-aj b/lang/erlang14/files/patch-aj
deleted file mode 100644
index c3b2f87f73c6..000000000000
--- a/lang/erlang14/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- erts/etc/unix/Install.src.orig Thu Oct 7 15:45:43 2004
-+++ erts/etc/unix/Install.src Thu Oct 7 15:45:59 2004
-@@ -157,4 +157,4 @@
- ./misc/format_man_pages $ERL_ROOT
- fi
-
--
-+exit 0
diff --git a/lang/erlang14/files/patch-erts_configure b/lang/erlang14/files/patch-erts_configure
deleted file mode 100644
index 44537bded1fa..000000000000
--- a/lang/erlang14/files/patch-erts_configure
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- erts/configure.orig
-+++ erts/configure
-@@ -1355,6 +1355,7 @@
- i586) ARCH=x86;;
- i686) ARCH=x86;;
- x86_64) ARCH=amd64;;
-+amd64) ARCH=amd64;;
- ppc) ARCH=ppc;;
- ppc64) ARCH=ppc64;;
- "Power Macintosh") ARCH=ppc;;
-@@ -6874,7 +6875,9 @@
-
- echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6
- echo "configure:6877: 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-erts_emulator_hipe_hipe__x86.c b/lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c
deleted file mode 100644
index b7086a076357..000000000000
--- a/lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/hipe/hipe_x86.c.orig
-+++ erts/emulator/hipe/hipe_x86.c
-@@ -106,7 +106,7 @@
- abort();
- map_start = mmap(map_hint, map_bytes,
- PROT_EXEC|PROT_READ|PROT_WRITE,
-- MAP_PRIVATE|MAP_ANONYMOUS
-+ MAP_PRIVATE|MAP_ANON
- #ifdef __x86_64__
- |MAP_32BIT
- #endif
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_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_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 ddc1ecb98b12..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"]).
-+
- %%----------------------------------------------------------------------
- %% 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/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" ;;