Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 847857A269 for ; Mon, 6 Feb 2017 01:29:12 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 358AE85582; Mon, 6 Feb 2017 01:29:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B797F8557B for ; Mon, 6 Feb 2017 01:29:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 2lb0kRqJOPZw for ; Mon, 6 Feb 2017 01:29:10 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C95E68557A for ; Mon, 6 Feb 2017 01:29:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C4692FBE4; Mon, 6 Feb 2017 01:29:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148634455031310" MIME-Version: 1.0 Date: Mon, 6 Feb 2017 01:29:10 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/graphics/blender To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20170206012910.C4692FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148634455031310 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Mon Feb 6 01:29:10 UTC 2017 Modified Files: pkgsrc/graphics/blender: Makefile PLIST PLIST.Linux PLIST.NetBSD Log Message: Allow python3.6 To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 pkgsrc/graphics/blender/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/blender/PLIST cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/blender/PLIST.Linux \ pkgsrc/graphics/blender/PLIST.NetBSD Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148634455031310 Content-Disposition: inline Content-Length: 12135 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/blender/Makefile diff -u pkgsrc/graphics/blender/Makefile:1.126 pkgsrc/graphics/blender/Makefile:1.127 --- pkgsrc/graphics/blender/Makefile:1.126 Thu Jan 19 10:03:00 2017 +++ pkgsrc/graphics/blender/Makefile Mon Feb 6 01:29:10 2017 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.126 2017/01/19 10:03:00 markd Exp $ +# $NetBSD: Makefile,v 1.127 2017/02/06 01:29:10 markd Exp $ DISTNAME= blender-2.77a -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://download.blender.org/source/ @@ -15,6 +15,12 @@ USE_CMAKE= yes USE_LANGUAGES= c c++ CMAKE_OPTS+= -DWITH_OPENAL:BOOL=OFF CMAKE_OPTS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX} +CMAKE_OPTS+= -DPYTHON_VERSION:STRING=${PYVERSSUFFIX} +CMAKE_OPTS+= -DPYTHON_ROOT_DIR:STRING=${PREFIX} +CMAKE_OPTS+= -DPYTHON_INCLUDE_DIR:STRING=${PREFIX}/${PYINC} +CMAKE_OPTS+= -DPYTHON_INCLUDE_CONFIG_DIR:STRING=${PREFIX}/${PYINC} +CMAKE_OPTS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} +CMAKE_OPTS+= -DPYTHON_LIBRARY:FILEPATH=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so CMAKE_OPTS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX}/share/blender CMAKE_OPTS+= -DCMAKE_MODULE_PATH:PATH=${_CMAKE_DIR} CMAKE_OPTS+= -DCMAKE_SKIP_RPATH:BOOL=TRUE @@ -29,10 +35,12 @@ CMAKE_OPTS+= -DOPENGL_glu_LIBRARY:STRIN CXXFLAGS+= -std=c++11 CMAKE_OPTS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS:Q} -PYTHON_VERSIONS_INCOMPATIBLE= 27 36 +PYTHON_VERSIONS_INCOMPATIBLE= 27 GCC_REQD+= 4.7 DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat +CMAKE_OPTS+= -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF +CMAKE_OPTS+= -DWITH_PYTHON_INSTALL_REQUESTS:BOOL=OFF REPLACE_PYTHON= release/bin/blender-thumbnailer.py @@ -49,7 +57,7 @@ PLIST_SUBST+= NETBSDVER=netbsd7 PLIST_SUBST+= NETBSDVER=netbsd6 .endif -PLIST_VARS+= py34 py35 +PLIST_VARS+= py34 py35 py36 OBJDIR= ../build CONFIGURE_DIRS= ${OBJDIR} @@ -91,6 +99,8 @@ post-install: PLIST.py34= yes .elif ${PYVERSSUFFIX} == "3.5" PLIST.py35= yes +.elif ${PYVERSSUFFIX} == "3.6" +PLIST.py36= yes .endif .include "../../mk/bsd.pkg.mk" Index: pkgsrc/graphics/blender/PLIST diff -u pkgsrc/graphics/blender/PLIST:1.23 pkgsrc/graphics/blender/PLIST:1.24 --- pkgsrc/graphics/blender/PLIST:1.23 Mon Aug 15 19:26:18 2016 +++ pkgsrc/graphics/blender/PLIST Mon Feb 6 01:29:10 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2016/08/15 19:26:18 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.24 2017/02/06 01:29:10 markd Exp $ bin/blender share/blender/${BLENDERVER}/datafiles/fonts/bmonofont-i18n.ttf.gz share/blender/${BLENDERVER}/datafiles/fonts/droidsans.ttf.gz @@ -50,7 +50,7 @@ share/blender/${BLENDERVER}/python/lib/p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_pyio.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_sitebuiltins.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_strptime.py -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_sysconfigdata.py +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_sysconfigdata.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_threading_local.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_weakrefset.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/abc.py @@ -61,7 +61,9 @@ share/blender/${BLENDERVER}/python/lib/p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asynchat.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/__init__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/base_events.py +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/base_futures.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/base_subprocess.py +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/base_tasks.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/compat.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/constants.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/coroutines.py @@ -98,7 +100,7 @@ share/blender/${BLENDERVER}/python/lib/p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/codecs.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/codeop.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/collections/__init__.py -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/collections/__main__.py +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/collections/__main__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/collections/abc.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/colorsys.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/compileall.py @@ -269,6 +271,7 @@ share/blender/${BLENDERVER}/python/lib/p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/mac_romanian.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/mac_turkish.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/mbcs.py +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/oem.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/palmos.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/ptcp154.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/punycode.py @@ -295,8 +298,10 @@ share/blender/${BLENDERVER}/python/lib/p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/zlib_codec.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/__init__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/__main__.py -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_uninstall.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/enum.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/filecmp.py @@ -341,7 +346,9 @@ share/blender/${BLENDERVER}/python/lib/p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/json/scanner.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/json/tool.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/keyword.py +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_asyncio.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_bisect.so +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_blake2.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_bz2.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_codecs_cn.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_codecs_hk.so @@ -370,6 +377,7 @@ share/blender/${BLENDERVER}/python/lib/p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_random.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_sha1.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_sha256.so +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_sha3.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_sha512.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_socket.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_ssl.so @@ -466,6 +474,7 @@ share/blender/${BLENDERVER}/python/lib/p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/rlcompleter.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/runpy.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/sched.py +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/secrets.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/selectors.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/shelve.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/shlex.py @@ -1508,3 +1517,4 @@ share/blender/blender.svg share/blender/copyright.txt share/blender/jemalloc-license.txt share/blender/readme.html +@pkgdir share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/site-packages Index: pkgsrc/graphics/blender/PLIST.Linux diff -u pkgsrc/graphics/blender/PLIST.Linux:1.4 pkgsrc/graphics/blender/PLIST.Linux:1.5 --- pkgsrc/graphics/blender/PLIST.Linux:1.4 Sat Dec 19 20:52:12 2015 +++ pkgsrc/graphics/blender/PLIST.Linux Mon Feb 6 01:29:10 2017 @@ -1,20 +1,10 @@ -@comment $NetBSD: PLIST.Linux,v 1.4 2015/12/19 20:52:12 markd Exp $ +@comment $NetBSD: PLIST.Linux,v 1.5 2017/02/06 01:29:10 markd Exp $ +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_sysconfigdata_linux.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_sqlite3.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/ossaudiodev.so -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/pyexpat.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/readline.so -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/CDROM.py -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/DLFCN.py -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/IN.py -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/TYPES.py -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/regen -share/blender/blender-thumbnailer.py -share/blender/icons/16x16/apps/blender.png -share/blender/icons/22x22/apps/blender.png -share/blender/icons/24x24/apps/blender.png -share/blender/icons/256x256/apps/blender.png -share/blender/icons/32x32/apps/blender.png -share/blender/icons/48x48/apps/blender.png -share/blender/icons/blender_icon_source.svg -share/blender/icons/scalable/apps/blender.svg -share/blender/blenderplayer +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/CDROM.py +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/DLFCN.py +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/IN.py +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/TYPES.py +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-linux/regen Index: pkgsrc/graphics/blender/PLIST.NetBSD diff -u pkgsrc/graphics/blender/PLIST.NetBSD:1.4 pkgsrc/graphics/blender/PLIST.NetBSD:1.5 --- pkgsrc/graphics/blender/PLIST.NetBSD:1.4 Sat Dec 19 20:52:12 2015 +++ pkgsrc/graphics/blender/PLIST.NetBSD Mon Feb 6 01:29:10 2017 @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST.NetBSD,v 1.4 2015/12/19 20:52:12 markd Exp $ -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-${NETBSDVER}/IN.py -share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-${NETBSDVER}/regen +@comment $NetBSD: PLIST.NetBSD,v 1.5 2017/02/06 01:29:10 markd Exp $ +${PLIST.py36}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_sysconfigdata_${NETBSDVER}.py +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-${NETBSDVER}/IN.py +${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/plat-${NETBSDVER}/regen --_----------=_148634455031310--