From nobody Tue Nov 5 13:55:42 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 4XjVHR3zbfz5c7cQ for ; Tue, 05 Nov 2024 13:56:19 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjVHR3mwJz52Jv for ; Tue, 5 Nov 2024 13:56:19 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730814979; 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: in-reply-to:in-reply-to:references:references; bh=om0DUKk3hmCWbMyxap+YvuUP9ibSoYuHknQlbXZWnOE=; b=xQfmtZuWFhoD+Ngjp8DKdsy3fXAI69eoXzyhOEi262r1ZRLe/eKpr48zNmDGxQTFUjgA0u tL6pFem7pUTbLi9yxweTutGyNeVSCRm0shpY6Ps4EVGKpEtBCCvE/X8AkR4ZzskqpQWYG4 u7xg2r72FMfdx6kkjosl7U1PZ3XzSJRGNrOGK+lQ1y0FPkq1uxXRTxXjnlnFAy1vzopjpt xURH7Qupw25Dz/l3jA+x6l/x831iLEFvHGqY4riBybDIQSyt+xO6UOmTRLXQXYxaxujq6x AOR4fZ7pyGuWCkzHkP4u4K7+ax9hdzFL6TvmtBdta5Wb4zCGjJqzReBkN/lNAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730814979; 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: in-reply-to:in-reply-to:references:references; bh=om0DUKk3hmCWbMyxap+YvuUP9ibSoYuHknQlbXZWnOE=; b=pmont+U5PljXlJoyQnAibkMxr5LpVfkJjrOniHzEpQlJC8g9SdPaywY3zETSOvxQvphopP enrMONLvXMHQoiTFyaYGV336M7srQJP/RARLkssgwqd+3IM/OOay36phIqZFp06Dp1jc4b PZzGHArOgOqXb8ZaFGEiJ6NnrgwQezwSb3KMMX3IkKwj69fVj0N+VzsIK9vjEVDlKtQ7dt lL5/EZDQonEqkMpc6lcMvAAq6Q5G3AfCyTcdxpWC6YKHU9jvZ3PpfaNXHbpfczfEP2UyEI s3a4iRAX6QGbeWxC2mdOwwIv7z/pFDR/HmDh2/X2qqJxlllV/oCuZtlVsIcpLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730814979; a=rsa-sha256; cv=none; b=kCLDZPYu4RC3bMZBqJVHE9bR4umivKoshPOVCDvVcfh2cyHgbvjWv+Nt5qSnQVnMxnd7VD rEBTxAFmRldHRMlzScuE3blwudnxQ3+qPQTUC48Z4FMojZjtHZfjY2Buoj4VvjpfLhrVVP p+0lLv6xG9bwswLGyZ4LQY/VVAL2rQ8jNlBQyHOc1z7SKcYCRG5GxdT4ASmQdiivsObNXV 1Tghvfa6c1U/jw/UAeXBuwB97dL38iiuot7BXHF0ypGHtAB+CnaxuWv9Y74RCet4SdLYyZ QwFJN3RDb64cM7Eu2cPVOZASF/wNpKydhhPI0q2df9btY15rJUwBHa5ePFvypA== Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XjVHR2j6vz1MYN for ; Tue, 5 Nov 2024 13:56:19 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5c948c41edeso6977681a12.1 for ; Tue, 05 Nov 2024 05:56:19 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVZ410Ld0N0dBpZMQw7Va43hk4/yhBmLaR7l8IjowXmf5pUW/KgIipmkMRyO8eWurHQieRf9O3qEKIWkEtOxgTNQRj1rIsk@freebsd.org X-Gm-Message-State: AOJu0YwOPL03TK1mLPdKyOx1CzNNCf4KiPx0x5rh+UmFMf2qPPi0M6Wp ZWb4Ty0hLvgYyxoFCXObySYnpS6RGNPEEWlu22RfRSnfLp6/pQRFi7xh/zPtAvrKAxhP2Tlia4L Qfx2+GObRfpUDSRw6ruTuMrXWtBoXIyGH4ryccg== X-Google-Smtp-Source: AGHT+IEnH7IkfZWbaCxuo1Lal0A5hBQ6QXtHarE5qLxHDeThb37TRRnSIxxF4NFrmCLxu/2faxXbfz1MQwh+FKxMKJ8= X-Received: by 2002:a17:907:2d8e:b0:a9a:3705:9ad9 with SMTP id a640c23a62f3a-a9e50b95730mr1734096466b.50.1730814978225; Tue, 05 Nov 2024 05:56:18 -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: <202411031150.4A3BoSP4041775@gitrepo.freebsd.org> <54773f66f99087c247071679b61d09d5@mail.infomaniak.com> In-Reply-To: <54773f66f99087c247071679b61d09d5@mail.infomaniak.com> From: Po-Chuan Hsieh Date: Tue, 5 Nov 2024 21:55:42 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 521da5fb1087 - main - */*: Change *_DEPENDS from devel/util-linux back to misc/getopt To: Daniel Engberg Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000f3238206262ac3e5" --000000000000f3238206262ac3e5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Nov 5, 2024 at 7:46=E2=80=AFAM Daniel Engberg < daniel.engberg.lists@pyret.net> wrote: > On 2024-11-03T20:34:54.000+01:00, Po-Chuan Hsieh > wrote: > > On Sun, Nov 3, 2024 at 8:32=E2=80=AFPM Daniel Engberg < > daniel.engberg.lists@pyret.net> wrote: > > On 2024-11-03T12:50:28.000+01:00, Po-Chuan Hsieh > wrote: > > > The branch main has been updated by sunpoet: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D521da5fb1087f9ec846a35e= 0ea200088e6571b1d > > commit 521da5fb1087f9ec846a35e0ea200088e6571b1d > Author: Po-Chuan Hsieh > AuthorDate: 2024-11-03 11:48:23 +0000 > Commit: Po-Chuan Hsieh > CommitDate: 2024-11-03 11:48:23 +0000 > > */*: Change *_DEPENDS from devel/util-linux back to misc/getopt > > - Revert c8ace2f4ca960d3a3a0038846923efcae2f8443d > - Bump PORTREVISION for dependency change > > PR: 281625, 281934 > Reference: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D= 281934#c2 > --- > devel/compiz-bcop/Makefile | 4 ++-- > devel/gitflow/Makefile | 4 ++-- > french/aster/Makefile | 4 ++-- > math/eukleides/Makefile | 4 ++-- > net/pacemaker2/Makefile | 2 +- > net/pacemaker2/Makefile.common | 4 ++-- > sysutils/password-store/Makefile | 4 ++-- > sysutils/tartarus/Makefile | 4 ++-- > textproc/rarian/Makefile | 6 +++--- > textproc/xmlto/Makefile | 4 ++-- > textproc/yodl/Makefile | 4 ++-- > x11-fonts/fontpreview/Makefile | 4 ++-- > 12 files changed, 24 insertions(+), 24 deletions(-) > > diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile > index 38fb057dfbcb..d7ef6d9116b4 100644 > --- a/devel/compiz-bcop/Makefile > +++ b/devel/compiz-bcop/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D compiz-bcop > PORTVERSION=3D 0.8.8 > -PORTREVISION=3D 3 > +PORTREVISION=3D 4 > CATEGORIES=3D devel x11-wm > MASTER_SITES=3D http://releases.compiz.org/${PORTVERSION}/ \ > https://BSDforge.com/projects/source/devel/compiz-bcop/ > @@ -10,7 +10,7 @@ COMMENT=3D Code generator for Compiz Fusion Plugins > WWW=3D https://forum.compiz-fusion.org/ > > RUN_DEPENDS=3D ${LOCALBASE}/bin/bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=3D0:misc/getopt > > GNU_CONFIGURE=3D yes > > diff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile > index 8ee786beb94a..0b1ababe2198 100644 > --- a/devel/gitflow/Makefile > +++ b/devel/gitflow/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D gitflow > PORTVERSION=3D 1.12.3 > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D devel > > MAINTAINER=3D nbari@tequila.io > @@ -10,7 +10,7 @@ WWW=3D https://github.com/petervanderdoes/gitflow-avh > LICENSE=3D BSD2CLAUSE LGPL21 > LICENSE_COMB=3D multi > > -RUN_DEPENDS=3D ${LOCALBASE}/bin/getopt:devel/util-linux > +RUN_DEPENDS=3D getopt>=3D0:misc/getopt > > USES=3D gmake > USE_GITHUB=3D yes > diff --git a/french/aster/Makefile b/french/aster/Makefile > index 2ed680e509b0..372553442ab7 100644 > --- a/french/aster/Makefile > +++ b/french/aster/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D aster > DISTVERSION=3D ${ASTER_DISTVERSION} > -PORTREVISION=3D 11 > +PORTREVISION=3D 12 > CATEGORIES=3D french cad > > MAINTAINER=3D thierry@FreeBSD.org > @@ -31,7 +31,7 @@ BUILD_DEPENDS+=3D astk-serveur>0:cad/astk-serveur \ > ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ > gnproc:sysutils/coreutils \ > bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux \ > + getopt>=3D0:misc/getopt \ > xterm:x11/xterm \ > ${PYNUMPY} \ > ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} > diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile > index 5bad4688bab7..86a4a388cd8a 100644 > --- a/math/eukleides/Makefile > +++ b/math/eukleides/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D eukleides > PORTVERSION=3D 1.5.4 > -PORTREVISION=3D 8 > +PORTREVISION=3D 9 > CATEGORIES=3D math > MASTER_SITES=3D http://www.eukleides.org/files/ > > @@ -12,7 +12,7 @@ LICENSE=3D GPLv3+ > LICENSE_FILE=3D ${WRKSRC}/COPYING > > RUN_DEPENDS=3D pstoedit:graphics/pstoedit \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=3D0:misc/getopt > > USES=3D bison gettext iconv gmake readline tar:bzip2 tex > USE_TEX=3D latex > diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile > index 249cadf0c946..02f87e609d0e 100644 > --- a/net/pacemaker2/Makefile > +++ b/net/pacemaker2/Makefile > @@ -1,5 +1,5 @@ > PORTVERSION=3D 2.1.7 > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > PKGNAMESUFFIX=3D 2 > > WWW=3D https://www.clusterlabs.org/pacemaker/ > diff --git a/net/pacemaker2/Makefile.common b/net/pacemaker2/Makefile.co= mmon > index 15526de4e5ea..434f980a4bf8 100644 > --- a/net/pacemaker2/Makefile.common > +++ b/net/pacemaker2/Makefile.common > @@ -9,7 +9,7 @@ LICENSE=3D GPLv2 > LICENSE_FILE=3D ${WRKSRC}/COPYING > > BUILD_DEPENDS=3D bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=3D0:misc/getopt > LIB_DEPENDS=3D libgnutls.so:security/gnutls \ > libltdl.so:devel/libltdl \ > libqb.so:devel/libqb \ > @@ -17,7 +17,7 @@ LIB_DEPENDS=3D libgnutls.so:security/gnutls \ > libxml2.so:textproc/libxml2 \ > libxslt.so:textproc/libxslt > RUN_DEPENDS=3D bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux \ > + getopt>=3D0:misc/getopt \ > ocf-tester:net-mgmt/resource-agents > > CONFLICTS=3D heartbeat > diff --git a/sysutils/password-store/Makefile b/sysutils/password-store/= Makefile > index bc2635a9c0a9..aac146975c22 100644 > --- a/sysutils/password-store/Makefile > +++ b/sysutils/password-store/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D password-store > PORTVERSION=3D 1.7.4 > -PORTREVISION=3D 6 > +PORTREVISION=3D 7 > CATEGORIES=3D sysutils > MASTER_SITES=3D https://git.zx2c4.com/${PORTNAME}/snapshot/ > > @@ -12,7 +12,7 @@ LICENSE=3D GPLv2+ > LICENSE_FILE=3D ${WRKSRC}/COPYING > > RUN_DEPENDS=3D bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux \ > + getopt>=3D0:misc/getopt \ > gnupg>=3D2:security/gnupg \ > tree>=3D1.7:sysutils/tree > > diff --git a/sysutils/tartarus/Makefile b/sysutils/tartarus/Makefile > index f69bfc909eca..9d70ed65ac9c 100644 > --- a/sysutils/tartarus/Makefile > +++ b/sysutils/tartarus/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D tartarus > PORTVERSION=3D 0.9.8 > -PORTREVISION=3D 7 > +PORTREVISION=3D 8 > CATEGORIES=3D sysutils > MASTER_SITES=3D http://wertarbyte.de/tartarus/ \ > https://ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/ > @@ -15,7 +15,7 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING > RUN_DEPENDS=3D ${LOCALBASE}/bin/bash:shells/bash \ > ${LOCALBASE}/bin/gtar:archivers/gtar \ > ${LOCALBASE}/bin/curl:ftp/curl \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=3D0:misc/getopt > > USES=3D gmake perl5 shebangfix tar:bzip2 > SHEBANG_FILES=3D ${WRKSRC}/bin/* > diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile > index 412019de0593..747474c78089 100644 > --- a/textproc/rarian/Makefile > +++ b/textproc/rarian/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D rarian > DISTVERSION=3D 0.8.5 > -PORTREVISION=3D 7 > +PORTREVISION=3D 8 > CATEGORIES=3D textproc gnome > MASTER_SITES=3D https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/= -/releases/${DISTVERSION}/downloads/assets/ > > @@ -14,13 +14,13 @@ LICENSE_FILE_GPLv2+ =3D ${WRKSRC}/COPYING.UTILS > LICENSE_FILE_LGPL21+ =3D ${WRKSRC}/COPYING.LIB > LICENSE_FILE_ZLIB=3D ${WRKSRC}/COPYING > > -BUILD_DEPENDS=3D ${LOCALBASE}/bin/getopt:devel/util-linux \ > +BUILD_DEPENDS=3D getopt>=3D0:misc/getopt \ > bash:shells/bash \ > xsltproc:textproc/libxslt \ > docbook-xml>0:textproc/docbook-xml \ > ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl > LIB_DEPENDS=3D libtinyxml.so:textproc/tinyxml > -RUN_DEPENDS=3D ${LOCALBASE}/bin/getopt:devel/util-linux \ > +RUN_DEPENDS=3D getopt>=3D0:misc/getopt \ > bash:shells/bash \ > xsltproc:textproc/libxslt \ > docbook-xml>0:textproc/docbook-xml \ > diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile > index 81e6b0a3c7c3..cd2e6c55d175 100644 > --- a/textproc/xmlto/Makefile > +++ b/textproc/xmlto/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D xmlto > PORTVERSION=3D 0.0.28 > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D textproc > MASTER_SITES=3D https://releases.pagure.org/xmlto/:xmlto \ > LOCAL/mandree/:xmlto \ > @@ -18,7 +18,7 @@ WWW=3D https://pagure.io/xmlto/ > LICENSE=3D GPLv2 > > BUILD_DEPENDS=3D ${BASH_CMD}:shells/bash \ > - ${GETOPT_CMD}:devel/util-linux \ > + ${GETOPT_CMD}:misc/getopt \ > xmllint:textproc/libxml2 \ > xsltproc:textproc/libxslt \ > docbook-xsl>0:textproc/docbook-xsl \ > diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile > index d3060026ce88..3f22fea0ab26 100644 > --- a/textproc/yodl/Makefile > +++ b/textproc/yodl/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D yodl > PORTVERSION=3D 3.10.00 > -PORTREVISION=3D 5 > +PORTREVISION=3D 6 > CATEGORIES=3D textproc > > MAINTAINER=3D bofh@FreeBSD.org > @@ -10,7 +10,7 @@ WWW=3D https://fbb-git.gitlab.io/yodl/ > LICENSE=3D GPLv3 > > RUN_DEPENDS=3D bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=3D0:misc/getopt > BUILD_DEPENDS=3D icmake:devel/icmake \ > bash:shells/bash \ > gsed:textproc/gsed > diff --git a/x11-fonts/fontpreview/Makefile b/x11-fonts/fontpreview/Make= file > index f38bba80b735..d013bb9dd953 100644 > --- a/x11-fonts/fontpreview/Makefile > +++ b/x11-fonts/fontpreview/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D fontpreview > DISTVERSION=3D 1.0.6 > -PORTREVISION=3D 4 > +PORTREVISION=3D 5 > CATEGORIES=3D x11-fonts graphics > > MAINTAINER=3D 0mp@FreeBSD.org > @@ -12,7 +12,7 @@ LICENSE_FILE=3D ${WRKSRC}/LICENSE > > RUN_DEPENDS=3D bash:shells/bash \ > fzf:textproc/fzf \ > - ${LOCALBASE}/bin/getopt:devel/util-linux \ > + getopt>=3D0:misc/getopt \ > nsxiv:graphics/nsxiv \ > xdotool:x11/xdotool > > Why is LOCALBASE prefix dropped? We have multiple versions of this so it > may be mismatched by doing this approach. > > Best regards, > Daniel > > > I don't follow you. > This is "getopt>=3D0:misc/getopt" which checks if the getopt port with > required version is installed. > What you said is "getopt:misc/getopt" which checks if the getopt binary > executable exists. > I see nothing wrong here. > > Best regards, > sunpoet > > Hi, > > I'm asking why ${LOCALBASE}/bin/getopt is dropped as we have multiple > binaries with the same name. > > Best regards, > Daniel > Hi, I already answered you in the previous mail. Please re-read the commit. My change is to check the port name (which is unique), rather than the binary executable name. Regards, sunpoet --000000000000f3238206262ac3e5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Tue, Nov 5, 2024 at 7:46=E2=80=AFAM Da= niel Engberg <daniel.e= ngberg.lists@pyret.net> wrote:
On 2= 024-11-03T20:34:54.000+01:00, Po-Chuan Hsieh <sunpoet@freebsd.org> wrote:
= 
On Sun, Nov 3, 2024=
 at 8:32=E2=80=AFPM Daniel Engberg <

  On 2024-11-03T=
