From nobody Wed Nov 06 11:10:47 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 4Xk2Yz2H4Yz5cS1P; Wed, 06 Nov 2024 11:10:47 +0000 (UTC) (envelope-from osa@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 4Xk2Yz1n23z4jkW; Wed, 6 Nov 2024 11:10:47 +0000 (UTC) (envelope-from osa@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730891447; 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=TUBNH9LJ9p5EP67yP/PBIpABgLdSPTUEK/seDlxCzrk=; b=JA3+TlasU244qxdB3DOEFDrUQBxtvFpnHF8nsl/1gXans0nytSg8zjZtOmNfxBQz28TAf7 nJLK1TBE3KbH4aUnIaFCo4iifd3KNTdjnjg0I8cFL308kS+eubjiQdwlXl58ZaqUCPsaQY OnSvKArVjPlHJXmaxTFMrIBc2F3XH87jLU6EFx0TpZr0fh47RdDrV8S89tmbRtxu84Ohaa hYdoKtiFilm51KR5ll1axB+I24jwZmw9TrKorOS5KAWRUycgcI4TUS+h+ZJglS/25bQyTL 9ASSe+QEkrWmT6wMzIWqtW7lzCH3wnhnz+zW5wnCteFAwTZilisLhyonru/eMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730891447; 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=TUBNH9LJ9p5EP67yP/PBIpABgLdSPTUEK/seDlxCzrk=; b=HAzoSm6cNp7zyt8/yAIiMMMiqGUnYwe6Lzb/bm4bEUJzdaJjmGfxQzmh4L5cJlsRN6N2aH Q/8iH+dBoDG/VDkhhWZtagXTU0YOVIjLE8YdWFprciNMz3SdKncFCdJ1cKPBmSpY/m+XD2 T5SOKvsE/h8B0Bgoo5fwsGCwrpyqlc/oyVWMXzKofNgoK+L1fASYUR7dAiFn0NCzs68hSd 8SYinCIxnNCP3Lz3LlhL0F16TXcFEkFvNhelS0Ps29kPaUlzPXbB2AsE5KkpUDIYrYSnAH ZbNPVosx7mBPXfvz4g+l4waI6xxaDRidObV1cb0kfHnYnmNfIiDbRnhVxBchfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730891447; a=rsa-sha256; cv=none; b=h9yz0pxwe1pnMuDo3aKqnB6R/v1I3EwnHuYPYxkJspb9q167szfnp98UNqB3KO2MLPUQYV fyBqxlFneEqzm/bwlHUhhSetNL8xyxbFakHkLSW2cmfQ3plE9Pii1eysWg47GzDridsiRg Hf1YG6HGPRwoH22r6+/oZ5xa2f89edKggy1r/94Q//tg/WhWEq1jlFeq8uJ8KL3sHDlQFT VoSOuqc/89GC+dsSogp0dH62+rBu1tnVQMpwYjEbNU/Y012AkeRl009+D9hgTXdhANGBgV Gn64YkwKLrZAa9KZVu7C64m6n1uhVXiPF+qfZgoWw8WpPIWDY2m1wFnv19fH1g== Received: by freefall.freebsd.org (Postfix, from userid 975) id 182AA338A; Wed, 06 Nov 2024 11:10:47 +0000 (UTC) Date: Wed, 6 Nov 2024 11:10:47 +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: 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=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Wed, Nov 06, 2024 at 10:49:58AM +0000, Sergey A. Osokin wrote: > 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? 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 -- Sergey A. Osokin