Date: Wed, 6 Nov 2024 13:41:01 +0100 From: Antoine Brodin <antoine@freebsd.org> To: "Sergey A. Osokin" <osa@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 96de6ae007dd - main - graphics/xpdf4: add Qt5/Qt6 flavors Message-ID: <CAALwa8=VR63fvqJ3UG5SjYA397_abTVdoUNix8FPJ_aAr7jsZQ@mail.gmail.com> In-Reply-To: <ZytJ1kRjkk1iU_b9@FreeBSD.org> References: <202411060024.4A60OppA091460@gitrepo.freebsd.org> <CAALwa8ntCPXoSyFveDwzPO6M9H6hUYieL%2BofhzOQ0xKnATvPHw@mail.gmail.com> <ZytJ1kRjkk1iU_b9@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Nov 6, 2024 at 11:49=E2=80=AFAM 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=E2=80=AFAM Sergey A. Osokin <osa@freebsd.or= g> wrote: > > > > > > The branch main has been updated by osa: > > > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D96de6ae007dd2d770f68= 5d8997523c9ea2def06d > > > > > > 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=3D xpdf > > > PORTVERSION=3D 4.05 > > > +PORTREVISION=3D 1 > > > PORTEPOCH=3D 1 > > > CATEGORIES=3D graphics print > > > MASTER_SITES=3D https://dl.xpdfreader.com/ > > > @@ -20,6 +21,13 @@ CONFLICTS_INSTALL+=3D xpdf3 xpdf > > > CONFLICTS_INSTALL+=3D xpdf3 xpdf4 > > > .endif > > > > > > +FLAVORS=3D qt5 qt6 > > > +FLAVOR?=3D ${FLAVORS:[1]} > > > +qt5_PKGNAMESUFFIX=3D > > > +qt6_PKGNAMESUFFIX=3D -qt6 > > > +qt5_CONFLICTS_INSTALL=3D ${PORTNAME}-qt6 > > > +qt6_CONFLICTS_INSTALL=3D ${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 othe= r formats > xpdf3-3.04_13 Display PDF files and convert them to othe= r formats > xpdf4-4.05,1 Display PDF files and convert them to othe= r formats > > After the update it should be like that: > % pkg search ^xpdf > xpdf-4.05_1,1 Display PDF files and convert them to othe= r formats > xpdf3-3.04_13 Display PDF files and convert them to othe= r formats > xpdf4-qt5-4.05_1,1 Display PDF files and convert them to othe= r formats > xpdf4-qt6-4.05_1,1 Display PDF files and convert them to othe= r formats > > Am I missing something there? % make -C graphics/xpdf4 -VPKGNAME FLAVOR=3Dqt5 xpdf-4.05_1,1 % make -C graphics/xpdf4 -VPKGNAME FLAVOR=3Dqt6 xpdf-qt6-4.05_1,1 % make -C graphics/xpdf -VPKGNAME FLAVOR=3Dqt5 xpdf-4.05_1,1 % make -C graphics/xpdf -VPKGNAME FLAVOR=3Dqt6 xpdf-qt6-4.05_1,1 Antoine
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8=VR63fvqJ3UG5SjYA397_abTVdoUNix8FPJ_aAr7jsZQ>