Fix some Erlang ports for version 20.0.

19 files changed, 80 insertions, 27 deletions

diff --git a/archivers/erlang-snappy/Makefile b/archivers/erlang-snappy/Makefile
index 7c2870826beb..9f0d5973fc04 100644
--- a/archivers/erlang-snappy/Makefile
+++ b/archivers/erlang-snappy/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	snappy
 PORTVERSION=	1.1.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	archivers
 PKGNAMEPREFIX=	erlang-
 
diff --git a/archivers/erlang-snappy/files/patch-rebar.config b/archivers/erlang-snappy/files/patch-rebar.config
new file mode 100644
index 000000000000..12506851a96c
--- /dev/null
+++ b/archivers/erlang-snappy/files/patch-rebar.config
@@ -0,0 +1,8 @@
+--- rebar.config.orig	2017-06-23 09:04:51 UTC
++++ rebar.config
+@@ -1,4 +1,4 @@
+-{require_otp_vsn, "R13B04|R14|R15|R16|17|18|19"}.
++{require_otp_vsn, "R13B04|R14|R15|R16|17|18|19|20"}.
+ {erl_opts, [debug_info, warn_unused_vars, warn_shadow_vars, warn_unused_import]}.
+ {eunit_opts, [verbose]}.
+ {pre_hooks, [
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 4dac58de08f2..6a3c2cd5b8f6 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	couchdb
 PORTVERSION=	1.6.1
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	2
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${PORTVERSION}
diff --git a/databases/couchdb/files/patch-configure b/databases/couchdb/files/patch-configure
index 399a9d7c6cf2..2e5f7d2f1ba0 100644
--- a/databases/couchdb/files/patch-configure
+++ b/databases/couchdb/files/patch-configure
@@ -5,7 +5,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
  $as_echo_n "checking Erlang version compatibility... " >&6; }
 -erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-8.0)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 20 (erts-9.0)"
  
  version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
  major_version=`echo $version | ${AWK} "{print \\$1}"`
@@ -14,7 +14,7 @@
  echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
  
 -if test $major_version -lt 5 -o $major_version -gt 6; then
-+if test $major_version -lt 5 -o $major_version -gt 8; then
++if test $major_version -lt 5 -o $major_version -gt 9; then
      as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
  fi
  
@@ -23,7 +23,7 @@
  
  
 - if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
-+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)"); then
++ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19|20)"); then
    USE_OTP_NIFS_TRUE=
    USE_OTP_NIFS_FALSE='#'
  else
@@ -32,7 +32,7 @@
  fi
  
 - if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
-+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)"); then
++ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19|20)"); then
    USE_EJSON_COMPARE_NIF_TRUE=
    USE_EJSON_COMPARE_NIF_FALSE='#'
  else
diff --git a/devel/elixir-conform/Makefile b/devel/elixir-conform/Makefile
index aad8df5cf6b0..8356937ed36c 100644
--- a/devel/elixir-conform/Makefile
+++ b/devel/elixir-conform/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	conform
-DISTVERSION=	2.3.3
+DISTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
 
diff --git a/devel/elixir-conform/distinfo b/devel/elixir-conform/distinfo
index 0786ba1d10ed..d94959c97be1 100644
--- a/devel/elixir-conform/distinfo
+++ b/devel/elixir-conform/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495220502
-SHA256 (bitwalker-conform-2.3.3_GH0.tar.gz) = 63a0482ac201beb94dac47c3c242762ce9d7391cb9f8629fbcf45dbf0320200d
-SIZE (bitwalker-conform-2.3.3_GH0.tar.gz) = 2969982
+TIMESTAMP = 1498119949
+SHA256 (bitwalker-conform-2.3.4_GH0.tar.gz) = 1f2a295082240974e51b8b0d1cd9cb1b0d23978dd638d44d650d72ce55fba5bc
+SIZE (bitwalker-conform-2.3.4_GH0.tar.gz) = 2969948
diff --git a/devel/erlang-cuttlefish/Makefile b/devel/erlang-cuttlefish/Makefile
index 6509cfde2425..0fee7ffc3a48 100644
--- a/devel/erlang-cuttlefish/Makefile
+++ b/devel/erlang-cuttlefish/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cuttlefish
 PORTVERSION=	2.0.11
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
diff --git a/devel/erlang-cuttlefish/files/patch-rebar.config b/devel/erlang-cuttlefish/files/patch-rebar.config
index 3628ae390410..ed28ec43f109 100644
--- a/devel/erlang-cuttlefish/files/patch-rebar.config
+++ b/devel/erlang-cuttlefish/files/patch-rebar.config
@@ -1,11 +1,14 @@
---- rebar.config.orig	2017-01-04 20:43:48 UTC
+--- rebar.config.orig	2017-01-04 17:58:38 UTC
 +++ rebar.config
-@@ -1,4 +1,4 @@
+@@ -1,6 +1,6 @@
 -{require_otp_vsn, "R16|17|18"}.
-+{require_otp_vsn, "R16|17|18|19"}.
++{require_otp_vsn, "R16|17|18|19|20"}.
  
