Re: [Maintainer Update] lang/elixir 1.16.2

2024-04-10 Thread Volker Schlecht 

Ping.

On 2024-03-26 22:07, Volker Schlecht wrote:

Updates lang/elixir to 1.16.2

Tested on amd64, runs elixir-ls, livebook and my own elixir code without a
hitch. net/rabbitmq runs and builds fine.

ok?



Index: Makefile
===
RCS file: /cvs/ports/lang/elixir/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile30 Dec 2023 20:24:39 -  1.70
+++ Makefile26 Mar 2024 21:01:11 -
@@ -1,6 +1,6 @@
COMMENT=functional language for building scalable applications

-V= 1.15.7
+V= 1.16.2
GH_ACCOUNT= elixir-lang
GH_PROJECT= elixir
GH_TAGNAME= v$V
Index: distinfo
===
RCS file: /cvs/ports/lang/elixir/distinfo,v
retrieving revision 1.60
diff -u -p -r1.60 distinfo
--- distinfo30 Dec 2023 20:24:39 -  1.60
+++ distinfo26 Mar 2024 21:01:11 -
@@ -1,2 +1,2 @@
-SHA256 (elixir-1.15.7.tar.gz) = eL3ieGs5VRWuHqp9Jvqn7f3WYyv8/NdbzLY0GhjoeY8=
-SIZE (elixir-1.15.7.tar.gz) = 3151775
+SHA256 (elixir-1.16.2.tar.gz) = 9T0G8+QEHFDmW3UOXVb+ycx8akRRB4aTfGpbsGZqcgc=
+SIZE (elixir-1.16.2.tar.gz) = 3357093
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/elixir/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST
--- pkg/PLIST   6 Aug 2023 16:29:12 -   1.22
+++ pkg/PLIST   26 Mar 2024 21:01:11 -
@@ -161,6 +161,7 @@ lib/elixir/lib/elixir/ebin/Elixir.Macro.
lib/elixir/lib/elixir/ebin/Elixir.Map.beam
lib/elixir/lib/elixir/ebin/Elixir.MapSet.beam
lib/elixir/lib/elixir/ebin/Elixir.MatchError.beam
+lib/elixir/lib/elixir/ebin/Elixir.MismatchedDelimiterError.beam
lib/elixir/lib/elixir/ebin/Elixir.Module.LocalsTracker.beam
lib/elixir/lib/elixir/ebin/Elixir.Module.ParallelChecker.beam
lib/elixir/lib/elixir/ebin/Elixir.Module.Types.Behaviour.beam
@@ -275,6 +276,7 @@ lib/elixir/lib/elixir/ebin/elixir_rewrit
lib/elixir/lib/elixir/ebin/elixir_sup.beam
lib/elixir/lib/elixir/ebin/elixir_tokenizer.beam
lib/elixir/lib/elixir/ebin/elixir_utils.beam
+lib/elixir/lib/elixir/ebin/iex.beam
lib/elixir/lib/ex_unit/
lib/elixir/lib/ex_unit/ebin/
lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.AssertionError.beam

[Maintainer Update] lang/elixir 1.16.2

2024-03-26 Thread Volker Schlecht 

Updates lang/elixir to 1.16.2

Tested on amd64, runs elixir-ls, livebook and my own elixir code without a
hitch. net/rabbitmq runs and builds fine.

ok?
Index: Makefile
===
RCS file: /cvs/ports/lang/elixir/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile30 Dec 2023 20:24:39 -  1.70
+++ Makefile26 Mar 2024 21:01:11 -
@@ -1,6 +1,6 @@
 COMMENT=   functional language for building scalable applications
 
-V= 1.15.7
+V= 1.16.2
 GH_ACCOUNT=elixir-lang
 GH_PROJECT=elixir
 GH_TAGNAME=v$V
Index: distinfo
===
RCS file: /cvs/ports/lang/elixir/distinfo,v
retrieving revision 1.60
diff -u -p -r1.60 distinfo
--- distinfo30 Dec 2023 20:24:39 -  1.60
+++ distinfo26 Mar 2024 21:01:11 -
@@ -1,2 +1,2 @@
-SHA256 (elixir-1.15.7.tar.gz) = eL3ieGs5VRWuHqp9Jvqn7f3WYyv8/NdbzLY0GhjoeY8=
-SIZE (elixir-1.15.7.tar.gz) = 3151775
+SHA256 (elixir-1.16.2.tar.gz) = 9T0G8+QEHFDmW3UOXVb+ycx8akRRB4aTfGpbsGZqcgc=
+SIZE (elixir-1.16.2.tar.gz) = 3357093
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/elixir/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST
--- pkg/PLIST   6 Aug 2023 16:29:12 -   1.22
+++ pkg/PLIST   26 Mar 2024 21:01:11 -
@@ -161,6 +161,7 @@ lib/elixir/lib/elixir/ebin/Elixir.Macro.
 lib/elixir/lib/elixir/ebin/Elixir.Map.beam
 lib/elixir/lib/elixir/ebin/Elixir.MapSet.beam
 lib/elixir/lib/elixir/ebin/Elixir.MatchError.beam
+lib/elixir/lib/elixir/ebin/Elixir.MismatchedDelimiterError.beam
 lib/elixir/lib/elixir/ebin/Elixir.Module.LocalsTracker.beam
 lib/elixir/lib/elixir/ebin/Elixir.Module.ParallelChecker.beam
 lib/elixir/lib/elixir/ebin/Elixir.Module.Types.Behaviour.beam
