Fix some Erlang ports for version 20.0.

4 files changed, 30 insertions, 10 deletions

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)
+ 
+ # ----------------------------------------------------