Index: head/graphics/py-pillow/Makefile
===================================================================
--- head/graphics/py-pillow/Makefile	(revision 370396)
+++ head/graphics/py-pillow/Makefile	(revision 370397)
@@ -1,94 +1,103 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pillow
-PORTVERSION=	2.5.1
+PORTVERSION=	2.6.0
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:C/p/P/}-${PORTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Fork of the Python Imaging Library (PIL)
 
 LICENSE=	PIL
 LICENSE_NAME=	Standard PIL License
 LICENSE_FILE=	${WRKSRC}/docs/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=		FREETYPE JPEG LCMS PNG TIFF TKINTER WEBP
 OPTIONS_DEFAULT=	FREETYPE JPEG PNG
 
 LCMS_DESC=		Little Color Management System
 TKINTER_DESC=		Tkinter (Tcl/Tk) BitmapImage & PhotoImage support
 
 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 LCMS_LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2
 TIFF_LIB_DEPENDs=	libtiff.so:${PORTSDIR}/graphics/tiff
 TKINTER_USES=		tk:build
 WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
 
 USE_GITHUB=		yes
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=			python
+USE_PYTHON=		autoplist concurrent distutils
+PYDISTUTILS_SETUP=	${PYSETUP}
+PYDISTUTILS_BUILD_TARGET=	build build_py build_ext
 
-PYDISTUTILS_AUTOPLIST=		yes
-PYDISTUTILS_BUILD_TARGET=	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
 
 GH_ACCOUNT=	python-pillow
 GH_PROJECT=	${PORTNAME:C/p/P/}
-GH_COMMIT=	1ab78b8
+GH_COMMIT=	9634e43
 
 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})
 
 regression-test: extract
 	@cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYSETUP} build_ext -i && \
 	${PYTHON_CMD} selftest.py
 
 .include <bsd.port.mk>
Index: head/graphics/py-pillow/distinfo
===================================================================
--- head/graphics/py-pillow/distinfo	(revision 370396)
+++ head/graphics/py-pillow/distinfo	(revision 370397)
@@ -1,2 +1,2 @@
-SHA256 (Pillow-2.5.1.tar.gz) = e7934f86705a7054e3c117ab1295d612b2aa34f4cfa4d61bd88e544e9a544a13
-SIZE (Pillow-2.5.1.tar.gz) = 6528250
+SHA256 (Pillow-2.6.0.tar.gz) = ffa1b214027acd5a62a38fd7851ade75a2a6d96957261f7aee932cf7f6f6db3b
+SIZE (Pillow-2.6.0.tar.gz) = 7235577