From nobody Wed Nov 06 10:49:58 2024 X-Original-To: dev-commits-ports-all@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 4Xk25y38Fqz5cQxp; Wed, 06 Nov 2024 10:49:58 +0000 (UTC) (envelope-from osa@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk25y2dJ6z4gfD; Wed, 6 Nov 2024 10:49:58 +0000 (UTC) (envelope-from osa@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730890198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/8NTkUV1QNIQPlmxGQ4AMi+ZkN0dOssL3iXqPxMe5ZY=; b=F9BXvw7K09Hz7hG0tc8RFlZJzfedwdddlNbA1UFXJSdd/MFLYbXczS7iP41HMPOvZCug5W meVnBI+HWG6hqp+4wJFFMR75HVSZbAQheGbsDp6R6t1wCqR05Nln/CClMI1PByVHlaC1Mo 9+UzTNI9VMZep7SDzWyStwqewRPg6fZ3AEiN+ZpJZRaEByPt08cVSsD7wlU4wngKTAC3sf jUhVy1tARGLlwlW5aMwLJhLPAzD/JwjGI9eZ7bN2cRWrvTtVj6mY4XiCtXpLzTUCtoCn8p +t88xpWOg6Du9SqGwm0u4A4HpbYLhTKZ0WrGcUs0PLoDzwc7h2IsgFVmO17QXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730890198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/8NTkUV1QNIQPlmxGQ4AMi+ZkN0dOssL3iXqPxMe5ZY=; b=KhE8/F2Xl9Tz3rPOAiu1OeFLiQbw+xapdv/DeUE2DNVxNLvMoODRlzQd80v2aAwRwefeN3 qRHlEIr1RAyqyTZTwjk76bqcZyDnu95bQbwWFfvsCDiPx3QQ1RxSHbmnZZVxonSXCWnvK7 bXGrMkYLqOSpVNLnopCSDAw5HXpDvBuYPMewfUz1mulBD9eOgxLH829FPU+HlbCPM9r2uL wQUbNDQzOoyDcnmWhdRIr2+CLlKtqfHcLQl3e1HM3dVi5nnz6tn+nMrpaFVJzW8Zu3Pnk/ 68Tp4CL97Zjg3muzl56i9g0z9kD7IzKHuT3tQwGF84wxsTQ1rWoEm9akl3g+IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730890198; a=rsa-sha256; cv=none; b=kfv8Wq1Z8N2ZZ2d72FItGsguzbqsSW9hqGjgZtJT15VN7d5pRcnZQO2KlkDA7z2Ns/zDQd lYonJeU827HEViURmmrIU05AuiW+lffcSFnc0xFrtQH3n/xNgSsvayo2bwCEssTl4NKqJb aaPkeQrXnX5ybcprjmDLKIDvSLwMSYfcgOSgia1BcupDgXNmCFWm+uGBpFYQRkT4LVfujX 7qyQdZtJSUB594FziJKeEExJm8BP49GAwzOVzIbRNaonr/AMzJ8J2o01ewRuQIuNYKUPy+ NcJySF0bNf0WRPmESDIL+GTnpsbxFYKxW17Nk7r3qZQ8gui5ehZX+J9I/Qcprw== Received: by freefall.freebsd.org (Postfix, from userid 975) id 2FCEA306A; Wed, 06 Nov 2024 10:49:58 +0000 (UTC) Date: Wed, 6 Nov 2024 10:49:58 +0000 From: "Sergey A. Osokin" To: Antoine Brodin 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: References: <202411060024.4A60OppA091460@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: 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 wrote: > > > > The branch main has been updated by osa: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=96de6ae007dd2d770f685d8997523c9ea2def06d > > > > commit 96de6ae007dd2d770f685d8997523c9ea2def06d > > Author: Sergey A. Osokin > > AuthorDate: 2024-11-06 00:23:35 +0000 > > Commit: Sergey A. Osokin > > 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? -- Sergey A. Osokin