<pre style='margin:0'>
ci42 pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/83ce2a0bcec6ed80446e489520e15bc4f18a248d">https://github.com/macports/macports-ports/commit/83ce2a0bcec6ed80446e489520e15bc4f18a248d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 83ce2a0 erlang: update to version 21.0
</span>83ce2a0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 83ce2a0bcec6ed80446e489520e15bc4f18a248d
</span>Author: ci42 <ciserlohn@macports.org>
AuthorDate: Sat Jul 7 23:13:41 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> erlang: update to version 21.0
</span>---
lang/erlang/Portfile | 40 ++++++------
lang/erlang/files/patch-erts_configure.diff | 11 ----
lang/erlang/files/patch-lib_wx_configure.diff | 93 ---------------------------
3 files changed, 20 insertions(+), 124 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/Portfile b/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84ce580..99f1629 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup wxWidgets 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name erlang
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 21.0
</span>
categories lang erlang
maintainers {ciserlohn @ci42}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,24 +41,25 @@ distfiles otp_src_${version}${extract.suffix} \
</span> otp_doc_man_${version}${extract.suffix} \
otp_doc_html_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums otp_src_20.3.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 769c8e98a8e1f55a5e999e90dba154b2a4ebb9bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- otp_doc_man_20.3.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 63780bb536982954386942eadb44474b87c14016 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 17e0b2f94f11576a12526614a906ecad629b8804c25e6c18523f7c4346607112 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- otp_doc_html_20.3.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 224d21e43818fa12b079ecbf10dbf0f3bcfd1957 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8099b62e9fa24b3f90eaeda151fa23ae729c8297e7d3fd8adaca865b35a3125d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-patch { file rename ${workpath}/otp_src_${version} ${workpath}/${name}-${version} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums otp_src_21.0.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6a13f1f49fddeb4bb0d5567ffe31ab232d80855b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 84146631 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otp_doc_man_21.0.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ae8e36273f56b427372e96dd4764fe687bc2e455 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 10bf0e44b97ee8320c4868d5a4259c49d4d2a74e9c48583735ae0401f010fb31 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1311959 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otp_doc_html_21.0.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 80b7299c65783921029d3c6b61e873573244d120 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fcc10885e8bf2eef14f7d6e150c34eeccf3fcf29c19e457b4fb8c203e57e153c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32501093
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir otp_src_${version}
</span>
# http://www.erlang.org/pipermail/erlang-bugs/2009-January/001171.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-erts_emulator_Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-erts_configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-erts_emulator_Makefile.in.diff
</span>
configure.args --prefix=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-kernel-poll \
</span> --enable-threads \
--enable-dynamic-ssl-lib \
--enable-smp-support \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,9 +81,9 @@ post-destroot {
</span> system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_html_${version}${extract.suffix}"
system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_man_${version}${extract.suffix}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set erts_dir erts-9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set erl_interface_dir erl_interface-3.10.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wx_dir wx-1.8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set erts_dir erts-10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set erl_interface_dir erl_interface-3.10.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wx_dir wx-1.8.4
</span>
foreach x {dialyzer ear ecc elink epmd erl erlc escript run_erl start to_erl typer} { file delete -force ${destroot}${prefix}/bin/${x} }
foreach x {dialyzer erl erlc escript run_erl start to_erl typer} { system "ln -s ../lib/erlang/bin/${x} ${destroot}${prefix}/bin/${x}" }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,8 +117,7 @@ platform darwin {
</span> variant wxwidgets description {Build wxWidgets support} {
wxWidgets.use wxWidgets-3.0
patchfiles-delete patch-disable_wx.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-lib_wx_configure.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_wx_configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-lib_wx_configure.in.diff
</span> depends_lib-append port:${wxWidgets.port}
depends_lib-append port:libGLU
configure.args-append --with-wxdir=${wxWidgets.wxdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/files/patch-erts_configure.diff b/lang/erlang/files/patch-erts_configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 73388cb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/files/patch-erts_configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- erts/configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ erts/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35557,7 +35557,7 @@ static __inline__ int check_fpe(double f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <machine/fpu.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !(defined(__OpenBSD__) && defined(__x86_64__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <ucontext.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/ucontext.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/files/patch-lib_wx_configure.diff b/lang/erlang/files/patch-lib_wx_configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 540a4ad..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/files/patch-lib_wx_configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,93 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/wx/configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/wx/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6116,10 +6116,10 @@ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gl/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_OPENGL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6189,10 +6189,10 @@ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gl/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_OPENGL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6262,10 +6262,10 @@ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gl/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_OPENGL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6335,10 +6335,10 @@ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gl/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_OPENGL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6408,10 +6408,10 @@ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gl/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_OPENGL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6481,10 +6481,10 @@ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gl/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_OPENGL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6564,10 +6564,10 @@ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gl/glu.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # include <GL/glu.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_OPENGL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <OpenGL/glu.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif defined(HAVE_GL_GL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include <GL/glu.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef CALLBACK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define CALLBACK
</span></pre><pre style='margin:0'>
</pre>