Re: CVS commit: pkgsrc/graphics/py-Pillow

[Ryo ONODERA <ryo%tetera.org@localhost>]

Hi,

On Thu, Jan 8, 2026 at 12:10 AM Greg Troxel <gdt%lexort.com@localhost> wrote:
>
> "Ryo ONODERA" <ryoon%netbsd.org@localhost> writes:
>
> > Index: pkgsrc/graphics/py-Pillow/Makefile
> > diff -u pkgsrc/graphics/py-Pillow/Makefile:1.97 pkgsrc/graphics/py-Pillow/Makefile:1.98
> > --- pkgsrc/graphics/py-Pillow/Makefile:1.97   Fri Jan  2 13:52:26 2026
> > +++ pkgsrc/graphics/py-Pillow/Makefile        Wed Jan  7 14:26:55 2026
> > @@ -1,4 +1,4 @@
> > -# $NetBSD: Makefile,v 1.97 2026/01/02 13:52:26 adam Exp $
> > +# $NetBSD: Makefile,v 1.98 2026/01/07 14:26:55 ryoon Exp $
> >
> >  DISTNAME=    pillow-12.1.0
> >  PKGNAME=     ${PYPKGPREFIX}-${DISTNAME:S/^p/P/}
> > @@ -27,6 +27,7 @@ DISTUTILS_BUILDDIR_IN_TEST_ENV=     yes
> >  # as of 11.3.0
> >  # 2 failed, 4934 passed, 88 skipped, 3 xfailed
> >
> > +.include "../../lang/python/wheel.mk"
> >  .include "../../devel/py-pybind11/buildlink3.mk"
> >  .include "../../devel/zlib/buildlink3.mk"
> >  .include "../../graphics/libavif/buildlink3.mk"
> > @@ -37,6 +38,5 @@ DISTUTILS_BUILDDIR_IN_TEST_ENV=     yes
> >  .include "../../graphics/openjpeg/buildlink3.mk"
> >  .include "../../graphics/raqm/buildlink3.mk"
> >  .include "../../graphics/tiff/buildlink3.mk"
> > -.include "../../lang/python/wheel.mk"
> >  .include "../../mk/jpeg.buildlink3.mk"
> >  .include "../../mk/bsd.pkg.mk"
>
> I'm not saying this is wrong, but
>
>   - how does moving wheel.mk affect things?

My change is ugly workaround and it looks strange, of course.
The root cause is inclusion of lang/python/pyversion.mk in
devel/py-pybind11/buildlink3.mk.
I think inclusion of lang/python/pyversion.mk may be removed from buildlink3.mk.
However I am not sure yet.

>   - if it does change behavior, how are people that read wheel.mk
>     comments/instructions supposed to know what to do?

Some buildlink3.mk files of Python modules include pyversion.mk too.
I do not confirm if removal of them is safe or not yet.

>   - did pkglint flag this?  If not, could it?

If pkglint will check similar problems, pkglint should check
buidlink3.mk files, I feel.
However I am not sure yet.

Thank you.

-- 
Ryo ONODERA // ryo%tetera.org@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3