Update to 2.49a. Upstream changelog is of course too massive, you can look

at http://www.blender.org/development/release-logs/ for info about new
features and fixes. While here, sort PLIST correctly.

9 files changed, 259 insertions, 240 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 6514ec986b6..6b082fdfaab 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2009/08/26 19:57:36 sno Exp $
+# $NetBSD: Makefile,v 1.67 2009/08/28 20:46:18 hasso Exp $
 
-DISTNAME=	blender-2.45
-PKGREVISION=	5
+DISTNAME=	blender-2.49a
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.blender.org/source/
 
@@ -51,12 +50,13 @@ do-install:
 		${DESTDIR}${PREFIX}/share/blender
 	${INSTALL_DATA} ${WRKSRCBIN}/.blender/.bfont.ttf \
 		${DESTDIR}${PREFIX}/share/blender
-	${INSTALL_DATA} ${WRKSRCBIN}/BlenderQuickStart.pdf \
+	${INSTALL_DATA} ${WRKSRC}/release/text/BlenderQuickStart.pdf \
 		${DESTDIR}${PREFIX}/share/blender
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/graphics/blender/PLIST b/graphics/blender/PLIST
index c685e4a44a0..d9dfe949ac2 100644
--- a/graphics/blender/PLIST
+++ b/graphics/blender/PLIST
@@ -1,175 +1,218 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:59:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/08/28 20:46:18 hasso Exp $
 bin/blender
 bin/blender-bin
-share/blender/.bfont.ttf
 share/blender/.Blanguages
+share/blender/.bfont.ttf
 share/blender/BlenderQuickStart.pdf
-share/blender/locale/nl/LC_MESSAGES/blender.mo
-share/blender/locale/pt_br/LC_MESSAGES/blender.mo
-share/blender/locale/ja/LC_MESSAGES/blender.mo
-share/blender/locale/cs/LC_MESSAGES/blender.mo
-share/blender/locale/fr/LC_MESSAGES/blender.mo
-share/blender/locale/pl/LC_MESSAGES/blender.mo
-share/blender/locale/zh_cn/LC_MESSAGES/blender.mo
-share/blender/locale/sr@Latn/LC_MESSAGES/blender.mo
 share/blender/locale/ar/LC_MESSAGES/blender.mo
 share/blender/locale/bg/LC_MESSAGES/blender.mo
-share/blender/locale/ru/LC_MESSAGES/blender.mo
+share/blender/locale/ca/LC_MESSAGES/blender.mo
+share/blender/locale/cs/LC_MESSAGES/blender.mo
 share/blender/locale/de/LC_MESSAGES/blender.mo
+share/blender/locale/el/LC_MESSAGES/blender.mo
 share/blender/locale/es/LC_MESSAGES/blender.mo
-share/blender/locale/it/LC_MESSAGES/blender.mo
-share/blender/locale/hr/LC_MESSAGES/blender.mo
-share/blender/locale/sr/LC_MESSAGES/blender.mo
-share/blender/locale/uk/LC_MESSAGES/blender.mo
 share/blender/locale/fi/LC_MESSAGES/blender.mo
-share/blender/locale/ro/LC_MESSAGES/blender.mo
+share/blender/locale/fr/LC_MESSAGES/blender.mo
+share/blender/locale/hr/LC_MESSAGES/blender.mo
 share/blender/locale/hr_HR/LC_MESSAGES/blender.mo
-share/blender/locale/ca/LC_MESSAGES/blender.mo
+share/blender/locale/it/LC_MESSAGES/blender.mo
+share/blender/locale/ja/LC_MESSAGES/blender.mo
+share/blender/locale/ko/LC_MESSAGES/blender.mo
+share/blender/locale/nl/LC_MESSAGES/blender.mo
+share/blender/locale/pl/LC_MESSAGES/blender.mo
+share/blender/locale/pt_BR/LC_MESSAGES/blender.mo
+share/blender/locale/ro/LC_MESSAGES/blender.mo
+share/blender/locale/ru/LC_MESSAGES/blender.mo
+share/blender/locale/sr/LC_MESSAGES/blender.mo
+share/blender/locale/sr@Latn/LC_MESSAGES/blender.mo
 share/blender/locale/sv/LC_MESSAGES/blender.mo
