Date: Wed, 6 Nov 2024 21:36:59 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: Robert Clausecker <fuz@freebsd.org> Cc: "Sergey A. Osokin" <osa@freebsd.org>, Antoine Brodin <antoine@freebsd.org>, dev-commits-ports-main@freebsd.org Subject: Re: git: 96de6ae007dd - main - graphics/xpdf4: add Qt5/Qt6 flavors Message-ID: <20241106213659.853a129a56dfb9585529aaa3@dec.sakura.ne.jp>
next in thread | raw e-mail | index | archive | help
> Am Wed, Nov 06, 2024 at 11:10:47AM +0000 schrieb Sergey A. Osokin:
>> On Wed, Nov 06, 2024 at 10:49:58AM +0000, Sergey A. Osokin wrote:
>> > > > +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?
>>
>> I mean:
>> % 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-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
>
> Additionally, make index reports:
>
> Warning: Duplicate INDEX entry: xpdf-4.05_1,1
> Warning: Duplicate INDEX entry: xpdf-qt6-4.05_1,1
>
> Yours,
> Robert Clausecker
>
> --
> () ascii ribbon campaign - for an encoding-agnostic world
> /\ - against html email - against proprietary attachments
Hi.
At least, lines 7-9 of the graphics/xpdf4/Makefile does nothing,
as line 26 and 27 overrides it.
Not tested, but does this help?
--- a/graphics/xpdf4/Makefile
+++ b/graphics/xpdf4/Makefile
@@ -4,9 +4,6 @@
PORTEPOCH= 1
CATEGORIES= graphics print
MASTER_SITES= https://dl.xpdfreader.com/
-.if !defined(MASTERDIR)
-PKGNAMESUFFIX= 4
-.endif
MAINTAINER= cy@FreeBSD.org
COMMENT= Display PDF files and convert them to other formats
@@ -23,8 +20,8 @@
FLAVORS= qt5 qt6
FLAVOR?= ${FLAVORS:[1]}
-qt5_PKGNAMESUFFIX=
+qt5_PKGNAMESUFFIX= 4
-qt6_PKGNAMESUFFIX= -qt6
+qt6_PKGNAMESUFFIX= 4-qt6
qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6
qt6_CONFLICTS_INSTALL= ${PORTNAME}
Regards.
--
Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20241106213659.853a129a56dfb9585529aaa3>