1 files changed, 142 insertions, 229 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 7675ed4f46fd..7b1bab9dfa7d 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	blender
-PORTVERSION=	2.68a
-PORTREVISION=	1
+PORTVERSION=	2.69
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
@@ -12,53 +11,117 @@ MASTER_SITES=	http://download.blender.org/source/ \
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	3D modeling/rendering/animation/gaming package
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
 USE_XORG=	x11 xext xmu
 USE_GL=		glew
-USES=		cmake:outsource
+USES=		cmake:outsource shebangfix
 USE_PYTHON=	3.3
-
+CMAKE_VERBOSE=	yes
 
 CMAKE_ARGS+=	-DWITH_PYTHON_INSTALL:BOOL=OFF \
 		-DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF
 
+python_CMD=	${PYTHON_CMD}
+SHEBANG_FILES=	release/bin/blender-thumbnailer.py \
+		release/scripts/modules/bl_i18n_utils/merge_po.py \
+		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
+		release/scripts/modules/blend_render_info.py
+
 SUB_FILES=	blender blenderplayer
-MAN1=		blender.1
 
-OUTDIR=		${INSTALL_WRKSRC}/bin/2.68
+OUTDIR=		${INSTALL_WRKSRC}/bin/2.69
 
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.options"
 
-.include <bsd.port.options.mk>
-
-. if ${PORT_OPTIONS:MMOD_BOOLEAN}
-CMAKE_ARGS+=	-DWITH_MOD_BOOLEAN:BOOL=ON
-LIB_DEPENDS+=	boost_thread:${PORTSDIR}/devel/boost-libs
-.else
-CMAKE_ARGS+=	-DWITH_MOD_BOOLEAN:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MMOD_FLUID}
-CMAKE_ARGS+=	-DWITH_MOD_FLUID:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_MOD_FLUID:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MMOD_REMESH}
-CMAKE_ARGS+=	-DWITH_MOD_REMESH:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_MOD_REMESH:BOOL=OFF
-.endif
+# TODO: WITH_CYCLES_STANDALONE WITH_CYCLES_STANDALONE_GUI
+
+MOD_BOOLEAN_CMAKE_ON=		-DWITH_MOD_BOOLEAN:BOOL=ON
+MOD_BOOLEAN_CMAKE_OFF=		-DWITH_MOD_BOOLEAN:BOOL=OFF
+MOD_BOOLEAN_LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+MOD_FLUID_CMAKE_ON=		-DWITH_MOD_FLUID:BOOL=ON
+MOD_FLUID_CMAKE_OFF=		-DWITH_MOD_FLUID:BOOL=OFF
+MOD_REMESH_CMAKE_ON=		-DWITH_MOD_REMESH:BOOL=ON
+MOD_REMESH_CMAKE_OFF=		-DWITH_MOD_REMESH:BOOL=OFF
+MOD_SMOKE_CMAKE_ON=		-DWITH_MOD_SMOKE:BOOL=ON
+MOD_SMOKE_CMAKE_OFF=		-DWITH_MOD_SMOKE:BOOL=OFF
+AVI_CMAKE_ON=			-DWITH_CODEC_AVI:BOOL=ON
+AVI_CMAKE_OFF=			-DWITH_CODEC_AVI:BOOL=OFF
+BULLET_CMAKE_ON=		-DWITH_BULLET:BOOL=ON
+BULLET_CMAKE_OFF=		-DWITH_BULLET:BOOL=OFF
+CINEON_CMAKE_ON=		-DWITH_IMAGE_CINEON:BOOL=ON
+CINEON_CMAKE_OFF=		-DWITH_IMAGE_CINEON:BOOL=OFF
+CAMERATRACK_CMAKE_ON=		-DWITH_LIBMV:BOOL=ON
+CAMERATRACK_CMAKE_OFF=		-DWITH_LIBMV:BOOL=OFF
+CAMERATRACK_LIB_DEPENDS=	libunwind.so:${PORTSDIR}/devel/libunwind
+COMPOSITOR_CMAKE_ON=		-DWITH_COMPOSITOR:BOOL=ON
+COMPOSITOR_CMAKE_OFF=		-DWITH_COMPOSITOR:BOOL=OFF
+DDS_CMAKE_ON=			-DWITH_IMAGE_DDS:BOOL=ON
+DDS_CMAKE_OFF=			-DWITH_IMAGE_DDS:BOOL=OFF
+FFMPEG_CMAKE_ON=		-DWITH_CODEC_FFMPEG:BOOL=ON
+FFMPEG_CMAKE_OFF=		-DWITH_CODEC_FFMPEG:BOOL=OFF
+FFMPEG_LIB_DEPENDS=		libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+FFTW3_CMAKE_ON=			-DWITH_FFTW3:BOOL=ON
+FFTW3_CMAKE_OFF=		-DWITH_FFTW3:BOOL=OFF
+FFTW3_LIB_DEPENDS=		libfftw3.so:${PORTSDIR}/math/fftw3
+FRAMESERVER_CMAKE_ON=		-DWITH_IMAGE_FRAMESERVER:BOOL=ON
+FRAMESERVER_CMAKE_OFF=		-DWITH_IMAGE_FRAMESERVER:BOOL=OFF
+FREESTYLE_CMAKE_ON=		-DWITH_FREESTYLE:BOOL=ON
+FREESTYLE_CMAKE_OFF=		-DWITH_FREESTYLE:BOOL=OFF
+GAMEENGINE_CMAKE_ON=		-DWITH_GAMEENGINE:BOOL=ON
+GAMEENGINE_CMAKE_OFF=		-DWITH_GAMEENGINE:BOOL=OFF
+HDR_CMAKE_ON=			-DWITH_IMAGE_HDR:BOOL=ON
+HDR_CMAKE_OFF=			-DWITH_IMAGE_HDR:BOOL=OFF
+INPUT_NDOF_CMAKE_ON=		-DWITH_INPUT_NDOF:BOOL=ON
+INPUT_NDOF_CMAKE_OFF=		-DWITH_INPUT_NDOF:BOOL=OFF
+JACK_CMAKE_ON=			-DWITH_JACK:BOOL=ON
+JACK_CMAKE_OFF=			-DWITH_JACK:BOOL=OFF
+JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+LZO_CMAKE_ON=			-DWITH_LZO:BOOL=ON
+LZO_CMAKE_OFF=			-DWITH_LZO:BOOL=OFF
+LZMA_CMAKE_ON=			-DWITH_LZMA:BOOL=ON
+LZMA_CMAKE_OFF=			-DWITH_LZMA:BOOL=OFF
+LIBMV_CMAKE_ON=			-DWITH_LIBMV:BOOL=ON
+LIBMV_CMAKE_OFF=		-DWITH_LIBMV:BOOL=OFF
+MENU_USES=			desktop-file-utils
+NLS_CMAKE_ON=			-DWITH_INTERNATIONAL:BOOL=ON
+NLS_CMAKE_OFF=			-DWITH_INTERNATIONAL:BOOL=OFF
+NLS_USES=			gettext iconv
+OPENCOLORIO_CMAKE_ON=		-DWITH_OPENCOLORIO:BOOL=ON
+OPENCOLORIO_CMAKE_OFF=		-DWITH_OPENCOLORIO:BOOL=OFF
+OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
+OPENEXR_CMAKE_ON=		-DWITH_IMAGE_OPENEXR:BOOL=ON
+OPENEXR_CMAKE_OFF=		-DWITH_IMAGE_OPENEXR:BOOL=OFF
+OPENEXR_LIB_DEPENDS=		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+OPENJPEG_CMAKE_ON=		-DWITH_SYSTEM_OPENJPEG:BOOL=ON \
+				-DWITH_IMAGE_OPENJPEG:BOOL=ON
+OPENJPEG_CMAKE_OFF=		-DWITH_IMAGE_OPENJPEG:BOOL=OFF
+OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
+OPENMP_CMAKE_ON=		-DWITH_OPENMP:BOOL=ON
+OPENMP_CMAKE_OFF=		-DWITH_OPENMP:BOOL=OFF
+RAYOPTIMIZATION_CMAKE_ON=	-DWITH_RAYOPTIMIZATION:BOOL=ON
+RAYOPTIMIZATION_CMAKE_OFF=	-DWITH_RAYOPTIMIZATION:BOOL=OFF
+SAMPLERATE_CMAKE_ON=		-DWITH_SAMPLERATE:BOOL=ON
+SAMPLERATE_CMAKE_OFF=		-DWITH_SAMPLERATE:BOOL=OFF
+SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SNDFILE_CMAKE_ON=		-DWITH_CODEC_SNDFILE:BOOL=ON
+SNDFILE_CMAKE_OFF=		-DWITH_CODEC_SNDFILE:BOOL=OFF
+SNDFILE_LIB_DEPENDS=		libsndfile.so:${PORTSDIR}/audio/libsndfile
+TIFF_CMAKE_ON=			-DWITH_IMAGE_TIFF:BOOL=ON
+TIFF_CMAKE_OFF=			-DWITH_IMAGE_TIFF:BOOL=OFF
+TIFF_LIB_DEPENDS=		libtiff.so:${PORTSDIR}/graphics/tiff
+XINPUT_CMAKE_ON=		-DWITH_X11_XINPUT:BOOL=ON
+XINPUT_CMAKE_OFF=		-DWITH_X11_XINPUT:BOOL=OFF
+XINPUT_USE=			XORG=xi
+XF86VMODE_CMAKE_ON=		-DWITH_X11_XF86VMODE:BOOL=ON
+XF86VMODE_CMAKE_OFF=		-DWITH_X11_XF86VMODE:BOOL=OFF
+XF86VMODE_USE=			XORG=xi xxf86vm
 
