From nobody Wed Nov 06 12:41:01 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 4Xk4ZL1lVBz5cXrF; Wed, 06 Nov 2024 12:41:14 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-vk1-f173.google.com (mail-vk1-f173.google.com [209.85.221.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk4ZK3fJCz41YP; Wed, 6 Nov 2024 12:41:13 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vk1-f173.google.com with SMTP id 71dfb90a1353d-50d399891d6so1999965e0c.1; Wed, 06 Nov 2024 04:41:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730896872; x=1731501672; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o8wjcHTzyYjnodsj1Rq2TuCPwcbBiWhPkjcDu/cQ1GA=; b=Zl+qtzQjP5G965uDXe3lieJEK/SxOOX06A8SpNkNrJU3Mvj1uneg0de/PDowVz+Cnk 9NmEb3ueWE7DhB/OaPJU7Kl9l1GCtJLl1/4OCLfUyaXm9xCGm/kxLdDI3rIc+lblnE2H QCz7xdWdFY3sbl3EnGsdtDDUUPHBfyw9ffbSlVqcdtPjKljjwOAYFV1O8GGjtf9yeDl0 nC5MwFimcrP44hir3Dw7A/B2BGIuoH2Birfd4OnL6enW1u9mFnLYYRF/9YJmDI5txGtn a8cR4eBalL73c16dQJh7ZpgdiEWwo4F25V8RCOB3bK5it1t4g/wp2uCf7uWzMbKfALRs 4nxQ== X-Forwarded-Encrypted: i=1; AJvYcCV1uyG8PWAdlzFFGOfs1pOIlS50vRehvRry+sUrEKgrRgm+9keqEf9lT+LB4txmiCQ0xW0Wgy5rx408pVy9/TxC+thFSjM=@freebsd.org, AJvYcCWHiy7KH3lhe3xeD0fQPzuRLknsuxJIolH+l+u9zZu2Fg5c3ahdr2a742Rx3q7Z0SiwJPNkDoOsGv4tEjCo+YykHJ0TujpkOA==@freebsd.org X-Gm-Message-State: AOJu0Yw1ghgk+Y4i1JBmE8X+Y4eZ2JLWK/OzmQgSqmNnvNwJxe48xhux kyCL1FLbq4Jwn7phQ+shXRWX4YShww79Nj8P3xo8j2m3YWTtPjnZcILhNDCcoLKI/vQaRfLRohs Hlivihk2khORUqPv9MmsngP/IsdPUGcVg X-Google-Smtp-Source: AGHT+IHVaWQlzo2qsohQsIlptfE7BCM8MAjcAFTcrWMH+CdGiCP4RL3hXsnDTxzDApjHV57gRf6IgVf8xwYOL4utbnk= X-Received: by 2002:a05:6122:32cc:b0:50c:55f4:b529 with SMTP id 71dfb90a1353d-51227346cb9mr18409257e0c.8.1730896872564; Wed, 06 Nov 2024 04:41:12 -0800 (PST) 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 References: <202411060024.4A60OppA091460@gitrepo.freebsd.org> In-Reply-To: From: Antoine Brodin Date: Wed, 6 Nov 2024 13:41:01 +0100 Message-ID: Subject: Re: git: 96de6ae007dd - main - graphics/xpdf4: add Qt5/Qt6 flavors To: "Sergey A. Osokin" Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Xk4ZK3fJCz41YP X-Spamd-Bar: ---- On Wed, Nov 6, 2024 at 11:49=E2=80=AFAM 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=E2=80=AFAM Sergey A. Osokin wrote: > > > > > > The branch main has been updated by osa: > > > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D96de6ae007dd2d770f68= 5d8997523c9ea2def06d > > > > > > 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=3D xpdf > > > PORTVERSION=3D 4.05 > > > +PORTREVISION=3D 1 > > > PORTEPOCH=3D 1 > > > CATEGORIES=3D graphics print > > > MASTER_SITES=3D https://dl.xpdfreader.com/ > > > @@ -20,6 +21,13 @@ CONFLICTS_INSTALL+=3D xpdf3 xpdf > > > CONFLICTS_INSTALL+=3D xpdf3 xpdf4 > > > .endif > > > > > > +FLAVORS=3D qt5 qt6 > > > +FLAVOR?=3D ${FLAVORS:[1]} > > > +qt5_PKGNAMESUFFIX=3D > > > +qt6_PKGNAMESUFFIX=3D -qt6 > > > +qt5_CONFLICTS_INSTALL=3D ${PORTNAME}-qt6 > > > +qt6_CONFLICTS_INSTALL=3D ${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 othe= r formats > xpdf3-3.04_13 Display PDF files and convert them to othe= r formats > xpdf4-4.05,1 Display PDF files and convert them to othe= r formats > > After the update it should be like that: > % pkg search ^xpdf > xpdf-4.05_1,1 Display PDF files and convert them to othe= r formats > xpdf3-3.04_13 Display PDF files and convert them to othe= r formats > xpdf4-qt5-4.05_1,1 Display PDF files and convert them to othe= r formats > xpdf4-qt6-4.05_1,1 Display PDF files and convert them to othe= r formats > > Am I missing something there? % make -C graphics/xpdf4 -VPKGNAME FLAVOR=3Dqt5 xpdf-4.05_1,1 % make -C graphics/xpdf4 -VPKGNAME FLAVOR=3Dqt6 xpdf-qt6-4.05_1,1 % make -C graphics/xpdf -VPKGNAME FLAVOR=3Dqt5 xpdf-4.05_1,1 % make -C graphics/xpdf -VPKGNAME FLAVOR=3Dqt6 xpdf-qt6-4.05_1,1 Antoine