Update blender package to version 2.36nb2 fixing the creation of the

/blender file.

4 files changed, 19 insertions, 9 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 03f93a2b06b..e281f578918 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.9830 2005/04/11 20:40:24 recht Exp $
+$NetBSD: CHANGES,v 1.9831 2005/04/11 23:01:20 reinoud Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -1993,3 +1993,4 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated postgresql80 to 8.0.2 [recht 2005-04-11]
 	Removed postgresql80-lib [recht 2005-04-11]
 	Removed postgresql80-docs [recht 2005-04-11]
+	Updated blender to 2.36nb2 [reinoud 2005-04-11]
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 353b3883e34..25fed3950db 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/04/11 23:01:21 reinoud Exp $
 #
 
 DISTNAME=		blender-2.36
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
 			http://download.blender.org/source/
@@ -38,12 +38,12 @@ do-build:
 
 do-install:
 	${CP} -f ${WRKSRC}/blender ${WRKSRC}/blender-bin
-	${SED} -e "s|__PREFIX__|${PREFIX}|g" files/blender > ${TMP}/blender
-	${CHMOD} +x ${TMP}/blender
+	${SED} -e "s|__PREFIX__|${PREFIX}|g" files/blender > ${WRKDIR}/blender/bin/blender
+	${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} ${TMP}/blender ${PREFIX}/bin
+	${INSTALL} ${WRKDIR}/blender/bin/blender ${PREFIX}/bin
 
 .if defined(BLENDER_INSTALL_DOC)
 DEPENDS+=		blender-doc:../../graphics/blender-doc
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index 41ec300a2ef..15b7465e6ca 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2005/02/26 21:54:13 reinoud Exp $
+$NetBSD: distinfo,v 1.16 2005/04/11 23:01:21 reinoud 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 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2
-SHA1 (patch-ae) = 7635599afe0629a5c2e127c3d3ab26043934e5d7
+SHA1 (patch-ae) = a6a0af4122d69d63bf44c78f3f33320634fe6e2f
 SHA1 (patch-af) = af095208cedd346621f59e9c85fa8693f3258dd3
 SHA1 (patch-ag) = ef3a596fc6a909eff1fb4d500140405573484543
diff --git a/graphics/blender/patches/patch-ae b/graphics/blender/patches/patch-ae
index 4f4b819fc98..48769df78a1 100644
--- a/graphics/blender/patches/patch-ae
+++ b/graphics/blender/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2005/02/26 20:34:43 reinoud Exp $
+$NetBSD: patch-ae,v 1.2 2005/04/11 23:01:21 reinoud Exp $
 
 --- SConstruct.orig	2004-12-21 18:00:25.000000000 +0100
 +++ SConstruct
+@@ -31,7 +31,7 @@ else:
+ 	playername = 'blenderplayer$PROGSUFFIX'
+ 
+ # Build directory.
+-# root_build_dir = '..' + os.sep + 'build' + os.sep + sys.platform + os.sep
++root_build_dir = '..' + os.sep + 'build' + os.sep + sys.platform + os.sep
+ 
+ bs_config.parseOpts()
+ 
 @@ -50,7 +50,92 @@ sdl_env = Environment ()
  freetype_env = Environment ()
  env = Environment ()