-.if ${PORT_OPTIONS:MMOD_SMOKE}
-CMAKE_ARGS+=	-DWITH_MOD_SMOKE:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_MOD_SMOKE:BOOL=OFF
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMOD_OCEANSIM}
 .if ${PORT_OPTIONS:MFFTW3}
@@ -70,37 +133,12 @@ BROKEN=		MOD_OCEANSIM requires FFTW3
 CMAKE_ARGS+=	-DWITH_MOD_OCEANSIM:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MBULLET}
-CMAKE_ARGS+=	-DWITH_BULLET:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_BULLET:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MCINEON}
-CMAKE_ARGS+=	-DWITH_IMAGE_CINEON:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_IMAGE_CINEON:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MCAMERATRACK}
-CMAKE_ARGS+=	-DWITH_LIBMV:BOOL=ON
-LIB_DEPENDS+=	unwind:${PORTSDIR}/devel/libunwind
-.else
-CMAKE_ARGS+=	-DWITH_LIBMV:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MCOMPOSITOR}
-CMAKE_ARGS+=	-DWITH_COMPOSITOR:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_COMPOSITOR:BOOL=OFF
-.endif
-
 .if ${PORT_OPTIONS:MCYCLES}
 CMAKE_ARGS+=	-DWITH_CYCLES:BOOL=ON
 .if !${PORT_OPTIONS:MOPENEXR} || !${PORT_OPTIONS:MTIFF}
 BROKEN=		CYCLES requires OPENEXR and TIFF
 .endif