- {erl_opts, [warnings_as_errors, {parse_transform, lager_transform}, debug_info, warn_untyped_record]}.
+-{erl_opts, [warnings_as_errors, {parse_transform, lager_transform}, debug_info, warn_untyped_record]}.
++{erl_opts, [{parse_transform, lager_transform}, debug_info, warn_untyped_record]}.
  
+ {eunit_opts, [verbose]}.
+ {cover_enabled, true}.
 @@ -12,12 +12,9 @@
  {xref_queries, [{"(XC - UC) || (XU - X - B - \"(rebar.*|mustache)\" : Mod)", []}]}.
  
diff --git a/devel/erlang-erlware_commons/Makefile b/devel/erlang-erlware_commons/Makefile
index 5f42c860cf8f..847c012d9a5c 100644
--- a/devel/erlang-erlware_commons/Makefile
+++ b/devel/erlang-erlware_commons/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	erlware_commons
 PORTVERSION=	0.22.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
diff --git a/devel/erlang-erlware_commons/files/patch-rebar.config b/devel/erlang-erlware_commons/files/patch-rebar.config
index 41cd9f717fc6..7b135ee1c701 100644
--- a/devel/erlang-erlware_commons/files/patch-rebar.config
+++ b/devel/erlang-erlware_commons/files/patch-rebar.config
@@ -1,4 +1,4 @@
---- rebar.config.orig	2016-12-10 09:13:15 UTC
+--- rebar.config.orig	2016-11-27 19:19:42 UTC
 +++ rebar.config
 @@ -2,7 +2,6 @@
  
@@ -8,3 +8,13 @@
  ]}.
  
  {erl_first_files, ["ec_dictionary", "ec_vsn"]}.