12:50:28.000+01:00, Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 wrote:
<=
/div>


 The branch main has been updated b=
y sunpoet:


 commit 521da5fb1087f9ec846a35e0ea200088e6571b1d
 Auth=
or:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 AuthorDate: 2024-11-03 =
11:48:23 +0000
 Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
<=
/div>
 CommitDate: 2024-11-03 11:48:23 +0000

     */*: Change *_DEPENDS from devel/util-linux back to misc/getopt
=


     - Revert c8ace2f4ca960d3a3a0038846923efcae2f=
8443d
     - Bump PORTREVISION for dependency change

     PR:             281625, 281934
 ---
=

  devel/compiz-bcop/Makefile       | 4 ++--
  deve=
l/gitflow/Makefile           | 4 ++--
  french/aster/Makefile=
            | 4 ++--
  math/eukleides/Makefile          | 4 +=
+--
  net/pacemaker2/Makefile          | 2 +-
 =
 net/pacemaker2/Makefile.common   | 4 ++--
  sysutils/passwor=
d-store/Makefile | 4 ++--
  sysutils/tartarus/Makefile       =
| 4 ++--
  textproc/rarian/Makefile         | 6 +++---
  textproc/xmlto/Makefile          | 4 ++--
  textpro=
c/yodl/Makefile           | 4 ++--
  x11-fonts/fontpreview/Ma=
kefile   | 4 ++--
  12 files changed, 24 insertions(+), 24 de=
letions(-)

 diff --git a/devel/compiz-bcop/Mak=
efile b/devel/compiz-bcop/Makefile
 index 38fb057dfbcb..d7ef6=
d9116b4 100644
 --- a/devel/compiz-bcop/Makefile
 +++ b/devel/compiz-bcop/Makefile
 @@ -1,6 +1,6 @@
  PORTNAME=3D compiz-bcop
  PORTVERSION=3D 0.8.8
 -PORTREVISION=3D 3
 +PORTREVISION=3D 4
  CATEGORIES=3D devel x11-wm
  MASTER_SITES=3D ht=
tp://releases.compiz.org/${PORTVERSION}/ \
 @@ -10,7 +10,7 @@ COMMENT=3D Code generator fo=
r Compiz Fusion Plugins

  RUN_DEPENDS=3D ${L=
OCALBASE}/bin/bash:shells/bash \
 -  ${LOCALBASE}/bin/getopt:=
devel/util-linux
 +  getopt&gt;=3D0:misc/getopt
=


  GNU_CONFIGURE=3D yes

 di=
ff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile
 i=
ndex 8ee786beb94a..0b1ababe2198 100644
 --- a/devel/gitflow/M=
akefile
 +++ b/devel/gitflow/Makefile
 @@ -1,6 =
+1,6 @@
  PORTNAME=3D gitflow
  PORTVERSION=3D =
1.12.3
 -PORTREVISION=3D 1
 +PORTREVISION=3D 2<=
br>
  CATEGORIES=3D devel

  MAINTAIN=
ER=3D nbari@tequila.i=
o
  LICENS=
E=3D BSD2CLAUSE LGPL21
  LICENSE_COMB=3D multi
=

 -RUN_DEPENDS=3D ${LOCALBASE}/bin/getopt:devel/util-linux
 +RUN_DEPENDS=3D getopt&gt;=3D0:misc/getopt
<=
br>
  USES=3D  gmake
  USE_GITHUB=3D yes
<=
div> diff --git a/french/aster/Makefile b/french/aster/Makefile
 index 2ed680e509b0..372553442ab7 100644
 --- a/french/ast=
er/Makefile
 +++ b/french/aster/Makefile
 @@ -1=
,6 +1,6 @@
  PORTNAME=3D aster
  DISTVERSION=3D=
 ${ASTER_DISTVERSION}
 -PORTREVISION=3D 11
 +PO=
RTREVISION=3D 12
  CATEGORIES=3D french cad
  MAINTAINER=3D thierry@FreeBSD.org
 @@ -31,7 +31,7 @@ BUILD_=
DEPENDS+=3D astk-serveur>0:cad/astk-serveur \
    ${SHELL_=
INSTALL_ASTER}:shells/${SHIADEP} \
    gnproc:sysutils/coreut=
ils   \
    bash:shells/bash    \
 -  ${LOCALBA=
SE}/bin/getopt:devel/util-linux \
 +  getopt&gt;=3D0:misc=
/getopt    \
    xterm:x11/xterm     \
    ${PY=
NUMPY} \
    ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@=
${PY_FLAVOR}
 diff --git a/math/eukleides/Makefile b/math/euk=
leides/Makefile
 index 5bad4688bab7..86a4a388cd8a 100644
<=
/div>
 --- a/math/eukleides/Makefile
 +++ b/math/eukleide=
s/Makefile
 @@ -1,6 +1,6 @@
  PORTNAME=3D eukle=
ides
  PORTVERSION=3D 1.5.4
 -PORTREVISION=3D 8=

 +PORTREVISION=3D 9
  CATEGORIES=3D math

 @@ -12,7 +12,7 @@ LICENSE=3D GPLv3+
  LICENSE_FILE=3D ${WRKSRC}/COPYING

  =
RUN_DEPENDS=3D pstoedit:graphics/pstoedit \
 -  ${LOCALBASE}/=
bin/getopt:devel/util-linux
 +  getopt&gt;=3D0:misc/getop=
t

  USES=3D  bison gettext iconv gmake readlin=
e tar:bzip2 tex
  USE_TEX=3D latex
 diff --git =
a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
 index 24=
9cadf0c946..02f87e609d0e 100644
 --- a/net/pacemaker2/Makefil=
e
 +++ b/net/pacemaker2/Makefile
 @@ -1,5 +1,5 =
@@
  PORTVERSION=3D  2.1.7
 -PORTREVISION=3D  2=

 +PORTREVISION=3D  3
  PKGNAMESUFFIX=3D  2
=


 diff --git a/net/pacemaker2/Makefi=
le.common b/net/pacemaker2/Makefile.common
 index 15526de4e5e=
a..434f980a4bf8 100644
 --- a/net/pacemaker2/Makefile.common<=
br>
 +++ b/net/pacemaker2/Makefile.common
 @@ -9,7 =
+9,7 @@ LICENSE=3D  GPLv2
  LICENSE_FILE=3D  ${WRKSRC}/COPYIN=
G

  BUILD_DEPENDS=3D  bash:shells/bash \
 -   ${LOCALBASE}/bin/getopt:devel/util-linux
 +   g=
etopt&gt;=3D0:misc/getopt
 @@ -17,7 +17,7 @@ LIB_DEPENDS=3D  libgnutls.so:security/gnutls \
  RUN_DEPENDS=3D  bash:shells/=
bash \
 -   ${LOCALBASE}/bin/getopt:devel/util-linux \
 +   getopt&gt;=3D0:misc/getopt \
     ocf-tester=
:net-mgmt/resource-agents

  CONFLICTS=3D  hear=
tbeat
 diff --git a/sysutils/password-store/Makefile b/sysuti=
ls/password-store/Makefile
 index bc2635a9c0a9..aac146975c22 =
100644
 --- a/sysutils/password-store/Makefile
=
 +++ b/sysutils/password-store/Makefile
 @@ -1,6 +1,6 @@
<=
/div>
  PORTNAME=3D password-store
  PORTVERSION=3D 1.7.4=

 -PORTREVISION=3D 6
 +PORTREVISION=3D 7
  CATEGORIES=3D sysutils
  MASTER_SITES=3D http=
s://git.zx2c4.com/${PORTNAME}/snapshot/

 @=
@ -12,7 +12,7 @@ LICENSE=3D GPLv2+
  LICENSE_FILE=3D ${WRKSRC=
}/COPYING

  RUN_DEPENDS=3D bash:shells/bash \<=
br>
 -  ${LOCALBASE}/bin/getopt:devel/util-linux \
=
 +  getopt&gt;=3D0:misc/getopt \
    gnupg&gt;=3D2:se=
curity/gnupg \
    tree&gt;=3D1.7:sysutils/tree
=


 diff --git a/sysutils/tartarus/Makefile b/sysutils/tar=
tarus/Makefile
 index f69bfc909eca..9d70ed65ac9c 100644
 --- a/sysutils/tartarus/Makefile
 +++ b/sysutils/ta=
rtarus/Makefile
 @@ -1,6 +1,6 @@
  PORTNAME=3D =
tartarus
  PORTVERSION=3D 0.9.8
 -PORTREVISION=
=3D 7
 +PORTREVISION=3D 8
  CATEGORIES=3D sysut=
ils
 @@ -15=
,7 +15,7 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING
  RUN_DEPENDS=
=3D ${LOCALBASE}/bin/bash:shells/bash \
    ${LOCALBASE}/bin/=
gtar:archivers/gtar \
    ${LOCALBASE}/bin/curl:ftp/curl \
 -  ${LOCALBASE}/bin/getopt:devel/util-linux
 +  =
getopt&gt;=3D0:misc/getopt

  USES=3D  gmak=
e perl5 shebangfix tar:bzip2
  SHEBANG_FILES=3D ${WRKSRC}/bin=
/*
 diff --git a/textproc/rarian/Makefile b/textproc/rarian/M=
akefile
 index 412019de0593..747474c78089 100644
 --- a/textproc/rarian/Makefile
 +++ b/textproc/rarian/Make=
file
 @@ -1,6 +1,6 @@
  PORTNAME=3D rarian
<=
/div>
  DISTVERSION=3D 0.8.5
 -PORTREVISION=3D 7
 +PORTREVISION=3D 8
  CATEGORIES=3D textproc gnome
<=
/div>
 +BUILD_DEPENDS=3D getopt&gt;=3D0:misc/getopt \
    bash:shells/bash \
    xsltproc:textproc/libxslt =
\
    docbook-xml>0:textproc/docbook-xml \
 =
   ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
<=
/div>
 -RUN_DEPENDS=3D ${LOCALBASE}/bin/getopt:devel/util-l=
inux \
 +RUN_DEPENDS=3D getopt&gt;=3D0:misc/getopt \
<=
/div>
    bash:shells/bash \
    xsltproc:textproc/libxsl=
t \
    docbook-xml>0:textproc/docbook-xml \
 diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
<=
div> index 81e6b0a3c7c3..cd2e6c55d175 100644
 --- a/textproc/=
xmlto/Makefile
 +++ b/textproc/xmlto/Makefile
 =
@@ -1,6 +1,6 @@
  PORTNAME=3D xmlto
  PORTVERSI=
ON=3D 0.0.28
 -PORTREVISION=3D 2
 +PORTREVISION=
=3D 3
  CATEGORIES=3D textproc
  MASTER_SITES=
=3D https://releases.pagure.org/xmlto/:xmlto \<=
br>
    LOCAL/mandree/:xmlto \
 @@ -18,7 +18,7 @@ W=
WW=3D  https://pagure.io/xmlto/
  LICENSE=3D GPLv=
2

  BUILD_DEPENDS=3D ${BASH_CMD}:shells/bash \=

 -  ${GETOPT_CMD}:devel/util-linux \
 +  ${GET=
OPT_CMD}:misc/getopt \
    xmllint:textproc/libxml2 \
    xsltproc:textproc/libxslt \
    docbook-xsl>0:t=
extproc/docbook-xsl \
 diff --git a/textproc/yodl/Makefile b/=
textproc/yodl/Makefile
 index d3060026ce88..3f22fea0ab26 1006=
44
 --- a/textproc/yodl/Makefile
 +++ b/textpro=
c/yodl/Makefile
 @@ -1,6 +1,6 @@
  PORTNAME=3D =
yodl
  PORTVERSION=3D 3.10.00
 -PORTREVISION=3D=
 5
 +PORTREVISION=3D 6
  CATEGORIES=3D textproc=


  MAINTAINER=3D bofh@FreeBSD.org
 @@ -10,7 +10,7=
 @@ WWW=3D  https://fbb-git.gitlab.io/yodl/
  LICENSE=3D GPLv3

  RUN_DEPENDS=3D bash:she=
lls/bash \
 -  ${LOCALBASE}/bin/getopt:devel/util-linux
 +  getopt&gt;=3D0:misc/getopt
  BUILD_DEPENDS=
=3D icmake:devel/icmake \
    bash:shells/bash \
    gsed:textproc/gsed
 diff --git a/x11-fonts/fontpreview/=
Makefile b/x11-fonts/fontpreview/Makefile
 index f38bba80b735=
..d013bb9dd953 100644
 --- a/x11-fonts/fontpreview/Makefile
 +++ b/x11-fonts/fontpreview/Makefile
 @@ -1,6 +=
1,6 @@
  PORTNAME=3D fontpreview
  DISTVERSION=
=3D 1.0.6
 -PORTREVISION=3D 4
 +PORTREVISION=3D=
 5
  CATEGORIES=3D x11-fonts graphics

  MAINTAINER=3D =
0mp@FreeBSD.org
 @@ -12,7 +12,7 @@ LICENSE_FILE=3D ${WRKS=
RC}/LICENSE

  RUN_DEPENDS=3D bash:shells/bash =
\
    fzf:textproc/fzf \
 -  ${LOCALBASE}/bin/g=
etopt:devel/util-linux \
 +  getopt&gt;=3D0:misc/getopt \=

    nsxiv:graphics/nsxiv \
    xdotool:x11/xdo=
tool

 Why is LOCALBASE prefix dropped? We have=
 multiple versions of this so it
 may be mismatched by doing =
this approach.

 Best regards,
 D=
aniel
 
I don't follow you.
This is "getopt&gt;=3D0:misc/getopt" which checks=
 if the getopt port with
required version is installed.
What you said is "getopt:misc/getopt" which checks if th=
e getopt binary
executable exists.
I see nothin=
g wrong here.

Best regards,
sunp=
oet
Hi,

I'm asking why ${LOCAL= BASE}/bin/getopt is dropped as we have multiple binaries with the same name= .

Best regards= ,
Daniel
Hi,

I already answered you in the prev= ious mail.
Please re-read the commit.
My change is to c= heck the port name (which is unique), rather than the binary executable nam= e.

Regards,
sunpoet
--000000000000f3238206262ac3e5--