From nobody Wed Nov 06 12:36:59 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk4Tl1Ynnz5cXBl for ; Wed, 06 Nov 2024 12:37:15 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from www121.sakura.ne.jp (www121.sakura.ne.jp [153.125.133.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk4Th4GrSz3xk6; Wed, 6 Nov 2024 12:37:12 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Authentication-Results: mx1.freebsd.org; dkim=fail ("headers rsa verify failed") header.d=dec.sakura.ne.jp header.s=s2405 header.b="mPib/nN4"; spf=pass (mx1.freebsd.org: domain of junchoon@dec.sakura.ne.jp designates 153.125.133.21 as permitted sender) smtp.mailfrom=junchoon@dec.sakura.ne.jp; dmarc=pass (policy=none) header.from=dec.sakura.ne.jp Received: from kalamity.joker.local (124-18-43-234.area1a.commufa.jp [124.18.43.234]) (authenticated bits=0) by www121.sakura.ne.jp (8.17.1/8.17.1/[SAKURA-WEB]/20201212) with ESMTPA id 4A6Cb0wd013990; Wed, 6 Nov 2024 21:37:01 +0900 (JST) (envelope-from junchoon@dec.sakura.ne.jp) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=dec.sakura.ne.jp; s=s2405; t=1730896622; bh=Yogeppx8crSJg2lz2qe2v+UVZFsD90wEnzqUzlJwGLc=; h=Date:From:To:Cc:Subject; b=mPib/nN4zPxF8OC8zSoA9rT08E+JZJK1y173f7q3Gnx3sOKLMU5tjtbqC1V/oz3nL PrMePK0X7rJP849f1h+RwTU4L8PDTXxuO2Vovs/bh+fdgRDw0twlJacj3LO232Jsom 4TbnrsCr6eWNYMKIw7sY6kLQbAfbqzbYJO94Djyc= Date: Wed, 6 Nov 2024 21:36:59 +0900 From: Tomoaki AOKI To: Robert Clausecker Cc: "Sergey A. Osokin" , Antoine Brodin , 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> Organization: Junchoon corps X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.1) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [1.30 / 15.00]; THREAD_HIJACKING_FROM_INJECTOR(2.00)[]; FAKE_REPLY(1.00)[]; NEURAL_HAM_LONG(-1.00)[-0.998]; NEURAL_HAM_MEDIUM(-0.96)[-0.959]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW_WITH_FAILURES(-0.50)[]; NEURAL_SPAM_SHORT(0.45)[0.454]; R_SPF_ALLOW(-0.20)[+ip4:153.125.133.16/28]; MIME_GOOD(-0.10)[text/plain]; ONCE_RECEIVED(0.10)[]; R_DKIM_REJECT(0.00)[dec.sakura.ne.jp:s=s2405]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; HAS_ORG_HEADER(0.00)[]; DMARC_POLICY_ALLOW(0.00)[dec.sakura.ne.jp,none]; RCVD_COUNT_ONE(0.00)[1]; RCPT_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-ports-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[dec.sakura.ne.jp:-]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:7684, ipnet:153.125.128.0/18, country:JP]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[] X-Rspamd-Queue-Id: 4Xk4Th4GrSz3xk6 X-Spamd-Bar: + > 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