- Update to 1.5.4

PR:		213938
Reported by:	yuri@rawbw.com

14 files changed, 61 insertions, 392 deletions

diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index 425ded475b74..1d59f3b6ea94 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wings
-PORTVERSION=	1.4.1
-PORTREVISION=	6
+PORTVERSION=	1.5.4
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 DIST_SUBDIR=	erlang
@@ -17,12 +16,14 @@ LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	erl:lang/erlang \
-		erlang-esdl>0:devel/erlang-esdl
+		erlang-esdl>0:devel/erlang-esdl \
+		erlang-cl>0:devel/erlang-cl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_ENV=	ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl
 PLIST_SUB=	VERSION="${PORTVERSION}"
 MAKE_JOBS_UNSAFE=yes
+USE_GL=		gl glu
 
 SUB_FILES=	${PORTNAME}.sh
 
@@ -40,6 +41,11 @@ DESKTOP_ENTRIES="Wings" \
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(GCC)|${CC} -I${LOCALBASE}/include -L${LOCALBASE}/lib|g' \
 		${WRKSRC}/plugins_src/accel/Makefile
+	@${REINPLACE_CMD} -e 's|random:|rand:|' \
+		${WRKSRC}/src/wings_deform.erl \
+		${WRKSRC}/src/wings_sel_cmd.erl \
+		${WRKSRC}/e3d/e3d_util.erl \
+		${WRKSRC}/plugins_src/autouv/auv_mapping.erl
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 do-install:
diff --git a/graphics/wings/distinfo b/graphics/wings/distinfo
index a107acd2d499..066a65df037b 100644
--- a/graphics/wings/distinfo
+++ b/graphics/wings/distinfo
@@ -1,2 +1,3 @@
-SHA256 (erlang/wings-1.4.1.tar.bz2) = 51aea431e18935e5634ea673caa945f586db2203855554d8dcab5e9545f2789a
-SIZE (erlang/wings-1.4.1.tar.bz2) = 3904369
+TIMESTAMP = 1479231639
+SHA256 (erlang/wings-1.5.4.tar.bz2) = bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663
+SIZE (erlang/wings-1.5.4.tar.bz2) = 6213585
diff --git a/graphics/wings/files/patch-e3d_e3d__qbvh.erl b/graphics/wings/files/patch-e3d_e3d__qbvh.erl
new file mode 100644
index 000000000000..a87d6c64fa3b
--- /dev/null
+++ b/graphics/wings/files/patch-e3d_e3d__qbvh.erl
@@ -0,0 +1,21 @@
+--- e3d/e3d_qbvh.erl.orig	2015-08-06 10:38:19 UTC
++++ e3d/e3d_qbvh.erl
+@@ -40,6 +40,7 @@
+ 
+ -define(F32, 32/float-native).
+ -define(I32, 32/signed-native).
++-define(U32, 32/unsigned-native).
+ -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,
+ convert_to_image(_, <<>>, Acc) -> Acc.
+ 
+ convert_children(4, _W, Qns, Acc) ->  {Qns, Acc};
+-convert_children(J, W, <<16#ffffffff:?I32, Qns/binary>>, Acc) ->  %% EMPTY
+-    convert_children(J+1, W, Qns, <<Acc/binary, 16#ffffffff:?I32>>);
++convert_children(J, W, <<16#ffffffff:?U32, Qns/binary>>, Acc) ->  %% EMPTY
++    convert_children(J+1, W, Qns, <<Acc/binary, 16#ffffffff:?U32>>);
+ convert_children(J, W, <<C0:?I32, Qns/binary>>, Acc) when C0 < 0 -> %% IS_LEAF
+     Count = first_quad(C0) * 10,
+     X = (Count rem W) div 10, %% "div 10" in order to not waste bits
diff --git a/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c b/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c
deleted file mode 100644
index 3260401de900..000000000000
--- a/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- plugins_src/accel/perlin_noise_drv.c.orig
-+++ plugins_src/accel/perlin_noise_drv.c
-@@ -22,6 +22,11 @@
- #include <math.h>
- #include <string.h>
- 
-+#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
-+typedef int ErlDrvSizeT;
-+typedef int ErlDrvSSizeT;
-+#endif
-+
- #define PNOISE3 3
- #define SNOISE1 4
- #define SNOISE2 5
-@@ -57,9 +62,9 @@
-  */
- static ErlDrvData perlin_noise_start(ErlDrvPort port, char *buff);
- static void perlin_noise_stop(ErlDrvData handle);
--static int control(ErlDrvData handle, unsigned int command, 
--                   char* buff, int count, 
--                   char** res, int res_size);
-+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command, 
-+                   char* buff, ErlDrvSizeT count, 
-+                   char** res, ErlDrvSizeT res_size);
- 
- /*
-  * Internal routines
-@@ -82,7 +87,18 @@
-    NULL,                  /* void * that is not used (BC) */
-    control,               /* F_PTR control, port_control callback */
-    NULL,                  /* F_PTR timeout, driver_set_timer callback */
--   NULL                   /* F_PTR outputv, reserved */
-+   NULL,                  /* F_PTR outputv, reserved */
-+   NULL,
-+   NULL,
-+   NULL,
-+   NULL,
-+   ERL_DRV_EXTENDED_MARKER,
-+   ERL_DRV_EXTENDED_MAJOR_VERSION,
-+   ERL_DRV_EXTENDED_MINOR_VERSION,
-+   0,
-+   NULL,
-+   NULL,
-+   NULL
- };
- 
- /*
-@@ -114,9 +130,9 @@
-    
- }
- 
--static int control(ErlDrvData handle, unsigned int command,
--		   char* buff, int count, 
--		   char** res, int res_size)
-+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
-+		   char* buff, ErlDrvSizeT count, 
-+		   char** res, ErlDrvSizeT res_size)
- {
-    ErlDrvBinary* bin;
- 
diff --git a/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c b/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c
deleted file mode 100644
index 906d856520a5..000000000000
--- a/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- plugins_src/accel/wings_pick_drv.c.orig
-+++ plugins_src/accel/wings_pick_drv.c
-@@ -20,14 +20,19 @@
- #endif
- #include <string.h>
- 
-+#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
-+typedef int ErlDrvSizeT;
-+typedef int ErlDrvSSizeT;
-+#endif
-+
- /*
-  * Interface routines.
-  */
- static ErlDrvData wings_file_start(ErlDrvPort port, char *buff);
- static void wings_file_stop(ErlDrvData handle);
--static int control(ErlDrvData handle, unsigned int command,
--                   char* buff, int count,
--                   char** res, int res_size);
-+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
-+                   char* buff, ErlDrvSizeT count,
-+                   char** res, ErlDrvSizeT res_size);
- static void outputv(ErlDrvData drv_data, ErlIOVec* ev);
- 
- /*
-@@ -47,7 +52,18 @@
-     NULL,                  /* void * that is not used (BC) */
-     control,               /* F_PTR control, port_control callback */
-     NULL,                  /* F_PTR timeout, driver_set_timer callback */
--    outputv                /* F_PTR outputv, reserved */
-+    outputv,                /* F_PTR outputv, reserved */
-+    NULL,
-+    NULL,
-+    NULL,
-+    NULL,
-+    ERL_DRV_EXTENDED_MARKER,
-+    ERL_DRV_EXTENDED_MAJOR_VERSION,
-+    ERL_DRV_EXTENDED_MINOR_VERSION,
-+    0,
-+    NULL,
-+    NULL,
-+    NULL
- };
- 
- struct vertex_struct {
-@@ -107,14 +123,14 @@
-  * Handle commands.
-  */
- 
--static int
-+static ErlDrvSSizeT
- control(ErlDrvData handle, unsigned int command,
--        char* buf, int count,
--        char** res, int res_size)
-+        char* buf, ErlDrvSizeT count,
-+        char** res, ErlDrvSizeT res_size)
- {
-   switch (command) {
-   case 0: {			/* Define matrix */
--    memcpy((void *) m, (void *) buf, count);
-+    memcpy((void *) m, (void *) buf, (size_t) count);
- #if 0
-     {
-       int i, j;
diff --git a/graphics/wings/files/patch-plugins__src_import_export_wpc_lwo.erl b/graphics/wings/files/patch-plugins__src_import_export_wpc_lwo.erl
new file mode 100644
index 000000000000..a5ceb54f1eb3
--- /dev/null
+++ b/graphics/wings/files/patch-plugins__src_import_export_wpc_lwo.erl
@@ -0,0 +1,11 @@
+--- plugins_src/import_export/wpc_lwo.erl.orig	2015-08-06 10:38:19 UTC
++++ plugins_src/import_export/wpc_lwo.erl
+@@ -13,7 +13,7 @@
+ 
+ -module(wpc_lwo).
+ -export([init/0, menu/2, command/2, export/1]).
+--include_lib("wings/e3d/e3d.hrl").
++-include_lib("e3d.hrl").
+ 
+ init() ->
+     true.
diff --git a/graphics/wings/files/patch-src_array.erl b/graphics/wings/files/patch-src_array.erl
deleted file mode 100644
index 3bbd5f407944..000000000000
--- a/graphics/wings/files/patch-src_array.erl
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/array.erl.orig	2015-06-24 22:14:48 UTC
-+++ src/array.erl
-@@ -155,7 +155,7 @@
- %% structure and the types of its fields.  So, please make sure that any
- %% changes to its structure are also propagated to erl_types.erl.
- %%
--%% -opaque array() :: #array{}.
-+-opaque array() :: #array{}.
- 
- %%
- %% Types
diff --git a/graphics/wings/files/patch-src_wings.hrl b/graphics/wings/files/patch-src_wings.hrl
deleted file mode 100644
index facba52e9392..000000000000
--- a/graphics/wings/files/patch-src_wings.hrl
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/wings.hrl.orig	2015-06-24 22:08:57 UTC
-+++ src/wings.hrl
-@@ -113,16 +113,16 @@
- %% State and records
- %% Main state record containing all objects and other important state.
- -record(st,
--	{shapes=gb_trees:empty() :: gb_tree(),	%All visible objects
-+	{shapes=gb_trees:empty() :: gb_trees:tree(),	%All visible objects
- 	 selmode=face :: sel_mode(),		%Selection mode.
- 	 sh=false :: boolean(),			%Smart highlighting active.
- 	 sel=[],				%Current sel: [{Id,GbSet}]
--	 ssels=gb_trees:empty() :: gb_tree(),   %Saved selections:
-+	 ssels=gb_trees:empty() :: gb_trees:tree(),   %Saved selections:
- 
- 	 %% Selection only temporary?
- 	 temp_sel=none :: 'none' | {sel_mode(),boolean()},
- 
--	 mat=gb_trees:empty() :: gb_tree(),	%Defined materials (GbTree).
-+	 mat=gb_trees:empty() :: gb_trees:tree(),	%Defined materials (GbTree).
- 	 pal=[],                                %Palette
- 	 file,					%Current filename.
- 	 saved=false :: 'false'  | 'true' | 'auto' | integer(),
-@@ -134,7 +134,7 @@
- 
- 	 edge_loop=none,			%Previous edge loop.
- 	 views={0,{}},				%{Current,TupleOfViews}
--	 pst=gb_trees:empty() :: gb_tree(),     %Plugin State Info
-+	 pst=gb_trees:empty() :: gb_trees:tree(),     %Plugin State Info
- 						%   gb_tree where key is plugin	module 
- 
- 	 %% Previous commands.
-@@ -148,7 +148,7 @@
- 
- 	 %% Undo information.
- 	 last_cmd=empty_scene,		        %Last command.
--	 undo=queue:new() :: queue(),		%Undo (de)queue.
-+	 undo=queue:new() :: queue:queue(),	%Undo (de)queue.
- 	 next_is_undo=true :: boolean(),	%State of undo/redo toggle.
- 	 undone=[] :: list()		        %States that were undone.
- 	}).
-@@ -165,14 +165,14 @@
- 						%  The GbSet contains the
- 						%  object's selection.
- 	 name="" :: string() | tuple(),		%Name. (AutoUV stores other things here.)
--	 es=array:new() :: array(),		%array containing edges
--	 lv=none :: 'none' | array(),	        %Left vertex attributes
--	 rv=none :: 'none' | array(),	        %Right vertex attributes,
--	 fs :: gb_tree(),		        %Faces
--	 he=gb_sets:empty() :: gb_set(),	%Hard edges
--	 vc :: array(),		                %Connection info (=incident edge)
-+	 es=array:new() :: array:array(),		%array containing edges
-+	 lv=none :: 'none' | array:array(),	        %Left vertex attributes
-+	 rv=none :: 'none' | array:array(),	        %Right vertex attributes,
-+	 fs :: gb_trees:tree(),		        %Faces
-+	 he=gb_sets:empty() :: gb_sets:set(),	%Hard edges
-+	 vc :: array:array(),		                %Connection info (=incident edge)
- 						% for vertices.
--	 vp=array:new() :: array(),		%Vertex positions.
-+	 vp=array:new() :: array:array(),		%Vertex positions.
- 	 pst=gb_trees:empty(),                  %Plugin State Info, 
- 						%   gb_tree where key is plugin module
- 	 mat=default,				%Materials.
diff --git a/graphics/wings/files/patch-src_wings____font.erl b/graphics/wings/files/patch-src_wings____font.erl
deleted file mode 100644
index 93d1bf0300dd..000000000000
--- a/graphics/wings/files/patch-src_wings____font.erl
+++ /dev/null
@@ -1,73 +0,0 @@
---- src/wings__font.erl.orig
-+++ src/wings__font.erl
-@@ -11,45 +11,50 @@
- %%     $Id$
- %%
- 
---module(wings__font, [Key,Desc,Width,Height,GlyphTab,Bitmaps]).
---export([key/0,desc/0,width/0,height/0,draw/1,char/1,char_width/1,
--	bold_char/1,bold_char_width/1]).
-+-module(wings__font).
-+-export([new/6,key/1,desc/1,width/1,height/1,draw/2,char/2,char_width/2,
-+	bold_char/2,bold_char_width/2]).
- 
--draw([C|T]) ->
--    char(C),
--    draw(T);
--draw([]) -> ok.
-+-record(font, {key, desc, width, height, glyph_tab, bitmaps}).
- 
--key() -> Key.
--desc() -> Desc.
-+new(Key, Desc, Width, Height, GlyphTab, Bitmaps) ->
-+    #font{key = Key, desc = Desc, width = Width, height = Height, glyph_tab = GlyphTab, bitmaps = Bitmaps}.
- 
--char_width(C) ->
--    element(1, glyph_info(C)).
--width() ->
-+draw(Font, [C|T]) ->
-+    char(Font, C),
-+    draw(Font, T);
-+draw(_Font, []) -> ok.
-+
-+key(#font{key = Key}) -> Key.
-+desc(#font{desc = Desc}) -> Desc.
-+
-+char_width(Font, C) ->
-+    element(1, glyph_info(Font, C)).
-+width(#font{width = Width}) ->
-     insert_glyph(char_width, Width),
-     Width.
--height() ->
-+height(#font{height = Height}) ->
-     insert_glyph(char_height, Height),
-     Height.
- 
--bold_char(C) ->
--    Glyph = glyph_info(C),
-+bold_char(Font, C) ->
-+    Glyph = glyph_info(Font, C),
-     draw_glyph(Glyph),
-     Cw = glyph_width(Glyph),
-     gl:bitmap(1, 1, 0, 0, -Cw+1, 0, <<0>>),
-     draw_glyph(Glyph).
- 
--bold_char_width(C) ->
--    Glyph = glyph_info(C),
-+bold_char_width(Font, C) ->
-+    Glyph = glyph_info(Font, C),
-     glyph_width(Glyph)+1.
- 
--char(C) ->
--    draw_glyph(glyph_info(C)).
-+char(Font, C) ->
-+    draw_glyph(glyph_info(Font, C)).
- 
- draw_glyph({W,H,Xorig,Yorig,Xmove,B}) ->
-     gl:bitmap(W, H, Xorig, Yorig, Xmove, 0, B).
- 
--glyph_info(C) ->
-+glyph_info(#font{glyph_tab = GlyphTab, width = Width, height = Height, bitmaps = Bitmaps}, C) ->
-     BitMap = case ets:lookup(GlyphTab, C) of
- 	[] when is_integer(C), C > 0 ->
- 	    %% Undefined character. Return a filled box.
diff --git a/graphics/wings/files/patch-src_wings__menu.erl b/graphics/wings/files/patch-src_wings__menu.erl
deleted file mode 100644
index 101f834fd4d4..000000000000
--- a/graphics/wings/files/patch-src_wings__menu.erl
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wings_menu.erl.orig	2015-06-24 22:22:23 UTC
-+++ src/wings_menu.erl
-@@ -43,7 +43,7 @@
- 	 sel=none :: 'none'|pos_integer(),	%Selected item (1..tuple_size(Menu))
- 	 sel_side=left :: 'left'|'right',	%Selection on left or right.
- 	 ns=[],					%Name stack.
--	 menu :: tuple(menu_item()),		%Normalized menu.
-+	 menu,					%Normalized menu.
- 	 timer=make_ref(),			%Active submenu timer.
- 	 level=?INITIAL_LEVEL,			%Menu level.
- 	 type :: 'plain'|'popup',	        %Type of menu.
diff --git a/graphics/wings/files/patch-src_wings__sel.erl b/graphics/wings/files/patch-src_wings__sel.erl
deleted file mode 100644
index 1173e3135d9b..000000000000
--- a/graphics/wings/files/patch-src_wings__sel.erl
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wings_sel.erl.orig	2015-06-24 22:25:49 UTC
-+++ src/wings_sel.erl
-@@ -122,7 +122,7 @@ mapfold_1(_F, Acc, [], Shs, _St, ShsAcc)
- -type filter_fun() :: fun((visible_face_num() | edge_num() | vertex_num() | 0,
- 			   #we{}) -> boolean()).
- -spec make(filter_fun(), sel_mode(), #st{}) ->
--    #st{sel::[{non_neg_integer(),gb_set()}]}.
-+    #st{sel::[{non_neg_integer(),gb_sets:set()}]}.
- 
- make(Filter, Mode, #st{shapes=Shapes}=St) when is_function(Filter, 2) ->
-     Sel0 = gb_trees:values(Shapes),
diff --git a/graphics/wings/files/patch-src_wings__text.erl b/graphics/wings/files/patch-src_wings__text.erl
deleted file mode 100644
index 5eb484549f72..000000000000
--- a/graphics/wings/files/patch-src_wings__text.erl
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/wings_text.erl.orig
-+++ src/wings_text.erl
-@@ -65,7 +65,7 @@
- 
- bold_string_width([C|S], W) ->
-     BCW = case wings_font_table:bold_char_width(C) of
--        undefined -> (current_font()):bold_char_width(C);
-+        undefined -> wings__font:bold_char_width(current_font(), C);
-         Other -> Other
-     end,
-     bold_string_width(S, BCW+W);
-@@ -74,19 +74,19 @@
- 
- char_width(C) ->
-     case wings_font_table:char_width(C) of
--        undefined -> (current_font()):char_width(C);
-+        undefined -> wings__font:char_width(current_font(), C);
-         Other -> Other
-     end.
- 
- width() ->
-     case wings_font_table:char(char_width) of
--        undefined -> (current_font()):width();
-+        undefined -> wings__font:width(current_font());
-         Other -> Other
-     end.
- 
- height() ->
-     case wings_font_table:char(char_height) of
--        undefined -> (current_font()):height();
-+        undefined -> wings__font:height(current_font());
-         Other -> Other
-     end.
- 
-@@ -111,13 +111,13 @@
- char(C) when is_atom(C) -> special(C);
- char(C) ->
-     case wings_font_table:char(C) of
--        undefined -> (current_font()):char(C);
-+        undefined -> wings__font:char(current_font(), C);
-         Other -> Other
-     end.
- 
- bold([C|S]) ->
-     case wings_font_table:bold_char(C) of
--        undefined -> (current_font()):bold_char(C);
-+        undefined -> wings__font:bold_char(current_font(), C);
-         Other -> Other
-     end,
-     bold(S);
-@@ -195,7 +195,7 @@
-     CharWidth = wings_text:width([$\s])*2,
-     Line = [$\s,$\s|Line0],
-     string_to_text_box(Tb#tb{text=Text,lw=LW+CharWidth,line=Line});
--    
-+
- string_to_text_box(#tb{text=[{Style,String}=Stylized|Text],lw=Lw, max=Max, line=Line0,res=Res}=Tb0) ->
-     Sw = width([Stylized]),
-     NLW = Lw + Sw,
-@@ -504,8 +504,8 @@
-     {ok,Bin} = file:read_file(FontDir),
-     Font = binary_to_term(Bin),
-     Mod = load_font_1(Font),
--    Key = Mod:key(),
--    Desc = Mod:desc(),
-+    Key = wings__font:key(Mod),
-+    Desc = wings__font:desc(Mod),
-     ets:insert(wings_fonts, {Key,Mod,Desc}).
- 
- load_font_1({wings_font,?wings_version,Font}) ->
diff --git a/graphics/wings/files/patch-src_wings__undo.erl b/graphics/wings/files/patch-src_wings__undo.erl
deleted file mode 100644
index 216a0dccb355..000000000000
--- a/graphics/wings/files/patch-src_wings__undo.erl
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/wings_undo.erl.orig	2015-06-24 22:27:33 UTC
-+++ src/wings_undo.erl
-@@ -30,12 +30,12 @@
- 	 
- %% The essential part of the state record.
- -record(est,
--	{shapes=[] :: list(#we{}) | gb_tree(),
-+	{shapes=[] :: list(#we{}) | gb_trees:tree(),
- 	 selmode=face :: sel_mode(),
- 	 sel=[] :: list(),
- 	 onext=1 :: elem_num(),
- 	 mat=wings_material:default(),
--	 pst=gb_trees:empty() :: gb_tree(),
-+	 pst=gb_trees:empty() :: gb_trees:tree(),
- 
- 	 %% For the Develop menu.
- 	 cmd,
diff --git a/graphics/wings/pkg-plist b/graphics/wings/pkg-plist
index b5094bd8749d..cd2d5d9f7445 100644
--- a/graphics/wings/pkg-plist
+++ b/graphics/wings/pkg-plist
@@ -1,6 +1,5 @@
 bin/wings
 lib/erlang/lib/wings
-lib/erlang/lib/wings-%%VERSION%%/ebin/array.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__bmp.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__meshclean.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__png.beam
@@ -21,14 +20,15 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_tds.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_transform.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_util.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_vec.beam
-lib/erlang/lib/wings-%%VERSION%%/ebin/orig_kd3.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/user_default.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings.beam
-lib/erlang/lib/wings-%%VERSION%%/ebin/wings__font.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_align.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ask.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_body.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_camera.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cc.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cc_ref.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cl.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_collapse.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_color.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_console.beam
@@ -51,7 +51,6 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/wings_facemat.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_ndo.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_wings.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_file.beam
-lib/erlang/lib/wings-%%VERSION%%/ebin/wings_font_table.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_gl.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_help.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_hotkey.beam
@@ -120,6 +119,9 @@ lib/erlang/lib/wings-%%VERSION%%/fonts/6x11.wingsfont
 lib/erlang/lib/wings-%%VERSION%%/fonts/7x14.wingsfont
 lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-12.wingsfont
 lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-16.wingsfont
+lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB14.wingsfont
+lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB16.wingsfont
+lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB24.wingsfont
 lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica11.wingsfont
 lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica14.wingsfont
 lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica20.wingsfont
@@ -181,11 +183,13 @@ lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_plane_cut.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_region.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_rotate_unconstrained.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sculpt.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sel_win.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shear.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shift.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sweep_extrude.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_turnedge.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_untriangulate.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_views_win.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_weld.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/default/README
 lib/erlang/lib/wings-%%VERSION%%/plugins/default/wp9_dialogs.beam
@@ -209,7 +213,7 @@ lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_x.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_yafray.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/README
 lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_bbox.beam
-lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_gear.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_cylinder.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_geodome.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_image.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_knot.beam
@@ -220,6 +224,7 @@ lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_torus.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_tt.beam
 lib/erlang/lib/wings-%%VERSION%%/shaders/brick.fs
 lib/erlang/lib/wings-%%VERSION%%/shaders/brick.vs
+lib/erlang/lib/wings-%%VERSION%%/shaders/cc_subdiv.cl
 lib/erlang/lib/wings-%%VERSION%%/shaders/depth.fs
 lib/erlang/lib/wings-%%VERSION%%/shaders/depth.vs
 lib/erlang/lib/wings-%%VERSION%%/shaders/envmap.fs
@@ -245,16 +250,17 @@ lib/erlang/lib/wings-%%VERSION%%/shaders/vertex_color.vs
 lib/erlang/lib/wings-%%VERSION%%/shaders/xray.fs
 lib/erlang/lib/wings-%%VERSION%%/shaders/xray.vs
 lib/erlang/lib/wings-%%VERSION%%/src/Makefile
-lib/erlang/lib/wings-%%VERSION%%/src/array.erl
 lib/erlang/lib/wings-%%VERSION%%/src/user_default.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings.hrl
 lib/erlang/lib/wings-%%VERSION%%/src/wings.icon
-lib/erlang/lib/wings-%%VERSION%%/src/wings__font.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_align.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_ask.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_body.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_camera.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_cc.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_cc_ref.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_cl.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_collapse.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_color.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_console.erl
@@ -262,6 +268,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_convert
 lib/erlang/lib/wings-%%VERSION%%/src/wings_cs.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_de.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl.bak
 lib/erlang/lib/wings-%%VERSION%%/src/wings_develop.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_dissolve.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_dl.erl
@@ -281,7 +288,6 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_ff_ndo.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_ff_wings.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_fi.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_file.erl
-lib/erlang/lib/wings-%%VERSION%%/src/wings_font_table.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_fr.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_gl.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_help.erl
@@ -294,6 +300,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_io_sdl.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_io_wx.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_it.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_job.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_jp.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_ko.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_lang.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_light.erl
@@ -320,6 +327,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_s.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_scale.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_sel.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl.bak
 lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_conv.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_shaders.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_shape.erl
@@ -351,4 +359,5 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_zh-tw.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wpa.erl
 lib/erlang/lib/wings-%%VERSION%%/textures/brand.png
 lib/erlang/lib/wings-%%VERSION%%/textures/grandcanyon.png
+lib/erlang/lib/wings-%%VERSION%%/textures/ip_helper.png
 share/pixmaps/wings.ico