+share/blender/locale/uk/LC_MESSAGES/blender.mo
+share/blender/locale/zh_CN/LC_MESSAGES/blender.mo
+share/blender/scripts/3ds_export.py
+share/blender/scripts/3ds_import.py
+share/blender/scripts/Axiscopy.py
+share/blender/scripts/DirectX8Exporter.py
+share/blender/scripts/DirectX8Importer.py
+share/blender/scripts/IDPropBrowser.py
+share/blender/scripts/ac3d_export.py
+share/blender/scripts/ac3d_import.py
+share/blender/scripts/add_mesh_empty.py
+share/blender/scripts/add_mesh_torus.py
+share/blender/scripts/animation_bake_constraints.py
+share/blender/scripts/animation_clean.py
+share/blender/scripts/animation_trajectory.py
+share/blender/scripts/armature_symmetry.py
+share/blender/scripts/bevel_center.py
+share/blender/scripts/blenderLipSynchro.py
+share/blender/scripts/bpydata/KUlang.txt
 share/blender/scripts/bpydata/config/readme.txt
 share/blender/scripts/bpydata/readme.txt
-share/blender/scripts/bpydata/KUlang.txt
-share/blender/scripts/bpymodules/colladaImEx/cutils.py
+share/blender/scripts/bpymodules/BPyAddMesh.py
+share/blender/scripts/bpymodules/BPyArmature.py
+share/blender/scripts/bpymodules/BPyBlender.py
+share/blender/scripts/bpymodules/BPyBlender.pyc
+share/blender/scripts/bpymodules/BPyCurve.py
+share/blender/scripts/bpymodules/BPyImage.py
+share/blender/scripts/bpymodules/BPyMathutils.py
+share/blender/scripts/bpymodules/BPyMesh.py
+share/blender/scripts/bpymodules/BPyMesh_redux.py
+share/blender/scripts/bpymodules/BPyMessages.py
+share/blender/scripts/bpymodules/BPyNMesh.py
+share/blender/scripts/bpymodules/BPyObject.py
+share/blender/scripts/bpymodules/BPyRegistry.py
+share/blender/scripts/bpymodules/BPyRegistry.pyc
+share/blender/scripts/bpymodules/BPyRender.py
+share/blender/scripts/bpymodules/BPySys.py
+share/blender/scripts/bpymodules/BPyTextPlugin.py
+share/blender/scripts/bpymodules/BPyWindow.py
+share/blender/scripts/bpymodules/blend2renderinfo.py
 share/blender/scripts/bpymodules/colladaImEx/__init__.py
-share/blender/scripts/bpymodules/colladaImEx/xmlUtils.py
 share/blender/scripts/bpymodules/colladaImEx/collada.py
-share/blender/scripts/bpymodules/colladaImEx/logo.png
 share/blender/scripts/bpymodules/colladaImEx/cstartup.py
+share/blender/scripts/bpymodules/colladaImEx/cutils.py
 share/blender/scripts/bpymodules/colladaImEx/helperObjects.py
+share/blender/scripts/bpymodules/colladaImEx/logo.png
 share/blender/scripts/bpymodules/colladaImEx/translator.py
-share/blender/scripts/bpymodules/BPyCurve.py
+share/blender/scripts/bpymodules/colladaImEx/xmlUtils.py
 share/blender/scripts/bpymodules/defaultdoodads.py
-share/blender/scripts/bpymodules/meshtools.py
-share/blender/scripts/bpymodules/BPyWindow.py
-share/blender/scripts/bpymodules/BPyMesh_redux.py
-share/blender/scripts/bpymodules/BPyRender.py
-share/blender/scripts/bpymodules/dxfReader.py
-share/blender/scripts/bpymodules/BPyMessages.py
-share/blender/scripts/bpymodules/BPyObject.py
 share/blender/scripts/bpymodules/dxfColorMap.py
-share/blender/scripts/bpymodules/eps2obj.py
-share/blender/scripts/bpymodules/gimp2obj.py
-share/blender/scripts/bpymodules/BPyBlender.py
-share/blender/scripts/bpymodules/BPyMesh.py
-share/blender/scripts/bpymodules/BPyMesh_octree.py
-share/blender/scripts/bpymodules/BPySys.py
+share/blender/scripts/bpymodules/dxfLibrary.py
+share/blender/scripts/bpymodules/dxfReader.py
 share/blender/scripts/bpymodules/mesh_gradient.py
