ports/116937: graphics/blender: upgrade to 2.45 & don't disable the game engine

Thu Oct 4 22:30:03 UTC 2007

>Number:         116937
>Category:       ports
>Synopsis:       graphics/blender: upgrade to 2.45 & don't disable the game engine
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 04 22:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 6.2-STABLE FreeBSD 6.2-STABLE #0: Sun May 20 15:59:36 CEST 2007 thierry at graf.pompo.net:/usr/obj/usr/src/sys/GRAF070519 i386

Note: second sending, the first one has been rejected by Gnats.

>Description:
	- Upgrade to 2.45;

        - Don't disable the game engine

        - s/post-patch/configure/ to ease patches modifications;

        - s/mv/cp -p/ to allow `make reinstall'.

        Changelog from
        <http://www.blender.org/development/release-logs/blender-245/>

>How-To-Repeat:
	Have a son hacking with blender ;-)

>Fix:
	Please consider the following patch:

--- blender.diff begins here ---
diff -urN graphics/blender.orig/Makefile graphics/blender/Makefile
--- graphics/blender.orig/Makefile	Fri Aug 10 21:04:04 2007
+++ graphics/blender/Makefile	Thu Oct  4 23:52:58 2007
@@ -5,9 +5,11 @@
 # $FreeBSD: ports/graphics/blender/Makefile,v 1.19 2007/08/07 17:06:35 beech Exp $
 
 PORTNAME=	blender
-PORTVERSION=	2.44.1
+PORTVERSION=	2.45
 CATEGORIES=	graphics games
-MASTER_SITES=	CENKES
+MASTER_SITES=	http://download.blender.org/source/		\
+		http://mirror.cs.umn.edu/blender.org/source/	\
+		http://public.planetmirror.com/pub/blender/source/
 
 MAINTAINER=	dyeske at gmail.com
 COMMENT=	3D modeling/rendering/animation/gaming package
@@ -46,13 +48,14 @@
 		-I${PYTHON_INCLUDEDIR}"
 MAKE_ENV+=	NAN_FREETYPE="${LOCALBASE}"
 MAKE_ENV+=	NAN_OPENEXR="${LOCALBASE}"
-MAKE_ENV+=	WITH_BF_BLENDERPLAYER="false"
+MAKE_ENV+=	WITH_BF_BLENDERPLAYER="true"
+MAKE_ENV+=	WITH_BF_BLENDERGAMEENGINE="true"
 
 .if defined(WITH_OCFLAGS)
 CFLAGS+=	-O3 -ffast-math
 .endif
 
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} -e \
 		's|sdl11-config|${SDL_CONFIG}|; \
 		s|2.3|${PYTHON_VER}|' \
@@ -78,7 +81,7 @@
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/obj/freebsd/bin/blender ${PREFIX}/bin
 .if !defined(WITH_NOPORTDOCS)
-	@${MV} ${WRKSRC}/README ${WRKSRC}/doc/
+	@${CP} -p ${WRKSRC}/README ${WRKSRC}/doc/
 	@${INSTALL} -d ${DOCSDIR}/
 	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
diff -urN graphics/blender.orig/distinfo graphics/blender/distinfo
--- graphics/blender.orig/distinfo	Fri Aug 10 21:04:04 2007
+++ graphics/blender/distinfo	Wed Oct  3 21:16:55 2007
@@ -1,3 +1,3 @@
-MD5 (blender-2.44.1.tar.gz) = 926d6ca3f0b1b4aeaa75a2b1767dc2a3
-SHA256 (blender-2.44.1.tar.gz) = 8d682ece9ce8ef15cffb5bb16e9099b11bef4c0eb3efae9b352853d58406b317
-SIZE (blender-2.44.1.tar.gz) = 14743807
+MD5 (blender-2.45.tar.gz) = 1358ca481b7f2b8eadd3327ebbd563ef
+SHA256 (blender-2.45.tar.gz) = 921f72a15d4076f62e52674337f5d3a90cd7a82675b12bb549ebe6cd5c9027ae
+SIZE (blender-2.45.tar.gz) = 14226829
diff -urN graphics/blender.orig/files/patch-source_nan_definitions.mk graphics/blender/files/patch-source_nan_definitions.mk
--- graphics/blender.orig/files/patch-source_nan_definitions.mk	Tue Aug  7 19:06:36 2007
+++ graphics/blender/files/patch-source_nan_definitions.mk	Thu Oct  4 22:01:39 2007
@@ -1,5 +1,5 @@
---- source/nan_definitions.mk.orig	Wed Nov 22 11:05:35 2006
-+++ source/nan_definitions.mk	Wed Mar 21 21:24:37 2007
+--- source/nan_definitions.mk.orig	Tue Sep 18 06:58:49 2007
++++ source/nan_definitions.mk	Thu Oct  4 22:00:38 2007
 @@ -55,9 +55,9 @@
      export NAN_LIBDIR ?= $(NANBLENDERHOME)/../lib
      export NAN_OBJDIR ?= $(NANBLENDERHOME)/obj
@@ -10,22 +10,5 @@
 -    export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS)
 +    export OCGDIR = $(NAN_OBJDIR)/freebsd
  
-     export NAN_MOTO ?= $(LCGDIR)/moto
- ifeq ($(FREE_WINDOWS), true)
-@@ -132,7 +132,7 @@
- 	  export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
-         else
-           export NAN_OPENEXR ?= /usr/local
--	  export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
-+	  export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libIlmThread.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
-         endif
-       endif
-       export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
-@@ -291,6 +291,7 @@
- 
-     # enable freetype2 support for text objects
-     # export WITH_FREETYPE2 ?= true
-+    export NAN_NO_KETSJI=true
- 
-   else
-   ifeq ($(OS),irix)
+     # Determines what targets are built
+     export WITH_BF_DYNAMICOPENGL ?= true
diff -urN graphics/blender.orig/files/patch-user-def.mk graphics/blender/files/patch-user-def.mk
--- graphics/blender.orig/files/patch-user-def.mk	Tue Aug  7 19:06:36 2007
+++ graphics/blender/files/patch-user-def.mk	Thu Oct  4 22:57:16 2007
@@ -1,5 +1,5 @@
---- user-def.mk.orig	1969-12-31 14:00:00.000000000 -1000
-+++ user-def.mk	2007-08-07 00:38:53.000000000 -0800
+--- ./user-def.mk.orig	Thu Oct  4 22:55:33 2007
++++ ./user-def.mk	Thu Oct  4 22:56:26 2007
 @@ -0,0 +1,74 @@
 +export NAN_DEBUG=-g
 +
@@ -44,7 +44,7 @@
 +	export WITH_FFMPEG=false
 +	export NAN_PYTHON=/usr/local
 +	export NAN_PYTHON_VERSION=2.5
-+	export NAN_OPENAL=/usr
++	#export NAN_OPENAL=/usr
 +	export NAN_FMOD=/usr/local
 +	export NAN_JPEG=/usr/local
 +	export NAN_PNG=/usr/local
--- blender.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

