Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Feb 2014 03:03:18 +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: r344324 - in head/graphics/py-pillow: . files
Message-ID:  <201402150303.s1F33Ipj076197@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Sat Feb 15 03:03:18 2014
New Revision: 344324
URL: http://svnweb.freebsd.org/changeset/ports/344324
QAT: https://qat.redports.org/buildarchive/r344324/

Log:
  graphics/py-pillow: Update to 2.3.0, Add OPTIONS, Modernise
  
  - Update to 2.3.0
  - Add OPTIONS: FREETYPE JPEG LCMS PNG TIFF WEBP
  - Enable STAGE support
  - Enable AUTOPLIST support, delete pkg-plist
  - Convert to new LIB_DEPENDS format
  - Replace use of PYDISTUTILS_PKGNAME with PORTNAME:modifier
  - Add LICENSE section
  - Delete unecessary patches
  
  Changes: https://github.com/python-imaging/Pillow/blob/2.3.0/CHANGES.rst
  
  Based on extended version of patch provided in:
  
  PR:		ports/186726
  Submitted by:	tota

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

Modified: head/graphics/py-pillow/Makefile
==============================================================================
--- head/graphics/py-pillow/Makefile	Sat Feb 15 01:59:21 2014	(r344323)
+++ head/graphics/py-pillow/Makefile	Sat Feb 15 03:03:18 2014	(r344324)
@@ -2,34 +2,84 @@
 # $FreeBSD$
 
 PORTNAME=	pillow
-PORTVERSION=	2.0.0
+PORTVERSION=	2.3.0
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PYDISTUTILS_PKGNAME}-${PORTVERSION}
+DISTNAME=	${PORTNAME:C/p/P/}-${PORTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Fork of the Python Imaging Library (PIL)
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		freetype:${PORTSDIR}/print/freetype2
+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 WEBP
+OPTIONS_DEFAULT=	JPEG PNG
+
+LCMS_DESC=		Little Color Management System
+
+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
+WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
 
 USE_GITHUB=		yes
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+
+PYDISTUTILS_AUTOPLIST=		yes
+PYDISTUTILS_BUILD_TARGET=	build_ext
 
 GH_ACCOUNT=	python-imaging
-GH_PROJECT=	${PYDISTUTILS_PKGNAME}
-GH_COMMIT=	baea361
+GH_PROJECT=	${PORTNAME:C/p/P/}
+GH_COMMIT=	b1b88cf
 
 CONFLICTS_INSTALL=	py*-imaging-*
 
-PYDISTUTILS_PKGNAME=	Pillow
-PYEASYINSTALL_ARCHDEP=	yes
+.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:MWEBP}
+PYDISTUTILS_BUILDARGS+=	--enable-webp
+.else
+PYDISTUTILS_BUILDARGS+=	--disable-webp
+.endif
 
 regression-test: extract
 	@cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYSETUP} build_ext -i && \
 	${PYTHON_CMD} selftest.py
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/graphics/py-pillow/distinfo
==============================================================================
--- head/graphics/py-pillow/distinfo	Sat Feb 15 01:59:21 2014	(r344323)
+++ head/graphics/py-pillow/distinfo	Sat Feb 15 03:03:18 2014	(r344324)
@@ -1,2 +1,2 @@
-SHA256 (Pillow-2.0.0.tar.gz) = bcfff312bc00b700306c725e33500f11d29e842cce47640283c5bac110f03a61
-SIZE (Pillow-2.0.0.tar.gz) = 1210841
+SHA256 (Pillow-2.3.0.tar.gz) = 635e366eaaf7b81d7a5d5818af50d42ca1247c42b5e4ad896473fb2d6e3a038f
+SIZE (Pillow-2.3.0.tar.gz) = 2224984



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