-share/blender/scripts/bpymodules/BPyAddMesh.py
-share/blender/scripts/bpymodules/BPyNMesh.py
-share/blender/scripts/bpymodules/ai2obj.py
-share/blender/scripts/bpymodules/BPyRegistry.py
-share/blender/scripts/bpymodules/BPyImage.py
-share/blender/scripts/bpymodules/BPyArmature.py
-share/blender/scripts/bpymodules/BPyMathutils.py
-share/blender/scripts/bpymodules/svg2obj.py
-share/blender/scripts/blenderLipSynchro.py
-share/blender/scripts/slp_import.py
+share/blender/scripts/bpymodules/meshtools.py
+share/blender/scripts/bpymodules/paths_ai2obj.py
+share/blender/scripts/bpymodules/paths_eps2obj.py
+share/blender/scripts/bpymodules/paths_gimp2obj.py
+share/blender/scripts/bpymodules/paths_svg2obj.py
 share/blender/scripts/bvh_import.py
-share/blender/scripts/3ds_import.py
-share/blender/scripts/uv_from_adjacent.py
-share/blender/scripts/object_batch_name_edit.py
-share/blender/scripts/vertexpaint_gradient.py
-share/blender/scripts/mesh_solidify.py
-share/blender/scripts/widgetwizard.py
-share/blender/scripts/vertexpaint_selfshadow_ao.py
-share/blender/scripts/uv_seams_from_islands.py
-share/blender/scripts/vrml97_export.py
-share/blender/scripts/sysinfo.py
-share/blender/scripts/weightpaint_envelope_assign.py
-share/blender/scripts/ac3d_import.py
-share/blender/scripts/help_manual.py
-share/blender/scripts/uvcalc_follow_active_coords.py
-share/blender/scripts/faceselect_same_weights.py
-share/blender/scripts/mesh_poly_reduce.py
+share/blender/scripts/c3d_import.py
+share/blender/scripts/camera_changer.py
+share/blender/scripts/colladaExport14.py
+share/blender/scripts/colladaImport14.py
+share/blender/scripts/collada_export.py
 share/blender/scripts/collada_import.py
-share/blender/scripts/mesh_skin.py
-share/blender/scripts/weightpaint_copy.py
-share/blender/scripts/help_getting_started.py
-share/blender/scripts/image_billboard.py
-share/blender/scripts/3ds_export.py
+share/blender/scripts/config.py
+share/blender/scripts/console.py
+share/blender/scripts/discombobulator.py
+share/blender/scripts/envelope_symmetry.py
+share/blender/scripts/export-iv-0.1.py
+share/blender/scripts/export_dxf.py
+share/blender/scripts/export_fbx.py
+share/blender/scripts/export_lightwave_motion.py
+share/blender/scripts/export_m3g.py
 share/blender/scripts/export_map.py
+share/blender/scripts/export_mdd.py
+share/blender/scripts/export_obj.py
+share/blender/scripts/faceselect_same_weights.py
+share/blender/scripts/flt_defaultp.py
+share/blender/scripts/flt_dofedit.py
+share/blender/scripts/flt_export.py
+share/blender/scripts/flt_filewalker.py
+share/blender/scripts/flt_import.py
+share/blender/scripts/flt_lodedit.py
+share/blender/scripts/flt_palettemanager.py
+share/blender/scripts/flt_properties.py
+share/blender/scripts/flt_toolbar.py
+share/blender/scripts/help_bpy_api.py
+share/blender/scripts/help_browser.py
+share/blender/scripts/help_getting_started.py
+share/blender/scripts/help_manual.py
 share/blender/scripts/help_release_notes.py
-share/blender/scripts/collada_export.py
-share/blender/scripts/export-iv-0.1.py
-share/blender/scripts/object_random_loc_sz_rot.py
-share/blender/scripts/mesh_cleanup.py
-share/blender/scripts/ac3d_export.py
-share/blender/scripts/save_theme.py
-share/blender/scripts/object_sel2dupgroup.py
+share/blender/scripts/help_tutorials.py
 share/blender/scripts/help_web_blender.py
