8 files changed, 48 insertions, 14 deletions

diff --git a/graphics/wings-devel/Makefile b/graphics/wings-devel/Makefile
index 8a07dd76a5ef..36cbefd486b5 100644
--- a/graphics/wings-devel/Makefile
+++ b/graphics/wings-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wings
-PORTVERSION=	0.98.20c
+PORTVERSION=	0.98.26b
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wings
diff --git a/graphics/wings-devel/distinfo b/graphics/wings-devel/distinfo
index 186265ded650..a6d46df8780e 100644
--- a/graphics/wings-devel/distinfo
+++ b/graphics/wings-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (erlang/wings-0.98.20c.tar.bz2) = cd7a10059850e8653baff78e95eaf6d1
-SIZE (erlang/wings-0.98.20c.tar.bz2) = 552459
+MD5 (erlang/wings-0.98.26b.tar.bz2) = bb5477d2c82ed3f31207bd8d354d35bc
+SIZE (erlang/wings-0.98.26b.tar.bz2) = 738488
diff --git a/graphics/wings-devel/files/patch-plugins__src_accel_Makefile b/graphics/wings-devel/files/patch-plugins__src_accel_Makefile
new file mode 100644
index 000000000000..bc863004331b
--- /dev/null
+++ b/graphics/wings-devel/files/patch-plugins__src_accel_Makefile
@@ -0,0 +1,11 @@
+--- plugins_src/accel/Makefile.orig	Wed Jan  5 00:51:37 2005
++++ plugins_src/accel/Makefile	        Wed Jan  5 00:57:55 2005
+@@ -58,7 +58,7 @@
+ else
+ $(LIBDIR)/wings_ogla_drv.so: wings_ogla_drv.c
+ 	install -d $(LIBDIR)
+-	gcc -o $(LIBDIR)/wings_ogla_drv.so -I$(ERL_INC) \
++	gcc -o $(LIBDIR)/wings_ogla_drv.so -I$(ERL_INC) -I/usr/X11R6/include -L/usr/X11R6/lib \
+   wings_ogla_drv.c $(LIBS) $(GL_LIBS)
+ endif
+ 
diff --git a/graphics/wings-devel/files/patch-plugins__src_autouv_Makefile b/graphics/wings-devel/files/patch-plugins__src_autouv_Makefile
index 8fcf2948f107..daa03c71eee4 100644
--- a/graphics/wings-devel/files/patch-plugins__src_autouv_Makefile
+++ b/graphics/wings-devel/files/patch-plugins__src_autouv_Makefile
@@ -3,10 +3,10 @@ $FreeBSD$
 
 --- plugins_src/autouv/Makefile.orig	Fri May 30 12:57:57 2003
 +++ plugins_src/autouv/Makefile	Fri May 30 12:58:51 2003
-@@ -41,7 +41,7 @@
+@@ -45,7 +45,7 @@
  # FLAGS
  # ----------------------------------------------------
- ERL_FLAGS += -I $(WINGS_SRC) -I $(WINGS_E3D) -pa $(ESDL_PATH)/ebin
+ ERL_FLAGS += -pa $(WINGS_EBIN) -I $(WINGS_SRC) -I $(WINGS_E3D) -pa $(ESDL_PATH)/ebin
 -ERL_COMPILE_FLAGS += -W $(TYPE_FLAGS) +warn_unused_vars +debug_info
 +ERL_COMPILE_FLAGS += -W $(TYPE_FLAGS) +debug_info
  
diff --git a/graphics/wings-devel/files/patch-plugins__src_commands_Makefile b/graphics/wings-devel/files/patch-plugins__src_commands_Makefile
index 52dd7c1c3fef..fc12458c92db 100644
--- a/graphics/wings-devel/files/patch-plugins__src_commands_Makefile
+++ b/graphics/wings-devel/files/patch-plugins__src_commands_Makefile
@@ -3,10 +3,10 @@ $FreeBSD$
 
 --- plugins_src/commands/Makefile.orig	Fri May 30 12:58:01 2003
 +++ plugins_src/commands/Makefile	Fri May 30 12:58:59 2003
-@@ -38,7 +38,7 @@
+@@ -41,7 +41,7 @@
  # FLAGS
  # ----------------------------------------------------
- ERL_FLAGS += -I $(WINGS_SRC) -I $(WINGS_E3D) -pa $(ESDL_PATH)/ebin
+ ERL_FLAGS += -pa $(WINGS_EBIN) -I $(WINGS_SRC) -I $(WINGS_E3D) -pa $(ESDL_PATH)/ebin
 -ERL_COMPILE_FLAGS += -W $(TYPE_FLAGS) +warn_unused_vars +debug_info
 +ERL_COMPILE_FLAGS += -W $(TYPE_FLAGS) +debug_info
  
diff --git a/graphics/wings-devel/files/patch-plugins__src_fonts_Makefile b/graphics/wings-devel/files/patch-plugins__src_fonts_Makefile
index cb554e1046e2..17dbf497eb8f 100644
--- a/graphics/wings-devel/files/patch-plugins__src_fonts_Makefile
+++ b/graphics/wings-devel/files/patch-plugins__src_fonts_Makefile
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- plugins_src/fonts/Makefile.orig	Fri May 30 12:58:06 2003
 +++ plugins_src/fonts/Makefile	Fri May 30 12:59:02 2003
