Changes 2.37a:

* Appending from files does not set the string for "last loaded file". That could give an accidentally save over of used library files.
* International Font support was broken for non-Latin fonts.
* Other fixes

7 files changed, 58 insertions, 68 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index c61f27809a3..5d2f8a34c40 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,22 +1,19 @@
-# $NetBSD: Makefile,v 1.45 2005/06/16 06:57:57 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.46 2005/08/03 11:58:14 adam Exp $
 
-DISTNAME=		blender-2.36
-PKGREVISION=		2
-CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
-			http://download.blender.org/source/
+DISTNAME=	blender-2.37a
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
+		http://download.blender.org/source/
 
-MAINTAINER=		jschauma@NetBSD.org
-HOMEPAGE=		http://www.blender.org/
-COMMENT=		Fully integrated 3D graphics creation suite
+MAINTAINER=	jschauma@NetBSD.org
+HOMEPAGE=	http://www.blender.org/
+COMMENT=	Fully integrated 3D graphics creation suite
 
 BUILD_DEPENDS+=		scons>=0.96:../../devel/scons
 
 WRKSRC=			${WRKDIR}/blender
-
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
-USE_LIBTOOL=		YES
 
 LDFLAGS+=		-lcrypto
 
@@ -39,11 +36,14 @@ do-install:
 	${CHMOD} +x ${WRKDIR}/blender/bin/blender
 	${INSTALL_PROGRAM} ${WRKSRC}/blender-bin ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/blender/scripts