-share/blender/scripts/lightwave_import.py
-share/blender/scripts/image_find_paths.py
-share/blender/scripts/mesh_wire.py
-share/blender/scripts/mesh_boneweight_copy.py
-share/blender/scripts/object_drop.py
-share/blender/scripts/weightpaint_gradient.py
-share/blender/scripts/DirectX8Exporter.py
-share/blender/scripts/ply_import.py
-share/blender/scripts/object_apply_def.py
-share/blender/scripts/vertexpaint_from_material.py
-share/blender/scripts/import_mdd.py
-share/blender/scripts/export_obj.py
-share/blender/scripts/scripttemplate_mesh_edit.py
+share/blender/scripts/help_web_devcomm.py
 share/blender/scripts/help_web_eshop.py
-share/blender/scripts/export_mdd.py
-share/blender/scripts/DirectX8Importer.py
-share/blender/scripts/object_cookie_cutter.py
-share/blender/scripts/IDPropBrowser.py
-share/blender/scripts/uvcalc_smart_project.py
-share/blender/scripts/lightwave_export.py
-share/blender/scripts/envelope_symmetry.py
-share/blender/scripts/bevel_center.py
-share/blender/scripts/weightpaint_clean.py
-share/blender/scripts/xsi_export.py
 share/blender/scripts/help_web_usercomm.py
+share/blender/scripts/hotkeys.py
+share/blender/scripts/image_2d_cutout.py
+share/blender/scripts/image_auto_layout.py
+share/blender/scripts/image_billboard.py
+share/blender/scripts/image_edit.py
+share/blender/scripts/import_dxf.py
+share/blender/scripts/import_lightwave_motion.py
+share/blender/scripts/import_mdd.py
 share/blender/scripts/import_obj.py
-share/blender/scripts/uvcopy.py
-share/blender/scripts/rvk1_torvk2.py
+share/blender/scripts/import_web3d.py
+share/blender/scripts/lightwave_export.py
+share/blender/scripts/lightwave_import.py
+share/blender/scripts/md2_export.py
 share/blender/scripts/md2_import.py
-share/blender/scripts/image_auto_layout.py
-share/blender/scripts/camera_changer.py
-share/blender/scripts/flt_export.py
-share/blender/scripts/export_lightwave_motion.py
-share/blender/scripts/export_fbx.py
-share/blender/scripts/uvcalc_quad_clickproj.py
-share/blender/scripts/ply_export.py
-share/blender/scripts/Axiscopy.py
-share/blender/scripts/raw_import.py
-share/blender/scripts/off_export.py
-share/blender/scripts/xfig_export.py
+share/blender/scripts/mesh_boneweight_copy.py
+share/blender/scripts/mesh_cleanup.py
+share/blender/scripts/mesh_edges2curves.py
+share/blender/scripts/mesh_mirror_tool.py
+share/blender/scripts/mesh_poly_reduce.py
+share/blender/scripts/mesh_poly_reduce_grid.py
+share/blender/scripts/mesh_skin.py
+share/blender/scripts/mesh_solidify.py
+share/blender/scripts/mesh_unfolder.py
+share/blender/scripts/mesh_wire.py
+share/blender/scripts/ms3d_import.py
+share/blender/scripts/ms3d_import_ascii.py
+share/blender/scripts/obdatacopier.py
+share/blender/scripts/object_active_to_other.py
+share/blender/scripts/object_apply_def.py
+share/blender/scripts/object_batch_name_edit.py
+share/blender/scripts/object_cookie_cutter.py
+share/blender/scripts/object_drop.py
 share/blender/scripts/object_find.py
-share/blender/scripts/weightpaint_grow_shrink.py
-share/blender/scripts/console.py
-share/blender/scripts/uvcalc_lightmap.py
-share/blender/scripts/animation_trajectory.py
-share/blender/scripts/discombobulator.py
-share/blender/scripts/armature_symmetry.py
+share/blender/scripts/object_random_loc_sz_rot.py
+share/blender/scripts/object_sel2dupgroup.py
+share/blender/scripts/object_timeofs_follow_act.py
+share/blender/scripts/off_export.py
+share/blender/scripts/off_import.py
+share/blender/scripts/paths_import.py
+share/blender/scripts/ply_export.py
+share/blender/scripts/ply_import.py
 share/blender/scripts/raw_export.py