-LIB_DEPENDS+=	OpenImageIO:${PORTSDIR}/graphics/openimageio
+LIB_DEPENDS+=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
 .else
 CMAKE_ARGS+=	-DWITH_CYCLES:BOOL=OFF
 .endif
@@ -109,50 +147,17 @@ CMAKE_ARGS+=	-DWITH_CYCLES:BOOL=OFF
 .if !${PORT_OPTIONS:MCYCLES}
 IGNORE=	support for the OpenShadingLanguage in cycles obviously requires CYCLES
 .endif
-CMAKE_ARGS+=	-DWITH_CYCLES_OSL:BOOL=ON
-LIB_DEPENDS+=	oslexec:${PORTSDIR}/graphics/openshadinglanguage
+CMAKE_ARGS+=	-DWITH_CYCLES_OSL:BOOL=ON \
+		-DLLVM_STATIC:BOOL=OFF \
+		-DWITH_LLVM:BOOL=ON \
+		-DLLVM_VERSION:STRING="3.3" \
+		-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config33"
+LIB_DEPENDS+=	liboslexec.so:${PORTSDIR}/graphics/openshadinglanguage
+BUILD_DEPENDS+=	llvm-config33:${PORTSDIR}/devel/llvm33
 .else
 CMAKE_ARGS+=	-DWITH_CYCLES_OSL:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MDDS}
