Date: Tue, 5 Nov 2024 21:55:42 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Daniel Engberg <daniel.engberg.lists@pyret.net> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 521da5fb1087 - main - */*: Change *_DEPENDS from devel/util-linux back to misc/getopt Message-ID: <CAMHz58T9KFEa59YFZzmvw8udMXL8TUhrsqO_vb8vnQnMZoQz3Q@mail.gmail.com> In-Reply-To: <54773f66f99087c247071679b61d09d5@mail.infomaniak.com> References: <202411031150.4A3BoSP4041775@gitrepo.freebsd.org> <b0e5ddbd063268f04bc090f15e818f38@mail.infomaniak.com> <CAMHz58TBL%2BJmrEs79tnKOcBNEAgaxZ%2BHUneA=QkdxwUFvuZRcw@mail.gmail.com> <54773f66f99087c247071679b61d09d5@mail.infomaniak.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <sunpoet@freebsd.org> > 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 <sunpoet@FreeBSD.org> > 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 <sunpoet@FreeBSD.org> > AuthorDate: 2024-11-03 11:48:23 +0000 > Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> > 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 <div dir=3D"ltr"><div dir=3D"ltr">On Tue, Nov 5, 2024 at 7:46=E2=80=AFAM Da= niel Engberg <<a href=3D"mailto:daniel.engberg.lists@pyret.net">daniel.e= ngberg.lists@pyret.net</a>> wrote:</div><div class=3D"gmail_quote"><bloc= kquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:= 1px solid rgb(204,204,204);padding-left:1ex"><div><div style=3D"font-family= :"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">On 2= 024-11-03T20:34:54.000+01:00, Po-Chuan Hsieh <<a href=3D"mailto:sunpoet@= freebsd.org" target=3D"_blank">sunpoet@freebsd.org</a>> wrote:<br></div>= <div><blockquote><pre style=3D"white-space:normal"><div>On Sun, Nov 3, 2024= at 8:32=E2=80=AFPM Daniel Engberg <<br></div><div><a href=3D"mailto:dan= iel.engberg.lists@pyret.net" target=3D"_blank">daniel.engberg.lists@pyret.n= et</a>> wrote:<br></div><div><br></div><blockquote><div> On 2024-11-03T= 12:50:28.000+01:00, Po-Chuan Hsieh <<a href=3D"mailto:sunpoet@FreeBSD.or= g" target=3D"_blank">sunpoet@FreeBSD.org</a>><br></div><div> wrote:<br><= /div><div><br></div><div><br></div><div> The branch main has been updated b= y sunpoet:<br></div><div><br></div><div> URL: <a rel=3D"noopener noreferrer= " href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D521da5fb1087f9ec846a3= 5e0ea200088e6571b1d" target=3D"_blank">https://cgit.FreeBSD.org/ports/commi= t/?id=3D521da5fb1087f9ec846a35e0ea200088e6571b1d</a><br></div><div><br></di= v><div> commit 521da5fb1087f9ec846a35e0ea200088e6571b1d<br></div><div> Auth= or: Po-Chuan Hsieh <<a href=3D"mailto:sunpoet@FreeBSD.org" target=3D= "_blank">sunpoet@FreeBSD.org</a>><br></div><div> AuthorDate: 2024-11-03 = 11:48:23 +0000<br></div><div> Commit: Po-Chuan Hsieh <<a href=3D"mai= lto:sunpoet@FreeBSD.org" target=3D"_blank">sunpoet@FreeBSD.org</a>><br><= /div><div> CommitDate: 2024-11-03 11:48:23 +0000<br></div><div><br></div><d= iv> */*: Change *_DEPENDS from devel/util-linux back to misc/getopt<br>= </div><div><br></div><div> - Revert c8ace2f4ca960d3a3a0038846923efcae2f= 8443d<br></div><div> - Bump PORTREVISION for dependency change<br></div= ><div><br></div><div> PR: 281625, 281934<br></div><div> = Reference: <a rel=3D"noopener noreferrer" href=3D"https://bugs.freebs= d.org/bugzilla/show_bug.cgi?id=3D281934#c2" target=3D"_blank">https://bugs.= freebsd.org/bugzilla/show_bug.cgi?id=3D281934#c2</a><br></div><div> ---<br>= </div><div> devel/compiz-bcop/Makefile | 4 ++--<br></div><div> deve= l/gitflow/Makefile | 4 ++--<br></div><div> french/aster/Makefile= | 4 ++--<br></div><div> math/eukleides/Makefile | 4 += +--<br></div><div> net/pacemaker2/Makefile | 2 +-<br></div><div> = net/pacemaker2/Makefile.common | 4 ++--<br></div><div> sysutils/passwor= d-store/Makefile | 4 ++--<br></div><div> sysutils/tartarus/Makefile = | 4 ++--<br></div><div> textproc/rarian/Makefile | 6 +++---<br></d= iv><div> textproc/xmlto/Makefile | 4 ++--<br></div><div> textpro= c/yodl/Makefile | 4 ++--<br></div><div> x11-fonts/fontpreview/Ma= kefile | 4 ++--<br></div><div> 12 files changed, 24 insertions(+), 24 de= letions(-)<br></div><div><br></div><div> diff --git a/devel/compiz-bcop/Mak= efile b/devel/compiz-bcop/Makefile<br></div><div> index 38fb057dfbcb..d7ef6= d9116b4 100644<br></div><div> --- a/devel/compiz-bcop/Makefile<br></div><di= v> +++ b/devel/compiz-bcop/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div= ><div> PORTNAME=3D compiz-bcop<br></div><div> PORTVERSION=3D 0.8.8<br></d= iv><div> -PORTREVISION=3D 3<br></div><div> +PORTREVISION=3D 4<br></div><div= > CATEGORIES=3D devel x11-wm<br></div><div> MASTER_SITES=3D <a rel=3D"noo= pener noreferrer" href=3D"http://releases.compiz.org/" target=3D"_blank">ht= tp://releases.compiz.org/</a>${PORTVERSION}/ \<br></div><div> <a rel=3D"= noopener noreferrer" href=3D"https://BSDforge.com/projects/source/devel/com= piz-bcop/" target=3D"_blank">https://BSDforge.com/projects/source/devel/com= piz-bcop/</a><br></div><div> @@ -10,7 +10,7 @@ COMMENT=3D Code generator fo= r Compiz Fusion Plugins<br></div><div> WWW=3D <a rel=3D"noopener noreferr= er" href=3D"https://forum.compiz-fusion.org/" target=3D"_blank">https://for= um.compiz-fusion.org/</a><br></div><div><br></div><div> RUN_DEPENDS=3D ${L= OCALBASE}/bin/bash:shells/bash \<br></div><div> - ${LOCALBASE}/bin/getopt:= devel/util-linux<br></div><div> + getopt&gt;=3D0:misc/getopt<br></div>= <div><br></div><div> GNU_CONFIGURE=3D yes<br></div><div><br></div><div> di= ff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile<br></div><div> i= ndex 8ee786beb94a..0b1ababe2198 100644<br></div><div> --- a/devel/gitflow/M= akefile<br></div><div> +++ b/devel/gitflow/Makefile<br></div><div> @@ -1,6 = +1,6 @@<br></div><div> PORTNAME=3D gitflow<br></div><div> PORTVERSION=3D = 1.12.3<br></div><div> -PORTREVISION=3D 1<br></div><div> +PORTREVISION=3D 2<= br></div><div> CATEGORIES=3D devel<br></div><div><br></div><div> MAINTAIN= ER=3D <a href=3D"mailto:nbari@tequila.io" target=3D"_blank">nbari@tequila.i= o</a><br></div><div> @@ -10,7 +10,7 @@ WWW=3D <a rel=3D"noopener noreferre= r" href=3D"https://github.com/petervanderdoes/gitflow-avh" target=3D"_blank= ">https://github.com/petervanderdoes/gitflow-avh</a><br></div><div>; LICENS= E=3D BSD2CLAUSE LGPL21<br></div><div> LICENSE_COMB=3D multi<br></div><div>= <br></div><div> -RUN_DEPENDS=3D ${LOCALBASE}/bin/getopt:devel/util-linux<br= ></div><div> +RUN_DEPENDS=3D getopt&gt;=3D0:misc/getopt<br></div><div><= br></div><div> USES=3D gmake<br></div><div> USE_GITHUB=3D yes<br></div><= div> diff --git a/french/aster/Makefile b/french/aster/Makefile<br></div><d= iv> index 2ed680e509b0..372553442ab7 100644<br></div><div> --- a/french/ast= er/Makefile<br></div><div> +++ b/french/aster/Makefile<br></div><div> @@ -1= ,6 +1,6 @@<br></div><div> PORTNAME=3D aster<br></div><div> DISTVERSION=3D= ${ASTER_DISTVERSION}<br></div><div> -PORTREVISION=3D 11<br></div><div> +PO= RTREVISION=3D 12<br></div><div> CATEGORIES=3D french cad<br></div><div><br= ></div><div> MAINTAINER=3D <a href=3D"mailto:thierry@FreeBSD.org" target= =3D"_blank">thierry@FreeBSD.org</a><br></div><div> @@ -31,7 +31,7 @@ BUILD_= DEPENDS+=3D astk-serveur>0:cad/astk-serveur \<br></div><div> ${SHELL_= INSTALL_ASTER}:shells/${SHIADEP} \<br></div><div> gnproc:sysutils/coreut= ils \<br></div><div> bash:shells/bash \<br></div><div> - ${LOCALBA= SE}/bin/getopt:devel/util-linux \<br></div><div> + getopt&gt;=3D0:misc= /getopt \<br></div><div> xterm:x11/xterm \<br></div><div> ${PY= NUMPY} \<br></div><div> ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@= ${PY_FLAVOR}<br></div><div> diff --git a/math/eukleides/Makefile b/math/euk= leides/Makefile<br></div><div> index 5bad4688bab7..86a4a388cd8a 100644<br><= /div><div> --- a/math/eukleides/Makefile<br></div><div> +++ b/math/eukleide= s/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME=3D eukle= ides<br></div><div> PORTVERSION=3D 1.5.4<br></div><div> -PORTREVISION=3D 8= <br></div><div> +PORTREVISION=3D 9<br></div><div> CATEGORIES=3D math<br></= div><div> MASTER_SITES=3D <a rel=3D"noopener noreferrer" href=3D"http://ww= w.eukleides.org/files/" target=3D"_blank">http://www.eukleides.org/files/</= a><br></div><div><br></div><div> @@ -12,7 +12,7 @@ LICENSE=3D GPLv3+<br></d= iv><div> LICENSE_FILE=3D ${WRKSRC}/COPYING<br></div><div><br></div><div> = RUN_DEPENDS=3D pstoedit:graphics/pstoedit \<br></div><div> - ${LOCALBASE}/= bin/getopt:devel/util-linux<br></div><div> + getopt&gt;=3D0:misc/getop= t<br></div><div><br></div><div> USES=3D bison gettext iconv gmake readlin= e tar:bzip2 tex<br></div><div> USE_TEX=3D latex<br></div><div> diff --git = a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile<br></div><div> index 24= 9cadf0c946..02f87e609d0e 100644<br></div><div> --- a/net/pacemaker2/Makefil= e<br></div><div> +++ b/net/pacemaker2/Makefile<br></div><div> @@ -1,5 +1,5 = @@<br></div><div> PORTVERSION=3D 2.1.7<br></div><div> -PORTREVISION=3D 2= <br></div><div> +PORTREVISION=3D 3<br></div><div> PKGNAMESUFFIX=3D 2<br>= </div><div><br></div><div> WWW=3D <a rel=3D"noopener noreferrer" href=3D"= https://www.clusterlabs.org/pacemaker/" target=3D"_blank">https://www.clust= erlabs.org/pacemaker/</a><br></div><div> diff --git a/net/pacemaker2/Makefi= le.common b/net/pacemaker2/Makefile.common<br></div><div> index 15526de4e5e= a..434f980a4bf8 100644<br></div><div> --- a/net/pacemaker2/Makefile.common<= br></div><div> +++ b/net/pacemaker2/Makefile.common<br></div><div> @@ -9,7 = +9,7 @@ LICENSE=3D GPLv2<br></div><div> LICENSE_FILE=3D ${WRKSRC}/COPYIN= G<br></div><div><br></div><div> BUILD_DEPENDS=3D bash:shells/bash \<br></= div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux<br></div><div> + g= etopt&gt;=3D0:misc/getopt<br></div><div> LIB_DEPENDS=3D <a rel=3D"noo= pener noreferrer" href=3D"http://libgnutls.so:security/gnutls" target=3D"_b= lank">libgnutls.so:security/gnutls</a> \<br></div><div> <a rel=3D"noope= ner noreferrer" href=3D"http://libltdl.so:devel/libltdl" target=3D"_blank">= libltdl.so:devel/libltdl</a> \<br></div><div> <a rel=3D"noopener norefe= rrer" href=3D"http://libqb.so:devel/libqb" target=3D"_blank">libqb.so:devel= /libqb</a> \<br></div><div> @@ -17,7 +17,7 @@ LIB_DEPENDS=3D <a rel=3D"noo= pener noreferrer" href=3D"http://libgnutls.so:security/gnutls" target=3D"_b= lank">libgnutls.so:security/gnutls</a> \<br></div><div> <a rel=3D"noope= ner noreferrer" href=3D"http://libxml2.so:textproc/libxml2" target=3D"_blan= k">libxml2.so:textproc/libxml2</a> \<br></div><div> <a rel=3D"noopener = noreferrer" href=3D"http://libxslt.so:textproc/libxslt" target=3D"_blank">l= ibxslt.so:textproc/libxslt</a><br></div><div> RUN_DEPENDS=3D bash:shells/= bash \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux \<br></d= iv><div> + getopt&gt;=3D0:misc/getopt \<br></div><div> ocf-tester= :net-mgmt/resource-agents<br></div><div><br></div><div> CONFLICTS=3D hear= tbeat<br></div><div> diff --git a/sysutils/password-store/Makefile b/sysuti= ls/password-store/Makefile<br></div><div> index bc2635a9c0a9..aac146975c22 = 100644<br></div><div> --- a/sysutils/password-store/Makefile<br></div><div>= +++ b/sysutils/password-store/Makefile<br></div><div> @@ -1,6 +1,6 @@<br><= /div><div> PORTNAME=3D password-store<br></div><div> PORTVERSION=3D 1.7.4= <br></div><div> -PORTREVISION=3D 6<br></div><div> +PORTREVISION=3D 7<br></d= iv><div> CATEGORIES=3D sysutils<br></div><div> MASTER_SITES=3D <a rel=3D"= noopener noreferrer" href=3D"https://git.zx2c4.com/" target=3D"_blank">http= s://git.zx2c4.com/</a>${PORTNAME}/snapshot/<br></div><div><br></div><div> @= @ -12,7 +12,7 @@ LICENSE=3D GPLv2+<br></div><div> LICENSE_FILE=3D ${WRKSRC= }/COPYING<br></div><div><br></div><div> RUN_DEPENDS=3D bash:shells/bash \<= br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux \<br></div><div>= + getopt&gt;=3D0:misc/getopt \<br></div><div> gnupg&gt;=3D2:se= curity/gnupg \<br></div><div> tree&gt;=3D1.7:sysutils/tree<br></div>= <div><br></div><div> diff --git a/sysutils/tartarus/Makefile b/sysutils/tar= tarus/Makefile<br></div><div> index f69bfc909eca..9d70ed65ac9c 100644<br></= div><div> --- a/sysutils/tartarus/Makefile<br></div><div> +++ b/sysutils/ta= rtarus/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME=3D = tartarus<br></div><div> PORTVERSION=3D 0.9.8<br></div><div> -PORTREVISION= =3D 7<br></div><div> +PORTREVISION=3D 8<br></div><div> CATEGORIES=3D sysut= ils<br></div><div> MASTER_SITES=3D <a rel=3D"noopener noreferrer" href=3D"= http://wertarbyte.de/tartarus/" target=3D"_blank">http://wertarbyte.de/tart= arus/</a> \<br></div><div> <a rel=3D"noopener noreferrer" href=3D"https:= //ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/" target=3D"_blank">https:= //ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/</a><br></div><div> @@ -15= ,7 +15,7 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING<br></div><div> RUN_DEPENDS= =3D ${LOCALBASE}/bin/bash:shells/bash \<br></div><div> ${LOCALBASE}/bin/= gtar:archivers/gtar \<br></div><div> ${LOCALBASE}/bin/curl:ftp/curl \<br= ></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux<br></div><div> + = getopt&gt;=3D0:misc/getopt<br></div><div><br></div><div> USES=3D gmak= e perl5 shebangfix tar:bzip2<br></div><div> SHEBANG_FILES=3D ${WRKSRC}/bin= /*<br></div><div> diff --git a/textproc/rarian/Makefile b/textproc/rarian/M= akefile<br></div><div> index 412019de0593..747474c78089 100644<br></div><di= v> --- a/textproc/rarian/Makefile<br></div><div> +++ b/textproc/rarian/Make= file<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME=3D rarian<br><= /div><div> DISTVERSION=3D 0.8.5<br></div><div> -PORTREVISION=3D 7<br></div= ><div> +PORTREVISION=3D 8<br></div><div> CATEGORIES=3D textproc gnome<br><= /div><div> MASTER_SITES=3D <a rel=3D"noopener noreferrer" href=3D"https://= gitlab.freedesktop.org/" target=3D"_blank">https://gitlab.freedesktop.org/<= /a>${PORTNAME}/${PORTNAME}/-/releases/${DISTVERSION}/downloads/assets/<br><= /div><div><br></div><div> @@ -14,13 +14,13 @@ LICENSE_FILE_GPLv2+ =3D ${WRK= SRC}/COPYING.UTILS<br></div><div> LICENSE_FILE_LGPL21+ =3D ${WRKSRC}/COPYI= NG.LIB<br></div><div> LICENSE_FILE_ZLIB=3D ${WRKSRC}/COPYING<br></div><div= ><br></div><div> -BUILD_DEPENDS=3D ${LOCALBASE}/bin/getopt:devel/util-linux= \<br></div><div> +BUILD_DEPENDS=3D getopt&gt;=3D0:misc/getopt \<br></d= iv><div> bash:shells/bash \<br></div><div> xsltproc:textproc/libxslt = \<br></div><div> docbook-xml>0:textproc/docbook-xml \<br></div><div> = ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl<br><= /div><div> LIB_DEPENDS=3D <a rel=3D"noopener noreferrer" href=3D"http://li= btinyxml.so:textproc/tinyxml" target=3D"_blank">libtinyxml.so:textproc/tiny= xml</a><br></div><div> -RUN_DEPENDS=3D ${LOCALBASE}/bin/getopt:devel/util-l= inux \<br></div><div> +RUN_DEPENDS=3D getopt&gt;=3D0:misc/getopt \<br><= /div><div> bash:shells/bash \<br></div><div> xsltproc:textproc/libxsl= t \<br></div><div> docbook-xml>0:textproc/docbook-xml \<br></div><div= > diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile<br></div><= div> index 81e6b0a3c7c3..cd2e6c55d175 100644<br></div><div> --- a/textproc/= xmlto/Makefile<br></div><div> +++ b/textproc/xmlto/Makefile<br></div><div> = @@ -1,6 +1,6 @@<br></div><div> PORTNAME=3D xmlto<br></div><div> PORTVERSI= ON=3D 0.0.28<br></div><div> -PORTREVISION=3D 2<br></div><div> +PORTREVISION= =3D 3<br></div><div> CATEGORIES=3D textproc<br></div><div> MASTER_SITES= =3D <a rel=3D"noopener noreferrer" href=3D"https://releases.pagure.org/xmlt= o/:xmlto" target=3D"_blank">https://releases.pagure.org/xmlto/:xmlto</a>; \<= br></div><div> LOCAL/mandree/:xmlto \<br></div><div> @@ -18,7 +18,7 @@ W= WW=3D <a rel=3D"noopener noreferrer" href=3D"https://pagure.io/xmlto/" tar= get=3D"_blank">https://pagure.io/xmlto/</a><br></div><div>; LICENSE=3D GPLv= 2<br></div><div><br></div><div> BUILD_DEPENDS=3D ${BASH_CMD}:shells/bash \= <br></div><div> - ${GETOPT_CMD}:devel/util-linux \<br></div><div> + ${GET= OPT_CMD}:misc/getopt \<br></div><div> xmllint:textproc/libxml2 \<br></di= v><div> xsltproc:textproc/libxslt \<br></div><div> docbook-xsl>0:t= extproc/docbook-xsl \<br></div><div> diff --git a/textproc/yodl/Makefile b/= textproc/yodl/Makefile<br></div><div> index d3060026ce88..3f22fea0ab26 1006= 44<br></div><div> --- a/textproc/yodl/Makefile<br></div><div> +++ b/textpro= c/yodl/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME=3D = yodl<br></div><div> PORTVERSION=3D 3.10.00<br></div><div> -PORTREVISION=3D= 5<br></div><div> +PORTREVISION=3D 6<br></div><div> CATEGORIES=3D textproc= <br></div><div><br></div><div> MAINTAINER=3D <a href=3D"mailto:bofh@FreeBS= D.org" target=3D"_blank">bofh@FreeBSD.org</a><br></div><div> @@ -10,7 +10,7= @@ WWW=3D <a rel=3D"noopener noreferrer" href=3D"https://fbb-git.gitlab.i= o/yodl/" target=3D"_blank">https://fbb-git.gitlab.io/yodl/</a><br></div><di= v> LICENSE=3D GPLv3<br></div><div><br></div><div> RUN_DEPENDS=3D bash:she= lls/bash \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux<br></= div><div> + getopt&gt;=3D0:misc/getopt<br></div><div> BUILD_DEPENDS= =3D icmake:devel/icmake \<br></div><div> bash:shells/bash \<br></div><di= v> gsed:textproc/gsed<br></div><div> diff --git a/x11-fonts/fontpreview/= Makefile b/x11-fonts/fontpreview/Makefile<br></div><div> index f38bba80b735= ..d013bb9dd953 100644<br></div><div> --- a/x11-fonts/fontpreview/Makefile<b= r></div><div> +++ b/x11-fonts/fontpreview/Makefile<br></div><div> @@ -1,6 += 1,6 @@<br></div><div> PORTNAME=3D fontpreview<br></div><div> DISTVERSION= =3D 1.0.6<br></div><div> -PORTREVISION=3D 4<br></div><div> +PORTREVISION=3D= 5<br></div><div> CATEGORIES=3D x11-fonts graphics<br></div><div><br></div= ><div> MAINTAINER=3D <a href=3D"mailto:0mp@FreeBSD.org" target=3D"_blank">= 0mp@FreeBSD.org</a><br></div><div> @@ -12,7 +12,7 @@ LICENSE_FILE=3D ${WRKS= RC}/LICENSE<br></div><div><br></div><div> RUN_DEPENDS=3D bash:shells/bash = \<br></div><div> fzf:textproc/fzf \<br></div><div> - ${LOCALBASE}/bin/g= etopt:devel/util-linux \<br></div><div> + getopt&gt;=3D0:misc/getopt \= <br></div><div> nsxiv:graphics/nsxiv \<br></div><div> xdotool:x11/xdo= tool<br></div><div><br></div><div> Why is LOCALBASE prefix dropped? We have= multiple versions of this so it<br></div><div> may be mismatched by doing = this approach.<br></div><div><br></div><div> Best regards,<br></div><div> D= aniel<br></div></blockquote><div> <br></div><div>I don't follow you.<br= ></div><div>This is "getopt&gt;=3D0:misc/getopt" which checks= if the getopt port with<br></div><div>required version is installed.<br></= div><div>What you said is "getopt:misc/getopt" which checks if th= e getopt binary<br></div><div>executable exists.<br></div><div>I see nothin= g wrong here.<br></div><div><br></div><div>Best regards,<br></div><div>sunp= oet<br></div></pre></blockquote></div><div style=3D"font-family:"Helve= tica Neue",Helvetica,Arial,sans-serif;font-size:14px">Hi,<br></div><di= v style=3D"font-family:"Helvetica Neue",Helvetica,Arial,sans-seri= f;font-size:14px"><br></div><div style=3D"font-family:"Helvetica Neue&= quot;,Helvetica,Arial,sans-serif;font-size:14px">I'm asking why ${LOCAL= BASE}/bin/getopt is dropped as we have multiple binaries with the same name= .<br></div><div style=3D"font-family:"Helvetica Neue",Helvetica,A= rial,sans-serif;font-size:14px"><br></div><div style=3D"font-family:"H= elvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">Best regards= ,<br></div><div style=3D"font-family:"Helvetica Neue",Helvetica,A= rial,sans-serif;font-size:14px">Daniel<br></div></div></blockquote><div><br= ></div><div>Hi,</div><div><br></div><div>I already answered you in the prev= ious mail.</div><div>Please re-read the commit.</div><div>My change is to c= heck the port name (which is unique), rather than the binary executable nam= e.</div><div><br></div><div>Regards,</div><div>sunpoet</div></div></div> --000000000000f3238206262ac3e5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58T9KFEa59YFZzmvw8udMXL8TUhrsqO_vb8vnQnMZoQz3Q>