-share/blender/scripts/obdatacopier.py
-share/blender/scripts/config.py
+share/blender/scripts/raw_import.py
 share/blender/scripts/renameobjectbyblock.py
-share/blender/scripts/help_web_devcomm.py
-share/blender/scripts/export_cal3d.py
-share/blender/scripts/help_browser.py
-share/blender/scripts/colladaExport14.py
-share/blender/scripts/uvcalc_from_adjacent.py
-share/blender/scripts/paths_import.py
-share/blender/scripts/off_import.py
-share/blender/scripts/import_dxf.py
-share/blender/scripts/mesh_unfolder.py
-share/blender/scripts/image_edit.py
-share/blender/scripts/help_bpy_api.py
-share/blender/scripts/flt_import.py
-share/blender/scripts/weightpaint_normalize.py
-share/blender/scripts/md2_export.py
+share/blender/scripts/render_save_layers.py
+share/blender/scripts/rvk1_torvk2.py
+share/blender/scripts/save_theme.py
+share/blender/scripts/scripttemplate_background_job.py
+share/blender/scripts/scripttemplate_camera_object.py
+share/blender/scripts/scripttemplate_gamelogic.py
+share/blender/scripts/scripttemplate_gamelogic_basic.py
+share/blender/scripts/scripttemplate_gamelogic_module.py
+share/blender/scripts/scripttemplate_ipo_gen.py
+share/blender/scripts/scripttemplate_mesh_edit.py
+share/blender/scripts/scripttemplate_metaball_create.py
+share/blender/scripts/scripttemplate_object_edit.py
+share/blender/scripts/scripttemplate_pyconstraint.py
+share/blender/scripts/scripttemplate_text_plugin.py
+share/blender/scripts/slp_import.py
+share/blender/scripts/sysinfo.py
+share/blender/scripts/textplugin_convert_ge.py
+share/blender/scripts/textplugin_functiondocs.py
+share/blender/scripts/textplugin_imports.py
+share/blender/scripts/textplugin_membersuggest.py
+share/blender/scripts/textplugin_outliner.py
+share/blender/scripts/textplugin_suggest.py
+share/blender/scripts/textplugin_templates.py
 share/blender/scripts/unweld.py
 share/blender/scripts/uv_export.py
-share/blender/scripts/colladaImport14.py
-share/blender/scripts/mesh_mirror_tool.py
-share/blender/scripts/mesh_edges2curves.py
-share/blender/scripts/add_mesh_torus.py
-share/blender/scripts/hotkeys.py
-share/blender/scripts/scripttemplate_object_edit.py
-share/blender/scripts/flt_filewalker.py
-share/blender/scripts/help_tutorials.py
+share/blender/scripts/uv_seams_from_islands.py
+share/blender/scripts/uvcalc_follow_active_coords.py
+share/blender/scripts/uvcalc_lightmap.py
+share/blender/scripts/uvcalc_quad_clickproj.py
+share/blender/scripts/uvcalc_smart_project.py
+share/blender/scripts/uvcopy.py
+share/blender/scripts/vertexpaint_from_material.py
+share/blender/scripts/vertexpaint_gradient.py
+share/blender/scripts/vertexpaint_selfshadow_ao.py
+share/blender/scripts/vrml97_export.py
+share/blender/scripts/weightpaint_average.py
+share/blender/scripts/weightpaint_clean.py
+share/blender/scripts/weightpaint_copy.py
+share/blender/scripts/weightpaint_envelope_assign.py
+share/blender/scripts/weightpaint_gradient.py
+share/blender/scripts/weightpaint_grow_shrink.py
+share/blender/scripts/weightpaint_invert.py
+share/blender/scripts/weightpaint_normalize.py
+share/blender/scripts/widgetwizard.py
+share/blender/scripts/wizard_bolt_factory.py
+share/blender/scripts/wizard_curve2tree.py
+share/blender/scripts/wizard_landscape_ant.py
 share/blender/scripts/x3d_export.py
