Re: git: 96de6ae007dd - main - graphics/xpdf4: add Qt5/Qt6 flavors

On Wed, Nov 6, 2024 at 11:49 AM Sergey A. Osokin <osa@freebsd.org> wrote:
>
> Hi Antoine,
>
> On Wed, Nov 06, 2024 at 09:06:29AM +0100, Antoine Brodin wrote:
> > On Wed, Nov 6, 2024 at 1:24 AM Sergey A. Osokin <osa@freebsd.org> wrote:
> > >
> > > The branch main has been updated by osa:
> > >
> > > URL: https://cgit.FreeBSD.org/ports/commit/?id=96de6ae007dd2d770f685d8997523c9ea2def06d
> > >
> > > commit 96de6ae007dd2d770f685d8997523c9ea2def06d
> > > Author:     Sergey A. Osokin <osa@FreeBSD.org>
> > > AuthorDate: 2024-11-06 00:23:35 +0000
> > > Commit:     Sergey A. Osokin <osa@FreeBSD.org>
> > > CommitDate: 2024-11-06 00:24:46 +0000
> > >
> > >     graphics/xpdf4: add Qt5/Qt6 flavors
> > >
> > >     Bump PORTREVISION.
> > >
> > >     Approved by:    cy (maintainer)
> > > ---
> > >  graphics/xpdf4/Makefile | 30 +++++++++++++++++++++++-------
> > >  1 file changed, 23 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile
> > > index a6f999c9babe..c41d6d9d7e3c 100644
> > > --- a/graphics/xpdf4/Makefile
> > > +++ b/graphics/xpdf4/Makefile
> > > @@ -1,5 +1,6 @@
> > >  PORTNAME=      xpdf
> > >  PORTVERSION=   4.05
> > > +PORTREVISION=  1
> > >  PORTEPOCH=     1
> > >  CATEGORIES=    graphics print
> > >  MASTER_SITES=  https://dl.xpdfreader.com/
> > > @@ -20,6 +21,13 @@ CONFLICTS_INSTALL+=  xpdf3 xpdf
> > >  CONFLICTS_INSTALL+=    xpdf3 xpdf4
> > >  .endif
> > >
> > > +FLAVORS=       qt5 qt6
> > > +FLAVOR?=       ${FLAVORS:[1]}
> > > +qt5_PKGNAMESUFFIX=
> > > +qt6_PKGNAMESUFFIX=     -qt6
> > > +qt5_CONFLICTS_INSTALL=  ${PORTNAME}-qt6
> > > +qt6_CONFLICTS_INSTALL=  ${PORTNAME}
> >
> > Hello,
> >
> > There is a PKGBASE (and PKGNAME) collision with graphics/xpdf
>
> The graphics/xpdf port by default builds graphics/xpdf4 port with
> the package name xpdf, i.e. same as the graphics/xpdf4 does, but
> without "4" suffix for the package name.  And the graphics/xpdf4
> by default builds xpdf4 package without -qtX suffix.
>
> For now it looks like this:
> % pkg search ^xpdf
> xpdf-4.05,1                    Display PDF files and convert them to other formats
> xpdf3-3.04_13                  Display PDF files and convert them to other formats
> xpdf4-4.05,1                   Display PDF files and convert them to other formats
>
> After the update it should be like that:
> % pkg search ^xpdf
> xpdf-4.05_1,1                  Display PDF files and convert them to other formats
> xpdf3-3.04_13                  Display PDF files and convert them to other formats
> xpdf4-qt5-4.05_1,1             Display PDF files and convert them to other formats
> xpdf4-qt6-4.05_1,1             Display PDF files and convert them to other formats
>
> Am I missing something there?

% make -C graphics/xpdf4 -VPKGNAME FLAVOR=qt5
xpdf-4.05_1,1
% make -C graphics/xpdf4 -VPKGNAME FLAVOR=qt6
xpdf-qt6-4.05_1,1
% make -C graphics/xpdf -VPKGNAME FLAVOR=qt5
xpdf-4.05_1,1
% make -C graphics/xpdf -VPKGNAME FLAVOR=qt6
xpdf-qt6-4.05_1,1

Antoine