-CMAKE_ARGS+=	-DWITH_IMAGE_DDS:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_IMAGE_DDS:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-CMAKE_ARGS+=	-DWITH_CODEC_FFMPEG:BOOL=ON
-LIB_DEPENDS+=	avutil:${PORTSDIR}/multimedia/ffmpeg
-.else
-CMAKE_ARGS+=	-DWITH_CODEC_FFMPEG:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MFFTW3}
-LIB_DEPENDS+=	fftw3:${PORTSDIR}/math/fftw3
-CMAKE_ARGS+=	-DWITH_FFTW3:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_FFTW3:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MFRAMESERVER}
-CMAKE_ARGS+=	-DWITH_IMAGE_FRAMESERVER:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_IMAGE_FRAMESERVER:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGAMEENGINE}
-CMAKE_ARGS+=	-DWITH_GAMEENGINE:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_GAMEENGINE:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MHDR}
-CMAKE_ARGS+=	-DWITH_IMAGE_HDR:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_IMAGE_HDR:BOOL=OFF
-.endif
-
 .if ${PORT_OPTIONS:MHEADLESS}
 .if ${PORT_OPTIONS:MXINPUT} || ${PORT_OPTIONS:MXF86VMODE}
 BROKEN=	HEADLESS does not require any X11 dependency
@@ -162,48 +167,6 @@ CMAKE_ARGS+=	-DWITH_HEADLESS:BOOL=ON
 CMAKE_ARGS+=	-DWITH_HEADLESS:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MINPUT_NDOF}
-CMAKE_ARGS+=	-DWITH_INPUT_NDOF:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_INPUT_NDOF:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
-CMAKE_ARGS+=	-DWITH_JACK:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_JACK:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLZO}
-CMAKE_ARGS+=	-DWITH_LZO:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_LZO:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLZMA}
-CMAKE_ARGS+=	-DWITH_LZMA:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_LZMA:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLIBMV}
-CMAKE_ARGS+=	-DWITH_LIBMV:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_LIBMV:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MMENU}
-USE_GNOME=	desktopfileutils
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-CMAKE_ARGS+=	-DWITH_INTERNATIONAL:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_INTERNATIONAL:BOOL=OFF
-.endif
-
 .if ${PORT_OPTIONS:MOPENAL}
 .if ${PORT_OPTIONS:MSAMPLERATE}
 USE_OPENAL=	al alut
@@ -215,33 +178,6 @@ BROKEN=		OPENAL requires SAMPLERATE
 CMAKE_ARGS+=	-DWITH_OPENAL:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MOPENCOLORIO}
-LIB_DEPENDS+=	OpenColorIO:${PORTSDIR}/graphics/opencolorio
-CMAKGE_ARGS+=	-DWITH_OPENCOLORIO:BOOL=ON
-.else
-CMAKGE_ARGS+=	-DWITH_OPENCOLORIO:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MOPENEXR}
-LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
-CMAKGE_ARGS+=	-DWITH_IMAGE_OPENEXR:BOOL=ON
-.else
-CMAKGE_ARGS+=	-DWITH_IMAGE_OPENEXR:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MOPENJPEG}
-LIB_DEPENDS+=	openjpeg:${PORTSDIR}/graphics/openjpeg
-CMAKE_ARGS+=	-DWITH_SYSTEM_OPENJPEG:BOOL=ON -DWITH_IMAGE_OPENJPEG:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_IMAGE_OPENJPEG:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MOPENMP}
-CMAKE_ARGS+=	-DWITH_OPENMP:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_OPENMP:BOOL=OFF
-.endif
-
 .if ${PORT_OPTIONS:MPLAYER}
 .if ${PORT_OPTIONS:MGAMEENGINE}
 CMAKE_ARGS+=	-DWITH_PLAYER:BOOL=ON
