Index: head/devel/relx/files/patch-src_rlx__prv__assembler.erl =================================================================== --- head/devel/relx/files/patch-src_rlx__prv__assembler.erl (revision 441681) +++ head/devel/relx/files/patch-src_rlx__prv__assembler.erl (nonexistent) @@ -1,37 +0,0 @@ ---- 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); Property changes on: head/devel/relx/files/patch-src_rlx__prv__assembler.erl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/relx/Makefile =================================================================== --- head/devel/relx/Makefile (revision 441681) +++ head/devel/relx/Makefile (revision 441682) @@ -1,81 +1,80 @@ # $FreeBSD$ PORTNAME= relx -PORTVERSION= 3.22.2 -PORTREVISION= 1 +PORTVERSION= 3.23.0 DISTVERSIONPREFIX= v CATEGORIES= devel MASTER_SITES+= LOCAL/olgeni:deps \ http://olgeni.olgeni.com/~olgeni/distfiles/:deps \ https://s3.amazonaws.com/s3.hex.pm/tarballs/:hex -DISTFILES= relx-cache-13${EXTRACT_SUFX}:deps +DISTFILES= relx-cache-14${EXTRACT_SUFX}:deps EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ - relx-cache-13${EXTRACT_SUFX} + relx-cache-14${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Sane, simple release creation for Erlang LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/bin/erl:lang/erlang \ rebar3>=0:devel/rebar3 RUN_DEPENDS:= ${BUILD_DEPENDS} PLIST_SUB= VERSION="${PORTVERSION}" # Use either erlware or tsloughter, depending on who actually # published the package on hex.pm USE_GITHUB= yes GH_ACCOUNT= erlware REBAR_DEPS= bbmustache-1.0.4 \ cf-0.2.2 \ - erlware_commons-0.22.0 \ + erlware_commons-1.0.0 \ getopt-0.8.2 \ providers-1.6.0 .for _dep in ${REBAR_DEPS} DISTFILES+= ${_dep}.tar:hex .endfor # rebar3 insists on downloading dependencies, and some kind of package # index into the user's HOME. We need to trick it into behaving by # providing both before building. post-extract: .for _dep in ${REBAR_DEPS} @${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//} @${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\ ${TAR} xfz - -C ${WRKSRC}/_build/default/lib/${_dep:C/-.*//} .endfor post-patch: @${REINPLACE_CMD} -i '' -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' \ ${WRKSRC}/src/${PORTNAME}.app.src do-build: @${RM} ${WRKSRC}/rebar.lock @cd ${WRKSRC} && HOME=${WRKDIR} rebar3 compile @${RM} ${WRKSRC}/rebar.lock @cd ${WRKSRC} && HOME=${WRKDIR} rebar3 escriptize post-build: @${LN} -s ${WRKSRC}/_build/dev/lib/${PORTNAME}/ebin ${WRKSRC} do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src ${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include ${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src ${INSTALL_DATA} ${WRKSRC}/_build/default/lib/relx/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv ${INSTALL_SCRIPT} ${WRKSRC}/_build/default/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} .include Index: head/devel/relx/distinfo =================================================================== --- head/devel/relx/distinfo (revision 441681) +++ head/devel/relx/distinfo (revision 441682) @@ -1,15 +1,15 @@ -TIMESTAMP = 1483547960 -SHA256 (relx-cache-13.tar.gz) = 82e76bd84fee5f53902185bc5f32ceaad0dec7f95fe59450a428602250d178a3 -SIZE (relx-cache-13.tar.gz) = 1381975 +TIMESTAMP = 1495717817 +SHA256 (relx-cache-14.tar.gz) = e276a312204b0667b44b5ac939a5f92e2aab7d30888a3ab24e0491195ea901e3 +SIZE (relx-cache-14.tar.gz) = 1904129 SHA256 (bbmustache-1.0.4.tar) = 03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12 SIZE (bbmustache-1.0.4.tar) = 20480 SHA256 (cf-0.2.2.tar) = 48283b3019bc7fad56e7b23028a5da4d3e6cd598a553ab2a99a2153bf5f19b21 SIZE (cf-0.2.2.tar) = 10240 -SHA256 (erlware_commons-0.22.0.tar) = 4ee0dc3dfda1d3cbe368f61b9d4bad8bc2d710f6acdb87168c7c1eba1e1c688a -SIZE (erlware_commons-0.22.0.tar) = 61440 +SHA256 (erlware_commons-1.0.0.tar) = a77f1beb3e4a0501c7b8bf3db646f88a718c0ad822f96679eb348529f3827772 +SIZE (erlware_commons-1.0.0.tar) = 61440 SHA256 (getopt-0.8.2.tar) = 736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7 SIZE (getopt-0.8.2.tar) = 20480 SHA256 (providers-1.6.0.tar) = 0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f SIZE (providers-1.6.0.tar) = 20480 -SHA256 (erlware-relx-v3.22.2_GH0.tar.gz) = 497c5ebf17f3463a27aa77cdcaab55a066ea72c4a9e95e4fbd899c9f4c2ab27f -SIZE (erlware-relx-v3.22.2_GH0.tar.gz) = 111687 +SHA256 (erlware-relx-v3.23.0_GH0.tar.gz) = 605c39be8ddf3276466770171b6835800657fd1e8e9ad28022a63f1abd09e881 +SIZE (erlware-relx-v3.23.0_GH0.tar.gz) = 114342 Index: head/devel/relx/pkg-plist =================================================================== --- head/devel/relx/pkg-plist (revision 441681) +++ head/devel/relx/pkg-plist (revision 441682) @@ -1,65 +1,66 @@ bin/relx lib/erlang/lib/relx-%%VERSION%%/ebin/relx.app lib/erlang/lib/relx-%%VERSION%%/ebin/relx.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_app_discovery.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_app_info.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_cmd_args.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_config.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_depsolver.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_depsolver_culprit.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_dscv_util.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_goal.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_goal_utils.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_prv_app_discover.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_prv_archive.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_prv_assembler.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_prv_overlay.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_prv_rel_discover.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_prv_release.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_prv_relup.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_rel_discovery.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_release.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_state.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_topo.beam lib/erlang/lib/relx-%%VERSION%%/ebin/rlx_util.beam lib/erlang/lib/relx-%%VERSION%%/include/relx.hrl lib/erlang/lib/relx-%%VERSION%%/priv/templates/bin lib/erlang/lib/relx-%%VERSION%%/priv/templates/bin_windows lib/erlang/lib/relx-%%VERSION%%/priv/templates/builtin_hook_pid +lib/erlang/lib/relx-%%VERSION%%/priv/templates/builtin_hook_status lib/erlang/lib/relx-%%VERSION%%/priv/templates/builtin_hook_wait_for_process lib/erlang/lib/relx-%%VERSION%%/priv/templates/builtin_hook_wait_for_vm_start lib/erlang/lib/relx-%%VERSION%%/priv/templates/erl_ini lib/erlang/lib/relx-%%VERSION%%/priv/templates/erl_script lib/erlang/lib/relx-%%VERSION%%/priv/templates/extended_bin lib/erlang/lib/relx-%%VERSION%%/priv/templates/extended_bin_windows lib/erlang/lib/relx-%%VERSION%%/priv/templates/install_upgrade_escript lib/erlang/lib/relx-%%VERSION%%/priv/templates/nodetool lib/erlang/lib/relx-%%VERSION%%/priv/templates/sys_config lib/erlang/lib/relx-%%VERSION%%/priv/templates/vm_args lib/erlang/lib/relx-%%VERSION%%/src/relx.app.src lib/erlang/lib/relx-%%VERSION%%/src/relx.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_app_discovery.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_app_info.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_cmd_args.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_config.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_depsolver.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_depsolver_culprit.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_dscv_util.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_goal.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_goal.peg lib/erlang/lib/relx-%%VERSION%%/src/rlx_goal_utils.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_prv_app_discover.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_prv_archive.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_prv_assembler.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_prv_overlay.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_prv_rel_discover.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_prv_release.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_prv_relup.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_rel_discovery.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_release.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_state.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_topo.erl lib/erlang/lib/relx-%%VERSION%%/src/rlx_util.erl %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/relx.config %%PORTEXAMPLES%%%%EXAMPLESDIR%%/relx_simple.config