update to erlang 25.1.2 and move some files from wx->main, from Volker Schlect
add @conflict, from me
This commit is contained in:
parent
d6c82065e1
commit
d2090f1985
@ -3,7 +3,7 @@ BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_in
|
||||
COMMENT-main= ${COMMENT}
|
||||
COMMENT-wx= WxWidgets bindings for Erlang
|
||||
|
||||
V= 25.1.1
|
||||
V= 25.1.2
|
||||
PORTROACH= limit:^OTP-25\.
|
||||
DISTNAME= otp_src_$V
|
||||
PKGNAME= erlang-$V
|
||||
@ -79,7 +79,7 @@ INETS_VSN 8.1 \
|
||||
JINTERFACE_VSN 1.13.1 \
|
||||
KERNEL_VSN 8.5.1 \
|
||||
MEGACO_VSN 4.4.1 \
|
||||
MNESIA_VSN 4.21.1 \
|
||||
MNESIA_VSN 4.21.2 \
|
||||
OBSERVER_VSN 2.13 \
|
||||
ODBC_VSN 2.14 \
|
||||
OS_MON_VSN 2.7.1 \
|
||||
@ -97,6 +97,6 @@ TFTP_VSN 1.0.3 \
|
||||
TOOLS_VSN 3.5.3 \
|
||||
WX_VSN 2.2 \
|
||||
XMERL_VSN 1.3.30 \
|
||||
ERTS_VSN 13.1.1
|
||||
ERTS_VSN 13.1.2
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,4 +1,4 @@
|
||||
SHA256 (otp_doc_man_25.1.1.tar.gz) = JFOUXQAIEH8DWgSiS4tB843Sm5aH3KiOaqPnVXnCO3M=
|
||||
SHA256 (otp_src_25.1.1.tar.gz) = QoQMMuE6J72yw3bWmqIkZlE9RBv+XriC3iO6+CGDCNM=
|
||||
SIZE (otp_doc_man_25.1.1.tar.gz) = 1715981
|
||||
SIZE (otp_src_25.1.1.tar.gz) = 103605051
|
||||
SHA256 (otp_doc_man_25.1.2.tar.gz) = IUmbAkGCWGDksfDGrlchNttIBdwaTt8f4fxfiB4RAsk=
|
||||
SHA256 (otp_src_25.1.2.tar.gz) = VELeppTnVV1HnYC8gfFCgCBjnCWPjkCyBScy0cyVzKU=
|
||||
SIZE (otp_doc_man_25.1.2.tar.gz) = 1713415
|
||||
SIZE (otp_src_25.1.2.tar.gz) = 103608131
|
||||
|
@ -1,4 +1,5 @@
|
||||
@option no-default-conflict
|
||||
@conflict erlang-wx->=25,<25.1.2
|
||||
@option is-branch
|
||||
bin/ct_run25
|
||||
bin/dialyzer25
|
||||
@ -1972,6 +1973,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/dbg.beam
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/dyntrace.beam
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/erts_alloc_config.beam
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/msacc.beam
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/observer_backend.beam
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.app
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.appup
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.beam
|
||||
@ -2003,6 +2005,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe-n.systemtap
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe.d
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe.systemtap
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/observer_backend.hrl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/lib/
|
||||
@so lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/lib/dyntrace.so
|
||||
@ -2014,6 +2017,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/dbg.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/dyntrace.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/erts_alloc_config.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/msacc.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/observer_backend.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/runtime_tools.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/runtime_tools_sup.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/scheduler.erl
|
||||
|
@ -172,9 +172,6 @@ lib/${ERLANG_V}/lib/${ERL_OBSERVER}/src/observer_tv_wx.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_OBSERVER}/src/observer_wx.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_OBSERVER}/src/ttb.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_OBSERVER}/src/ttb_et.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/observer_backend.beam
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/observer_backend.hrl
|
||||
lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/observer_backend.erl
|
||||
lib/${ERLANG_V}/lib/${ERL_WX}/
|
||||
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/
|
||||
lib/${ERLANG_V}/lib/${ERL_WX}/ebin/gl.beam
|
||||
|
Loading…
Reference in New Issue
Block a user