@@ -252,12 +188,6 @@ BROKEN=		PLAYER requires GAMEENGINE
 CMAKE_ARGS+=	-DWITH_PLAYER:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MRAYOPTIMIZATION}
-CMAKE_ARGS+=	-DWITH_RAYOPTIMIZATION:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_RAYOPTIMIZATION:BOOL=OFF
-.endif
-
 .if ${PORT_OPTIONS:MREDCODE}
 .if ${PORT_OPTIONS:MOPENJPEG} && ${PORT_OPTIONS:MFFMPEG}
 CMAKE_ARGS+=	-DWITH_IMAGE_REDCODE:BOOL=ON
@@ -268,13 +198,6 @@ BROKEN=		REDCODE requires OPENJPEG and FFMPEG
 CMAKE_ARGS+=	-DWITH_IMAGE_REDCODE:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
-CMAKE_ARGS+=	-DWITH_SAMPLERATE:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_SAMPLERATE:BOOL=OFF
-.endif
-
 .if ${PORT_OPTIONS:MSDL}
 .if ${PORT_OPTIONS:MSAMPLERATE}
 USE_SDL=	sdl
@@ -286,79 +209,68 @@ BROKEN=		SDL requires SAMPLERATE
 CMAKE_ARGS+=	-DWITH_SDL:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
-CMAKE_ARGS+=	-DWITH_CODEC_SNDFILE:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_CODEC_SNDFILE:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
-CMAKE_ARGS+=	-DWITH_IMAGE_TIFF:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_IMAGE_TIFF:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MXINPUT}
-USE_XORG+=	xi
-CMAKE_ARGS+=	-DWITH_X11_XINPUT:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_X11_XINPUT:BOOL=OFF
-.endif
+post-patch:
+	@cd ${WRKSRC}/intern/cycles && ${REINPLACE_CMD} \
+		-e 's/__align/cycles_align/' \
+		-e 's/__global/cycles_global/g' \
+		util/util_types.h kernel/kernel_compat_cuda.h \
+		kernel/kernel_displace.h kernel/kernel_film.h \
+		kernel/kernel_passes.h kernel/kernel_path.h \
+		kernel/kernel_random.h
 
