5 files changed, 55 insertions, 207 deletions

diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile
index d7af4c498ea9..00cff704b9e5 100644
--- a/graphics/blender-devel/Makefile
+++ b/graphics/blender-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	blender
-PORTVERSION=	2.42a
+PORTVERSION=	2.43
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
@@ -23,18 +23,16 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		SDL.11:${PORTSDIR}/devel/sdl12 \
 		Half.2:${PORTSDIR}/graphics/OpenEXR \
 		gettextpo.1:${PORTSDIR}/devel/gettext \
+		openal.0:${PORTSDIR}/audio/openal \
+		alut.1:${PORTSDIR}/audio/freealut \
 		avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
 
-BROKEN=		Does not build
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2007-04-10
-
 PLIST_FILES=	bin/blender
 USE_X_PREFIX=	yes
-USE_PYTHON=	2.3
-USE_SCONS=	yes
+USE_PYTHON=	2.4+
 USE_SDL=	sdl
 USE_GL=		yes
+USE_GMAKE=	yes
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
@@ -42,9 +40,7 @@ CFLAGS+=	-O3 -ffast-math
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on 4.x
-.endif
+ONLY_FOR_ARCHS=	i386
 
 pre-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
@@ -52,7 +48,30 @@ pre-everything::
 	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|sdl11-config|${SDL_CONFIG}|; \
