From 14aa3719ef02a1564534296c7363d303397da4c6 Mon Sep 17 00:00:00 2001 From: Jimmy Olgeni Date: Wed, 22 Dec 2004 15:31:14 +0000 Subject: Upgrade to version r10b2. --- lang/erlang14/Makefile | 27 ++++---- lang/erlang14/Makefile.lib | 67 ++++++++++---------- lang/erlang14/Makefile.man | 47 ++++++++------ lang/erlang14/distinfo | 12 ++-- lang/erlang14/files/patch-Makefile.in | 19 ++---- lang/erlang14/files/patch-aj | 16 +---- .../erlang14/files/patch-erts_emulator_Makefile.in | 13 ---- .../files/patch-lib_crypto_c__src_Makefile.in | 14 +++++ .../files/patch-lib_gs_src_tool__utils.erl | 73 +++++++++++----------- .../files/patch-lib_kernel_src_inet__config.erl | 19 ------ .../files/patch-lib_ssl_src_ssl__broker.erl | 14 ----- .../files/patch-lib_stdlib_src_filelib.erl | 17 ----- lang/erlang14/pkg-message | 2 +- lang/erlang14/pkg-plist | 8 --- 14 files changed, 141 insertions(+), 207 deletions(-) delete mode 100644 lang/erlang14/files/patch-erts_emulator_Makefile.in create mode 100644 lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in delete mode 100644 lang/erlang14/files/patch-lib_kernel_src_inet__config.erl delete mode 100644 lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl delete mode 100644 lang/erlang14/files/patch-lib_stdlib_src_filelib.erl (limited to 'lang/erlang14') diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 56755c414103..156b2f445710 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -6,15 +6,16 @@ # PORTNAME= erlang -PORTVERSION= r9c2 -PORTREVISION= 1 +PORTVERSION= r10b2 PORTEPOCH= 1 CATEGORIES= lang parallel -MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \ +MASTER_SITES= http://www.erlang.org/download/ \ + 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-2 +DISTNAME= otp_src_R10B-2 + DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -30,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_man_R9C-2.tar.gz +ERLANG_MAN= otp_doc_man_R10B-2.tar.gz .if !defined(NOPORTDOCS) -ERLANG_DOCS= otp_html_R9C-2.tar.gz +ERLANG_DOCS= otp_doc_html_R10B-2.tar.gz .endif USE_GMAKE= yes @@ -104,13 +105,13 @@ pre-configure: # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. post-install: - @for SCRIPT in ecc elink ear escript; do \ - ${REINPLACE_CMD} -e "s@ERLANG_EARS=.*@ERLANG_EARS=${LOCALBASE}/lib/erlang/erts-${ERTS_VSN}@" ${LOCALBASE}/bin/$${SCRIPT}; \ - done - - @for SCRIPT in ecc elink; do \ - ${REINPLACE_CMD} -e "s@exec .*beam_evm@exec beam_evm@" ${LOCALBASE}/bin/$${SCRIPT}; \ - done +# @for SCRIPT in ecc elink ear escript; do \ +# ${REINPLACE_CMD} -e "s@ERLANG_EARS=.*@ERLANG_EARS=${LOCALBASE}/lib/erlang/erts-${ERTS_VSN}@" ${LOCALBASE}/bin/$${SCRIPT}; \ +# done + +# @for SCRIPT in ecc elink; do \ +# ${REINPLACE_CMD} -e "s@exec .*beam_evm@exec beam_evm@" ${LOCALBASE}/bin/$${SCRIPT}; \ +# done @${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib index 367bdcd97cc6..3a9e062227a2 100644 --- a/lang/erlang14/Makefile.lib +++ b/lang/erlang14/Makefile.lib @@ -1,43 +1,46 @@ # $FreeBSD$ -ERTS_VSN= 5.3.6.3 -OTP_LIBS= appmon-2.1.2 \ - asn1-1.4.4.2 \ - compiler-4.2.3 \ +ERTS_VSN= 5.4.3 +OTP_LIBS= appmon-2.1.3 \ + asn1-1.4.4.4 \ + compiler-4.3.2 \ cosEvent-2.1 \ cosEventDomain-1.1 \ - cosFileTransfer-1.1 \ + cosFileTransfer-1.1.2 \ cosNotification-1.1.1 \ cosProperty-1.1.1 \ cosTime-1.1 \ cosTransactions-1.2 \ - crypto-1.2 \ - debugger-2.2.2 \ - erl_interface-3.4.5 \ + crypto-1.2.2 \ + debugger-2.3.1 \ + edoc-0.6.1 \ + erl_interface-3.5 \ et-1.0 \ - eva-2.0.4 \ - gs-1.5.2 \ - ic-4.2.6 \ - inets-3.0.7 \ - jinterface-1.2.1.2 \ - kernel-2.9.6.6 \ - megaco-2.1.3 \ + gs-1.5.3 \ + hipe-3.0.1 \ + ic-4.2.7 \ + inets-4.0.1 \ + jinterface-1.3 \ + kernel-2.10.3 \ + megaco-2.1.7 \ mnemosyne-1.2.5 \ - mnesia-4.1.12 \ + mnesia-4.2 \ mnesia_session-1.1.5 \ - observer-0.9.5 \ - 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.8 \ - ssl-3.0.2 \ - stdlib-1.12.8 \ - toolbar-1.1.0 \ - tools-2.3 \ - tv-2.0.5 \ - webtool-0.8.1 + observer-0.9.6 \ + odbc-2.0.2 \ + orber-3.5.3 \ + os_mon-1.7.1 \ + 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 \ + syntax_tools-1.4.1 \ + toolbar-1.2 \ + tools-2.4 \ + tv-2.1.1 \ + webtool-0.8.2 \ + xmerl-1.0 diff --git a/lang/erlang14/Makefile.man b/lang/erlang14/Makefile.man index 5fec01b9bf54..f0af050609c2 100644 --- a/lang/erlang14/Makefile.man +++ b/lang/erlang14/Makefile.man @@ -147,12 +147,6 @@ MAN3= CosEventChannelAdmin.3 \ et_viewer.3 \ etop.3 \ ets.3 \ - eva.3 \ - eva_log.3 \ - eva_log_snmp.3 \ - eva_server.3 \ - eva_snmp_adaptation.3 \ - eva_sup.3 \ file.3 \ file_sorter.3 \ filelib.3 \ @@ -171,6 +165,8 @@ MAN3= CosEventChannelAdmin.3 \ global_group.3 \ gs.3 \ heart.3 \ + http.3 \ + http_base_64.3 \ httpd.3 \ httpd_conf.3 \ httpd_core.3 \ @@ -191,11 +187,7 @@ MAN3= CosEventChannelAdmin.3 \ lists.3 \ lname.3 \ lname_component.3 \ - log.3 \ log_mf_h.3 \ - log_server.3 \ - log_snmp.3 \ - log_snmpea.3 \ make.3 \ math.3 \ megaco.3 \ @@ -243,15 +235,18 @@ MAN3= CosEventChannelAdmin.3 \ ordsets.3 \ os.3 \ os_mon.3 \ + os_mon_mib.3 \ os_sup.3 \ otp_mib.3 \ overload.3 \ + packages.3 \ pg.3 \ pg2.3 \ pman.3 \ pool.3 \ proc_lib.3 \ proplists.3 \ + qlc.3 \ queue.3 \ random.3 \ rb.3 \ @@ -266,22 +261,30 @@ MAN3= CosEventChannelAdmin.3 \ slave.3 \ snmp.3 \ snmp_community_mib.3 \ - snmp_error.3 \ - snmp_error_io.3 \ - snmp_error_report.3 \ snmp_framework_mib.3 \ snmp_generic.3 \ snmp_index.3 \ - snmp_local_db.3 \ - snmp_mgr.3 \ - snmp_mpd.3 \ snmp_notification_mib.3 \ snmp_pdus.3 \ snmp_standard_mib.3 \ - snmp_supervisor.3 \ snmp_target_mib.3 \ snmp_user_based_sm_mib.3 \ snmp_view_based_acm_mib.3 \ + snmpa.3 \ + snmpa_error.3 \ + snmpa_error_io.3 \ + snmpa_error_logger.3 \ + snmpa_error_report.3 \ + snmpa_local_db.3 \ + snmpa_mpd.3 \ + snmpa_network_interface.3 \ + snmpa_notification_filter.3 \ + snmpa_supervisor.3 \ + snmpc.3 \ + snmpm.3 \ + snmpm_mpd.3 \ + snmpm_network_interface.3 \ + snmpm_user.3 \ sofs.3 \ ssl.3 \ ssl_pkix.3 \ @@ -299,9 +302,14 @@ MAN3= CosEventChannelAdmin.3 \ webtool.3 \ win32reg.3 \ wrap_log_reader.3 \ + xmerl.3 \ + xmerl_eventp.3 \ + xmerl_scan.3 \ + xmerl_xpath.3 \ + xmerl_xs.3 \ xref.3 \ yecc.3 - + MAN4= app.4 \ appup.4 \ config.4 \ @@ -310,11 +318,10 @@ MAN4= app.4 \ script.4 MAN6= crypto.6 \ - eva.6 \ - inets.6 \ kernel.6 \ observer.6 \ runtime_tools.6 \ sasl.6 \ snmp.6 \ ssl.6 + diff --git a/lang/erlang14/distinfo b/lang/erlang14/distinfo index bcab375dd165..08b235171fe2 100644 --- a/lang/erlang14/distinfo +++ b/lang/erlang14/distinfo @@ -1,6 +1,6 @@ -MD5 (erlang/otp_src_R9C-2.tar.gz) = 3cdb1c58671995d6b334e0f8da414816 -SIZE (erlang/otp_src_R9C-2.tar.gz) = 8669987 -MD5 (erlang/otp_man_R9C-2.tar.gz) = 08f0459871e5bc08cc1099483f4bcc90 -SIZE (erlang/otp_man_R9C-2.tar.gz) = 572023 -MD5 (erlang/otp_html_R9C-2.tar.gz) = 532554f358059f19ea2ef691d7ee906b -SIZE (erlang/otp_html_R9C-2.tar.gz) = 4497077 +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 diff --git a/lang/erlang14/files/patch-Makefile.in b/lang/erlang14/files/patch-Makefile.in index f3c31acac387..86bb7e10acf2 100644 --- a/lang/erlang14/files/patch-Makefile.in +++ b/lang/erlang14/files/patch-Makefile.in @@ -1,32 +1,21 @@ $FreeBSD$ ---- Makefile.in.orig Fri Dec 19 13:55:58 2003 -+++ Makefile.in Sat Jun 26 20:25:23 2004 -@@ -534,14 +534,20 @@ +--- Makefile.in.orig Tue Sep 14 13:46:54 2004 ++++ Makefile.in Thu Oct 7 14:36:38 2004 +@@ -528,14 +528,9 @@ # Erlang base public files # install.bin: - rm -f $(BINDIR)/erl $(BINDIR)/erlc \ - $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -+ rm -f $(BINDIR)/erl $(BINDIR)/erlc $(BINDIR)/run_erl \ -+ $(BINDIR)/to_erl $(BINDIR)/beam_evm $(BINDIR)/ear \ -+ $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/erlexec \ -+ $(BINDIR)/escript ++ rm -f $(BINDIR)/erl $(BINDIR)/erlc ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc - ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc - ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink - ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear - ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript -+ ${LN_S} $(ERLANG_BINDIR)/run_erl $(BINDIR)/run_erl -+ ${LN_S} $(ERLANG_BINDIR)/to_erl $(BINDIR)/to_erl -+ ${LN_S} $(ERLANG_ERTSBINDIR)/beam_evm $(BINDIR)/beam_evm -+ ${LN_S} $(ERLANG_ERTSBINDIR)/ear $(BINDIR)/ear -+ ${LN_S} $(ERLANG_ERTSBINDIR)/ecc $(BINDIR)/ecc -+ ${LN_S} $(ERLANG_ERTSBINDIR)/elink $(BINDIR)/elink -+ ${LN_S} $(ERLANG_ERTSBINDIR)/erlexec $(BINDIR)/erlexec -+ ${LN_S} $(ERLANG_ERTSBINDIR)/escript $(BINDIR)/escript # # Directories needed before we can install diff --git a/lang/erlang14/files/patch-aj b/lang/erlang14/files/patch-aj index 6b8104ce7904..c3b2f87f73c6 100644 --- a/lang/erlang14/files/patch-aj +++ b/lang/erlang14/files/patch-aj @@ -1,19 +1,9 @@ $FreeBSD$ ---- erts/etc/unix/Install.src.orig Wed Mar 5 17:20:07 2003 -+++ erts/etc/unix/Install.src Wed Mar 5 17:21:04 2003 -@@ -119,7 +119,8 @@ - sed -e "s;%EMU%;%EMULATOR%%EMULATOR_NUMBER%;" $ERL_ROOT/erts-%I_VSN%/bin/start_erl.src > start_erl - chmod 755 start_erl - --if [ -d $ERL_ROOT/lib/sasl* ] -+set $ERL_ROOT/lib/sasl* -+if [ -d $1 ] - then - (cd $ERL_ROOT/releases - echo %I_VSN% %I_SYSTEM_VSN% > start_erl.data) -@@ -193,4 +194,4 @@ +--- 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 diff --git a/lang/erlang14/files/patch-erts_emulator_Makefile.in b/lang/erlang14/files/patch-erts_emulator_Makefile.in deleted file mode 100644 index cae12b839cda..000000000000 --- a/lang/erlang14/files/patch-erts_emulator_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- erts/emulator/Makefile.in.orig Sat Jun 26 13:57:01 2004 -+++ erts/emulator/Makefile.in Sat Jun 26 13:57:39 2004 -@@ -220,6 +220,7 @@ - $(INSTALL_DATA) $(RELEASE_INCLUDES) $(RELSYSDIR)/src - $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE) $(RELSYSDIR)/bin - ifeq ($(ERLANG_OSTYPE), unix) -+ $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE_SAE) $(RELSYSDIR)/bin - $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE_ELIB) $(RELSYSDIR)/bin - $(INSTALL_PROGRAM) $(BINDIR)/$(CS_EXECUTABLE) $(RELSYSDIR)/bin - endif diff --git a/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 000000000000..81e0ce9e83b3 --- /dev/null +++ b/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in @@ -0,0 +1,14 @@ + +$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_gs_src_tool__utils.erl b/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl index 4f4482bc45b1..883ff337892d 100644 --- a/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl +++ b/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl @@ -1,8 +1,8 @@ $FreeBSD$ ---- lib/gs/src/tool_utils.erl.orig Thu Sep 4 23:01:37 2003 -+++ lib/gs/src/tool_utils.erl Fri Sep 5 00:16:20 2003 +--- 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 @@ -27,6 +27,9 @@ -export([file_dialog/1]). -export([notify/2, confirm/2, confirm_yesno/2, request/2]). @@ -13,29 +13,31 @@ $FreeBSD$ %%---------------------------------------------------------------------- %% open_help(GS, File) %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -51,7 +54,7 @@ - local -> - Cmd = case os:type() of +@@ -65,7 +68,8 @@ + local -> + case os:type() of {unix,_AnyType} -> - "netscape -remote \"openURL(file:" ++ File ++ ")\""; + unix_url_command("file:" ++ File); - ++ {win32,_AnyType} -> - "start " ++ filename:nativename(File) -@@ -62,7 +65,7 @@ - remote -> - Cmd = case os:type() of + "start " ++ filename:nativename(File); + +@@ -77,7 +81,7 @@ + remote -> + case os:type() of {unix,_AnyType} -> - "netscape -remote \"openURL(" ++ File ++ ")\""; -+ unix_url_command(File); ++ unix_url_command("file:" ++ File); {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/") -@@ -307,3 +310,54 @@ + "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); +@@ -337,3 +341,54 @@ [Last]; insert_newlines(Other) -> Other. + ++ +%% find_browser(BrowserList) => string() | false +%% BrowserList - [string()] +%% Given a list of basenames, find the first available executable. @@ -61,28 +63,27 @@ $FreeBSD$ + 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; ++ 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 ++ 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_kernel_src_inet__config.erl b/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl deleted file mode 100644 index 362a217ce495..000000000000 --- a/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl +++ /dev/null @@ -1,19 +0,0 @@ - -$FreeBSD$ - ---- lib/kernel/src/inet_config.erl.orig Mon Jul 7 14:06:28 2003 -+++ lib/kernel/src/inet_config.erl Fri Sep 19 14:21:14 2003 -@@ -78,7 +78,12 @@ - error("can't set lookup to native: ~p", [Reason]) - end; - freebsd -> %% we may have to check version (2.2.2) -- load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd); -+ case os:version() of -+ {Major,_,_} when Major >= 5 -> -+ load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf); -+ _ -> -+ load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd) -+ end; - 'bsd/os' -> - load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos); - linux -> diff --git a/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl b/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl deleted file mode 100644 index e91c911ef98d..000000000000 --- a/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/ssl/src/ssl_broker.erl.orig Thu Mar 11 17:58:12 2004 -+++ lib/ssl/src/ssl_broker.erl Thu Mar 11 18:00:07 2004 -@@ -330,6 +330,8 @@ - case gen_tcp:recv(St#st.proxysock, Length, Timeout) of - {ok, Data} -> - {reply, {ok, Data}, St}; -+ {error, timeout} -> -+ {reply, {error, timeout}, St}; - {error, Reason} -> - {reply, {error, Reason}, St#st{status = closing}} - end diff --git a/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl b/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl deleted file mode 100644 index 2b26e8e6c039..000000000000 --- a/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- lib/stdlib/src/filelib.erl.orig Thu Mar 11 21:05:33 2004 -+++ lib/stdlib/src/filelib.erl Thu Mar 11 21:06:40 2004 -@@ -84,7 +84,10 @@ - false -> - fold_files(T, Dir, RegExp, Recursive, Fun, Acc0) - end -- end. -+ end; -+ -+fold_files([], _, _, _, _, Acc) -> -+ Acc. - - last_modified(File) -> - case file:read_file_info(File) of diff --git a/lang/erlang14/pkg-message b/lang/erlang14/pkg-message index 1fd1cd3c4338..1e6e061aeac0 100644 --- a/lang/erlang14/pkg-message +++ b/lang/erlang14/pkg-message @@ -7,7 +7,7 @@ Installation tips: You can find an emacs mode for Erlang here: - ${LOCALBASE}/lib/erlang/lib/tools-2.3/emacs + ${LOCALBASE}/lib/erlang/lib/tools-2.4/emacs You may wish to add the following line to /etc/manpath.config: diff --git a/lang/erlang14/pkg-plist b/lang/erlang14/pkg-plist index 49046c4e9cf0..022066e8e3f7 100644 --- a/lang/erlang14/pkg-plist +++ b/lang/erlang14/pkg-plist @@ -1,14 +1,6 @@ -bin/beam_evm -bin/ear -bin/ecc -bin/elink bin/erl bin/erl_call bin/erlc -bin/erlexec -bin/escript -bin/run_erl -bin/to_erl @comment Insert PLIST.lib-erlang here @comment -=[ begin PLIST.lib-erlang ]=- @comment -=[ end PLIST.lib-erlang ]=- -- cgit v1.2.3