Index: branches/2017Q1/graphics/py-pillow/Makefile
===================================================================
--- branches/2017Q1/graphics/py-pillow/Makefile	(revision 430992)
+++ branches/2017Q1/graphics/py-pillow/Makefile	(revision 430993)
@@ -1,76 +1,78 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pillow
-PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTVERSION=	3.4.2
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Fork of the Python Imaging Library (PIL)
 
 LICENSE=	PIL
 LICENSE_NAME=	Standard PIL License
 LICENSE_FILE=	${WRKSRC}/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 TKINTER WEBP
+OPTIONS_DEFINE=		FREETYPE JPEG JPEG2000 LCMS PNG TIFF TKINTER WEBP
+OPTIONS_DEFAULT=	FREETYPE JPEG JPEG2000 PNG TKINTER WEBP
 
 LCMS_DESC=		Little Color Management System
 TKINTER_DESC=		Tkinter (Tcl/Tk) BitmapImage & PhotoImage support
 
 FREETYPE_LIB_DEPENDS=	libfreetype.so: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
 
+JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
+JPEG2000_VARS=		PYDISTUTILS_BUILDARGS+=--enable-jpeg2000
+JPEG2000_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--disable-jpeg2000
+
 LCMS_LIB_DEPENDS=	liblcms2.so: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:graphics/tiff
 TIFF_VARS=		PYDISTUTILS_BUILDARGS+=--enable-tiff
 TIFF_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-tiff
 
 TKINTER_USES=		tk
 TKINTER_BUILD_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 TKINTER_RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}tkinter>0: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"
+TKINTER_VARS=		PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}"
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
-WEBP_VARS=		PYDISTUTILS_BUILDARGS+=--enable-webp
-WEBP_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-webp
+WEBP_VARS=		PYDISTUTILS_BUILDARGS+=--enable-webp --enable-webpmux
+WEBP_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-webp --disable-webpmux
 
 USES?=		cpe python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils
 
 GH_ACCOUNT=	python-${PORTNAME}
 GH_PROJECT=	${PORTNAME:C/p/P/}
 
 CONFLICTS_INSTALL=	py*-imaging-*
 
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_BUILD_TARGET=	build build_ext
 PYDISTUTILS_BUILDARGS+=		saveopts
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PIL/*.so
 
 do-test:
 	@cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYSETUP} build_ext -i && \
 	${PYTHON_CMD} selftest.py && \
 	${PYTHON_CMD} -m nose -vx Tests/test_*.py
 
 .include <bsd.port.post.mk>
Index: branches/2017Q1/graphics/py-pillow/distinfo
===================================================================
--- branches/2017Q1/graphics/py-pillow/distinfo	(revision 430992)
+++ branches/2017Q1/graphics/py-pillow/distinfo	(revision 430993)
@@ -1,2 +1,3 @@
-SHA256 (python-pillow-Pillow-3.1.1_GH0.tar.gz) = a2ab64b39378031effdd86a6cd303de7b5b606445ab0338359e9ff9dc3f2e634
-SIZE (python-pillow-Pillow-3.1.1_GH0.tar.gz) = 10051635
+TIMESTAMP = 1482579087
+SHA256 (python-pillow-Pillow-3.4.2_GH0.tar.gz) = 0ee762ab924e004b7e69643b44e82cf65e0fa1f16862e11bd821950dbbc5f3d3
+SIZE (python-pillow-Pillow-3.4.2_GH0.tar.gz) = 10746584
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 430992)
+++ branches/2017Q1	(revision 430993)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r430992