-.if ${PORT_OPTIONS:MXF86VMODE}
-USE_XORG+=	xi xxf86vm
-CMAKE_ARGS+=	-DWITH_X11_XF86VMODE:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_X11_XF86VMODE:BOOL=OFF
-.endif
+# We ignore MAKE_ARGS, since those would set DESTDIR for make stage,
+# which in turn would cause make install to install everything in a
+# wrong location
+do-install:
+	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/blender ${PREFIX}/bin/blender
-	@${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/blender \
-		${PREFIX}/bin/blender-bin
-	@${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/blender-thumbnailer.py \
-		${PREFIX}/bin/blender-thumbnailer.py
+	${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}${PREFIX}/bin/blender
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/blender \
+		${STAGEDIR}${PREFIX}/bin/blender-bin
+	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/blender-thumbnailer.py \
+		${STAGEDIR}${PREFIX}/bin/blender-thumbnailer.py
 	@${ECHO} bin/blender >> ${TMPPLIST}
 	@${ECHO} bin/blender-bin >> ${TMPPLIST}
 	@${ECHO} bin/blender-thumbnailer.py >> ${TMPPLIST}
 
 .if ${PORT_OPTIONS:MPLAYER}
-	@${INSTALL_SCRIPT} ${WRKDIR}/blenderplayer ${PREFIX}/bin/blenderplayer
-	@${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/blenderplayer \
-		${PREFIX}/bin/blenderplayer-bin
+	${INSTALL_SCRIPT} ${WRKDIR}/blenderplayer \
+		${STAGEDIR}${PREFIX}/bin/blenderplayer
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/blenderplayer \
+		${STAGEDIR}${PREFIX}/bin/blenderplayer-bin
 	@${ECHO} bin/blenderplayer >> ${TMPPLIST}
 	@${ECHO} bin/blenderplayer-bin >> ${TMPPLIST}
 .endif
 
 .if ${PORT_OPTIONS:MMENU}
-	@${MKDIR} ${DESKTOPDIR}
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${PORTNAME}.desktop \
-		${DESKTOPDIR}
+	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${PORTNAME}.desktop \
+		${STAGEDIR}${DESKTOPDIR}
 	@-update-desktop-database -q
 	@${ECHO} share/applications/${PORTNAME}.desktop >> ${TMPPLIST}
 .endif
 
-	@${MKDIR} ${DATADIR}
-	@(cd ${OUTDIR} && ${COPYTREE_SHARE} scripts ${DATADIR})
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${PORTNAME}.svg \
-		${PREFIX}/share/pixmaps/${PORTNAME}.svg
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${OUTDIR} && ${COPYTREE_SHARE} scripts ${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${PORTNAME}.svg \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.svg
 	@(cd ${OUTDIR}; ${FIND} scripts -type f) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST}
 	@(cd ${OUTDIR}; ${FIND} scripts -type d) | ${SORT} -r | ${SED} "s|^|@dirrm ${DATADIR_REL}/|" >> ${TMPPLIST}
 	@${ECHO} share/pixmaps/${PORTNAME}.svg >> ${TMPPLIST}
 
 .if ${PORT_OPTIONS:MOPENCOLORIO}
-	@cd ${OUTDIR} && ${COPYTREE_SHARE} datafiles/colormanagement ${DATADIR}
+	cd ${OUTDIR} && ${COPYTREE_SHARE} datafiles/colormanagement ${STAGEDIR}${DATADIR}
 	@(cd ${OUTDIR}; ${FIND} datafiles/colormanagement -type f) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST}
 	@(cd ${OUTDIR}; ${FIND} datafiles/colormanagement -type d) | ${SORT} -r | ${SED} "s|^|@dirrm ${DATADIR_REL}/|" >> ${TMPPLIST}
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-	@cd ${OUTDIR} && ${COPYTREE_SHARE} datafiles/locale ${DATADIR}
+	cd ${OUTDIR} && ${COPYTREE_SHARE} datafiles/locale ${STAGEDIR}${DATADIR}
 	@(cd ${OUTDIR}; ${FIND} datafiles/locale -type f -name languages) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST}
 	@(cd ${OUTDIR}; ${FIND} datafiles/locale -type f -name ${PORTNAME}.mo) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST}
-	@cd ${OUTDIR} && ${COPYTREE_SHARE} datafiles/fonts ${DATADIR}
+	cd ${OUTDIR} && ${COPYTREE_SHARE} datafiles/fonts ${STAGEDIR}${DATADIR}
 	@(cd ${OUTDIR}; ${FIND} datafiles/fonts -type f) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST}
 	@(cd ${OUTDIR}; ${FIND} datafiles/fonts -type d) | ${SORT} -r | ${SED} "s|^|@dirrm ${DATADIR_REL}/|" >> ${TMPPLIST}
 	@(cd ${OUTDIR}; ${FIND} datafiles/locale -type d) | ${SORT} -r | ${SED} "s|^|@dirrm ${DATADIR_REL}/|" >> ${TMPPLIST}
@@ -367,8 +279,9 @@ post-install:
 	@${ECHO} @dirrm ${DATADIR_REL} >> ${TMPPLIST}
 
 .if !defined(NO_INSTALL_MANPAGES)
-	@${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
-		${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
+	@${ECHO} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>