On Mon, Nov 23, 2020 at 09:26:40PM +0000, Stuart Henderson wrote:
> Like what was done for py2-cairo, to unblock py-Pillow updates I would
> like to re-import a copy of py-Pillow with the following changes to
> ports/graphics/py2-Pillow (tgz attached).
> OK?
I guess I'd like to see some notation about why this exists. Right now
the COMMENT and DESCR are remaining the same.
Otherwise, ok kmos
--Kurt
> DISTNAME= Pillow-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> CATEGORIES= graphics
> -REVISION= 0
> +REVISION= 1
> ...
> -
> -FLAVORS= python3
> -FLAVOR?=
>
> @comment $OpenBSD: PLIST,v 1.12 2020/01/03 14:42:18 sthen Exp $
> @conflict py-Imaging-*
> -@pkgpath graphics/py-Pillow,-main${MODPY_FLAVOR}
> +@pkgpath graphics/py-Pillow,-main
> +@pkgpath graphics/py-Pillow
> @pkgpath
> graphics/py-Imaging,-bin[,python2.4][,python2.5][,python2.6][,python2.7]
> @pkgpath
> graphics/py-Imaging,-docs[,python2.4][,python2.5][,python2.6][,python2.7]
> @pkgpath
> graphics/py-Imaging,-examples[,python2.4][,python2.5][,python2.6][,python2.7]
>
> ...
>
> I will then turn graphics/py-Pillow into a py3-only port, diff for that
> below, and switch dependent py2 ports over to using it.
>
>
> Index: graphics/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/Makefile,v
> retrieving revision 1.530
> diff -u -p -r1.530 Makefile
> --- graphics/Makefile 14 Nov 2020 11:06:54 -0000 1.530
> +++ graphics/Makefile 23 Nov 2020 21:23:39 -0000
> @@ -237,7 +237,7 @@
> SUBDIR += pqiv
> SUBDIR += pstoedit
> SUBDIR += py-blurhash
> - SUBDIR += py-Pillow
> + SUBDIR += py2-Pillow
> SUBDIR += py-Pillow,python3
> SUBDIR += py-cairo,python3
> SUBDIR += py-cycler
> Index: graphics/py-Pillow/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/py-Pillow/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- graphics/py-Pillow/Makefile 3 Jul 2020 21:12:55 -0000 1.32
> +++ graphics/py-Pillow/Makefile 23 Nov 2020 21:24:12 -0000
> @@ -6,7 +6,7 @@ MODPY_EGG_VERSION= 6.2.2
> DISTNAME= Pillow-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> CATEGORIES= graphics
> -REVISION= 0
> +REVISION= 1
>
> HOMEPAGE= https://python-pillow.org/
>
> @@ -15,7 +15,7 @@ HOMEPAGE= https://python-pillow.org/
> PERMIT_PACKAGE= Yes
>
> FLAVORS= python3
> -FLAVOR?=
> +FLAVOR= python3
>
> MODPY_PI = Yes
>
> Index: graphics/py-Pillow/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/graphics/py-Pillow/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- graphics/py-Pillow/pkg/PLIST 3 Jan 2020 14:42:18 -0000 1.12
> +++ graphics/py-Pillow/pkg/PLIST 23 Nov 2020 21:24:12 -0000
> @@ -1,10 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.12 2020/01/03 14:42:18 sthen Exp $
> -@conflict py-Imaging-*
> @pkgpath graphics/py-Pillow,-main${MODPY_FLAVOR}
> -@pkgpath
> graphics/py-Imaging,-bin[,python2.4][,python2.5][,python2.6][,python2.7]
> -@pkgpath
> graphics/py-Imaging,-docs[,python2.4][,python2.5][,python2.6][,python2.7]
> -@pkgpath
> graphics/py-Imaging,-examples[,python2.4][,python2.5][,python2.6][,python2.7]
> -@pkgpath
> graphics/py-Imaging,-main[,python2.4][,python2.5][,python2.6][,python2.7]
> ${INCL_DIR}/ImPlatform.h
> ${INCL_DIR}/Imaging.h
> lib/python${MODPY_VERSION}/site-packages/PIL/
>
