Date: Sat, 29 Feb 2020 17:16:51 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527444 - in head/graphics: py-pillow py-pillow6 Message-ID: <202002291716.01THGpqQ095166@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Feb 29 17:16:51 2020 New Revision: 527444 URL: https://svnweb.freebsd.org/changeset/ports/527444 Log: Limit py-pillow6 to python 2.7 to eliminate possible conflict with py-pillow With hat: portmgr Modified: head/graphics/py-pillow/Makefile head/graphics/py-pillow6/Makefile Modified: head/graphics/py-pillow/Makefile ============================================================================== --- head/graphics/py-pillow/Makefile Sat Feb 29 16:48:46 2020 (r527443) +++ head/graphics/py-pillow/Makefile Sat Feb 29 17:16:51 2020 (r527444) @@ -25,8 +25,6 @@ USE_PYTHON= autoplist concurrent distutils GH_ACCOUNT= python-${PORTNAME} GH_PROJECT= ${PORTNAME:C/p/P/} -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pillow6 - OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP Modified: head/graphics/py-pillow6/Makefile ============================================================================== --- head/graphics/py-pillow6/Makefile Sat Feb 29 16:48:46 2020 (r527443) +++ head/graphics/py-pillow6/Makefile Sat Feb 29 17:16:51 2020 (r527444) @@ -18,15 +18,12 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} -# Python 2.7,3.5+ -USES= cpe python +USES= cpe python:2.7 USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils GH_ACCOUNT= python-${PORTNAME} GH_PROJECT= ${PORTNAME:C/p/P/} - -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pillow OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002291716.01THGpqQ095166>