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

On Wed, 6 Nov 2024 13:42:39 +0100
Robert Clausecker <fuz@fuz.su> wrote:

> Greetings,
> 
> Am Wed, Nov 06, 2024 at 09:36:59PM +0900 schrieb Tomoaki AOKI:
> > 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}
> 
> Why is graphics/xpdf a master port and not just a slave port, depending
> on graphics/xpdf3 or graphicss/xpdf4 depending on what the user has
> configured?
> 
> Yours,
> Robert Clausecker
> 
> -- 
> ()  ascii ribbon campaign - for an encoding-agnostic world
> /\  - against html email  - against proprietary attachments

Hi.

I don't know why graphics/xpdf is a master port, as I'm neither
the maintainer nor submitter of the commit.
Just noticed PKGNAMESUFFIX is overridden.

And if conditional using MASTERDIR is actually needed,
it should be around qt?_PKGNAMESUFFIX lines.

Regards.


-- 
Tomoaki AOKI    <junchoon@dec.sakura.ne.jp>