-@@ -37,7 +37,7 @@
+@@ -39,7 +39,7 @@
  # FLAGS
  # ----------------------------------------------------
  ERL_FLAGS += -I $(WINGS_SRC) -I $(WINGS_E3D) -pa $(ESDL)/ebin
diff --git a/graphics/wings-devel/files/patch-plugins__src_import__export_Makefile b/graphics/wings-devel/files/patch-plugins__src_import__export_Makefile
index ba79544c2db9..0049f21725cd 100644
--- a/graphics/wings-devel/files/patch-plugins__src_import__export_Makefile
+++ b/graphics/wings-devel/files/patch-plugins__src_import__export_Makefile
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- plugins_src/import_export/Makefile.orig	Fri May 30 12:58:09 2003
 +++ plugins_src/import_export/Makefile	Fri May 30 12:59:06 2003
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  # FLAGS
  # ----------------------------------------------------
- ERL_FLAGS += -I $(WINGS_SRC) -I $(WINGS_E3D) -I $(ESDL_PATH)/include
+ ERL_FLAGS += -pa $(WINGS_EBIN) -I $(WINGS_SRC) -I $(WINGS_E3D) -I $(ESDL_PATH)/include
 -ERL_COMPILE_FLAGS += -W $(TYPE_FLAGS) -pa $(ESDL_PATH)/ebin +warn_unused_vars +debug_info
 +ERL_COMPILE_FLAGS += -W $(TYPE_FLAGS) -pa $(ESDL_PATH)/ebin +debug_info
- 
+
  # ----------------------------------------------------
  # Targets
diff --git a/graphics/wings-devel/pkg-plist b/graphics/wings-devel/pkg-plist
index 087c43d82cb0..12c67fedefeb 100644
--- a/graphics/wings-devel/pkg-plist
+++ b/graphics/wings-devel/pkg-plist
@@ -23,7 +23,9 @@ 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_collapse.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_color.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_console.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_deform.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_dl.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_drag.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_draw.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_draw_util.beam
@@ -44,6 +46,7 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/wings_image.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_import.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_init.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_io.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_lang.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_light.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_magnet.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_material.beam
@@ -51,11 +54,14 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/wings_menu.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_menu_util.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_move.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_outliner.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_palette.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_pb.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_pick.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_plugin.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_pref.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_render.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_rotate.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_s.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_scale.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_sel.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_sel_cmd.beam
@@ -65,6 +71,7 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/wings_start.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_subdiv.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_tesselation.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_text.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_toolbar.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_undo.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_util.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_vec.beam
@@ -75,10 +82,11 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/wings_we.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_wm.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wings_wm_toplevel.beam
 lib/erlang/lib/wings-%%VERSION%%/ebin/wpa.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/accel/wings_ogla_drv.so
+lib/erlang/lib/wings-%%VERSION%%/plugins/accel/wpc_ogla.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/README
 lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/auv_mapping.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/auv_matrix.beam
-lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/auv_pick.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/auv_placement.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/auv_seg_ui.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/auv_segment.beam
@@ -87,6 +95,9 @@ lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/auv_util.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/wpc_autouv.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/wpc_snap.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/README
+lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_connect_tool.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_intersect_edge.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_intersect_vertex.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_region.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_turnedge.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_tweak.beam
@@ -95,16 +106,17 @@ lib/erlang/lib/wings-%%VERSION%%/plugins/default/wp9_dialogs.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/default/wpc_test_ask.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/fonts/README
 lib/erlang/lib/wings-%%VERSION%%/plugins/fonts/wpf_6x11.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/fonts/wpf_fixed6x12.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/fonts/wpf_7x14.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/fonts/wpf_terminal8x12.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/README
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_3ds.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_ai.beam
-lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_am.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_hlines.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_obj.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_opengl.beam
-lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_ply.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_rwx.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_toxic.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_wrl.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_yafray.beam
 lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/README
@@ -125,7 +137,9 @@ 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_collapse.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_color.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_console.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_dl.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_drag.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_draw.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_draw_util.erl
@@ -139,12 +153,15 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_face_cmd.erl
 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_file.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_fr.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_help.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_hotkey.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_image.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_import.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_init.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_io.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_it.lang
+lib/erlang/lib/wings-%%VERSION%%/src/wings_lang.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_light.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_magnet.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_material.erl
@@ -152,11 +169,14 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_menu.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_menu_util.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_move.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_outliner.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_palette.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_pb.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_pick.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_plugin.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_pref.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_render.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_rotate.erl
+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
@@ -164,8 +184,10 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_shape.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_shapes.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_start.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_subdiv.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_sv.lang
 lib/erlang/lib/wings-%%VERSION%%/src/wings_tesselation.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_text.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_toolbar.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_undo.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_util.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_vec.erl
@@ -177,6 +199,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_wm.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wings_wm_toplevel.erl
 lib/erlang/lib/wings-%%VERSION%%/src/wpa.erl
 @dirrm lib/erlang/lib/wings-%%VERSION%%/src
+@dirrm lib/erlang/lib/wings-%%VERSION%%/plugins/accel
 @dirrm lib/erlang/lib/wings-%%VERSION%%/plugins/primitives
 @dirrm lib/erlang/lib/wings-%%VERSION%%/plugins/import_export
 @dirrm lib/erlang/lib/wings-%%VERSION%%/plugins/fonts