@@ -275,6 +276,7 @@ lib/elixir/lib/elixir/ebin/elixir_rewrit
 lib/elixir/lib/elixir/ebin/elixir_sup.beam
 lib/elixir/lib/elixir/ebin/elixir_tokenizer.beam
 lib/elixir/lib/elixir/ebin/elixir_utils.beam
+lib/elixir/lib/elixir/ebin/iex.beam
 lib/elixir/lib/ex_unit/
 lib/elixir/lib/ex_unit/ebin/
 lib/elixir/lib/ex_unit/ebin/Elixir.ExUnit.AssertionError.beam

Re: [Maintainer Update] lang/elixir 1.15.7

2023-12-30 Thread openbsd-ports 

Ping

On 12/19/23 19:45, Volker Schlecht wrote:

Ping. I've been running this for a really long time now. It works ...
ok?

On 2023-11-04 19:18, Volker Schlecht wrote:

Ping.
On 2023-10-24 21:03, Volker Schlecht wrote:

Ping.
On Tue Oct 17, 2023 at 12:06 AM CEST, Volker Schlecht wrote:

Updates lang/elixir to the latest maintenance/bugfix release.

Tests pass, my elixir code works, and net/rabbitmq still works on 
amd64.

(With and without the erlang update I just sent.)

ok?

Re: [Maintainer Update] lang/elixir 1.15.7

2023-12-19 Thread Volker Schlecht 
Ping. I've been running this for a really long time now. It works ... 


ok?

On 2023-11-04 19:18, Volker Schlecht wrote:

Ping.
On 2023-10-24 21:03, Volker Schlecht wrote:

Ping.
On Tue Oct 17, 2023 at 12:06 AM CEST, Volker Schlecht wrote:

Updates lang/elixir to the latest maintenance/bugfix release.

Tests pass, my elixir code works, and net/rabbitmq still works on amd64.
(With and without the erlang update I just sent.)

ok?




Index: Makefile
===
RCS file: /cvs/ports/lang/elixir/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile3 Sep 2023 11:55:46 -   1.69
+++ Makefile16 Oct 2023 22:00:22 -
@@ -1,6 +1,6 @@
 COMMENT=   functional language for building scalable applications
 
-V= 1.15.5
+V= 1.15.7
 GH_ACCOUNT=elixir-lang
 GH_PROJECT=elixir
 GH_TAGNAME=v$V
Index: distinfo
===
RCS file: /cvs/ports/lang/elixir/distinfo,v
retrieving revision 1.59
diff -u -p -r1.59 distinfo
--- distinfo3 Sep 2023 11:55:46 -   1.59
+++ distinfo16 Oct 2023 22:00:22 -
@@ -1,2 +1,2 @@
-SHA256 (elixir-1.15.5.tar.gz) = afYgPt7S1bLSRsgHUo+Jaz01IUHJzz4JV2J0jWd8cmA=
-SIZE (elixir-1.15.5.tar.gz) = 3147002
+SHA256 (elixir-1.15.7.tar.gz) = eL3ieGs5VRWuHqp9Jvqn7f3WYyv8/NdbzLY0GhjoeY8=
+SIZE (elixir-1.15.7.tar.gz) = 3151775

Re: [Maintainer Update] lang/elixir 1.15.7

2023-11-04 Thread Volker Schlecht 

Ping.
On 2023-10-24 21:03, Volker Schlecht wrote:

Ping.
On Tue Oct 17, 2023 at 12:06 AM CEST, Volker Schlecht wrote:

Updates lang/elixir to the latest maintenance/bugfix release.

Tests pass, my elixir code works, and net/rabbitmq still works on amd64.
(With and without the erlang update I just sent.)

ok?

Re: [Maintainer Update] lang/elixir 1.15.7

2023-10-24 Thread Volker Schlecht 
Ping.
On Tue Oct 17, 2023 at 12:06 AM CEST, Volker Schlecht wrote:
> Updates lang/elixir to the latest maintenance/bugfix release.
>
> Tests pass, my elixir code works, and net/rabbitmq still works on amd64.
> (With and without the erlang update I just sent.)
>
> ok?

[Maintainer Update] lang/elixir 1.15.7

2023-10-16 Thread Volker Schlecht 
Updates lang/elixir to the latest maintenance/bugfix release.

Tests pass, my elixir code works, and net/rabbitmq still works on amd64.
(With and without the erlang update I just sent.)

ok?
Index: Makefile
===
RCS file: /cvs/ports/lang/elixir/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile	3 Sep 2023 11:55:46 -	1.69
+++ Makefile	16 Oct 2023 22:00:22 -
@@ -1,6 +1,6 @@
 COMMENT=		functional language for building scalable applications
 
-V=			1.15.5
+V=			1.15.7
 GH_ACCOUNT=		elixir-lang
 GH_PROJECT=		elixir
 GH_TAGNAME=		v$V
Index: distinfo
===
RCS file: /cvs/ports/lang/elixir/distinfo,v
retrieving revision 1.59
diff -u -p -r1.59 distinfo
--- distinfo	3 Sep 2023 11:55:46 -	1.59
+++ distinfo	16 Oct 2023 22:00:22 -
@@ -1,2 +1,2 @@
-SHA256 (elixir-1.15.5.tar.gz) = afYgPt7S1bLSRsgHUo+Jaz01IUHJzz4JV2J0jWd8cmA=
-SIZE (elixir-1.15.5.tar.gz) = 3147002
+SHA256 (elixir-1.15.7.tar.gz) = eL3ieGs5VRWuHqp9Jvqn7f3WYyv8/NdbzLY0GhjoeY8=
+SIZE (elixir-1.15.7.tar.gz) = 3151775