+share/blender/scripts/xsi_export.py
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index f35ab457657..bd502b734a1 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.26 2008/06/23 21:22:58 markd Exp $
+$NetBSD: distinfo,v 1.27 2009/08/28 20:46:18 hasso Exp $
 
-SHA1 (blender-2.45.tar.gz) = ff66ec5f0129fd04a2ba5c063627ef13033c0598
-RMD160 (blender-2.45.tar.gz) = fd39b59de0f4d770fe26ce39d51356e98b1ec8ea
-Size (blender-2.45.tar.gz) = 14226829 bytes
-SHA1 (patch-ab) = 7f5b4966bd08333f5d726cf9b6d7c2300e62d711
+SHA1 (blender-2.49a.tar.gz) = 59f5be96eda874bb901390f55a70d58cf8e0b979
+RMD160 (blender-2.49a.tar.gz) = f37100c7a02c75b622b8e055f32f06e064a62de2
+Size (blender-2.49a.tar.gz) = 23039535 bytes
+SHA1 (patch-ab) = afc00773b4e00f1f63fce2bd2203dbab0b0bfc9f
 SHA1 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2
-SHA1 (patch-ad) = 0f05a5151f0ba5fee1583f86019967beba52eadd
-SHA1 (patch-ae) = 45ea375bc405948d4eadc786379f8a8b700c8d91
-SHA1 (patch-af) = ce57bcf10e9291ed156e54b66d154950b0079eb9
-SHA1 (patch-ag) = bd3fae7b10349dd2c1ef45a18346d980530e01a4
+SHA1 (patch-ad) = ee070c6e61585c5ee657f8aa0cd210c15f73bcc9
 SHA1 (patch-ah) = b45f534b4c5850da13e9b421f73e33c8d079696f
-SHA1 (patch-ai) = 8909e9d698b9370bb756b81c41812a05790da419
+SHA1 (patch-ai) = 31f94e8dcdabbe043d94a7fd53bfbdaa9d35fc99
 SHA1 (patch-aj) = 59c935bc84101e3a57af5231d6f1153897bbbb03
diff --git a/graphics/blender/patches/patch-ab b/graphics/blender/patches/patch-ab
index f24cf01a135..811c045c19a 100644
--- a/graphics/blender/patches/patch-ab
+++ b/graphics/blender/patches/patch-ab
@@ -1,19 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2006/02/23 20:15:21 joerg Exp $
+$NetBSD: patch-ab,v 1.7 2009/08/28 20:46:19 hasso Exp $
 
---- source/blender/blenlib/intern/storage.c.orig	2005-04-30 09:57:35.000000000 +0000
-+++ source/blender/blenlib/intern/storage.c
-@@ -50,6 +50,10 @@
+--- source/blender/blenlib/intern/storage.c.orig	2009-05-25 19:46:22 +0300
++++ source/blender/blenlib/intern/storage.c	2009-08-28 21:32:31 +0300
+@@ -47,7 +47,7 @@
  #include <time.h>
  #include <sys/stat.h>
  
-+#if defined(__DragonFly__)
-+#include <sys/statvfs.h>
-+#endif
-+
- #if !defined(linux) && (defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__))
+-#if defined (__sun__) || defined (__sun) || defined (__sgi)
++#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined(__DragonFly__)
+ #include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
+ #elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
  #include <sys/statfs.h>
