Thu Feb 9 20:45:11 2017 UTC ()
Drop left-over that was committed in the mean time by someone else.


(joerg)
diff -r1.128 -r1.129 pkgsrc/graphics/blender/Makefile
cvs diff -r1.128 -r1.129 pkgsrc/graphics/blender/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/blender/Makefile 2017/02/09 00:23:29 1.128
+++ pkgsrc/graphics/blender/Makefile 2017/02/09 20:45:11 1.129
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.128 2017/02/09 00:23:29 joerg Exp $ 1# $NetBSD: Makefile,v 1.129 2017/02/09 20:45:11 joerg Exp $
2 2
3DISTNAME= blender-2.77a 3DISTNAME= blender-2.77a
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://download.blender.org/source/ 6MASTER_SITES= http://download.blender.org/source/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.blender.org/ 9HOMEPAGE= http://www.blender.org/
10COMMENT= Fully integrated 3D graphics creation suite 10COMMENT= Fully integrated 3D graphics creation suite
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_TOOLS+= gmake sed 13USE_TOOLS+= gmake sed
14USE_CMAKE= yes 14USE_CMAKE= yes
@@ -26,27 +26,26 @@ CMAKE_OPTS+= -DCMAKE_MODULE_PATH:PATH=$ @@ -26,27 +26,26 @@ CMAKE_OPTS+= -DCMAKE_MODULE_PATH:PATH=$
26CMAKE_OPTS+= -DCMAKE_SKIP_RPATH:BOOL=TRUE 26CMAKE_OPTS+= -DCMAKE_SKIP_RPATH:BOOL=TRUE
27CMAKE_OPTS+= -DCMAKE_INSTALL_LIBDIR:PATH=lib 27CMAKE_OPTS+= -DCMAKE_INSTALL_LIBDIR:PATH=lib
28CMAKE_OPTS+= -DCMAKE_INSTALL_MANDIR:PATH=man 28CMAKE_OPTS+= -DCMAKE_INSTALL_MANDIR:PATH=man
29CMAKE_OPTS+= -DFREETYPE_INCLUDE_DIRS:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2 29CMAKE_OPTS+= -DFREETYPE_INCLUDE_DIRS:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2
30CMAKE_OPTS+= -DFREETYPE_LIBRARY:STRING=freetype 30CMAKE_OPTS+= -DFREETYPE_LIBRARY:STRING=freetype
31CMAKE_OPTS+= -D_OPENGL_LIB_PATH:PATH=${BUILDLINK_PREFIX.MesaLib}/lib 31CMAKE_OPTS+= -D_OPENGL_LIB_PATH:PATH=${BUILDLINK_PREFIX.MesaLib}/lib
32CMAKE_OPTS+= -D_OPENGL_INCLUDE_PATH:PATH=${BUILDLINK_PREFIX.MesaLib}/include 32CMAKE_OPTS+= -D_OPENGL_INCLUDE_PATH:PATH=${BUILDLINK_PREFIX.MesaLib}/include
33CMAKE_OPTS+= -DOPENGL_glu_LIBRARY:STRING=GLU 33CMAKE_OPTS+= -DOPENGL_glu_LIBRARY:STRING=GLU
34 34
35CXXFLAGS+= -std=c++11 35CXXFLAGS+= -std=c++11
36CMAKE_OPTS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS:Q} 36CMAKE_OPTS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS:Q}
37 37
38PYTHON_VERSIONS_INCOMPATIBLE= 27 38PYTHON_VERSIONS_INCOMPATIBLE= 27
39CMAKE_OPTS+= -DPYTHON_VERSION=${PYVERSSUFFIX:Q} 
40GCC_REQD+= 4.7 39GCC_REQD+= 4.7
41 40
42DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat 41DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
43CMAKE_OPTS+= -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF 42CMAKE_OPTS+= -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF
44CMAKE_OPTS+= -DWITH_PYTHON_INSTALL_REQUESTS:BOOL=OFF 43CMAKE_OPTS+= -DWITH_PYTHON_INSTALL_REQUESTS:BOOL=OFF
45 44
46REPLACE_PYTHON= release/bin/blender-thumbnailer.py 45REPLACE_PYTHON= release/bin/blender-thumbnailer.py
47 46
48.include "options.mk" 47.include "options.mk"
49 48
50INSTALLATION_DIRS= bin share/blender 49INSTALLATION_DIRS= bin share/blender
51 50
52PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} 51PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}