mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
Upgrade to version R9C-1.
This commit is contained in:
Jimmy Olgeni
parent
a2211b901f
commit
7f0e3a8319
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=110199
@ -6,15 +6,14 @@
|
||||
#
|
||||
|
||||
PORTNAME= erlang
|
||||
PORTVERSION= r9c0
|
||||
PORTREVISION= 7
|
||||
PORTVERSION= r9c1
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= lang
|
||||
MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \
|
||||
http://www.erlang.org/download/ \
|
||||
http://erlang.stacken.kth.se/download/ \
|
||||
http://www.csd.uu.se/ftp/mirror/erlang/download/
|
||||
DISTNAME= otp_src_R9C-0
|
||||
DISTNAME= otp_src_R9C-1
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
|
||||
DIST_SUBDIR= erlang
|
||||
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
||||
@ -34,9 +33,9 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
|
||||
JAVABINDIR?= ${LOCALBASE}/jdk1.4.2/bin
|
||||
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14
|
||||
|
||||
ERLANG_MAN= otp_man_R9C-0.tar.gz
|
||||
ERLANG_MAN= otp_man_R9C-1.tar.gz
|
||||
.if !defined(NOPORTDOCS)
|
||||
ERLANG_DOCS= otp_html_R9C-0.tar.gz
|
||||
ERLANG_DOCS= otp_html_R9C-1.tar.gz
|
||||
.endif
|
||||
|
||||
USE_GMAKE= yes
|
||||
|
||||
@ -1,42 +1,42 @@
|
||||
# $FreeBSD$
|
||||
|
||||
OTP_LIBS= appmon-2.1.2 \
|
||||
asn1-1.4.2 \
|
||||
compiler-4.2 \
|
||||
asn1-1.4.4.2 \
|
||||
compiler-4.2.3 \
|
||||
cosEvent-2.1 \
|
||||
cosEventDomain-1.1 \
|
||||
cosFileTransfer-1.1 \
|
||||
cosNotification-1.1 \
|
||||
cosProperty-1.1 \
|
||||
cosNotification-1.1.1 \
|
||||
cosProperty-1.1.1 \
|
||||
cosTime-1.1 \
|
||||
cosTransactions-1.2 \
|
||||
crypto-1.2 \
|
||||
debugger-2.2 \
|
||||
erl_interface-3.4 \
|
||||
debugger-2.2.2 \
|
||||
erl_interface-3.4.5 \
|
||||
et-1.0 \
|
||||
eva-2.0.4 \
|
||||
gs-1.5.2 \
|
||||
hipe-2.0.2 \
|
||||
ic-4.2.1 \
|
||||
inets-3.0.6 \
|
||||
jinterface-1.2.1.1 \
|
||||
kernel-2.9 \
|
||||
megaco-1.2.3 \
|
||||
ic-4.2.6 \
|
||||
inets-3.0.7 \
|
||||
jinterface-1.2.1.2 \
|
||||
kernel-2.9.6.3 \
|
||||
megaco-2.1.1 \
|
||||
mnemosyne-1.2.5 \
|
||||
mnesia-4.1.4 \
|
||||
mnesia-4.1.11 \
|
||||
mnesia_session-1.1.5 \
|
||||
observer-0.9.5 \
|
||||
odbc-1.0.8 \
|
||||
orber-3.4.2 \
|
||||
os_mon-1.6.1 \
|
||||
otp_mibs-1.0 \
|
||||
odbc-2.0 \
|
||||
orber-3.5.1 \
|
||||
os_mon-1.6.2 \
|
||||
otp_mibs-1.0.2 \
|
||||
parsetools-1.2 \
|
||||
pman-2.4.1 \
|
||||
runtime_tools-1.4 \
|
||||
sasl-1.10 \
|
||||
snmp-3.4 \
|
||||
ssl-3.0.1 \
|
||||
stdlib-1.12 \
|
||||
snmp-3.4.7 \
|
||||
ssl-3.0.2 \
|
||||
stdlib-1.12.7 \
|
||||
toolbar-1.1.0 \
|
||||
tools-2.3 \
|
||||
tv-2.0.5 \
|
||||
|
||||
@ -13,8 +13,7 @@ MAN1= epmd.1 \
|
||||
start_webtool.1 \
|
||||
werl.1
|
||||
|
||||
MAN3= CORBA_Environment_alloc.3 \
|
||||
CosEventChannelAdmin.3 \
|
||||
MAN3= CosEventChannelAdmin.3 \
|
||||
CosEventChannelAdmin_ConsumerAdmin.3 \
|
||||
CosEventChannelAdmin_EventChannel.3 \
|
||||
CosEventChannelAdmin_ProxyPullConsumer.3 \
|
||||
@ -179,6 +178,8 @@ MAN3= CORBA_Environment_alloc.3 \
|
||||
httpd_util.3 \
|
||||
i.3 \
|
||||
ic.3 \
|
||||
ic_c_protocol.3 \
|
||||
ic_clib.3 \
|
||||
inet.3 \
|
||||
init.3 \
|
||||
instrument.3 \
|
||||
@ -200,8 +201,10 @@ MAN3= CORBA_Environment_alloc.3 \
|
||||
megaco.3 \
|
||||
megaco_codec_meas.3 \
|
||||
megaco_codec_transform.3 \
|
||||
megaco_encoder.3 \
|
||||
megaco_flex_scanner.3 \
|
||||
megaco_tcp.3 \
|
||||
megaco_transport.3 \
|
||||
megaco_udp.3 \
|
||||
megaco_user.3 \
|
||||
memsup.3 \
|
||||
@ -233,6 +236,7 @@ MAN3= CORBA_Environment_alloc.3 \
|
||||
nteventlog.3 \
|
||||
odbc.3 \
|
||||
orber.3 \
|
||||
orber_diagnostics.3 \
|
||||
orber_ifr.3 \
|
||||
orber_tc.3 \
|
||||
orddict.3 \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
MD5 (erlang/otp_src_R9C-0.tar.gz) = d40842cf79ca65007de5ad54d3c50d18
|
||||
SIZE (erlang/otp_src_R9C-0.tar.gz) = 8229056
|
||||
MD5 (erlang/otp_man_R9C-0.tar.gz) = f94bbaba800cc73e67704b92df5aab60
|
||||
SIZE (erlang/otp_man_R9C-0.tar.gz) = 561329
|
||||
MD5 (erlang/otp_html_R9C-0.tar.gz) = 6885f276d1501fd22a72ae421b4a94e6
|
||||
SIZE (erlang/otp_html_R9C-0.tar.gz) = 4143404
|
||||
MD5 (erlang/otp_src_R9C-1.tar.gz) = 8d69f2db99ba0b4e37b5d7da777468b3
|
||||
SIZE (erlang/otp_src_R9C-1.tar.gz) = 8658000
|
||||
MD5 (erlang/otp_man_R9C-1.tar.gz) = 63e8c5f5856aedc75acec91ceabc915f
|
||||
SIZE (erlang/otp_man_R9C-1.tar.gz) = 570707
|
||||
MD5 (erlang/otp_html_R9C-1.tar.gz) = 6c3bfc06c2e10475683ac652f1ec6f46
|
||||
SIZE (erlang/otp_html_R9C-1.tar.gz) = 4469714
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/debugger/src/dbg_ui_mon.erl.orig Thu Sep 4 22:26:08 2003
|
||||
+++ lib/debugger/src/dbg_ui_mon.erl Thu Sep 4 22:26:51 2003
|
||||
@@ -379,7 +379,7 @@
|
||||
|
||||
%% Help Menu
|
||||
gui_cmd('Debugger', State) ->
|
||||
- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]),
|
||||
+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]),
|
||||
tool_utils:open_help(State#state.gs, HelpFile),
|
||||
State;
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/debugger/src/dbg_ui_trace.erl.orig Thu Sep 4 22:26:12 2003
|
||||
+++ lib/debugger/src/dbg_ui_trace.erl Thu Sep 4 22:26:56 2003
|
||||
@@ -352,7 +352,7 @@
|
||||
|
||||
%% Help menu
|
||||
gui_cmd('Debugger', State) ->
|
||||
- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]),
|
||||
+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]),
|
||||
tool_utils:open_help(State#state.gs, HelpFile),
|
||||
State;
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/debugger/src/dbg_ui_view.erl.orig Thu Sep 4 22:26:16 2003
|
||||
+++ lib/debugger/src/dbg_ui_view.erl Thu Sep 4 22:29:05 2003
|
||||
@@ -165,7 +165,7 @@
|
||||
|
||||
%% Help menu
|
||||
gui_cmd('Debugger', State) ->
|
||||
- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]),
|
||||
+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]),
|
||||
tool_utils:open_help(State#state.gs, HelpFile),
|
||||
State.
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/erl_interface/src/decode/decode_longlong.c.orig Sun Aug 31 14:00:44 2003
|
||||
+++ lib/erl_interface/src/decode/decode_longlong.c Sun Aug 31 14:01:41 2003
|
||||
@@ -51,7 +51,7 @@
|
||||
int pos, shift = 0;
|
||||
n = 0;
|
||||
for (pos = 0; pos < arity; pos++) {
|
||||
- n |= get8(s) << shift;
|
||||
+ n |= ((EI_LONGLONG) get8(s)) << shift;
|
||||
shift += 8;
|
||||
}
|
||||
}
|
||||
@ -1,77 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/stdlib/src/dets_v9.erl.orig Mon Jul 7 14:17:44 2003
|
||||
+++ lib/stdlib/src/dets_v9.erl Fri Dec 26 14:58:33 2003
|
||||
@@ -212,7 +212,6 @@
|
||||
-define(FREELIST_POS, 0).
|
||||
-define(CLOSED_PROPERLY_POS, 8).
|
||||
-define(D_POS, 20).
|
||||
--define(NO_KEYS_POS, (?D_POS + 16)).
|
||||
|
||||
%%% Dets file versions up to 8 are handled in dets_v8. This module
|
||||
%%% handles version 9, introduced in R8.
|
||||
@@ -416,7 +415,7 @@
|
||||
alloc_part(Head, SegZero, PartPos),
|
||||
{NewHead, InitSegment, [SegPointer]} =
|
||||
alloc_seg(Head1, SegZero, SegNo, Part),
|
||||
- {NewHead, InitSegment, [SegPointer, InitArrPart, ArrPartPointer]};
|
||||
+ {NewHead, InitSegment, [InitArrPart, SegPointer, ArrPartPointer]};
|
||||
Part ->
|
||||
alloc_seg(Head, SegZero, SegNo, Part)
|
||||
end.
|
||||
@@ -1222,7 +1221,7 @@
|
||||
%% Note that space for the array parts and the segments has
|
||||
%% already been allocated, but the segments have not been
|
||||
%% initialized on disk.
|
||||
- NoParts = no_parts(Head#head.m),
|
||||
+ NoParts = no_parts(Head#head.next),
|
||||
%% All parts first, ensured by init_segments/6.
|
||||
Addr = ?BASE + NoParts * 4 * ?SEGPARTSZ,
|
||||
{Head, [{?FSCK_SEGMENT,Addr,Data,0} | L]};
|
||||
@@ -1586,7 +1585,11 @@
|
||||
{FLW, FLSize} = free_lists_to_file(H1),
|
||||
FileSize = FreeListsPointer + FLSize + 4,
|
||||
ok = dets_utils:write(H, [FLW | <<FileSize:32>>]),
|
||||
- NoColls = case H1#head.no_collections of
|
||||
+ FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY),
|
||||
+ dets_utils:pwrite(H1, [{0, FileHeader}]).
|
||||
+
|
||||
+file_header(Head, FreeListsPointer, ClosedProperly) ->
|
||||
+ NoColls = case Head#head.no_collections of
|
||||
undefined -> [];
|
||||
NC -> NC
|
||||
end,
|
||||
@@ -1594,8 +1597,7 @@
|
||||
NoColls,
|
||||
lists:map(fun(X) -> {X,0} end, lists:seq(4,?MAXBUD-1))),
|
||||
CW = lists:map(fun({_LSz,N}) -> <<N:32>> end, L),
|
||||
- FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY, CW),
|
||||
- dets_utils:pwrite(H1, [{0, FileHeader}]).
|
||||
+ file_header(Head, FreeListsPointer, ClosedProperly, CW).
|
||||
|
||||
file_header(Head, FreeListsPointer, ClosedProperly, NoColls) ->
|
||||
Cookie = ?MAGIC,
|
||||
@@ -2356,17 +2358,18 @@
|
||||
update_no_keys(Head, Ws, DeltaObjects, DeltaKeys) ->
|
||||
NoKeys = Head#head.no_keys,
|
||||
NewNoKeys = NoKeys + DeltaKeys,
|
||||
+ NewNoObject = Head#head.no_objects + DeltaObjects,
|
||||
+ NewHead = Head#head{no_objects = NewNoObject, no_keys = NewNoKeys},
|
||||
NWs =
|
||||
if
|
||||
- NewNoKeys > Head#head.max_no_slots ->
|
||||
+ NewNoKeys > NewHead#head.max_no_slots ->
|
||||
Ws;
|
||||
NoKeys div ?SEGSZP == NewNoKeys div ?SEGSZP ->
|
||||
Ws;
|
||||
true ->
|
||||
- [{?NO_KEYS_POS, <<NewNoKeys:32>>} | Ws]
|
||||
+ [{0, file_header(NewHead, 0, ?NOT_PROPERLY_CLOSED)} | Ws]
|
||||
end,
|
||||
- NewNoObject = Head#head.no_objects + DeltaObjects,
|
||||
- {Head#head{no_objects = NewNoObject, no_keys = NewNoKeys}, NWs}.
|
||||
+ {NewHead, NWs}.
|
||||
|
||||
slot_position(S) ->
|
||||
SegNo = ?SLOT2SEG(S), % S div ?SEGSZP
|
||||
@ -6,15 +6,14 @@
|
||||
#
|
||||
|
||||
PORTNAME= erlang
|
||||
PORTVERSION= r9c0
|
||||
PORTREVISION= 7
|
||||
PORTVERSION= r9c1
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= lang
|
||||
MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \
|
||||
http://www.erlang.org/download/ \
|
||||
http://erlang.stacken.kth.se/download/ \
|
||||
http://www.csd.uu.se/ftp/mirror/erlang/download/
|
||||
DISTNAME= otp_src_R9C-0
|
||||
DISTNAME= otp_src_R9C-1
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
|
||||
DIST_SUBDIR= erlang
|
||||
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
||||
@ -34,9 +33,9 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
|
||||
JAVABINDIR?= ${LOCALBASE}/jdk1.4.2/bin
|
||||
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14
|
||||
|
||||
ERLANG_MAN= otp_man_R9C-0.tar.gz
|
||||
ERLANG_MAN= otp_man_R9C-1.tar.gz
|
||||
.if !defined(NOPORTDOCS)
|
||||
ERLANG_DOCS= otp_html_R9C-0.tar.gz
|
||||
ERLANG_DOCS= otp_html_R9C-1.tar.gz
|
||||
.endif
|
||||
|
||||
USE_GMAKE= yes
|
||||
|
||||
@ -1,42 +1,42 @@
|
||||
# $FreeBSD$
|
||||
|
||||
OTP_LIBS= appmon-2.1.2 \
|
||||
asn1-1.4.2 \
|
||||
compiler-4.2 \
|
||||
asn1-1.4.4.2 \
|
||||
compiler-4.2.3 \
|
||||
cosEvent-2.1 \
|
||||
cosEventDomain-1.1 \
|
||||
cosFileTransfer-1.1 \
|
||||
cosNotification-1.1 \
|
||||
cosProperty-1.1 \
|
||||
cosNotification-1.1.1 \
|
||||
cosProperty-1.1.1 \
|
||||
cosTime-1.1 \
|
||||
cosTransactions-1.2 \
|
||||
crypto-1.2 \
|
||||
debugger-2.2 \
|
||||
erl_interface-3.4 \
|
||||
debugger-2.2.2 \
|
||||
erl_interface-3.4.5 \
|
||||
et-1.0 \
|
||||
eva-2.0.4 \
|
||||
gs-1.5.2 \
|
||||
hipe-2.0.2 \
|
||||
ic-4.2.1 \
|
||||
inets-3.0.6 \
|
||||
jinterface-1.2.1.1 \
|
||||
kernel-2.9 \
|
||||
megaco-1.2.3 \
|
||||
ic-4.2.6 \
|
||||
inets-3.0.7 \
|
||||
jinterface-1.2.1.2 \
|
||||
kernel-2.9.6.3 \
|
||||
megaco-2.1.1 \
|
||||
mnemosyne-1.2.5 \
|
||||
mnesia-4.1.4 \
|
||||
mnesia-4.1.11 \
|
||||
mnesia_session-1.1.5 \
|
||||
observer-0.9.5 \
|
||||
odbc-1.0.8 \
|
||||
orber-3.4.2 \
|
||||
os_mon-1.6.1 \
|
||||
otp_mibs-1.0 \
|
||||
odbc-2.0 \
|
||||
orber-3.5.1 \
|
||||
os_mon-1.6.2 \
|
||||
otp_mibs-1.0.2 \
|
||||
parsetools-1.2 \
|
||||
pman-2.4.1 \
|
||||
runtime_tools-1.4 \
|
||||
sasl-1.10 \
|
||||
snmp-3.4 \
|
||||
ssl-3.0.1 \
|
||||
stdlib-1.12 \
|
||||
snmp-3.4.7 \
|
||||
ssl-3.0.2 \
|
||||
stdlib-1.12.7 \
|
||||
toolbar-1.1.0 \
|
||||
tools-2.3 \
|
||||
tv-2.0.5 \
|
||||
|
||||
@ -13,8 +13,7 @@ MAN1= epmd.1 \
|
||||
start_webtool.1 \
|
||||
werl.1
|
||||
|
||||
MAN3= CORBA_Environment_alloc.3 \
|
||||
CosEventChannelAdmin.3 \
|
||||
MAN3= CosEventChannelAdmin.3 \
|
||||
CosEventChannelAdmin_ConsumerAdmin.3 \
|
||||
CosEventChannelAdmin_EventChannel.3 \
|
||||
CosEventChannelAdmin_ProxyPullConsumer.3 \
|
||||
@ -179,6 +178,8 @@ MAN3= CORBA_Environment_alloc.3 \
|
||||
httpd_util.3 \
|
||||
i.3 \
|
||||
ic.3 \
|
||||
ic_c_protocol.3 \
|
||||
ic_clib.3 \
|
||||
inet.3 \
|
||||
init.3 \
|
||||
instrument.3 \
|
||||
@ -200,8 +201,10 @@ MAN3= CORBA_Environment_alloc.3 \
|
||||
megaco.3 \
|
||||
megaco_codec_meas.3 \
|
||||
megaco_codec_transform.3 \
|
||||
megaco_encoder.3 \
|
||||
megaco_flex_scanner.3 \
|
||||
megaco_tcp.3 \
|
||||
megaco_transport.3 \
|
||||
megaco_udp.3 \
|
||||
megaco_user.3 \
|
||||
memsup.3 \
|
||||
@ -233,6 +236,7 @@ MAN3= CORBA_Environment_alloc.3 \
|
||||
nteventlog.3 \
|
||||
odbc.3 \
|
||||
orber.3 \
|
||||
orber_diagnostics.3 \
|
||||
orber_ifr.3 \
|
||||
orber_tc.3 \
|
||||
orddict.3 \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
MD5 (erlang/otp_src_R9C-0.tar.gz) = d40842cf79ca65007de5ad54d3c50d18
|
||||
SIZE (erlang/otp_src_R9C-0.tar.gz) = 8229056
|
||||
MD5 (erlang/otp_man_R9C-0.tar.gz) = f94bbaba800cc73e67704b92df5aab60
|
||||
SIZE (erlang/otp_man_R9C-0.tar.gz) = 561329
|
||||
MD5 (erlang/otp_html_R9C-0.tar.gz) = 6885f276d1501fd22a72ae421b4a94e6
|
||||
SIZE (erlang/otp_html_R9C-0.tar.gz) = 4143404
|
||||
MD5 (erlang/otp_src_R9C-1.tar.gz) = 8d69f2db99ba0b4e37b5d7da777468b3
|
||||
SIZE (erlang/otp_src_R9C-1.tar.gz) = 8658000
|
||||
MD5 (erlang/otp_man_R9C-1.tar.gz) = 63e8c5f5856aedc75acec91ceabc915f
|
||||
SIZE (erlang/otp_man_R9C-1.tar.gz) = 570707
|
||||
MD5 (erlang/otp_html_R9C-1.tar.gz) = 6c3bfc06c2e10475683ac652f1ec6f46
|
||||
SIZE (erlang/otp_html_R9C-1.tar.gz) = 4469714
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/debugger/src/dbg_ui_mon.erl.orig Thu Sep 4 22:26:08 2003
|
||||
+++ lib/debugger/src/dbg_ui_mon.erl Thu Sep 4 22:26:51 2003
|
||||
@@ -379,7 +379,7 @@
|
||||
|
||||
%% Help Menu
|
||||
gui_cmd('Debugger', State) ->
|
||||
- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]),
|
||||
+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]),
|
||||
tool_utils:open_help(State#state.gs, HelpFile),
|
||||
State;
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/debugger/src/dbg_ui_trace.erl.orig Thu Sep 4 22:26:12 2003
|
||||
+++ lib/debugger/src/dbg_ui_trace.erl Thu Sep 4 22:26:56 2003
|
||||
@@ -352,7 +352,7 @@
|
||||
|
||||
%% Help menu
|
||||
gui_cmd('Debugger', State) ->
|
||||
- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]),
|
||||
+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]),
|
||||
tool_utils:open_help(State#state.gs, HelpFile),
|
||||
State;
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/debugger/src/dbg_ui_view.erl.orig Thu Sep 4 22:26:16 2003
|
||||
+++ lib/debugger/src/dbg_ui_view.erl Thu Sep 4 22:29:05 2003
|
||||
@@ -165,7 +165,7 @@
|
||||
|
||||
%% Help menu
|
||||
gui_cmd('Debugger', State) ->
|
||||
- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]),
|
||||
+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]),
|
||||
tool_utils:open_help(State#state.gs, HelpFile),
|
||||
State.
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/erl_interface/src/decode/decode_longlong.c.orig Sun Aug 31 14:00:44 2003
|
||||
+++ lib/erl_interface/src/decode/decode_longlong.c Sun Aug 31 14:01:41 2003
|
||||
@@ -51,7 +51,7 @@
|
||||
int pos, shift = 0;
|
||||
n = 0;
|
||||
for (pos = 0; pos < arity; pos++) {
|
||||
- n |= get8(s) << shift;
|
||||
+ n |= ((EI_LONGLONG) get8(s)) << shift;
|
||||
shift += 8;
|
||||
}
|
||||
}
|
||||
@ -1,77 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/stdlib/src/dets_v9.erl.orig Mon Jul 7 14:17:44 2003
|
||||
+++ lib/stdlib/src/dets_v9.erl Fri Dec 26 14:58:33 2003
|
||||
@@ -212,7 +212,6 @@
|
||||
-define(FREELIST_POS, 0).
|
||||
-define(CLOSED_PROPERLY_POS, 8).
|
||||
-define(D_POS, 20).
|
||||
--define(NO_KEYS_POS, (?D_POS + 16)).
|
||||
|
||||
%%% Dets file versions up to 8 are handled in dets_v8. This module
|
||||
%%% handles version 9, introduced in R8.
|
||||
@@ -416,7 +415,7 @@
|
||||
alloc_part(Head, SegZero, PartPos),
|
||||
{NewHead, InitSegment, [SegPointer]} =
|
||||
alloc_seg(Head1, SegZero, SegNo, Part),
|
||||
- {NewHead, InitSegment, [SegPointer, InitArrPart, ArrPartPointer]};
|
||||
+ {NewHead, InitSegment, [InitArrPart, SegPointer, ArrPartPointer]};
|
||||
Part ->
|
||||
alloc_seg(Head, SegZero, SegNo, Part)
|
||||
end.
|
||||
@@ -1222,7 +1221,7 @@
|
||||
%% Note that space for the array parts and the segments has
|
||||
%% already been allocated, but the segments have not been
|
||||
%% initialized on disk.
|
||||
- NoParts = no_parts(Head#head.m),
|
||||
+ NoParts = no_parts(Head#head.next),
|
||||
%% All parts first, ensured by init_segments/6.
|
||||
Addr = ?BASE + NoParts * 4 * ?SEGPARTSZ,
|
||||
{Head, [{?FSCK_SEGMENT,Addr,Data,0} | L]};
|
||||
@@ -1586,7 +1585,11 @@
|
||||
{FLW, FLSize} = free_lists_to_file(H1),
|
||||
FileSize = FreeListsPointer + FLSize + 4,
|
||||
ok = dets_utils:write(H, [FLW | <<FileSize:32>>]),
|
||||
- NoColls = case H1#head.no_collections of
|
||||
+ FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY),
|
||||
+ dets_utils:pwrite(H1, [{0, FileHeader}]).
|
||||
+
|
||||
+file_header(Head, FreeListsPointer, ClosedProperly) ->
|
||||
+ NoColls = case Head#head.no_collections of
|
||||
undefined -> [];
|
||||
NC -> NC
|
||||
end,
|
||||
@@ -1594,8 +1597,7 @@
|
||||
NoColls,
|
||||
lists:map(fun(X) -> {X,0} end, lists:seq(4,?MAXBUD-1))),
|
||||
CW = lists:map(fun({_LSz,N}) -> <<N:32>> end, L),
|
||||
- FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY, CW),
|
||||
- dets_utils:pwrite(H1, [{0, FileHeader}]).
|
||||
+ file_header(Head, FreeListsPointer, ClosedProperly, CW).
|
||||
|
||||
file_header(Head, FreeListsPointer, ClosedProperly, NoColls) ->
|
||||
Cookie = ?MAGIC,
|
||||
@@ -2356,17 +2358,18 @@
|
||||
update_no_keys(Head, Ws, DeltaObjects, DeltaKeys) ->
|
||||
NoKeys = Head#head.no_keys,
|
||||
NewNoKeys = NoKeys + DeltaKeys,
|
||||
+ NewNoObject = Head#head.no_objects + DeltaObjects,
|
||||
+ NewHead = Head#head{no_objects = NewNoObject, no_keys = NewNoKeys},
|
||||
NWs =
|
||||
if
|
||||
- NewNoKeys > Head#head.max_no_slots ->
|
||||
+ NewNoKeys > NewHead#head.max_no_slots ->
|
||||
Ws;
|
||||
NoKeys div ?SEGSZP == NewNoKeys div ?SEGSZP ->
|
||||
Ws;
|
||||
true ->
|
||||
- [{?NO_KEYS_POS, <<NewNoKeys:32>>} | Ws]
|
||||
+ [{0, file_header(NewHead, 0, ?NOT_PROPERLY_CLOSED)} | Ws]
|
||||
end,
|
||||
- NewNoObject = Head#head.no_objects + DeltaObjects,
|
||||
- {Head#head{no_objects = NewNoObject, no_keys = NewNoKeys}, NWs}.
|
||||
+ {NewHead, NWs}.
|
||||
|
||||
slot_position(S) ->
|
||||
SegNo = ?SLOT2SEG(S), % S div ?SEGSZP
|
||||
Loading…
Reference in New Issue
Block a user