From owner-svn-ports-head@freebsd.org Sat Feb 11 15:57:08 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7854BCDB2CD; Sat, 11 Feb 2017 15:57:08 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B43F969; Sat, 11 Feb 2017 15:57:08 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1BFv7I3042415; Sat, 11 Feb 2017 15:57:07 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1BFv7CM042413; Sat, 11 Feb 2017 15:57:07 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201702111557.v1BFv7CM042413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Sat, 11 Feb 2017 15:57:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433885 - in head/devel/relx: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2017 15:57:08 -0000 Author: olgeni Date: Sat Feb 11 15:57:06 2017 New Revision: 433885 URL: https://svnweb.freebsd.org/changeset/ports/433885 Log: devel/relx: fix usage of {include_erts,true} (GitHub pull request #565). Added: head/devel/relx/files/ head/devel/relx/files/patch-src_rlx__prv__assembler.erl (contents, props changed) Modified: head/devel/relx/Makefile Modified: head/devel/relx/Makefile ============================================================================== --- head/devel/relx/Makefile Sat Feb 11 15:43:56 2017 (r433884) +++ head/devel/relx/Makefile Sat Feb 11 15:57:06 2017 (r433885) @@ -2,6 +2,7 @@ PORTNAME= relx PORTVERSION= 3.22.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel MASTER_SITES+= LOCAL/olgeni:deps \ Added: head/devel/relx/files/patch-src_rlx__prv__assembler.erl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/relx/files/patch-src_rlx__prv__assembler.erl Sat Feb 11 15:57:06 2017 (r433885) @@ -0,0 +1,37 @@ +--- src/rlx_prv_assembler.erl.orig 2016-12-27 16:21:42 UTC ++++ src/rlx_prv_assembler.erl +@@ -121,7 +121,10 @@ format_error({start_clean_script_generat + rlx_util:indent(2), Module:format_error(Errors)]; + format_error({strip_release, Reason}) -> + io_lib:format("Stripping debug info from release beam files failed becuase ~s", +- [beam_lib:format_error(Reason)]). ++ [beam_lib:format_error(Reason)]); ++format_error({rewrite_app_file, AppFile, Error}) -> ++ io_lib:format("Unable to rewrite .app file ~s due to ~p", ++ [AppFile, Error]). + + %%%=================================================================== + %%% Internal Functions +@@ -255,13 +258,16 @@ rewrite_app_file(State, App, TargetDir) + ,AppData2 + ,{modules, OldModules -- ExcludedModules}) + end, +- Spec = io_lib:format("~p.\n", [{application, AppName, AppData3}]), +- write_file_if_contents_differ(AppFile, Spec). ++ Spec = [{application, AppName, AppData3}], ++ case write_file_if_contents_differ(AppFile, Spec) of ++ ok -> ok; ++ Error -> ?RLX_ERROR({rewrite_app_file, AppFile, Error}) ++ end. + +-write_file_if_contents_differ(Filename, Bytes) -> +- ToWrite = iolist_to_binary(Bytes), +- case file:read_file(Filename) of +- {ok, ToWrite} -> ++write_file_if_contents_differ(Filename, Spec) -> ++ ToWrite = io_lib:format("~p.\n", Spec), ++ case file:consult(Filename) of ++ {ok, Spec} -> + ok; + {ok, _} -> + file:write_file(Filename, ToWrite);