[update] lang/elixir 1.15.5

2023-09-01 Thread Volker Schlecht 
Update to lates elixir release.
Drops patch that is now included upstream.

Builds, works and rebuilds net/rabbitmq, which is the only consumer
Index: Makefile
===
RCS file: /cvs/ports/lang/elixir/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile	6 Aug 2023 16:29:08 -	1.68
+++ Makefile	1 Sep 2023 14:58:01 -
@@ -1,6 +1,6 @@
 COMMENT=		functional language for building scalable applications
 
-V=			1.15.4
+V=			1.15.5
 GH_ACCOUNT=		elixir-lang
 GH_PROJECT=		elixir
 GH_TAGNAME=		v$V
Index: distinfo
===
RCS file: /cvs/ports/lang/elixir/distinfo,v
retrieving revision 1.58
diff -u -p -r1.58 distinfo
--- distinfo	6 Aug 2023 16:29:08 -	1.58
+++ distinfo	1 Sep 2023 14:58:01 -
@@ -1,2 +1,2 @@
-SHA256 (elixir-1.15.4.tar.gz) = MCv4Blq3kqiPbDoMAaa7WHN74+T8JWTIr9QYv5eSUBw=
-SIZE (elixir-1.15.4.tar.gz) = 3146690
+SHA256 (elixir-1.15.5.tar.gz) = afYgPt7S1bLSRsgHUo+Jaz01IUHJzz4JV2J0jWd8cmA=
+SIZE (elixir-1.15.5.tar.gz) = 3147002
Index: patches/patch-lib_mix_lib_mix_compilers_elixir_ex
===
RCS file: patches/patch-lib_mix_lib_mix_compilers_elixir_ex
diff -N patches/patch-lib_mix_lib_mix_compilers_elixir_ex
--- patches/patch-lib_mix_lib_mix_compilers_elixir_ex	6 Aug 2023 16:29:10 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Backport https://github.com/elixir-lang/elixir/commit/9b7b7d655d140203044af181842754db7bdbb7ef 
-Index: lib/mix/lib/mix/compilers/elixir.ex
 lib/mix/lib/mix/compilers/elixir.ex.orig
-+++ lib/mix/lib/mix/compilers/elixir.ex
-@@ -454,6 +454,9 @@ defmodule Mix.Compilers.Elixir do
-   8 -> :crypto.hash(:blake2b, contents)
-   _ -> :crypto.hash(:blake2s, contents)
- end
-+  rescue
-+# Blake may not be available on all OpenSSL distribution
-+_ -> :erlang.md5(contents)
-   end
- 
-   defp set_compiler_opts(opts) do

Re: [maintainer update] lang/elixir 1.15.4

2023-08-06 Thread Volker Schlecht 

Ping

On 7/19/23 19:09, Volker Schlecht wrote:

Updates lang/elixir to most recent release 1.15.4

Pulling in one commit from upstream fixing test failures:

https://github.com/elixir-lang/elixir/commit/9b7b7d655d140203044af181842754db7bdbb7ef

This needs to go in *after* net/rabbitmq 3.11.20.

Builds and tests fine on amd64.
I've had all the 1.15.x releases running on OpenBSD without
any issue.

[maintainer update] lang/elixir 1.15.4

2023-07-19 Thread Volker Schlecht 

Updates lang/elixir to most recent release 1.15.4

Pulling in one commit from upstream fixing test failures:

https://github.com/elixir-lang/elixir/commit/9b7b7d655d140203044af181842754db7bdbb7ef

This needs to go in *after* net/rabbitmq 3.11.20.

Builds and tests fine on amd64.
I've had all the 1.15.x releases running on OpenBSD without
any issue.Index: Makefile
===
RCS file: /cvs/ports/lang/elixir/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile	10 Apr 2023 08:57:06 -	1.67
+++ Makefile	19 Jul 2023 16:58:47 -
@@ -1,6 +1,6 @@
 COMMENT=		functional language for building scalable applications
 
-V=			1.14.4
+V=			1.15.4
 GH_ACCOUNT=		elixir-lang
 GH_PROJECT=		elixir
 GH_TAGNAME=		v$V
@@ -31,7 +31,8 @@ CONFIGURE_STYLE=	None
 MAKE_ENV+=		LC_ALL="en_US.UTF-8"
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/bin/elixir
+	${SUBST_CMD} ${WRKSRC}/bin/elixir \
+		${WRKSRC}/Makefile
 
 pre-install:
 	-rm ${WRKSRC}/bin/*{.beforesubst,${PATCHORIG}}
Index: distinfo
===
RCS file: /cvs/ports/lang/elixir/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- distinfo	10 Apr 2023 08:57:06 -	1.57
+++ distinfo	19 Jul 2023 16:58:47 -
@@ -1,2 +1,2 @@
-SHA256 (elixir-1.14.4.tar.gz) = B9Zs8UesrcIb0WefSG79b41kpzhW7Mg8cbXpAwgbRdI=
-SIZE (elixir-1.14.4.tar.gz) = 3076206
+SHA256 (elixir-1.15.4.tar.gz) = MCv4Blq3kqiPbDoMAaa7WHN74+T8JWTIr9QYv5eSUBw=
+SIZE (elixir-1.15.4.tar.gz) = 3146690
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile	19 Jul 2023 16:58:47 -
@@ -0,0 +1,21 @@
+Explicitly start and kill epmd, to avoid lingering instances after tests are
+complete.
+
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -279,12 +279,13 @@ test_elixir: test_stdlib test_ex_unit test_logger test
+ 
+ test_stdlib: compile
+ 	@ echo "==> elixir (ex_unit)"
+-	$(Q) exec epmd & exit
++	$(Q) exec epmd${MODERL_VERSION} & exit
+ 	$(Q) if [ "$(OS)" = "Windows_NT" ]; then \
+ 		cd lib/elixir && cmd //C call ../../bin/elixir.bat --sname primary -r "test/elixir/test_helper.exs" -pr "test/elixir/**/$(TEST_FILES)"; \
+ 	else \
+ 		cd lib/elixir && ../../bin/elixir --sname primary -r "test/elixir/test_helper.exs" -pr "test/elixir/**/$(TEST_FILES)"; \
+ 	fi
++	$(Q) exec epmd${MODERL_VERSION} -kill
+ 
+ #==> Dialyzer tasks
+ 
Index: patches/patch-bin_elixir
===
RCS file: /cvs/ports/lang/elixir/patches/patch-bin_elixir,v
retrieving revision 1.9
diff -u -p -r1.9 patch-bin_elixir
--- patches/patch-bin_elixir	18 Jan 2023 09:33:59 -	1.9
+++ patches/patch-bin_elixir	19 Jul 2023 16:58:47 -
@@ -3,7 +3,7 @@ Detect erlang ERTS directory at runtime.
 Index: bin/elixir
 --- bin/elixir.orig
 +++ bin/elixir
