Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Feb 2016 13:21:27 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r409464 - in head/graphics/py-pillow: . files
Message-ID:  <201602241321.u1ODLR5e020091@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Wed Feb 24 13:21:27 2016
New Revision: 409464
URL: https://svnweb.freebsd.org/changeset/ports/409464

Log:
  graphics/py-pillow: Update to 3.1.1, Modernize
  
  - Update PORTVERSION and distinfo checksum (3.1.1)
  - Convert remaining conditionals to to OPTIONS helpers
  - Replace custom do-install and replace build/install target hacks
  - Remove patches (upstream, were previously backported)
  - Strip shared extensions
  - Extend test suite
  
  Changes:
  
    https://github.com/python-pillow/Pillow/blob/3.1.1/CHANGES.rst

Deleted:
  head/graphics/py-pillow/files/
Modified:
  head/graphics/py-pillow/Makefile
  head/graphics/py-pillow/distinfo

Modified: head/graphics/py-pillow/Makefile
==============================================================================
--- head/graphics/py-pillow/Makefile	Wed Feb 24 12:51:04 2016	(r409463)
+++ head/graphics/py-pillow/Makefile	Wed Feb 24 13:21:27 2016	(r409464)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pillow
-PORTVERSION=	2.9.0
-PORTREVISION=	1
+PORTVERSION=	3.1.1
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -22,84 +21,53 @@ LCMS_DESC=		Little Color Management Syst
 TKINTER_DESC=		Tkinter (Tcl/Tk) BitmapImage & PhotoImage support
 
 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_VARS=		PYDISTUTILS_BUILDARGS+=--enable-freetype
+FREETYPE_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--disable-freetype
+
 JPEG_USES=		jpeg
+JPEG_VARS=		PYDISTUTILS_BUILDARGS+=--enable-jpeg
+JPEG_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-jpeg
+
 LCMS_LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2
+LCMS_VARS=		PYDISTUTILS_BUILDARGS+=--enable-lcms
+LCMS_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-lcms
+
+PNG_VARS=		PYDISTUTILS_BUILDARGS+=--enable-zlib
+PNG_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-zlib
+
 TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_VARS=		PYDISTUTILS_BUILDARGS+=--enable-tiff
+TIFF_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-tiff
+
 TKINTER_USES=		tk:build
 TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKINTER_VARS=		PYDISTUTILS_BUILDARGS+=--enable-tcl --enable-tk --include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}
+TKINTER_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--disable-tcl --disable-tk
+
 WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_VARS=		PYDISTUTILS_BUILDARGS+=--enable-webp
+WEBP_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-webp
 
-USES=			cpe python
-USE_GITHUB=		yes
-USES=			python
-USE_PYTHON=		autoplist concurrent distutils
-PYDISTUTILS_SETUP=		${PYSETUP}
-PYDISTUTILS_BUILD_TARGET=	build build_py build_ext
-
-# we have to build and install everything in a single run,
-# otherwise pillow's build_ext extension tries to be clever
-# and messes up standard distutils behaviour...
-NO_BUILD=		yes
+USES=		cpe python
+USE_GITHUB=	yes
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+PYDISTUTILS_BUILD_TARGET=	build build_ext
 
 GH_ACCOUNT=	python-${PORTNAME}
 GH_PROJECT=	${PORTNAME:C/p/P/}
 
 CONFLICTS_INSTALL=	py*-imaging-*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFREETYPE}
-PYDISTUTILS_BUILDARGS+=	--enable-freetype
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-freetype
-.endif
-
-.if ${PORT_OPTIONS:MJPEG}
-PYDISTUTILS_BUILDARGS+=	--enable-jpeg
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-jpeg
-.endif
-
-.if ${PORT_OPTIONS:MLCMS}
-PYDISTUTILS_BUILDARGS+=	--enable-lcms
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-lcms
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-PYDISTUTILS_BUILDARGS+=	--enable-zlib
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-zlib
-.endif
-
-.if ${PORT_OPTIONS:MTIFF}
-PYDISTUTILS_BUILDARGS+=	--enable-tiff
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-tiff
-.endif
-
-.if ${PORT_OPTIONS:MTKINTER}
-PYDISTUTILS_BUILDARGS+=	--enable-tcl --enable-tk \
-			--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-tcl --disable-tk
-.endif
-
-.if ${PORT_OPTIONS:MWEBP}
-PYDISTUTILS_BUILDARGS+=	--enable-webp
-.else
-PYDISTUTILS_BUILDARGS+=	--disable-webp
-.endif
-
-do-install:
-	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-		${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS} \
-		${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PIL/*.so
 
-do-test: extract
+do-test:
 	@cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYSETUP} build_ext -i && \
-	${PYTHON_CMD} selftest.py
+	${PYTHON_CMD} selftest.py && \
+	${PYTHON_CMD} -m nose -vx Tests/test_*.py
 
 .include <bsd.port.mk>

Modified: head/graphics/py-pillow/distinfo
==============================================================================
--- head/graphics/py-pillow/distinfo	Wed Feb 24 12:51:04 2016	(r409463)
+++ head/graphics/py-pillow/distinfo	Wed Feb 24 13:21:27 2016	(r409464)
@@ -1,2 +1,2 @@
-SHA256 (python-pillow-Pillow-2.9.0_GH0.tar.gz) = e048d3fb43832b09077242dc46f3ed83f09fada0a2386196b7b0eea664422158
-SIZE (python-pillow-Pillow-2.9.0_GH0.tar.gz) = 9320944
+SHA256 (python-pillow-Pillow-3.1.1_GH0.tar.gz) = a2ab64b39378031effdd86a6cd303de7b5b606445ab0338359e9ff9dc3f2e634
+SIZE (python-pillow-Pillow-3.1.1_GH0.tar.gz) = 10051635



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602241321.u1ODLR5e020091>