+@@ -14,8 +13,7 @@
+   {platform_define, "^R1[4|5]", deprecated_crypto},
+   {platform_define, "^1[8|9]", rand_module},
+   {platform_define, "^2", rand_module},
+-  debug_info,
+-  warnings_as_errors]}.
++  debug_info]}.
+ 
+ %% EUnit =======================================================================
+ {eunit_opts, [verbose,
diff --git a/devel/erlang-erlware_commons/files/patch-rebar.config.script b/devel/erlang-erlware_commons/files/patch-rebar.config.script
index 414449c31e76..6efbbb8766ee 100644
--- a/devel/erlang-erlware_commons/files/patch-rebar.config.script
+++ b/devel/erlang-erlware_commons/files/patch-rebar.config.script
@@ -1,4 +1,4 @@
---- rebar.config.script.orig	2016-08-02 12:50:27 UTC
+--- rebar.config.script.orig	2016-11-27 19:19:42 UTC
 +++ rebar.config.script
 @@ -7,7 +7,6 @@ IsRebar3 = case application:get_key(reba
             end,
diff --git a/devel/erlang-msgpack/Makefile b/devel/erlang-msgpack/Makefile
index e2faf5e1b06d..169c71d9c006 100644
--- a/devel/erlang-msgpack/Makefile
+++ b/devel/erlang-msgpack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	msgpack
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
diff --git a/devel/erlang-msgpack/files/patch-rebar.config b/devel/erlang-msgpack/files/patch-rebar.config
new file mode 100644
index 000000000000..c8a6a5dbc35a
--- /dev/null
+++ b/devel/erlang-msgpack/files/patch-rebar.config
@@ -0,0 +1,8 @@
+--- rebar.config.orig	2017-06-23 09:06:28 UTC
++++ rebar.config
+@@ -1,4 +1,4 @@
+-{require_otp_vsn, "17|18|19"}.
++{require_otp_vsn, "17|18|19|20"}.
+ 
+ {erl_opts, [fail_on_warning, debug_info, warn_untyped_record]}.
+ %%, {parse_transform, eqc_cover}]}.
diff --git a/devel/erlang-unicode_util_compat/Makefile b/devel/erlang-unicode_util_compat/Makefile
index 4aaeee1b7045..06e36645a359 100644
--- a/devel/erlang-unicode_util_compat/Makefile
+++ b/devel/erlang-unicode_util_compat/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	unicode_util_compat
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
diff --git a/devel/erlang-unicode_util_compat/pkg-plist b/devel/erlang-unicode_util_compat/pkg-plist
index 3bbbb3154924..477395cd5d80 100644
--- a/devel/erlang-unicode_util_compat/pkg-plist
+++ b/devel/erlang-unicode_util_compat/pkg-plist
@@ -1,7 +1,5 @@
-lib/erlang/lib/unicode_util_compat-%%VERSION%%/ebin/unicode_util.beam
 lib/erlang/lib/unicode_util_compat-%%VERSION%%/ebin/unicode_util_compat.app
 lib/erlang/lib/unicode_util_compat-%%VERSION%%/ebin/unicode_util_compat.beam
-lib/erlang/lib/unicode_util_compat-%%VERSION%%/src/unicode_util.erl
 lib/erlang/lib/unicode_util_compat-%%VERSION%%/src/unicode_util_compat.app.src
 lib/erlang/lib/unicode_util_compat-%%VERSION%%/src/unicode_util_compat.erl
 %%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index cc4ea622dac4..2ed59bc1c5e8 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wings
 PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 DIST_SUBDIR=	erlang
@@ -47,7 +47,7 @@ post-patch:
 		${WRKSRC}/src/wings_sel_cmd.erl \
 		${WRKSRC}/e3d/e3d_util.erl \
 		${WRKSRC}/plugins_src/autouv/auv_mapping.erl
-	@${FIND} ${WRKSRC} -name "*.orig" -delete
+#	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "src ebin fonts plugins textures shaders patches" \
diff --git a/graphics/wings/files/patch-e3d_e3d__qbvh.erl b/graphics/wings/files/patch-e3d_e3d__qbvh.erl
index a87d6c64fa3b..f0dfaae0dccd 100644
--- a/graphics/wings/files/patch-e3d_e3d__qbvh.erl
+++ b/graphics/wings/files/patch-e3d_e3d__qbvh.erl
@@ -1,6 +1,15 @@
 --- e3d/e3d_qbvh.erl.orig	2015-08-06 10:38:19 UTC
 +++ e3d/e3d_qbvh.erl
-@@ -40,6 +40,7 @@
+@@ -17,6 +17,8 @@
+ 
+ -module(e3d_qbvh).
+ 
++-compile({no_auto_import,[ceil/1]}).
++
+ -export([init/1, init/2,
+ 	 n_nodes/1, n_quads/1, convert_to_image2d/3
+ 	]).
+@@ -40,6 +42,7 @@
  
  -define(F32, 32/float-native).
  -define(I32, 32/signed-native).
@@ -8,7 +17,7 @@
  -define(QNODE_SZ, ((24+4)*4)).
  -define(QTRI_SZ,  ((12*3+4)*4)).
  
-@@ -118,8 +119,8 @@ convert_to_image(W, <<BBs:(24*4)/binary,
+@@ -118,8 +121,8 @@ convert_to_image(W, <<BBs:(24*4)/binary,
  convert_to_image(_, <<>>, Acc) -> Acc.
  
  convert_children(4, _W, Qns, Acc) ->  {Qns, Acc};
diff --git a/graphics/wings/files/patch-intl__tools_tools.erl b/graphics/wings/files/patch-intl__tools_tools.erl
index 87b449386ed3..98042bb8720a 100644
--- a/graphics/wings/files/patch-intl__tools_tools.erl
+++ b/graphics/wings/files/patch-intl__tools_tools.erl
@@ -1,26 +1,26 @@
---- intl_tools/tools.erl.orig	2016-09-23 14:29:04 UTC
+--- intl_tools/tools.erl.orig	2015-08-06 10:38:19 UTC
 +++ intl_tools/tools.erl
-@@ -244,7 +244,7 @@ get_en_template_1([_|T]) ->
+@@ -261,7 +261,7 @@ get_en_template_1([_|T]) ->
  %%%
  
  -define(STRINGS, wings_lang_transform_strings).
 --define(FUNCTION_NAME, wings_lang_transform_function_name).
-+-define(WINGS_FUNCTION_NAME, wings_lang_transform_function_name).
++-define(T_FUNCTION_NAME, wings_lang_transform_function_name).
  -define(ERRORS, wings_lang_transform_errors).
  -define(FILENAME, wings_lang_transform_filename).
  
-@@ -269,12 +269,12 @@ transform({attribute,_,file,{Filename,_}
+@@ -286,12 +286,12 @@ transform({attribute,_,file,{Filename,_}
      put(?FILENAME, Filename),
      Form;
  transform({function,L,Name,Arity,Cs}) ->
 -    put(?FUNCTION_NAME, Name),
-+    put(?WINGS_FUNCTION_NAME, Name),
++    put(?T_FUNCTION_NAME, Name),
      {function,L,Name,Arity,transform(Cs)};
  transform({call,L,{remote,_,{atom,_,wings_lang},{atom,_,str}}=Rem,
  	   [{tuple,_,[{atom,_,M}=Mod,Key]},
  	    {string,_,S}=Str]}) ->
 -    FunName = get(?FUNCTION_NAME),
-+    FunName = get(?WINGS_FUNCTION_NAME),
++    FunName = get(?T_FUNCTION_NAME),
      K = literal_key(Key),
      add_string({{M,FunName,K},{S,L}}),
      {call,L,Rem,[{tuple,L,[Mod,{atom,L,FunName},Key]},Str]};
diff --git a/graphics/wings/files/patch-src_Makefile b/graphics/wings/files/patch-src_Makefile
new file mode 100644
index 000000000000..48bdad055a3f
--- /dev/null
+++ b/graphics/wings/files/patch-src_Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	2015-08-06 10:38:19 UTC
++++ src/Makefile
+@@ -132,7 +132,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam
+ # ----------------------------------------------------
+ # FLAGS
+ # ----------------------------------------------------
+-ERL_COMPILE_FLAGS += -Werror -I ../e3d $(TYPE_FLAGS) \
++ERL_COMPILE_FLAGS += -I ../e3d $(TYPE_FLAGS) \
+ '-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) $(USE_WX)
+ 
+ # ----------------------------------------------------