aboutsummaryrefslogtreecommitdiffstats
path: root/lang/erlang
diff options
context:
space:
mode:
Diffstat (limited to 'lang/erlang')
-rw-r--r--lang/erlang/Makefile9
-rw-r--r--lang/erlang/Makefile.lib46
-rw-r--r--lang/erlang/distinfo12
-rw-r--r--lang/erlang/files/patch-erts_etc_unix_run__erl.c14
-rw-r--r--lang/erlang/files/patch-lib_gs_src_tool__utils.erl36
-rw-r--r--lang/erlang/files/patch-lib_runtime__tools_c__src_Makefile.in25
-rw-r--r--lang/erlang/files/patch-lib_sasl_src_rb.erl65
-rw-r--r--lang/erlang/pkg-message2
8 files changed, 51 insertions, 158 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 80223c79a2f..68f4eea11be 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= erlang
-PORTVERSION= r10b2
-PORTREVISION= 4
+PORTVERSION= r10b3
PORTEPOCH= 1
CATEGORIES= lang parallel
MASTER_SITES= http://www.erlang.org/download/ \
@@ -15,7 +14,7 @@ MASTER_SITES= http://www.erlang.org/download/ \
http://www.erlang.org/download/ \
http://erlang.stacken.kth.se/download/ \
http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTNAME= otp_src_R10B-2
+DISTNAME= otp_src_R10B-3
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
DIST_SUBDIR= erlang
@@ -32,9 +31,9 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
JAVABINDIR?= ${LOCALBASE}/jdk1.4.2/bin
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14
-ERLANG_MAN= otp_doc_man_R10B-2.tar.gz
+ERLANG_MAN= otp_doc_man_R10B-3.tar.gz
.if !defined(NOPORTDOCS)
-ERLANG_DOCS= otp_doc_html_R10B-2.tar.gz
+ERLANG_DOCS= otp_doc_html_R10B-3.tar.gz
.endif
USE_GMAKE= yes
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index 3a9e062227a..1e38ead4abe 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,9 +1,9 @@
# $FreeBSD$
-ERTS_VSN= 5.4.3
-OTP_LIBS= appmon-2.1.3 \
+ERTS_VSN= 5.4.4
+OTP_LIBS= appmon-2.1.4 \
asn1-1.4.4.4 \
- compiler-4.3.2 \
+ compiler-4.3.3 \
cosEvent-2.1 \
cosEventDomain-1.1 \
cosFileTransfer-1.1.2 \
@@ -11,36 +11,36 @@ OTP_LIBS= appmon-2.1.3 \
cosProperty-1.1.1 \
cosTime-1.1 \
cosTransactions-1.2 \
- crypto-1.2.2 \
- debugger-2.3.1 \
+ crypto-1.2.3 \
+ debugger-2.3.2 \
edoc-0.6.1 \
- erl_interface-3.5 \
+ erl_interface-3.5.1 \
et-1.0 \
- gs-1.5.3 \
- hipe-3.0.1 \
+ gs-1.5.4 \
+ hipe-3.0.2 \
ic-4.2.7 \
- inets-4.0.1 \
+ inets-4.2 \
jinterface-1.3 \
- kernel-2.10.3 \
- megaco-2.1.7 \
+ kernel-2.10.4 \
+ megaco-3.0 \
mnemosyne-1.2.5 \
- mnesia-4.2 \
+ mnesia-4.2.1 \
mnesia_session-1.1.5 \
observer-0.9.6 \
odbc-2.0.2 \
orber-3.5.3 \
- os_mon-1.7.1 \
+ os_mon-1.7.2 \
otp_mibs-1.0.4 \
- parsetools-1.3 \
- pman-2.5.1 \
- runtime_tools-1.5 \
- sasl-2.0 \
- snmp-4.0.4 \
- ssl-3.0.4 \
- stdlib-1.13.3 \
+ parsetools-1.3.1 \
+ pman-2.5.2 \
+ runtime_tools-1.5.1 \
+ sasl-2.0.1 \
+ snmp-4.1.1 \
+ ssl-3.0.5 \
+ stdlib-1.13.4 \
syntax_tools-1.4.1 \
- toolbar-1.2 \
- tools-2.4 \
- tv-2.1.1 \
+ toolbar-1.2.1 \
+ tools-2.4.1 \
+ tv-2.1.2 \
webtool-0.8.2 \
xmerl-1.0
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 08b235171fe..5e48b9defbc 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,6 +1,6 @@
-MD5 (erlang/otp_src_R10B-2.tar.gz) = 318f5e61872035290c5939c47631cd83
-SIZE (erlang/otp_src_R10B-2.tar.gz) = 9452827
-MD5 (erlang/otp_doc_man_R10B-2.tar.gz) = c073820c7e97988aa9483618fe67aaf0
-SIZE (erlang/otp_doc_man_R10B-2.tar.gz) = 591524
-MD5 (erlang/otp_doc_html_R10B-2.tar.gz) = 118a44d4d70c8900dc7c43aeaf8b8d0b
-SIZE (erlang/otp_doc_html_R10B-2.tar.gz) = 4559646
+MD5 (erlang/otp_src_R10B-3.tar.gz) = 4eb8a702b6cf98f3dfa8602d9d7c20fb
+SIZE (erlang/otp_src_R10B-3.tar.gz) = 9936188
+MD5 (erlang/otp_doc_man_R10B-3.tar.gz) = 4ceb6d8b9c44716b1695ecb36e3d8330
+SIZE (erlang/otp_doc_man_R10B-3.tar.gz) = 593032
+MD5 (erlang/otp_doc_html_R10B-3.tar.gz) = 4b0bf3a4fff2d4632885efa047b5fd5b
+SIZE (erlang/otp_doc_html_R10B-3.tar.gz) = 4568533
diff --git a/lang/erlang/files/patch-erts_etc_unix_run__erl.c b/lang/erlang/files/patch-erts_etc_unix_run__erl.c
deleted file mode 100644
index c43d701e001..00000000000
--- a/lang/erlang/files/patch-erts_etc_unix_run__erl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- erts/etc/unix/run_erl.c.orig
-+++ erts/etc/unix/run_erl.c
-@@ -738,7 +738,7 @@
- */
- static int create_fifo(char *name, int perm)
- {
-- if ((mknod(name, S_IFIFO | perm, 0) < 0) && (errno != EEXIST))
-+ if ((mkfifo(name, perm) < 0) && (errno != EEXIST))
- return -1;
- return 0;
- }
diff --git a/lang/erlang/files/patch-lib_gs_src_tool__utils.erl b/lang/erlang/files/patch-lib_gs_src_tool__utils.erl
index 883ff337892..ddc1ecb98b1 100644
--- a/lang/erlang/files/patch-lib_gs_src_tool__utils.erl
+++ b/lang/erlang/files/patch-lib_gs_src_tool__utils.erl
@@ -1,8 +1,8 @@
$FreeBSD$
---- lib/gs/src/tool_utils.erl.orig Tue Oct 12 22:14:23 2004
-+++ lib/gs/src/tool_utils.erl Tue Oct 12 22:17:17 2004
+--- 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]).
@@ -13,31 +13,29 @@ $FreeBSD$
%%----------------------------------------------------------------------
%% open_help(GS, File)
%% GS = gsobj() (GS root object returned by gs:start/0,1)
-@@ -65,7 +68,8 @@
- local ->
- case os:type() of
- {unix,_AnyType} ->
-- "netscape -remote \"openURL(file:" ++ File ++ ")\"";
-+ unix_url_command("file:" ++ File);
-+
+@@ -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);
-
-@@ -77,7 +81,7 @@
- remote ->
- case os:type() of
- {unix,_AnyType} ->
-- "netscape -remote \"openURL(" ++ File ++ ")\"";
-+ unix_url_command("file:" ++ 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,"\\\\","/");
-@@ -337,3 +341,54 @@
+@@ -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.
diff --git a/lang/erlang/files/patch-lib_runtime__tools_c__src_Makefile.in b/lang/erlang/files/patch-lib_runtime__tools_c__src_Makefile.in
deleted file mode 100644
index bb88be4c394..00000000000
--- a/lang/erlang/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/erlang/files/patch-lib_sasl_src_rb.erl b/lang/erlang/files/patch-lib_sasl_src_rb.erl
deleted file mode 100644
index 6fae0f417ac..00000000000
--- a/lang/erlang/files/patch-lib_sasl_src_rb.erl
+++ /dev/null
@@ -1,65 +0,0 @@
-
-$FreeBSD$
-
---- lib/sasl/src/rb.erl.orig
-+++ lib/sasl/src/rb.erl
-@@ -177,7 +177,7 @@
- {reply, ok, State#state{device = standard_io}};
- handle_call({show_number, Number}, _From, State) ->
- #state{dir = Dir, data = Data, device = Device, abort = Abort, log = Log} = State,
-- NewDevice = print_report(Dir, Data, Number, Device, Abort, Log),
-+ NewDevice = print_report_by_num(Dir, Data, Number, Device, Abort, Log),
- {reply, ok, State#state{device = NewDevice}};
- handle_call({show_type, Type}, _From, State) ->
- #state{dir = Dir, data = Data, device = Device, abort = Abort, log = Log} = State,
-@@ -541,6 +541,10 @@
- io_lib:format("~s", [ShortDescr]),
- Date]).
-
-+print_report_by_num(Dir, Data, Number, Device, Abort, Log) ->
-+ {_,Device1} = print_report(Dir, Data, Number, Device, Abort, Log),
-+ Device1.
-+
- print_typed_reports(_Dir, [], _Type, Device, _Abort, _Log) ->
- Device;
- print_typed_reports(Dir, Data, Type, Device, Abort, Log) ->
-@@ -569,23 +573,29 @@
- end.
-
- print_report(Dir, Data, Number, Device, Abort, Log) ->
-- {Fname, FilePosition} = find_report(Data, Number),
-- FileName = lists:concat([Dir, Fname]),
-- case file:open(FileName, read) of
-- {ok, Fd} ->
-- read_rep(Fd, FilePosition, Device, Abort, Log);
-- _ ->
-- io:format("rb: can't open file ~p~n", [Fname]),
-+ case find_report(Data, Number) of
-+ {Fname, FilePosition} ->
-+ FileName = lists:concat([Dir, Fname]),
-+ case file:open(FileName, read) of
-+ {ok, Fd} ->
-+ read_rep(Fd, FilePosition, Device, Abort, Log);
-+ _ ->
-+ io:format("rb: can't open file ~p~n", [Fname]),
-+ {proceed,Device}
-+ end;
-+ no_report ->
- {proceed,Device}
- end.
-
- find_report([{No, _Type, _Descr, _Date, Fname, FilePosition}|_T], No) ->
- {Fname, FilePosition};
--find_report([_H|T], No) -> find_report(T, No);
-+find_report([_H|T], No) ->
-+ find_report(T, No);
- find_report([], No) ->
-- io:format("There is no report with number ~p.~n", [No]).
-+ io:format("There is no report with number ~p.~n", [No]),
-+ no_report.
-
--print_grep_reports(_Dir, [], _RegExp, Device, Abort, Log) ->
-+print_grep_reports(_Dir, [], _RegExp, Device, _Abort, _Log) ->
- Device;
- print_grep_reports(Dir, Data, RegExp, Device, Abort, Log) ->
- {Next,Device1} = print_grep_report(Dir, Data, element(1, hd(Data)),
diff --git a/lang/erlang/pkg-message b/lang/erlang/pkg-message
index 1e6e061aeac..d6bad9c3831 100644
--- a/lang/erlang/pkg-message
+++ b/lang/erlang/pkg-message
@@ -7,7 +7,7 @@ Installation tips:
You can find an emacs mode for Erlang here:
- ${LOCALBASE}/lib/erlang/lib/tools-2.4/emacs
+ ${LOCALBASE}/lib/erlang/lib/tools-2.4.1/emacs
You may wish to add the following line to /etc/manpath.config:
generated by cgit (git 2.34.1) at 2024-12-19 23:16:33 +0800