-	${INSTALL_DATA} ${WRKSRC}/release/scripts/* ${PREFIX}/share/blender/scripts
+	${INSTALL_DATA} ${WRKSRC}/release/scripts/*.py \
+		${PREFIX}/share/blender/scripts
+	${INSTALL_DATA_DIR} ${PREFIX}/share/blender/scripts/bpymodules
+	${INSTALL_DATA} ${WRKSRC}/release/scripts/bpymodules/*.py \
+		${PREFIX}/share/blender/scripts/bpymodules
 	${INSTALL} ${WRKDIR}/blender/bin/blender ${PREFIX}/bin
 
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/blender/PLIST b/graphics/blender/PLIST
index 971652c6af6..ac7bcdfab31 100644
--- a/graphics/blender/PLIST
+++ b/graphics/blender/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/03/04 16:04:59 reinoud Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/08/03 11:58:14 adam Exp $
 bin/blender
 bin/blender-bin
 share/blender/scripts/Apply_def.py
@@ -8,14 +8,32 @@ share/blender/scripts/DirectXExporter.py
 share/blender/scripts/UVpaint05.py
 share/blender/scripts/ac3d_export.py
 share/blender/scripts/ac3d_import.py
+share/blender/scripts/armature_symetry.py
 share/blender/scripts/batch_name_edit.py
 share/blender/scripts/bevel_center.py
 share/blender/scripts/blender2cal3d.py
+share/blender/scripts/bpymodules/BPyBlender.py
+share/blender/scripts/bpymodules/BPyMathutils.py
+share/blender/scripts/bpymodules/BPyNMesh.py
+share/blender/scripts/bpymodules/BPyRegistry.py
+share/blender/scripts/bpymodules/ai2obj.py
+share/blender/scripts/bpymodules/defaultdoodads.py
+share/blender/scripts/bpymodules/eps2obj.py
+share/blender/scripts/bpymodules/gimp2obj.py
+share/blender/scripts/bpymodules/meshtools.py
+share/blender/scripts/bpymodules/svg2obj.py
+share/blender/scripts/bvh2arm.py
 share/blender/scripts/bvh_export.py
 share/blender/scripts/bvh_import.py
+share/blender/scripts/camera_changer.py
 share/blender/scripts/clean_mesh.py
+share/blender/scripts/config.py
+share/blender/scripts/console.py
+share/blender/scripts/discombobulator.py
 share/blender/scripts/disp_paint.py
 share/blender/scripts/doc_browser.py
+share/blender/scripts/envelope_assignment.py
+share/blender/scripts/envelope_symmetry.py
 share/blender/scripts/fixfromarmature.py
 share/blender/scripts/help_browser.py
 share/blender/scripts/help_getting_started.py
@@ -32,12 +50,6 @@ share/blender/scripts/kloputils.py
 share/blender/scripts/knife.py
 share/blender/scripts/lightwave_export.py
 share/blender/scripts/lightwave_import.py
-share/blender/scripts/mod_ai2obj.py
-share/blender/scripts/mod_blender.py
-share/blender/scripts/mod_eps2obj.py
-share/blender/scripts/mod_gimp2obj.py
-share/blender/scripts/mod_meshtools.py
-share/blender/scripts/mod_svg2obj.py
 share/blender/scripts/nendo_export.py
 share/blender/scripts/nendo_import.py
 share/blender/scripts/obdatacopier.py
@@ -60,11 +72,14 @@ share/blender/scripts/sysinfo.py
 share/blender/scripts/tex2uvbaker.py
 share/blender/scripts/truespace_export.py
 share/blender/scripts/truespace_import.py
-share/blender/scripts/unweld044.py
+share/blender/scripts/unweld.py
 share/blender/scripts/uv_export.py
 share/blender/scripts/videoscape_export.py
+share/blender/scripts/vrml97_export.py
 share/blender/scripts/wings_export.py
 share/blender/scripts/wings_import.py
 share/blender/scripts/wrl2export.py
+share/blender/scripts/x3d_export.py
+@dirrm share/blender/scripts/bpymodules
 @dirrm share/blender/scripts
 @dirrm share/blender
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index 15b7465e6ca..deaf0c4a086 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.16 2005/04/11 23:01:21 reinoud Exp $
+$NetBSD: distinfo,v 1.17 2005/08/03 11:58:14 adam Exp $
 
-SHA1 (blender-2.36.tar.gz) = 7f771bfc5fd77d0c7d17f10d235217714936a614
-RMD160 (blender-2.36.tar.gz) = 64a7f86515be4dbb08ec8fe088cc64c16fd7f909
-Size (blender-2.36.tar.gz) = 6912828 bytes
-SHA1 (patch-ab) = 46b1d28ee4702501cdc6a7b48cbd0eb2642550c8
+SHA1 (blender-2.37a.tar.gz) = 8070654abdca449658f8fb7c9ecfc4fb7e445465
+RMD160 (blender-2.37a.tar.gz) = 77a78a9f5ead45b7d1f67837c30446afbe937889
+Size (blender-2.37a.tar.gz) = 7990789 bytes
+SHA1 (patch-ab) = d0579486a3887d8cbfea341edf2f11f41e9a47ae
 SHA1 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2
-SHA1 (patch-ae) = a6a0af4122d69d63bf44c78f3f33320634fe6e2f
-SHA1 (patch-af) = af095208cedd346621f59e9c85fa8693f3258dd3
-SHA1 (patch-ag) = ef3a596fc6a909eff1fb4d500140405573484543
+SHA1 (patch-ae) = 5bf3ac144f8934c517115a7633b86a47627cc922
diff --git a/graphics/blender/patches/patch-ab b/graphics/blender/patches/patch-ab
index 816cfa91712..dc45fb372ed 100644
--- a/graphics/blender/patches/patch-ab
+++ b/graphics/blender/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/06/10 22:04:13 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2005/08/03 11:58:14 adam Exp $
 
---- source/blender/blenlib/intern/storage.c.orig	2003-05-29 16:09:25.000000000 +0200
+--- source/blender/blenlib/intern/storage.c.orig	2005-04-30 09:57:35.000000000 +0000
 +++ source/blender/blenlib/intern/storage.c
-@@ -182,7 +182,11 @@ double BLI_diskfree(char *dir)
+@@ -177,7 +177,11 @@ double BLI_diskfree(char *dir)
  
  	return (double) (freec*bytesps*sectorspc);
  #else
@@ -14,15 +14,15 @@ $NetBSD: patch-ab,v 1.3 2004/06/10 22:04:13 jmmv Exp $
  	char name[100],*slash;
  
  
-@@ -193,7 +197,10 @@ double BLI_diskfree(char *dir)
+@@ -188,7 +192,10 @@ double BLI_diskfree(char *dir)
  		if (slash) slash[1] = 0;
  	} else strcpy(name,"/");
  
--#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) 
+-#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || defined (__APPLE__) 
 +#if defined (__NetBSD__) && __NetBSD_Version__ >= 200040000 /* 2.0D */
 +	if (statvfs(name, &disk)) return(-1);
 +#elif defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || \
