diff --git a/lang/elixir/Makefile b/lang/elixir/Makefile index 1139f885ede..2f97d867d8d 100644 --- a/lang/elixir/Makefile +++ b/lang/elixir/Makefile @@ -1,6 +1,6 @@ COMMENT= functional language for building scalable applications -V= 1.14.2 +V= 1.14.3 GH_ACCOUNT= elixir-lang GH_PROJECT= elixir GH_TAGNAME= v$V @@ -32,6 +32,6 @@ pre-configure: ${SUBST_CMD} ${WRKSRC}/bin/elixir pre-install: - -rm ${WRKSRC}/bin/*.{beforesubst,orig} + -rm ${WRKSRC}/bin/*{.beforesubst,${PATCHORIG}} .include diff --git a/lang/elixir/distinfo b/lang/elixir/distinfo index 051099f51a3..e68e1981375 100644 --- a/lang/elixir/distinfo +++ b/lang/elixir/distinfo @@ -1,2 +1,2 @@ -SHA256 (elixir-1.14.2.tar.gz) = P3njhHBklXJRGfYJgvoW6oLVEMP76s/G7hp3x5K/FSo= -SIZE (elixir-1.14.2.tar.gz) = 3085613 +SHA256 (elixir-1.14.3.tar.gz) = vUZBRSV/Nr1k97qL7ZO2SZxQVxtBXEkbICZ9J9cDVwc= +SIZE (elixir-1.14.3.tar.gz) = 3086297 diff --git a/lang/elixir/patches/patch-bin_elixir b/lang/elixir/patches/patch-bin_elixir index 0caa25e0ad2..544eb533182 100644 --- a/lang/elixir/patches/patch-bin_elixir +++ b/lang/elixir/patches/patch-bin_elixir @@ -1,12 +1,16 @@ +Detect erlang ERTS directory at runtime. + Index: bin/elixir --- bin/elixir.orig +++ bin/elixir -@@ -92,7 +92,7 @@ starts_with () { - esac - } +@@ -226,7 +226,9 @@ fi --ERL_EXEC="erl" -+ERL_EXEC="erl${MODERL_VERSION}" - MODE="elixir" - I=1 - E=0 + # One MAY change ERTS_BIN= but you MUST NOT change + # ERTS_BIN=$ERTS_BIN as it is handled by Elixir releases. +-ERTS_BIN= ++for obsd_erts in ${LOCALBASE}/lib/erlang${MODERL_VERSION}/erts-*; do ++ ERTS_BIN="$obsd_erts/bin/"; ++done + ERTS_BIN="$ERTS_BIN" + + set -- "$ERTS_BIN$ERL_EXEC" -pa "$SCRIPT_PATH"/../lib/*/ebin $ELIXIR_ERL_OPTIONS $ERL "$@"