-@@ -226,7 +226,9 @@ fi
+@@ -225,7 +225,9 @@ fi
  
  # One MAY change ERTS_BIN= but you MUST NOT change
  # ERTS_BIN=$ERTS_BIN as it is handled by Elixir releases.
@@ -13,4 +13,4 @@ Index: bin/elixir
 +done
  ERTS_BIN="$ERTS_BIN"
  
- set -- "$ERTS_BIN$ERL_EXEC" -pa "$SCRIPT_PATH"/../lib/*/ebin $ELIXIR_ERL_OPTIONS $ERL "$@"
+ set -- "$ERTS_BIN$ERL_EXEC" -noshell -elixir_root "$SCRIPT_PATH"/../lib -pa "$SCRIPT_PATH"/../lib/elixir/ebin $ELIXIR_ERL_OPTIONS -s elixir start_$MODE $ERL "$@"
Index: patches/patch-lib_mix_lib_mix_compilers_elixir_ex
===
RCS file: patches/patch-lib_mix_lib_mix_compilers_elixir_ex
diff -N patches/patch-lib_mix_lib_mix_compilers_elixir_ex
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-lib_mix_lib_mix_compilers_elixir_ex	19 Jul 2023 16:58:47 -
@@ -0,0 +1,14 @@
+Backport https://github.com/elixir-lang/elixir/commit/9b7b7d655d140203044af181842754db7bdbb7ef 
+Index: lib/mix/lib/mix/compilers/elixir.ex
+--- lib/mix/lib/mix/compilers/elixir.ex.orig
 lib/mix/lib/mix/compilers/elixir.ex
+@@ -454,6 +454,9 @@ defmodule Mix.Compilers.Elixir do
+   8 -> :crypto.hash(:blake2b, contents)
+   _ -> :crypto.hash(:blake2s, contents)
+ end
++  rescue
++# Blake may not be available on all OpenSSL distribution
++_ -> :erlang.md5(contents)
+   end
+ 
+   defp set_compiler_opts(opts) do
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/elixir/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST
--- pkg/PLIST	4 Sep 2022 08:36:45 -	1.21
+++ pkg/PLIST	19 Jul 2023 16:58:47 -
@@ -144,6 +144,7 @@ lib/elixir/lib/elixir/ebin/Elixir.Kernel
 lib/elixir/lib/elixir/ebin/Elixir.Kernel.ParallelRequire.beam
 lib/elixir/lib/elixir/ebin/Elixir.Kernel.SpecialForms.beam
 lib/elixir/lib/elixir/ebin/Elixir.Kernel.Typespec.beam
+lib/elixir/lib/elixir/ebin/Elixir.Kernel.TypespecError.beam

Re: [Maintainer Update] lang/elixir 1.14.4

2023-04-10 Thread Rafael Sadowski 
On Sun Apr 09, 2023 at 05:08:56PM +0200, Volker Schlecht wrote:
> Trivial diff to update elixir to 1.14.4
> 
> * Establishes compatibility with erlang/otp 26
> * Fixes a handful of bugs
> 
> https://github.com/elixir-lang/elixir/releases/tag/v1.14.4
> 
> Change to the port:
> 
> * Explicitly set CONFIGURE_STYLE=None to document that lang/elixir
> doesn't depend on rebar3 (which would be pulled in automatically by
> erlang.port.mk)
> 
> Builds and works fine on amd64, rebuilds net/rabbitmq

Committed, thanks

[Maintainer Update] lang/elixir 1.14.4

2023-04-09 Thread Volker Schlecht 

Trivial diff to update elixir to 1.14.4

* Establishes compatibility with erlang/otp 26
* Fixes a handful of bugs

https://github.com/elixir-lang/elixir/releases/tag/v1.14.4

Change to the port:

* Explicitly set CONFIGURE_STYLE=None to document that lang/elixir
doesn't depend on rebar3 (which would be pulled in automatically by
erlang.port.mk)

Builds and works fine on amd64, rebuilds net/rabbitmqIndex: Makefile
===
RCS file: /cvs/ports/lang/elixir/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile	18 Jan 2023 09:33:59 -	1.66
+++ Makefile	9 Apr 2023 15:01:23 -
@@ -1,6 +1,6 @@
 COMMENT=		functional language for building scalable applications
 
-V=			1.14.3
+V=			1.14.4
 GH_ACCOUNT=		elixir-lang
 GH_PROJECT=		elixir
 GH_TAGNAME=		v$V
@@ -24,6 +24,8 @@ PORTHOME=		${WRKDIR}
 MAKE_FLAGS=		PREFIX="${PREFIX}" \
 			MAN_PREFIX="${PREFIX}/man" \
 			Q=""
+
+CONFIGURE_STYLE=	None
 
 # Needed because otherwise the bootstrapping step complains
 MAKE_ENV+=		LC_ALL="en_US.UTF-8"
Index: distinfo
===
RCS file: /cvs/ports/lang/elixir/distinfo,v
retrieving revision 1.56
diff -u -p -r1.56 distinfo
--- distinfo	18 Jan 2023 09:33:59 -	1.56
+++ distinfo	9 Apr 2023 15:01:23 -
@@ -1,2 +1,2 @@
-SHA256 (elixir-1.14.3.tar.gz) = vUZBRSV/Nr1k97qL7ZO2SZxQVxtBXEkbICZ9J9cDVwc=
-SIZE (elixir-1.14.3.tar.gz) = 3086297
+SHA256 (elixir-1.14.4.tar.gz) = B9Zs8UesrcIb0WefSG79b41kpzhW7Mg8cbXpAwgbRdI=
+SIZE (elixir-1.14.4.tar.gz) = 3076206

Re: [Update] lang/elixir

2023-01-16 Thread Volker Schlecht 

On 1/16/23 19:39, Stuart Henderson wrote:


noticed while testing:

: ===>  Building for elixir-1.14.3
: Can't open /usr/obj/ports/elixir-1.14.3/elixir-1.14.3/rebar.config: No such 
file or directory.

I presume this is unimportant and can be ignored?


That's coming from erlang.port.mk pre-build:

[...]
.  if ! target(pre-build)
pre-build:
  @cp -f ${REBAR_BIN} ${WRKSRC}/rebar
  @perl -pi -e 'BEGIN{undef $$/;} s/{deps,.*?]}.//smg' 
${WRKSRC}/rebar.config

.  endif
.endif
[...]

Elixir doesn't use rebar3 to build, it's just pulled in via 
erlang.port.mk by default, because CONFIGURE_STYLE is empty.


Hence, no rebar.config


Should we add /usr/local/lib/erlang25/bin/epmd to the path for tests
or something, or just ignore this?


epmd is a port mapper daemon used for peer discovery. It's started 
automatically when you invoke 'erl' (see rabbitmq), and there's no epmd 
already running. It doesn't seem to be needed for tests to pass, so I 
wouldn't consider it important here.


On a side note, I've seen that both FreeBSD and Debian install an epmd 
rc script with their erlang packages, to run it system-wide ... I wanted 
to look into that option for the erlang port. Unrelated to lang/elixir, 
but I might send a diff to lang/erlang about that soonish.

Re: [Update] lang/elixir

2023-01-16 Thread Stuart Henderson 
On 2023/01/15 16:48, Volker Schlecht wrote:
> The attached diff modifies an existing patch to lang/elixir to detect
> erlang's erts directory (containing the "erl" binary) at runtime instead of
> hardcoding it to "erl${MODERL_VERSION}".
> 
> This fixes the remaining test failures that occurred because no
> self-contained releases could be built, plus it makes 'mix release' work
> properly on OpenBSD.
> 
> It also contains a trivial update to the latest bugfix release 1.14.3
> 
> Tested on amd64.

noticed while testing:

: ===>  Building for elixir-1.14.3
: Can't open /usr/obj/ports/elixir-1.14.3/elixir-1.14.3/rebar.config: No such 
file or directory.

I presume this is unimportant and can be ignored?

: ===>  Regression tests for elixir-1.14.3

: ==> elixir (eunit)
: erl -I lib/elixir/include -noshell -pa lib/elixir/ebin -pa 
lib/elixir/test/ebin -s test_helper test;
:   All 131 tests passed.
: 
: ==> elixir (ex_unit)
: exec epmd & exit
: /bin/sh: epmd: not found

Should we add /usr/local/lib/erlang25/bin/epmd to the path for tests
or something, or just ignore this?

[Update] lang/elixir

2023-01-15 Thread Volker Schlecht 
The attached diff modifies an existing patch to lang/elixir to detect 
erlang's erts directory (containing the "erl" binary) at runtime instead 
of hardcoding it to "erl${MODERL_VERSION}".


This fixes the remaining test failures that occurred because no 
self-contained releases could be built, plus it makes 'mix release' work 
properly on OpenBSD.


It also contains a trivial update to the latest bugfix release 1.14.3

Tested on amd64.Index: Makefile
===
RCS file: /cvs/ports/lang/elixir/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile	23 Dec 2022 10:14:01 -	1.65
+++ Makefile	15 Jan 2023 15:43:17 -
@@ -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
Index: distinfo
===
RCS file: /cvs/ports/lang/elixir/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo	23 Dec 2022 10:14:01 -	1.55
+++ distinfo	15 Jan 2023 15:43:17 -
@@ -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
Index: patches/patch-bin_elixir
===
RCS file: /cvs/ports/lang/elixir/patches/patch-bin_elixir,v
retrieving revision 1.8
diff -u -p -r1.8 patch-bin_elixir
--- patches/patch-bin_elixir	4 Sep 2022 08:36:44 -	1.8
+++ patches/patch-bin_elixir	15 Jan 2023 15:43:17 -
@@ -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 "$@"

Re: [UPDATE] lang/elixir 1.14.0

2022-09-04 Thread Omar Polo 
On 2022/09/03 15:20:43 +0200, Volker Schlecht  
wrote:
> Updates lang/elixir to 1.14.0
> Tested on amd64, requires a patch to net/rabbitmq to whitelist 1.14.x 
> versions for the build.
> 
> Patch adds myself as maintainer, unless there's any objections, of course.

if my awk-ing is not wrong, make test is also happy with 5467 test
passed and 9 failed.

committed, thanks!

Re: [UPDATE] lang/elixir 1.13.4

2022-07-30 Thread Christoph Roland Winter 

Hello Stuart,

thanks for the fast answer, Yes, then it works.

Regards,


Christoph


Am 30.07.22 um 15:15 schrieb Stuart Henderson:

The erlang.port.mk diff is also required for this one.

--
   Sent from a phone, apologies for poor formatting.


On 30 July 2022 13:02:18 Christoph Roland Winter  wrote:


Hello,

tried the patch using OpenBSD 7.2-beta (GENERIC.MP) #656: Thu Jul 28
10:05:38 MDT 2022, amd64 and Erlang 25.0.3 from ports and got.

Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
===>  Checking files for elixir-1.13.4
Invalid MODERL_VERSION set: 25. (in lang/elixir)

Fetch

https://github.com/elixir-lang/elixir/archive/v1.13.4/elixir-1.13.4.tar.gz

(SHA256) elixir-1.13.4.tar.gz: OK

===> elixir-1.13.4 depends on: rebar-* - not found
===>  Verifying install for rebar-* in devel/rebar
===>  Checking files for rebar-2.6.4p2

Fetch https://github.com/rebar/rebar/archive/2.6.4/rebar-2.6.4.tar.gz
(SHA256) rebar-2.6.4.tar.gz: OK
Broken dependency: lang/erlang/ ends with / (DEPENDS was

lang/erlang/) in devel/rebar
*** Error 1 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2293
'/usr/ports/pobj/rebar-2.6.4/.dep-lang-erlang-': @unset...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/rebar-2.6.4/.extract_done': @cd /usr/p...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2143
'/usr/ports/packages/amd64/all/rebar-2.6.4p2.tgz': @cd ...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2632 '_internal-package':
@case X${_DEPENDS_CACHE} in  X) _D...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'package': @:; cd
/usr/ports/devel/rebar && PKGPATH=dev...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2164
'/var/db/pkg/rebar-2.6.4p2/+CONTENTS': @cd /usr/ports/d...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install':
@lock=rebar-2.6.4p2;  export _LOCKS_HELD=" e...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2293
'/usr/ports/pobj/elixir-1.13.4/.dep-devel-rebar,': @unset
_DEPENDS_TARGET _M...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/elixir-1.13.4/.extract_done': @cd
/usr/ports/lang/elixir &&...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2143
'/usr/ports/packages/amd64/all/elixir-1.13.4.tgz': @cd
/usr/ports/lang/elixi...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2632
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$(
mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2611
'package': @:; cd /usr/ports/lang/elixir && PKGPATH=lang/elixir make
_intern...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2164
'/var/db/pkg/elixir-1.13.4/+CONTENTS': @cd /usr/ports/lang/elixir &&
PKGPATH...)
*** Error 2 in /usr/ports/lang/elixir
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install':
@lock=elixir-1.13.4;  export _LOCKS_HELD=" e...)


Regards,


Christoph


Am 30.07.22 um 10:49 schrieb Volker Schlecht:

Another bump.

On 7/23/22 10:55, Volker Schlecht wrote:

bump

On 7/16/22 11:26, Volker Schlecht wrote:

Updates lang/elixir to 1.13.4
Changes MODERL_VERSION to 25 (erlang21 is now unsupported)
Requires rebar3 >= 3.19.0
Requires the patched lang/erlang/erlang.port.mk

Builds and tests fine on amd64

Re: [UPDATE] lang/elixir 1.13.4

2022-07-30 Thread Stuart Henderson 

The erlang.port.mk diff is also required for this one.

--
 Sent from a phone, apologies for poor formatting.

On 30 July 2022 13:02:18 Christoph Roland Winter  wrote:


Hello,

tried the patch using OpenBSD 7.2-beta (GENERIC.MP) #656: Thu Jul 28
10:05:38 MDT 2022, amd64 and Erlang 25.0.3 from ports and got.

Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
===>  Checking files for elixir-1.13.4
Invalid MODERL_VERSION set: 25. (in lang/elixir)
>> Fetch
https://github.com/elixir-lang/elixir/archive/v1.13.4/elixir-1.13.4.tar.gz
>> (SHA256) elixir-1.13.4.tar.gz: OK
===> elixir-1.13.4 depends on: rebar-* - not found
===>  Verifying install for rebar-* in devel/rebar
===>  Checking files for rebar-2.6.4p2
>> Fetch https://github.com/rebar/rebar/archive/2.6.4/rebar-2.6.4.tar.gz
>> (SHA256) rebar-2.6.4.tar.gz: OK
>> Broken dependency: lang/erlang/ ends with / (DEPENDS was
lang/erlang/) in devel/rebar
*** Error 1 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2293
'/usr/ports/pobj/rebar-2.6.4/.dep-lang-erlang-': @unset...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/rebar-2.6.4/.extract_done': @cd /usr/p...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2143
'/usr/ports/packages/amd64/all/rebar-2.6.4p2.tgz': @cd ...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2632 '_internal-package':
@case X${_DEPENDS_CACHE} in  X) _D...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'package': @:; cd
/usr/ports/devel/rebar && PKGPATH=dev...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2164
'/var/db/pkg/rebar-2.6.4p2/+CONTENTS': @cd /usr/ports/d...)
*** Error 2 in /usr/ports/devel/rebar
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install':
@lock=rebar-2.6.4p2;  export _LOCKS_HELD=" e...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2293
'/usr/ports/pobj/elixir-1.13.4/.dep-devel-rebar,': @unset
_DEPENDS_TARGET _M...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2705
'/usr/ports/pobj/elixir-1.13.4/.extract_done': @cd
/usr/ports/lang/elixir &&...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2143
'/usr/ports/packages/amd64/all/elixir-1.13.4.tgz': @cd
/usr/ports/lang/elixi...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2632
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$(
mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2611
'package': @:; cd /usr/ports/lang/elixir && PKGPATH=lang/elixir make
_intern...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2164
'/var/db/pkg/elixir-1.13.4/+CONTENTS': @cd /usr/ports/lang/elixir &&
PKGPATH...)
*** Error 2 in /usr/ports/lang/elixir
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install':
@lock=elixir-1.13.4;  export _LOCKS_HELD=" e...)


Regards,


Christoph


Am 30.07.22 um 10:49 schrieb Volker Schlecht:

Another bump.

On 7/23/22 10:55, Volker Schlecht wrote:

bump

On 7/16/22 11:26, Volker Schlecht wrote:

Updates lang/elixir to 1.13.4
Changes MODERL_VERSION to 25 (erlang21 is now unsupported)
Requires rebar3 >= 3.19.0
Requires the patched lang/erlang/erlang.port.mk

Builds and tests fine on amd64

Re: [UPDATE] lang/elixir 1.13.4

2022-07-30 Thread Christoph Roland Winter 

Hello,

tried the patch using OpenBSD 7.2-beta (GENERIC.MP) #656: Thu Jul 28 
10:05:38 MDT 2022, amd64 and Erlang 25.0.3 from ports and got.


Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
Invalid MODERL_VERSION set: 25. (in lang/elixir)
===>  Checking files for elixir-1.13.4
Invalid MODERL_VERSION set: 25. (in lang/elixir)
>> Fetch 
https://github.com/elixir-lang/elixir/archive/v1.13.4/elixir-1.13.4.tar.gz

>> (SHA256) elixir-1.13.4.tar.gz: OK
===> elixir-1.13.4 depends on: rebar-* - not found
===>  Verifying install for rebar-* in devel/rebar
===>  Checking files for rebar-2.6.4p2
>> Fetch https://github.com/rebar/rebar/archive/2.6.4/rebar-2.6.4.tar.gz
>> (SHA256) rebar-2.6.4.tar.gz: OK
>> Broken dependency: lang/erlang/ ends with / (DEPENDS was 
lang/erlang/) in devel/rebar
*** Error 1 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2293 
'/usr/ports/pobj/rebar-2.6.4/.dep-lang-erlang-': @unset...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2705 
'/usr/ports/pobj/rebar-2.6.4/.extract_done': @cd /usr/p...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2143 
'/usr/ports/packages/amd64/all/rebar-2.6.4p2.tgz': @cd ...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2632 '_internal-package': 
@case X${_DEPENDS_CACHE} in  X) _D...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'package': @:; cd 
/usr/ports/devel/rebar && PKGPATH=dev...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2164 
'/var/db/pkg/rebar-2.6.4p2/+CONTENTS': @cd /usr/ports/d...)
*** Error 2 in /usr/ports/devel/rebar 
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install': 
@lock=rebar-2.6.4p2;  export _LOCKS_HELD=" e...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2293 
'/usr/ports/pobj/elixir-1.13.4/.dep-devel-rebar,': @unset 
_DEPENDS_TARGET _M...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2705 
'/usr/ports/pobj/elixir-1.13.4/.extract_done': @cd 
/usr/ports/lang/elixir &&...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2143 
'/usr/ports/packages/amd64/all/elixir-1.13.4.tgz': @cd 
/usr/ports/lang/elixi...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2632 
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$( 
mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2611 
'package': @:; cd /usr/ports/lang/elixir && PKGPATH=lang/elixir make 
_intern...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2164 
'/var/db/pkg/elixir-1.13.4/+CONTENTS': @cd /usr/ports/lang/elixir && 
PKGPATH...)
*** Error 2 in /usr/ports/lang/elixir 
(/usr/ports/infrastructure/mk/bsd.port.mk:2611 'install': 
@lock=elixir-1.13.4;  export _LOCKS_HELD=" e...)



Regards,


Christoph


Am 30.07.22 um 10:49 schrieb Volker Schlecht:

Another bump.

On 7/23/22 10:55, Volker Schlecht wrote:

bump

On 7/16/22 11:26, Volker Schlecht wrote:

Updates lang/elixir to 1.13.4
Changes MODERL_VERSION to 25 (erlang21 is now unsupported)
Requires rebar3 >= 3.19.0
Requires the patched lang/erlang/erlang.port.mk

Builds and tests fine on amd64

[update] lang/elixir

2017-09-06 Thread Doug Hogan 
Add FLAVORs for all Erlang releases supported by Elixir: 18, 19 and 20.
Add versioned binaries and directories.
Setup an UTF-8 environment so it doesn't complain and 'make test' runs.


diff --git lang/elixir/Makefile lang/elixir/Makefile
index 
983cbb11abcc760b4fa2f6be6f49b68e0699ecc7..b1fbbc5cd6c942348a6219ac001b0566e3979315
 100644
--- lang/elixir/Makefile
+++ lang/elixir/Makefile
@@ -8,6 +8,7 @@ GH_PROJECT= elixir
 GH_TAGNAME=v$V
 DISTNAME=  ${GH_PROJECT}-$V
 CATEGORIES=lang
+REVISION=  0
 
 HOMEPAGE=  http://elixir-lang.org/
 
@@ -17,15 +18,29 @@ MAINTAINER= Jasper Lievisse Adriaanse 

 PERMIT_PACKAGE_CDROM=  Yes
 
 MODULES=   lang/erlang
-MODERL_VERSION=19
+
+# Elixir 1.5.x works with erlang 18+.
+# These flavors correspond to entries in lang/erlang/erlang.port.mk
+FLAVOR ?=  erlang19
+.if ${FLAVOR:Merlang18} || ${FLAVOR:Merlang19} || ${FLAVOR:Merlang20}
+.else
+ERRORS +=  "Fatal: Invalid FLAVOR set: ${FLAVOR}"
+.endif
 
 ALL_TARGET=# empty
 
 TEST_TARGET=   test
 PORTHOME=  ${WRKDIR}
 
+# Elixir expects a UTF-8 environment.
+MAKE_ENV=  LC_CTYPE="en_US.UTF-8" \
+   LANG="en_US.UTF-8"
+
 MAKE_FLAGS=PREFIX="${PREFIX}" \
-   Q=""
+   Q="" \
+   MODERL_VERSION="${MODERL_VERSION}"
+
+SUBST_VARS+=   MODERL_VERSION
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/bin/elixir
diff --git lang/elixir/patches/patch-Makefile lang/elixir/patches/patch-Makefile
index 
74aaaba5f63b7b32c8802655ab19e79cab008c0e..0a9681efd82be30f9e106b6e53dc5e8c42121533
 100644
--- lang/elixir/patches/patch-Makefile
+++ lang/elixir/patches/patch-Makefile
@@ -1,8 +1,81 @@
 $OpenBSD: patch-Makefile,v 1.1 2017/01/07 13:21:50 jasper Exp $
 Makefile.orig  Sat Jan  7 14:14:00 2017
-+++ Makefile   Sat Jan  7 14:18:37 2017
-@@ -251,9 +251,9 @@ clean_man:
-   rm -f man/iex.1
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -3,8 +3,10 @@ PREFIX ?= /usr/local
+ SHARE_PREFIX ?= $(PREFIX)/share
+ CANONICAL := v1.5/
+ ELIXIRC := bin/elixirc --verbose --ignore-module-conflict
+-ERLC := erlc -I lib/elixir/include
+-ERL := erl -I lib/elixir/include -noshell -pa lib/elixir/ebin
++ERLC := erlc$(MODERL_VERSION) -I lib/elixir/include
++ERL := erl$(MODERL_VERSION) -I lib/elixir/include -noshell -pa lib/elixir/ebin
++EPMD := epmd$(MODERL_VERSION)
++DIALYZER := dialyzer$(MODERL_VERSION)
+ VERSION := $(strip $(shell cat VERSION))
+ Q := @
+ LIBDIR := lib
+@@ -22,7 +24,7 @@ GIT_TAG = $(strip $(shell head="$(call GIT_REVISION)";
+ #==> Functions
+ 
+ define CHECK_ERLANG_RELEASE
+-  $(Q) erl -noshell -eval '{V,_} = 
string:to_integer(erlang:system_info(otp_release)), io:fwrite("~s", 
[is_integer(V) and (V >= 18)])' -s erlang halt | grep -q '^true'; \
++  $(Q) erl$(MODERL_VERSION) -noshell -eval '{V,_} = 
string:to_integer(erlang:system_info(otp_release)), io:fwrite("~s", 
[is_integer(V) and (V >= 18)])' -s erlang halt | grep -q '^true'; \
+   if [ $$? != 0 ]; then \
+ echo "At least Erlang 18.0 is required to build Elixir"; \
+ exit 1; \
+@@ -102,15 +104,15 @@ $(eval $(call APP_TEMPLATE,iex,IEx))
+ install: compile
+   @ echo "==> elixir (install)"
+   $(Q) for dir in lib/*; do \
+-  rm -rf $(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/$$dir/ebin; \
+-  $(INSTALL_DIR) 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/$$dir/ebin"; \
+-  $(INSTALL_DATA) $$dir/ebin/* 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/$$dir/ebin"; \
++  rm -rf 
$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/$$dir/ebin; \
++  $(INSTALL_DIR) 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/$$dir/ebin"; \
++  $(INSTALL_DATA) $$dir/ebin/* 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/$$dir/ebin"; \
+   done
+-  $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin"
+-  $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, 
$(wildcard bin/*))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin"
++  $(Q) $(INSTALL_DIR) 
"$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/bin"
++  $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, 
$(wildcard bin/*))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir$(MODERL_VERSION)/bin"
+   $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(BINDIR)"
+-  $(Q) for file in "$(DESTDIR)$(PREFIX)"/$(LIBDIR)/elixir/bin/*; do \
+-  ln -sf "../$(LIBDIR)/elixir/bin/$${file##*/}" 
"$(DESTDIR)$(PREFIX)/$(BINDIR)/"; \
++  $(Q) for file in 
"$(DESTDIR)$(PREFIX)"/$(LIBDIR)/elixir$(MODERL_VERSION)/bin/*; do \
++  ln -sf "../$(LIBDIR)/elixir$(MODERL_VERSION)/bin/$${file##*/}" 
"$(DESTDIR)$(PREFIX)/$(BINDIR)/$${file##*/}$(MODERL_VERSION)"; \
+   done
+   $(MAKE) install_man
+