+		s|2.3|${PYTHON_VER}|' \
+		${WRKSRC}/source/nan_definitions.mk
+
+	@${REINPLACE_CMD} -e \
+		's|gcc|${CC}|; \
+		s|g++|${CXX}|; \
+		s|-O2|${CFLAGS}|; \
+		s|-DGAMEBLENDER=1||; \
+		s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
+		${WRKSRC}/source/nan_compile.mk
+
+	@${REINPLACE_CMD} -e \
+		's|-lc_r||; \
+		s|-pthread|${PTHREAD_LIBS}|' \
+		${WRKSRC}/source/nan_link.mk
+
+	@${REINPLACE_CMD} -e \
+		's|-FIX_NAN_WARN||' \
+		${WRKSRC}/source/nan_warn.mk
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/../install/freebsd/blender ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/obj/freebsd/bin/blender ${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/graphics/blender-devel/distinfo b/graphics/blender-devel/distinfo
index 122d46899cfe..03c91412f72c 100644
--- a/graphics/blender-devel/distinfo
+++ b/graphics/blender-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (blender-2.42a.tar.gz) = 3d60b7ebe0dea47da12744fe2462d96c
-SHA256 (blender-2.42a.tar.gz) = f046a66abe2e9a93a17ef1538f43642d2b6a6e48b55b804899fea59279dacd52
-SIZE (blender-2.42a.tar.gz) = 12295244
+MD5 (blender-2.43.tar.gz) = 7629c31bc45e286bdf3b2c555e6446a2
+SHA256 (blender-2.43.tar.gz) = a48213b61302d03eb8db0cf42712b142d280d16ad111f6411cd8e43403e5e61b
+SIZE (blender-2.43.tar.gz) = 13806334
diff --git a/graphics/blender-devel/files/patch-intern_ghost-SConscript b/graphics/blender-devel/files/patch-intern_ghost-SConscript
deleted file mode 100644
index 0eb4d3c16932..000000000000
--- a/graphics/blender-devel/files/patch-intern_ghost-SConscript
+++ /dev/null
@@ -1,27 +0,0 @@
---- intern/ghost/SConscript.orig	Mon Jun  5 17:52:26 2006
-+++ intern/ghost/SConscript	Mon Aug 21 00:20:20 2006
-@@ -26,6 +26,24 @@
-     for f in pf:
-         sources.remove('intern' + os.sep + f + 'Win32.cpp')
-         sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+elif window_system == 'freebsd4':
-+    for f in pf:
-+        sources.remove('intern' + os.sep + f + 'Win32.cpp')
-+        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+elif window_system == 'freebsd5':
-+    for f in pf:
-+        sources.remove('intern' + os.sep + f + 'Win32.cpp')
-+        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+elif window_system == 'freebsd6':
-+    for f in pf:
-+        sources.remove('intern' + os.sep + f + 'Win32.cpp')
-+        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+elif window_system == 'freebsd7':
-+    for f in pf:
-+        sources.remove('intern' + os.sep + f + 'Win32.cpp')
-+        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-+
-+
- else:
-     print "Unknown window system specified."
-     Exit()
diff --git a/graphics/blender-devel/files/patch-source_nan_definitions.mk b/graphics/blender-devel/files/patch-source_nan_definitions.mk
new file mode 100644
index 000000000000..5118e4365185
--- /dev/null
+++ b/graphics/blender-devel/files/patch-source_nan_definitions.mk
@@ -0,0 +1,22 @@
+--- source/nan_definitions.mk.orig	Wed Nov 22 14:05:35 2006
++++ source/nan_definitions.mk	Tue Feb 20 03:38:18 2007
+@@ -55,9 +55,9 @@
+     export NAN_LIBDIR ?= $(NANBLENDERHOME)/../lib
+     export NAN_OBJDIR ?= $(NANBLENDERHOME)/obj
+     # Library Config_Guess DIRectory
+-    export LCGDIR = $(NAN_LIBDIR)/$(CONFIG_GUESS)
++    export LCGDIR = $(NAN_LIBDIR)/freebsd
+     # Object Config_Guess DIRectory
+-    export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS)
++    export OCGDIR = $(NAN_OBJDIR)/freebsd
+ 
+     export NAN_MOTO ?= $(LCGDIR)/moto
+ ifeq ($(FREE_WINDOWS), true)
+@@ -291,6 +291,7 @@
+ 
+     # enable freetype2 support for text objects
+     # export WITH_FREETYPE2 ?= true
++    export NAN_NO_KETSJI=true
+ 
+   else
+   ifeq ($(OS),irix)
diff --git a/graphics/blender-devel/files/patch-user-config_py b/graphics/blender-devel/files/patch-user-config_py
deleted file mode 100644
index b7ee12e68932..000000000000
--- a/graphics/blender-devel/files/patch-user-config_py
+++ /dev/null
@@ -1,166 +0,0 @@
---- user-config.py.orig	Mon Aug 21 01:28:00 2006
-+++ user-config.py	Mon Aug 21 01:28:13 2006
-@@ -0,0 +1,163 @@
-+LCGDIR = '../lib/freebsd'
-+BF_PYTHON = '/usr/local'
-+BF_PYTHON_VERSION = '2.3'
-+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
-+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config'
-+
-+WITH_BF_OPENAL = 'false'
-+BF_OPENAL = '/usr/local'
-+BF_OPENAL_INC = '${BF_OPENAL}/include/AL'
-+BF_OPENAL_LIB = 'openal'
-+
-+WITH_BF_SDL = 'true'
-+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
-+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-+BF_SDL_LIBPATH = '${BF_SDL}/lib'
-+
-+WITH_BF_FMOD = 'false'
-+BF_FMOD = LCGDIR + '/fmod'
-+
-+WITH_BF_OPENEXR = 'true'
-+BF_OPENEXR = '/usr/local'
-+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-+
-+WITH_BF_JPEG = 'true'
-+BF_JPEG = '/usr/local'
-+BF_JPEG_INC = '${BF_JPEG}/include'
-+BF_JPEG_LIB = 'jpeg'
-+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-+
-+WITH_BF_PNG = 'true'
-+BF_PNG = '/usr/local'
-+BF_PNG_INC = '${BF_PNG}/include/libpng'
-+BF_PNG_LIB = 'png'
-+BF_PNG_LIBPATH = '${BF_PNG}/lib'
-+
-+BF_TIFF = '/usr/local'
-+BF_TIFF_INC = '${BF_TIFF}/include'
-+
-+WITH_BF_ZLIB = 'true'
-+BF_ZLIB = '/usr'
-+BF_ZLIB_INC = '${BF_ZLIB}/include'
-+BF_ZLIB_LIB = 'z'
-+
-+WITH_BF_INTERNATIONAL = 'true'
-+
-+BF_GETTEXT = '/usr/local'
-+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-+BF_GETTEXT_LIB = 'intl iconv'
-+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-+
-+WITH_BF_FTGL = 'true'
-+BF_FTGL = '/usr/X11R6'
-+BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
-+BF_FTGL_LIB = 'extern_ftgl'
-+#BF_FTGL = '#extern/bFTGL'
-+#BF_FTGL_INC = '${BF_FTGL}/include'
-+#BF_FTGL_LIB = 'extern_ftgl'
-+
-+
-+WITH_BF_GAMEENGINE='true'
-+
-+WITH_BF_ODE = 'false'
-+BF_ODE = LCGDIR + '/ode'
-+BF_ODE_INC = BF_ODE + '/include'
-+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-+
-+WITH_BF_BULLET = 'true'
-+BF_BULLET = '#extern/bullet'
-+BF_BULLET_INC = '${BF_BULLET}/LinearMath ${BF_BULLET}/BulletDynamics ${BF_BULLET}/Bullet'
-+BF_BULLET_LIB = 'extern_bullet'
-+
-+BF_SOLID = '#extern/solid'
-+BF_SOLID_INC = '${BF_SOLID}'
-+BF_SOLID_LIB = 'extern_solid'
-+
-+#WITH_BF_NSPR = 'true'
-+#BF_NSPR = $(LCGDIR)/nspr
-+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-+#BF_NSPR_LIB = 
-+
-+# Uncomment the following line to use Mozilla inplace of netscape
-+#CPPFLAGS += -DMOZ_NOT_NET
-+# Location of MOZILLA/Netscape header files...
-+#BF_MOZILLA = $(LCGDIR)/mozilla
-+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-+#BF_MOZILLA_LIB =
-+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-+# if this is not set.
-+#
-+# Be paranoid regarding library creation (do not update archives)
-+#BF_PARANOID = 'true'
-+
-+# enable freetype2 support for text objects
-+BF_FREETYPE = '/usr/local'
-+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-+BF_FREETYPE_LIB = 'freetype'
-+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-+
-+WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
-+BF_QUICKTIME = '/usr/local'
-+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-+
-+# enable ffmpeg  support
-+WITH_BF_FFMPEG = 'true'  # -DWITH_FFMPEG
-+BF_FFMPEG = '/usr/local'
-+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-+BF_FFMPEG_LIBPATH='$(BF_FFMPEG)/lib'
-+BF_FFMPEG_LIB = 'avformat avcodec avutil'
-+
-+# Mesa Libs should go here if your using them as well....
-+WITH_BF_STATICOPENGL = 'true'
-+BF_OPENGL = '/usr/X11R6'
-+BF_OPENGL_INC = '${BF_OPENGL}/include'
-+BF_OPENGL_LIB = 'OSMesa'
-+BF_OPENGL_LIBPATH = '${BF_OPENGL}/lib'
-+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.so ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
-+
-+##
-+CC = 'gcc'
-+CXX = 'g++'
-+##ifeq ($CPU),alpha)
-+##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
-+
-+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-+
-+CPPFLAGS = ['-DXP_UNIX','-I/usr/local/include','-I/usr/X11R6/include']
-+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-I/usr/local/include','-I/usr/X11R6/include']
-+REL_CFLAGS = ['-O2']
-+REL_CCFLAGS = ['-O2']
-+##BF_DEPEND = 'true'
-+##
-+##AR = ar
-+##ARFLAGS = ruv
-+##ARFLAGSQUIET = ru
-+##
-+CC = 'gcc'
-+CXX = 'g++'
-+C_WARN = '-Wall'
-+
-+CC_WARN = '-Wall'
-+
-+##FIX_STUBS_WARNINGS = -Wno-unused
-+
-+LLIBS = 'util m pthread stdc++'
-+##LOPTS = --dynamic
-+##DYNLDFLAGS = -shared $(LDFLAGS)
-+
-+BF_PROFILE_FLAGS = ['-pg','-g']
-+BF_PROFILE = 'false'
-+
-+BF_DEBUG = 'false'
-+BF_DEBUG_FLAGS = ''
-+
-+BF_BUILDDIR = '../build/freebsd'
-+BF_INSTALLDIR='../install/freebsd'
-+
-+
-+#Link against pthread
-+PLATFORM_LINKFLAGS = ['-pthread','-L/usr/local/lib','-L/usr/X11R6/lib']