OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Oct-2007 16:23:57
Branch: HEAD Handle: 2007100215235700
Added files:
openpkg-src/erlang erlang.patch
Modified files:
openpkg-src/erlang erlang.spec
Log:
upgrading package: erlang R11B.3 -> R11B.5
Summary:
Revision Changes Path
1.1 +267 -0 openpkg-src/erlang/erlang.patch
1.9 +6 -4 openpkg-src/erlang/erlang.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/erlang/erlang.patch
============================================================================
$ cvs diff -u -r0 -r1.1 erlang.patch
--- /dev/null 2007-10-02 16:22:00 +0200
+++ erlang.patch 2007-10-02 16:23:57 +0200
@@ -0,0 +1,267 @@
+Index: erts/emulator/Makefile.in
+--- erts/emulator/Makefile.in.orig 2007-03-27 15:26:54 +0200
++++ erts/emulator/Makefile.in 2007-10-02 13:24:47 +0200
+@@ -265,8 +265,10 @@
+ endif
+ [EMAIL PROTECTED]@
+ ifdef WITH_SCTP
++ifneq ($(findstring freebsd,$(TARGET)),freebsd)
+ LIBS += -lsctp
+ endif
++endif
+
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+Index: erts/emulator/beam/erl_process_dump.c
+--- erts/emulator/beam/erl_process_dump.c.orig 2007-04-25 10:07:32
+0200
++++ erts/emulator/beam/erl_process_dump.c 2007-10-02 13:24:47 +0200
+@@ -382,9 +382,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);
+
+ if (is_fun(term)) {
+ /*
+@@ -416,4 +418,6 @@
+ while (s < p) {
+ erts_print(to, to_arg, "%02X", *s++);
+ }
++
++ erts_free(ERTS_ALC_T_TMP, (void *) sbuf);
+ }
+Index: erts/emulator/hipe/hipe_x86.c
+--- erts/emulator/hipe/hipe_x86.c.orig 2006-08-29 11:49:44 +0200
++++ erts/emulator/hipe/hipe_x86.c 2007-10-02 13:24:47 +0200
+@@ -112,7 +112,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
+Index: erts/etc/unix/Install.src
+--- erts/etc/unix/Install.src.orig 2007-03-27 15:27:48 +0200
++++ erts/etc/unix/Install.src 2007-10-02 13:24:47 +0200
+@@ -148,4 +148,4 @@
+ ./misc/format_man_pages $ERL_ROOT
+ fi
+
+-
++exit 0
+Index: lib/asn1/c_src/Makefile.in
+--- lib/asn1/c_src/Makefile.in.orig 2007-06-11 13:37:45 +0200
++++ lib/asn1/c_src/Makefile.in 2007-10-02 13:24:47 +0200
+@@ -129,7 +129,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)
+Index: lib/crypto/c_src/Makefile.in
+--- lib/crypto/c_src/Makefile.in.orig 2007-06-11 14:59:08 +0200
++++ lib/crypto/c_src/Makefile.in 2007-10-02 13:24:47 +0200
+@@ -135,7 +135,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
+
+Index: lib/erl_interface/src/connect/ei_resolve.c
+--- lib/erl_interface/src/connect/ei_resolve.c.orig 2006-11-06 14:53:29
+0100
++++ lib/erl_interface/src/connect/ei_resolve.c 2007-10-02 13:24:47
+0200
+@@ -51,6 +51,10 @@
+ #include "ei_resolve.h"
+ #include "ei_locking.h"
+
++#if defined(HAVE_GETHOSTBYNAME_R) && defined(__FreeBSD__)
++#undef HAVE_GETHOSTBYNAME_R
++#endif
++
+ #ifdef HAVE_GETHOSTBYNAME_R
+
+ void ei_init_resolve(void)
+Index: lib/et/src/et_contents_viewer.erl
+--- lib/et/src/et_contents_viewer.erl.orig 2002-10-03 00:10:21 +0200
++++ lib/et/src/et_contents_viewer.erl 2007-10-02 13:24:47 +0200
+@@ -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) ->
+Index: lib/et/src/et_viewer.erl
+--- lib/et/src/et_viewer.erl.orig 2002-10-14 15:49:18 +0200
++++ lib/et/src/et_viewer.erl 2007-10-02 13:24:47 +0200
+@@ -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
+Index: lib/gs/src/tool_utils.erl
+--- lib/gs/src/tool_utils.erl.orig 2007-06-11 15:00:04 +0200
++++ lib/gs/src/tool_utils.erl 2007-10-02 13:24:47 +0200
+@@ -37,6 +37,9 @@
+ }).
+
+
++%% Browser executable list (openURL command line protocol required)
++-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera"]).
++
+ %%----------------------------------------------------------------------
+ %% open_help(Parent, File)
+ %% Parent = gsobj() (GS root object or parent window)
+@@ -77,7 +80,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);
+@@ -92,7 +95,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,"\\\\","/");
+@@ -429,3 +432,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.
+Index: lib/hipe/regalloc/Makefile
+--- lib/hipe/regalloc/Makefile.orig 2007-06-11 14:56:03 +0200
++++ lib/hipe/regalloc/Makefile 2007-10-02 13:50:23 +0200
+@@ -43,7 +43,6 @@
+ hipe_temp_map \
+ hipe_optimistic_regalloc \
+ hipe_coalescing_regalloc \
+- hipe_optimistic_regalloc \
+ hipe_graph_coloring_regalloc \
+ hipe_regalloc_loop \
+ hipe_ls_regalloc \
+Index: lib/odbc/c_src/odbcserver.c
+--- lib/odbc/c_src/odbcserver.c.orig 2007-01-29 14:17:56 +0100
++++ lib/odbc/c_src/odbcserver.c 2007-10-02 13:24:47 +0200
+@@ -111,6 +111,7 @@
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+ #include <netdb.h>
++#include <netinet/in.h>
+ #endif
+
+ #include "ei.h"
+Index: lib/sasl/src/rb.erl
+--- lib/sasl/src/rb.erl.orig 2007-06-11 14:53:04 +0200
++++ lib/sasl/src/rb.erl 2007-10-02 13:24:47 +0200
+@@ -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
+Index: lib/snmp/src/misc/snmp_config.erl
+--- lib/snmp/src/misc/snmp_config.erl.orig 2007-03-14 14:29:59 +0100
++++ lib/snmp/src/misc/snmp_config.erl 2007-10-02 13:24:47 +0200
+@@ -1705,7 +1705,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) ->
+Index: lib/stdlib/src/io_lib_pretty.erl
+--- lib/stdlib/src/io_lib_pretty.erl.orig 2007-06-11 14:52:56 +0200
++++ lib/stdlib/src/io_lib_pretty.erl 2007-10-02 13:24:47 +0200
+@@ -167,7 +167,9 @@
+ %% Reuse the list created by io_lib:write_binary()...
+ pp_binary([LT,LT,S,GT,GT], Col, Ll, Ind, LD) ->
+ N = max(8, Ll - Col - LD),
+- [LT,LT,pp_binary(S, N, N, Ind),GT,GT].
++ [LT,LT,pp_binary(S, N, N, Ind),GT,GT];
++pp_binary(S, _Col, _Ll, _Ind, _LD) ->
++ S.
+
+ pp_binary([BS, $, | S], N, N0, Ind) ->
+ Len = length(BS) + 1,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/erlang/erlang.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 erlang.spec
--- openpkg-src/erlang/erlang.spec 26 Mar 2007 13:15:11 -0000 1.8
+++ openpkg-src/erlang/erlang.spec 2 Oct 2007 14:23:57 -0000 1.9
@@ -23,8 +23,8 @@
##
# package version
-%define V_real R11B-3
-%define V_opkg R11B.3
+%define V_real R11B-5
+%define V_opkg R11B.5
# package information
Name: erlang
@@ -37,11 +37,12 @@
Group: Language
License: Erlang Public License
Version: %{V_opkg}
-Release: 20070326
+Release: 20071002
# list of sources
Source0: http://www.erlang.org/download/otp_src_%{V_real}.tar.gz
Source1: http://www.erlang.org/download/otp_doc_man_%{V_real}.tar.gz
+Patch0: erlang.patch
# build information
Prefix: %{l_prefix}
@@ -68,6 +69,7 @@
%prep
%setup -q -n otp_src_%{V_real}
+ %patch -p0
%build
CC="%{l_cc}" \
@@ -84,7 +86,7 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install INSTALL_PREFIX=$RPM_BUILD_ROOT
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
- for file in erl erlc epmd run_erl to_erl dialyzer ; do
+ for file in erl erlc epmd run_erl to_erl dialyzer escript typer; do
rm -f $file
ln -s ../lib/erlang/bin/$file $file
done
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