- #endif
-@@ -89,10 +93,6 @@ struct statfs {
+@@ -88,10 +88,6 @@ struct statfs {
  #include <pwd.h>
  #endif
  
@@ -24,27 +22,24 @@ $NetBSD: patch-ab,v 1.6 2006/02/23 20:15:21 joerg Exp $
  /* lib includes */
  #include "MEM_guardedalloc.h"
  
-@@ -177,7 +177,11 @@ double BLI_diskfree(char *dir)
- 
+@@ -179,7 +175,7 @@ double BLI_diskfree(char *dir)
  	return (double) (freec*bytesps*sectorspc);
  #else
-+#if defined(__DragonFly__) || (defined (__NetBSD__) && __NetBSD_Version__ >= 299000900) /* 2.99.9 */
-+	struct statvfs disk;
-+#else
- 	struct statfs disk;
-+#endif
- 	char name[100],*slash;
- 
  
-@@ -188,7 +192,10 @@ double BLI_diskfree(char *dir)
- 		if (slash) slash[1] = 0;
- 	} else strcpy(name,"/");
+-#if defined (__sun__) || defined (__sun) || defined (__sgi)
++#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined(__DragonFly__)
+ 	struct statvfs disk;
+ #else
+ 	struct statfs disk;
+@@ -204,9 +200,9 @@ double BLI_diskfree(char *dir)
+ 	return -1;
+ #endif
  
--#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || defined (__APPLE__) 
-+#if defined(__DragonFly__) || (defined (__NetBSD__) && __NetBSD_Version__ >= 299000900) /* 2.99.9 */
-+	if (statvfs(name, &disk)) return(-1);
-+#elif defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || \
-+      defined (__APPLE__) || defined (__NetBSD__)
- 	if (statfs(name, &disk)) return(-1);
+-#if defined (__sun__) || defined (__sun) || defined (__sgi)
++#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined(__DragonFly__) || defined (__NetBSD__)
+ 	if (statvfs(name, &disk)) return(-1);	
+-#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
++#elif !defined(__FreeBSD__) && !defined(linux) && !defined (__OpenBSD__) && !defined (__NetBSD__) && (defined(__sparc) || defined(__sparc__))
+ 	/* WARNING - This may not be supported by geeneric unix os's - Campbell */
+ 	if (statfs(name, &disk, sizeof(struct statfs), 0)) return(-1);
  #endif
- #ifdef __BeOS
diff --git a/graphics/blender/patches/patch-ad b/graphics/blender/patches/patch-ad
index 33de94f017d..d30cfaaa999 100644
--- a/graphics/blender/patches/patch-ad
+++ b/graphics/blender/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.4 2008/06/23 21:22:58 markd Exp $
+$NetBSD: patch-ad,v 1.5 2009/08/28 20:46:19 hasso Exp $
 
---- extern/bFTGL/src/FTVectoriser.cpp.orig	2007-12-05 02:15:19.000000000 +1300
-+++ extern/bFTGL/src/FTVectoriser.cpp
-@@ -7,7 +7,7 @@
- 
- #ifdef __APPLE_CC__    
-     typedef GLvoid (*GLUTesselatorFunction)(...);
+--- extern/bFTGL/src/FTVectoriser.cpp.orig	2007-11-05 15:05:58 +0200
++++ extern/bFTGL/src/FTVectoriser.cpp	2009-08-28 21:34:45 +0300
+@@ -11,7 +11,7 @@
+     #else
+         typedef GLvoid (*GLUTesselatorFunction)(...);
+     #endif
 -#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__)
 +#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) || defined( __NetBSD__ ) || defined(__DragonFly__)
      typedef GLvoid (*GLUTesselatorFunction)();
diff --git a/graphics/blender/patches/patch-ae b/graphics/blender/patches/patch-ae
deleted file mode 100644
index 452dd4ded94..00000000000
--- a/graphics/blender/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2008/05/17 10:33:15 tonnerre Exp $
-
---- source/blender/src/usiblender.c.orig	2007-09-18 04:58:42.000000000 +0000
-+++ source/blender/src/usiblender.c
-@@ -172,10 +172,12 @@ static void init_userdef_file(void)
- 		U.tb_rightmouse= 5;
- 	}
- 	if(U.mixbufsize==0) U.mixbufsize= 2048;
--	if (BLI_streq(U.tempdir, "/")) {
-+	if (BLI_streq(U.tempdir, "/") || BLI_streq(U.tempdir, "/tmp/")) {
- 		char *tmp= getenv("TEMP");
-+		char *home= getenv("HOME");
- 		
--		strcpy(U.tempdir, tmp?tmp:"/tmp/");
-+		strcpy(U.tempdir, tmp?tmp:home);
-+		if (!tmp) strcat(U.tempdir, "/.blender/");
- 	}
- 	if (U.savetime <= 0) {
- 		U.savetime = 1;
diff --git a/graphics/blender/patches/patch-af b/graphics/blender/patches/patch-af
deleted file mode 100644
index 2735f07e088..00000000000
--- a/graphics/blender/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.6 2008/05/17 10:33:15 tonnerre Exp $
-
---- source/blender/blenkernel/intern/blender.c.orig	2007-09-18 04:58:33.000000000 +0000
-+++ source/blender/blenkernel/intern/blender.c
-@@ -714,7 +714,7 @@ void BKE_undo_save_quit(void)
- 		
- 	BLI_make_file_string("/", str, U.tempdir, "quit.blend");
- 
--	file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666);
-+	file = open(str,O_BINARY|O_WRONLY|O_CREAT|O_TRUNC|O_EXCL, 0666);
- 	if(file == -1) {
- 		printf("Unable to save %s\n", str);
- 		return;
diff --git a/graphics/blender/patches/patch-ag b/graphics/blender/patches/patch-ag
deleted file mode 100644
index 6f44e5c0256..00000000000
--- a/graphics/blender/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2008/05/17 10:33:15 tonnerre Exp $
-
---- source/blender/imbuf/intern/radiance_hdr.c.orig	2007-09-18 04:58:45.000000000 +0000
-+++ source/blender/imbuf/intern/radiance_hdr.c
-@@ -191,7 +191,8 @@ struct ImBuf *imb_loadhdr(unsigned char 
- 			}
- 		}
- 		if (found) {
--			sscanf((char*)&mem[x+1], "%s %d %s %d", (char*)&oriY, &height, (char*)&oriX, &width);
-+			if (sscanf((char *)&mem[x+1], "%79s %d %79s %d", (char*)&oriY, &height,
-+				(char*)&oriX, &width) != 4) return NULL;
- 
- 			/* find end of this line, data right behind it */
- 			ptr = (unsigned char *)strchr((char*)&mem[x+1], '\n');
diff --git a/graphics/blender/patches/patch-ai b/graphics/blender/patches/patch-ai
index 47c49b2c6c5..91618403c43 100644
--- a/graphics/blender/patches/patch-ai
+++ b/graphics/blender/patches/patch-ai
@@ -1,8 +1,24 @@
-$NetBSD: patch-ai,v 1.1 2008/01/04 19:56:46 markd Exp $
+$NetBSD: patch-ai,v 1.2 2009/08/28 20:46:19 hasso Exp $
 
---- CMakeLists.txt.orig	2007-12-07 15:07:16.000000000 +1300
-+++ CMakeLists.txt
-@@ -133,6 +133,8 @@ IF(UNIX)
+--- CMakeLists.txt.orig	2009-05-18 22:14:15 +0300
++++ CMakeLists.txt	2009-08-28 22:04:18 +0300
+@@ -102,6 +102,7 @@ IF(UNIX)
+   FIND_LIBRARY(INTL_LIBRARY
+     NAMES intl
+     PATHS
++    "${_CMAKE_INSTALL_DIR}/lib"
+     /usr/local/lib
+     /usr/lib
+     /sw/lib
+@@ -112,6 +113,7 @@ IF(UNIX)
+   FIND_LIBRARY(ICONV_LIBRARY
+     NAMES iconv
+     PATHS
++    "${_CMAKE_INSTALL_DIR}/lib"
+     /usr/local/lib
+     /usr/lib
+     /sw/lib
+@@ -121,11 +123,14 @@ IF(UNIX)
    )
    IF(INTL_LIBRARY AND ICONV_LIBRARY)
      SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
@@ -11,3 +27,17 @@ $NetBSD: patch-ai,v 1.1 2008/01/04 19:56:46 markd Exp $
    ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
    
    FIND_PATH(FREETYPE_INC
+     freetype
+     PATHS
++    "${_CMAKE_INSTALL_DIR}/include/freetype2"
+     /usr/local/include/freetype2
+     /usr/include/freetype2
+     /sw/include/freetype2
+@@ -150,6 +155,7 @@ IF(UNIX)
+   FIND_PATH(OPENEXR_INC
+     ImfXdr.h
+     PATHS
++    "${_CMAKE_INSTALL_DIR}/include/OpenEXR"
+     /usr/local/include/OpenEXR
+     /usr/include/OpenEXR
+     /sw/include/OpenEXR