5 files changed, 38 insertions, 29 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 8467c8eafb95..a79c7e72b02c 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	blender
-PORTVERSION=	2.57b
-PORTREVISION=	1
+PORTVERSION=	2.58
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
 		http://public.planetmirror.com/pub/blender/source/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	3D modeling/rendering/animation/gaming package
@@ -33,7 +33,7 @@ CMAKE_ARGS+=	-DWITH_BUILTIN_GLEW:BOOL=OFF -DWITH_PYTHON_INSTALL:BOOL=OFF
 SUB_FILES=	blender blenderplayer
 MAN1=		blender.1
 
-OUTDIR=		${INSTALL_WRKSRC}/bin/2.57
+OUTDIR=		${INSTALL_WRKSRC}/bin/${PORTVERSION}
 
 LANG=		ar bg ca cs de el es fi fr hr hr_HR it ja ko nl pl pt_BR ro \
 		ru sr sr@Latn sv uk zh_CN
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index 05dea39ac624..3ab86f609335 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,2 +1,2 @@
-SHA256 (blender-2.57b.tar.gz) = 110dfda3df9d036527ef17a4e2d1be6f40f98f25a1b274a8ddfd0279f615db75
-SIZE (blender-2.57b.tar.gz) = 16754513
+SHA256 (blender-2.58.tgz) = 29c578ca9743b65552fa3566658daf4f4249e6a5cc012e4ef2b64b03b559d51f
+SIZE (blender-2.58.tgz) = 16882377
diff --git a/graphics/blender/files/patch-intern_audaspace_jack_AUD_JackDevice.h b/graphics/blender/files/patch-intern_audaspace_jack_AUD_JackDevice.h
deleted file mode 100644
index 895316b2c3d5..000000000000
--- a/graphics/blender/files/patch-intern_audaspace_jack_AUD_JackDevice.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- intern/audaspace/jack/AUD_JackDevice..h.orig	2011-05-13 16:00:11.000000000 +0200
-+++ intern/audaspace/jack/AUD_JackDevice.h	2011-05-13 16:00:34.000000000 +0200
-@@ -38,8 +38,8 @@
- 
- #include <string>
- 
--#include <jack.h>
--#include <ringbuffer.h>
-+#include <jack/jack.h>
-+#include <jack/ringbuffer.h>
- 
- typedef void (*AUD_syncFunction)(void*, int, float);
- 
diff --git a/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c b/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c
index 1641a19763da..8a9b87508a25 100644
--- a/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c
+++ b/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c
@@ -1,16 +1,16 @@
---- source/blender/blenkernel/intern/writeffmpeg.c.orig	2011-06-24 09:07:48.320613989 +0200
-+++ source/blender/blenkernel/intern/writeffmpeg.c	2011-06-24 09:08:17.697825516 +0200
-@@ -1101,12 +1101,12 @@
+--- source/blender/blenkernel/intern/writeffmpeg.c.orig	2011-06-26 11:28:46.000000000 +0200
++++ source/blender/blenkernel/intern/writeffmpeg.c	2011-06-26 11:29:27.000000000 +0200
+@@ -1053,12 +1053,12 @@
  	switch (o->type) {
  	case FF_OPT_TYPE_INT:
  	case FF_OPT_TYPE_INT64:
--		val.i = o->default_val;
+-		val.i = FFMPEG_DEF_OPT_VAL_INT(o);
 +		val.i = o->default_val.i64;
  		idp_type = IDP_INT;
  		break;
  	case FF_OPT_TYPE_DOUBLE:
  	case FF_OPT_TYPE_FLOAT:
--		val.f = o->default_val;
+-		val.f = FFMPEG_DEF_OPT_VAL_DOUBLE(o);
 +		val.f = o->default_val.dbl;
  		idp_type = IDP_FLOAT;
  		break;
diff --git a/graphics/blender/pkg-plist b/graphics/blender/pkg-plist
index fbaaf3858ded..eb0fba51afc6 100644
--- a/graphics/blender/pkg-plist
+++ b/graphics/blender/pkg-plist
@@ -30,7 +30,6 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/addons/add_mesh_ant_landscape.py
 %%DATADIR%%/scripts/addons/add_mesh_pipe_joint.py
 %%DATADIR%%/scripts/addons/add_mesh_solid.py
-%%DATADIR%%/scripts/addons/add_mesh_twisted_torus.py
 %%DATADIR%%/scripts/addons/animation_add_corrective_shape_key.py
 %%DATADIR%%/scripts/addons/animation_animall.py
 %%DATADIR%%/scripts/addons/animation_rotobezier.py
@@ -81,6 +80,8 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/addons/io_scene_fbx/export_fbx.py
 %%DATADIR%%/scripts/addons/io_scene_m3/__init__.py
 %%DATADIR%%/scripts/addons/io_scene_m3/import_m3.py
+%%DATADIR%%/scripts/addons/io_scene_map/__init__.py
+%%DATADIR%%/scripts/addons/io_scene_map/export_map.py
 %%DATADIR%%/scripts/addons/io_scene_obj/__init__.py
 %%DATADIR%%/scripts/addons/io_scene_obj/export_obj.py
 %%DATADIR%%/scripts/addons/io_scene_obj/import_obj.py
@@ -92,10 +93,20 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/addons/io_shape_mdd/import_mdd.py
 %%DATADIR%%/scripts/addons/light_field_tools/__init__.py
 %%DATADIR%%/scripts/addons/light_field_tools/light_field_tools.py
+%%DATADIR%%/scripts/addons/mesh_inset/__init__.py
+%%DATADIR%%/scripts/addons/mesh_inset/geom.py
+%%DATADIR%%/scripts/addons/mesh_inset/model.py
+%%DATADIR%%/scripts/addons/mesh_inset/offset.py
+%%DATADIR%%/scripts/addons/mesh_inset/triquad.py
 %%DATADIR%%/scripts/addons/mesh_bsurfaces.py
 %%DATADIR%%/scripts/addons/mesh_looptools.py
 %%DATADIR%%/scripts/addons/mesh_relax.py
 %%DATADIR%%/scripts/addons/modules/add_utils.py
+%%DATADIR%%/scripts/addons/modules/constants_utils.py
+%%DATADIR%%/scripts/addons/modules/cursor_utils.py
+%%DATADIR%%/scripts/addons/modules/geometry_utils.py
+%%DATADIR%%/scripts/addons/modules/misc_utils.py
+%%DATADIR%%/scripts/addons/modules/ui_utils.py
 %%DATADIR%%/scripts/addons/modules/extensions_framework/__init__.py
 %%DATADIR%%/scripts/addons/modules/extensions_framework/ui.py
 %%DATADIR%%/scripts/addons/modules/extensions_framework/util.py
@@ -122,9 +133,11 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/addons/object_fracture/data.blend
 %%DATADIR%%/scripts/addons/object_fracture/fracture_ops.py
 %%DATADIR%%/scripts/addons/object_fracture/fracture_setup.py
+%%DATADIR%%/scripts/addons/paint_palette.py
 %%DATADIR%%/scripts/addons/render_povray/__init__.py
 %%DATADIR%%/scripts/addons/render_povray/render.py
 %%DATADIR%%/scripts/addons/render_povray/ui.py
+%%DATADIR%%/scripts/addons/render_povray/update_files.py
 %%DATADIR%%/scripts/addons/render_renderfarmfi.py
 %%DATADIR%%/scripts/addons/rigify/CREDITS
 %%DATADIR%%/scripts/addons/rigify/README
@@ -135,6 +148,9 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/addons/rigify/metarigs/human.py
 %%DATADIR%%/scripts/addons/rigify/rig_ui_template.py
 %%DATADIR%%/scripts/addons/rigify/rigs/__init__.py
+%%DATADIR%%/scripts/addons/rigify/rigs/basic/__init__.py
+%%DATADIR%%/scripts/addons/rigify/rigs/basic/copy.py
+%%DATADIR%%/scripts/addons/rigify/rigs/basic/copy_chain.py
 %%DATADIR%%/scripts/addons/rigify/rigs/biped/__init__.py
 %%DATADIR%%/scripts/addons/rigify/rigs/biped/arm/__init__.py
 %%DATADIR%%/scripts/addons/rigify/rigs/biped/arm/deform.py
@@ -144,7 +160,6 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/addons/rigify/rigs/biped/leg/deform.py
 %%DATADIR%%/scripts/addons/rigify/rigs/biped/leg/fk.py
 %%DATADIR%%/scripts/addons/rigify/rigs/biped/leg/ik.py
-%%DATADIR%%/scripts/addons/rigify/rigs/copy.py
 %%DATADIR%%/scripts/addons/rigify/rigs/finger.py
 %%DATADIR%%/scripts/addons/rigify/rigs/misc/__init__.py
 %%DATADIR%%/scripts/addons/rigify/rigs/misc/delta.py
@@ -167,7 +182,7 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/addons/system_demo_mode/config.py
 %%DATADIR%%/scripts/addons/system_demo_mode/demo_mode.py
 %%DATADIR%%/scripts/addons/system_property_chart.py
-%%DATADIR%%/scripts/modules/add_object_utils.py
+%%DATADIR%%/scripts/addons/texture_paint_layer_manager.py
 %%DATADIR%%/scripts/modules/addon_utils.py
 %%DATADIR%%/scripts/modules/animsys_refactor.py
 %%DATADIR%%/scripts/modules/blend_render_info.py
@@ -175,6 +190,12 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/modules/bpy/ops.py
 %%DATADIR%%/scripts/modules/bpy/path.py
 %%DATADIR%%/scripts/modules/bpy/utils.py
+%%DATADIR%%/scripts/modules/bpy_extras/__init__.py
+%%DATADIR%%/scripts/modules/bpy_extras/image_utils.py
+%%DATADIR%%/scripts/modules/bpy_extras/io_utils.py
+%%DATADIR%%/scripts/modules/bpy_extras/mesh_utils.py
+%%DATADIR%%/scripts/modules/bpy_extras/object_utils.py
+%%DATADIR%%/scripts/modules/bpy_extras/view3d_utils.py
 %%DATADIR%%/scripts/modules/bpy_types.py
 %%DATADIR%%/scripts/modules/bpyml.py
 %%DATADIR%%/scripts/modules/bpyml_ui.py
@@ -186,10 +207,7 @@ share/pixmaps/blender.svg
 %%DATADIR%%/scripts/modules/console_python.py
 %%DATADIR%%/scripts/modules/console_shell.py
 %%DATADIR%%/scripts/modules/graphviz_export.py
-%%DATADIR%%/scripts/modules/image_utils.py
-%%DATADIR%%/scripts/modules/io_utils.py
 %%DATADIR%%/scripts/modules/keyingsets_utils.py
-%%DATADIR%%/scripts/modules/mesh_utils.py
 %%DATADIR%%/scripts/modules/rna_info.py
 %%DATADIR%%/scripts/modules/rna_prop_ui.py
 %%DATADIR%%/scripts/modules/sys_info.py
@@ -357,6 +375,7 @@ share/pixmaps/blender.svg
 @dirrm %%DATADIR%%/scripts/presets/cloth
 @dirrm %%DATADIR%%/scripts/presets
 @dirrm %%DATADIR%%/scripts/modules/console
+@dirrm %%DATADIR%%/scripts/modules/bpy_extras
 @dirrm %%DATADIR%%/scripts/modules/bpy
 @dirrm %%DATADIR%%/scripts/modules
 @dirrm %%DATADIR%%/scripts/addons/system_demo_mode
@@ -365,6 +384,7 @@ share/pixmaps/blender.svg
 @dirrm %%DATADIR%%/scripts/addons/rigify/rigs/biped/leg
 @dirrm %%DATADIR%%/scripts/addons/rigify/rigs/biped/arm
 @dirrm %%DATADIR%%/scripts/addons/rigify/rigs/biped
+@dirrm %%DATADIR%%/scripts/addons/rigify/rigs/basic
 @dirrm %%DATADIR%%/scripts/addons/rigify/rigs
 @dirrm %%DATADIR%%/scripts/addons/rigify/metarigs
 @dirrm %%DATADIR%%/scripts/addons/rigify
@@ -373,10 +393,12 @@ share/pixmaps/blender.svg
 @dirrm %%DATADIR%%/scripts/addons/netrender
 @dirrm %%DATADIR%%/scripts/addons/modules/extensions_framework
 @dirrm %%DATADIR%%/scripts/addons/modules
+@dirrm %%DATADIR%%/scripts/addons/mesh_inset
 @dirrm %%DATADIR%%/scripts/addons/light_field_tools
 @dirrm %%DATADIR%%/scripts/addons/io_shape_mdd
 @dirrm %%DATADIR%%/scripts/addons/io_scene_x3d
 @dirrm %%DATADIR%%/scripts/addons/io_scene_obj
+@dirrm %%DATADIR%%/scripts/addons/io_scene_map
 @dirrm %%DATADIR%%/scripts/addons/io_scene_m3
 @dirrm %%DATADIR%%/scripts/addons/io_scene_fbx
 @dirrm %%DATADIR%%/scripts/addons/io_scene_3ds