-+      defined (__NetBSD__)
++      defined (__APPLE__) || defined (__NetBSD__)
  	if (statfs(name, &disk)) return(-1);
  #endif
  #ifdef __BeOS
diff --git a/graphics/blender/patches/patch-ae b/graphics/blender/patches/patch-ae
index 48769df78a1..1be043d2047 100644
--- a/graphics/blender/patches/patch-ae
+++ b/graphics/blender/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2005/04/11 23:01:21 reinoud Exp $
+$NetBSD: patch-ae,v 1.3 2005/08/03 11:58:14 adam Exp $
 
---- SConstruct.orig	2004-12-21 18:00:25.000000000 +0100
+--- SConstruct.orig	2005-05-29 19:14:21.000000000 +0000
 +++ SConstruct
-@@ -31,7 +31,7 @@ else:
+@@ -34,7 +34,7 @@ else:
  	playername = 'blenderplayer$PROGSUFFIX'
  
  # Build directory.
@@ -11,9 +11,9 @@ $NetBSD: patch-ae,v 1.2 2005/04/11 23:01:21 reinoud Exp $
  
  bs_config.parseOpts()
  
-@@ -50,7 +50,92 @@ sdl_env = Environment ()
- freetype_env = Environment ()
- env = Environment ()
+@@ -53,7 +53,92 @@ sdl_env = Environment (ENV = os.environ)
+ freetype_env = Environment (ENV = os.environ)
+ env = Environment (ENV = os.environ)
  
 -if sys.platform == 'linux2' or sys.platform == 'linux-i386':
 +# pkgsrc patch
@@ -33,7 +33,7 @@ $NetBSD: patch-ae,v 1.2 2005/04/11 23:01:21 reinoud Exp $
 +	build_blender_static = 'false'
 +	build_blender_player = 'false'
 +	build_blender_plugin = 'false'
-+	release_flags = ['-O2']
++	release_flags = string.split(os.environ[ 'CFLAGS' ])
 +	debug_flags = ['-O2', '-g']
 +	extra_flags = ['-pipe', '-fPIC', '-funsigned-char']
 +	cxxflags = []
@@ -102,10 +102,10 @@ $NetBSD: patch-ae,v 1.2 2005/04/11 23:01:21 reinoud Exp $
 +	print "Building for FreeBSD"
 +
 +elif sys.platform == 'linux2' or sys.platform == 'linux-i386':
- 	use_international = 'false'
+ 	use_international = 'true'
  	use_gameengine = 'true'
  	use_openal = 'false'
-@@ -591,7 +676,7 @@ elif sys.platform=='openbsd3':
+@@ -600,7 +685,7 @@ elif sys.platform=='openbsd3':
  	use_openal = 'false'
  	use_fmod = 'false'
  	use_quicktime = 'false'
diff --git a/graphics/blender/patches/patch-af b/graphics/blender/patches/patch-af
deleted file mode 100644
index 3b924849cbb..00000000000
--- a/graphics/blender/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/02/26 20:34:43 reinoud Exp $
-
---- source/gameengine/BlenderRoutines/SConscript.orig	2004-05-16 15:07:17.000000000 +0200
-+++ source/gameengine/BlenderRoutines/SConscript
-@@ -46,6 +46,7 @@ kx_blenderhook_env.Append (CPPPATH=['.',
- 
- kx_blenderhook_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
- kx_blenderhook_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
-+kx_blenderhook_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
- 
- if sys.platform=='win32':
-     kx_blenderhook_env.Append (CXXFLAGS = ['/GR'])
diff --git a/graphics/blender/patches/patch-ag b/graphics/blender/patches/patch-ag
deleted file mode 100644
index 55afa7877e7..00000000000
--- a/graphics/blender/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/02/26 20:34:43 reinoud Exp $
-
---- source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.orig	2004-05-16 15:07:16.000000000 +0200
-+++ source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
-@@ -14,5 +14,6 @@ ras_openglrasterizer_env.Append (CPPPATH
-                                           '#intern/moto/include',
-                                           '#source/gameengine/Rasterizer'
-                                          ])
-+ras_openglrasterizer_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
- 
- ras_openglrasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_OpenGLRasterizer', source=source_files)