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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, Nov 5, 2024 at 7:46 AM 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 PM 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=521da5fb1087f9ec846a35e0ea200088e6571b1d > > 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=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= compiz-bcop > PORTVERSION= 0.8.8 > -PORTREVISION= 3 > +PORTREVISION= 4 > CATEGORIES= devel x11-wm > MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ \ > https://BSDforge.com/projects/source/devel/compiz-bcop/ > @@ -10,7 +10,7 @@ COMMENT= Code generator for Compiz Fusion Plugins > WWW= https://forum.compiz-fusion.org/ > > RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=0:misc/getopt > > GNU_CONFIGURE= 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= gitflow > PORTVERSION= 1.12.3 > -PORTREVISION= 1 > +PORTREVISION= 2 > CATEGORIES= devel > > MAINTAINER= nbari@tequila.io > @@ -10,7 +10,7 @@ WWW= https://github.com/petervanderdoes/gitflow-avh > LICENSE= BSD2CLAUSE LGPL21 > LICENSE_COMB= multi > > -RUN_DEPENDS= ${LOCALBASE}/bin/getopt:devel/util-linux > +RUN_DEPENDS= getopt>=0:misc/getopt > > USES= gmake > USE_GITHUB= 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= aster > DISTVERSION= ${ASTER_DISTVERSION} > -PORTREVISION= 11 > +PORTREVISION= 12 > CATEGORIES= french cad > > MAINTAINER= thierry@FreeBSD.org > @@ -31,7 +31,7 @@ BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \ > ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ > gnproc:sysutils/coreutils \ > bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux \ > + getopt>=0: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= eukleides > PORTVERSION= 1.5.4 > -PORTREVISION= 8 > +PORTREVISION= 9 > CATEGORIES= math > MASTER_SITES= http://www.eukleides.org/files/ > > @@ -12,7 +12,7 @@ LICENSE= GPLv3+ > LICENSE_FILE= ${WRKSRC}/COPYING > > RUN_DEPENDS= pstoedit:graphics/pstoedit \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=0:misc/getopt > > USES= bison gettext iconv gmake readline tar:bzip2 tex > USE_TEX= 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= 2.1.7 > -PORTREVISION= 2 > +PORTREVISION= 3 > PKGNAMESUFFIX= 2 > > WWW= https://www.clusterlabs.org/pacemaker/ > diff --git a/net/pacemaker2/Makefile.common b/net/pacemaker2/Makefile.common > index 15526de4e5ea..434f980a4bf8 100644 > --- a/net/pacemaker2/Makefile.common > +++ b/net/pacemaker2/Makefile.common > @@ -9,7 +9,7 @@ LICENSE= GPLv2 > LICENSE_FILE= ${WRKSRC}/COPYING > > BUILD_DEPENDS= bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=0:misc/getopt > LIB_DEPENDS= libgnutls.so:security/gnutls \ > libltdl.so:devel/libltdl \ > libqb.so:devel/libqb \ > @@ -17,7 +17,7 @@ LIB_DEPENDS= libgnutls.so:security/gnutls \ > libxml2.so:textproc/libxml2 \ > libxslt.so:textproc/libxslt > RUN_DEPENDS= bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux \ > + getopt>=0:misc/getopt \ > ocf-tester:net-mgmt/resource-agents > > CONFLICTS= 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= password-store > PORTVERSION= 1.7.4 > -PORTREVISION= 6 > +PORTREVISION= 7 > CATEGORIES= sysutils > MASTER_SITES= https://git.zx2c4.com/${PORTNAME}/snapshot/ > > @@ -12,7 +12,7 @@ LICENSE= GPLv2+ > LICENSE_FILE= ${WRKSRC}/COPYING > > RUN_DEPENDS= bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux \ > + getopt>=0:misc/getopt \ > gnupg>=2:security/gnupg \ > tree>=1.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= tartarus > PORTVERSION= 0.9.8 > -PORTREVISION= 7 > +PORTREVISION= 8 > CATEGORIES= sysutils > MASTER_SITES= http://wertarbyte.de/tartarus/ \ > https://ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/ > @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING > RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ > ${LOCALBASE}/bin/gtar:archivers/gtar \ > ${LOCALBASE}/bin/curl:ftp/curl \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=0:misc/getopt > > USES= gmake perl5 shebangfix tar:bzip2 > SHEBANG_FILES= ${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= rarian > DISTVERSION= 0.8.5 > -PORTREVISION= 7 > +PORTREVISION= 8 > CATEGORIES= textproc gnome > MASTER_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/releases/${DISTVERSION}/downloads/assets/ > > @@ -14,13 +14,13 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.UTILS > LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB > LICENSE_FILE_ZLIB= ${WRKSRC}/COPYING > > -BUILD_DEPENDS= ${LOCALBASE}/bin/getopt:devel/util-linux \ > +BUILD_DEPENDS= getopt>=0: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= libtinyxml.so:textproc/tinyxml > -RUN_DEPENDS= ${LOCALBASE}/bin/getopt:devel/util-linux \ > +RUN_DEPENDS= getopt>=0: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= xmlto > PORTVERSION= 0.0.28 > -PORTREVISION= 2 > +PORTREVISION= 3 > CATEGORIES= textproc > MASTER_SITES= https://releases.pagure.org/xmlto/:xmlto \ > LOCAL/mandree/:xmlto \ > @@ -18,7 +18,7 @@ WWW= https://pagure.io/xmlto/ > LICENSE= GPLv2 > > BUILD_DEPENDS= ${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= yodl > PORTVERSION= 3.10.00 > -PORTREVISION= 5 > +PORTREVISION= 6 > CATEGORIES= textproc > > MAINTAINER= bofh@FreeBSD.org > @@ -10,7 +10,7 @@ WWW= https://fbb-git.gitlab.io/yodl/ > LICENSE= GPLv3 > > RUN_DEPENDS= bash:shells/bash \ > - ${LOCALBASE}/bin/getopt:devel/util-linux > + getopt>=0:misc/getopt > BUILD_DEPENDS= 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= fontpreview > DISTVERSION= 1.0.6 > -PORTREVISION= 4 > +PORTREVISION= 5 > CATEGORIES= x11-fonts graphics > > MAINTAINER= 0mp@FreeBSD.org > @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= bash:shells/bash \ > fzf:textproc/fzf \ > - ${LOCALBASE}/bin/getopt:devel/util-linux \ > + getopt>=0: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>=0: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 [-- Attachment #2 --] <div dir="ltr"><div dir="ltr">On Tue, Nov 5, 2024 at 7:46 AM Daniel Engberg <<a href="mailto:daniel.engberg.lists@pyret.net">daniel.engberg.lists@pyret.net</a>> wrote:</div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">On 2024-11-03T20:34:54.000+01:00, Po-Chuan Hsieh <<a href="mailto:sunpoet@freebsd.org" target="_blank">sunpoet@freebsd.org</a>> wrote:<br></div><div><blockquote><pre style="white-space:normal"><div>On Sun, Nov 3, 2024 at 8:32 PM Daniel Engberg <<br></div><div><a href="mailto:daniel.engberg.lists@pyret.net" target="_blank">daniel.engberg.lists@pyret.net</a>> wrote:<br></div><div><br></div><blockquote><div> On 2024-11-03T12:50:28.000+01:00, Po-Chuan Hsieh <<a href="mailto:sunpoet@FreeBSD.org" target="_blank">sunpoet@FreeBSD.org</a>><br></div><div> wrote:<br></div><div><br></div><div><br></div><div> The branch main has been updated by sunpoet:<br></div><div><br></div><div> URL: <a rel="noopener noreferrer" href="https://cgit.FreeBSD.org/ports/commit/?id=521da5fb1087f9ec846a35e0ea200088e6571b1d" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=521da5fb1087f9ec846a35e0ea200088e6571b1d</a><br></div><div><br></div><div>; commit 521da5fb1087f9ec846a35e0ea200088e6571b1d<br></div><div> Author: Po-Chuan Hsieh <<a href="mailto:sunpoet@FreeBSD.org" target="_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="mailto:sunpoet@FreeBSD.org" target="_blank">sunpoet@FreeBSD.org</a>><br></div><div> CommitDate: 2024-11-03 11:48:23 +0000<br></div><div><br></div><div> */*: Change *_DEPENDS from devel/util-linux back to misc/getopt<br></div><div><br></div><div> - Revert c8ace2f4ca960d3a3a0038846923efcae2f8443d<br></div><div> - Bump PORTREVISION for dependency change<br></div><div><br></div><div> PR: 281625, 281934<br></div><div> Reference: <a rel="noopener noreferrer" href="https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281934#c2" target="_blank">https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281934#c2</a><br></div><div>; ---<br></div><div> devel/compiz-bcop/Makefile | 4 ++--<br></div><div> devel/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/password-store/Makefile | 4 ++--<br></div><div> sysutils/tartarus/Makefile | 4 ++--<br></div><div> textproc/rarian/Makefile | 6 +++---<br></div><div> textproc/xmlto/Makefile | 4 ++--<br></div><div> textproc/yodl/Makefile | 4 ++--<br></div><div> x11-fonts/fontpreview/Makefile | 4 ++--<br></div><div> 12 files changed, 24 insertions(+), 24 deletions(-)<br></div><div><br></div><div> diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile<br></div><div> index 38fb057dfbcb..d7ef6d9116b4 100644<br></div><div> --- a/devel/compiz-bcop/Makefile<br></div><div> +++ b/devel/compiz-bcop/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME= compiz-bcop<br></div><div> PORTVERSION= 0.8.8<br></div><div> -PORTREVISION= 3<br></div><div> +PORTREVISION= 4<br></div><div> CATEGORIES= devel x11-wm<br></div><div> MASTER_SITES= <a rel="noopener noreferrer" href="http://releases.compiz.org/" target="_blank">http://releases.compiz.org/</a>${PORTVERSION}/ \<br></div><div> <a rel="noopener noreferrer" href="https://BSDforge.com/projects/source/devel/compiz-bcop/" target="_blank">https://BSDforge.com/projects/source/devel/compiz-bcop/</a><br></div><div>; @@ -10,7 +10,7 @@ COMMENT= Code generator for Compiz Fusion Plugins<br></div><div> WWW= <a rel="noopener noreferrer" href="https://forum.compiz-fusion.org/" target="_blank">https://forum.compiz-fusion.org/</a><br></div><div><br></div><div>; RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux<br></div><div> + getopt&gt;=0:misc/getopt<br></div><div><br></div><div> GNU_CONFIGURE= yes<br></div><div><br></div><div> diff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile<br></div><div> index 8ee786beb94a..0b1ababe2198 100644<br></div><div> --- a/devel/gitflow/Makefile<br></div><div> +++ b/devel/gitflow/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME= gitflow<br></div><div> PORTVERSION= 1.12.3<br></div><div> -PORTREVISION= 1<br></div><div> +PORTREVISION= 2<br></div><div> CATEGORIES= devel<br></div><div><br></div><div> MAINTAINER= <a href="mailto:nbari@tequila.io" target="_blank">nbari@tequila.io</a><br></div><div> @@ -10,7 +10,7 @@ WWW= <a rel="noopener noreferrer" href="https://github.com/petervanderdoes/gitflow-avh" target="_blank">https://github.com/petervanderdoes/gitflow-avh</a><br></div><div>; LICENSE= BSD2CLAUSE LGPL21<br></div><div> LICENSE_COMB= multi<br></div><div><br></div><div> -RUN_DEPENDS= ${LOCALBASE}/bin/getopt:devel/util-linux<br></div><div> +RUN_DEPENDS= getopt&gt;=0:misc/getopt<br></div><div><br></div><div> USES= gmake<br></div><div> USE_GITHUB= yes<br></div><div> diff --git a/french/aster/Makefile b/french/aster/Makefile<br></div><div> index 2ed680e509b0..372553442ab7 100644<br></div><div> --- a/french/aster/Makefile<br></div><div> +++ b/french/aster/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME= aster<br></div><div> DISTVERSION= ${ASTER_DISTVERSION}<br></div><div> -PORTREVISION= 11<br></div><div> +PORTREVISION= 12<br></div><div> CATEGORIES= french cad<br></div><div><br></div><div> MAINTAINER= <a href="mailto:thierry@FreeBSD.org" target="_blank">thierry@FreeBSD.org</a><br></div><div> @@ -31,7 +31,7 @@ BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \<br></div><div> ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \<br></div><div> gnproc:sysutils/coreutils \<br></div><div> bash:shells/bash \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux \<br></div><div> + getopt&gt;=0:misc/getopt \<br></div><div> xterm:x11/xterm \<br></div><div> ${PYNUMPY} \<br></div><div> ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}<br></div><div> diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile<br></div><div> index 5bad4688bab7..86a4a388cd8a 100644<br></div><div> --- a/math/eukleides/Makefile<br></div><div> +++ b/math/eukleides/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME= eukleides<br></div><div> PORTVERSION= 1.5.4<br></div><div> -PORTREVISION= 8<br></div><div> +PORTREVISION= 9<br></div><div> CATEGORIES= math<br></div><div> MASTER_SITES= <a rel="noopener noreferrer" href="http://www.eukleides.org/files/" target="_blank">http://www.eukleides.org/files/</a><br></div><div><br></div><div>; @@ -12,7 +12,7 @@ LICENSE= GPLv3+<br></div><div> LICENSE_FILE= ${WRKSRC}/COPYING<br></div><div><br></div><div> RUN_DEPENDS= pstoedit:graphics/pstoedit \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux<br></div><div> + getopt&gt;=0:misc/getopt<br></div><div><br></div><div> USES= bison gettext iconv gmake readline tar:bzip2 tex<br></div><div> USE_TEX= latex<br></div><div> diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile<br></div><div> index 249cadf0c946..02f87e609d0e 100644<br></div><div> --- a/net/pacemaker2/Makefile<br></div><div> +++ b/net/pacemaker2/Makefile<br></div><div> @@ -1,5 +1,5 @@<br></div><div> PORTVERSION= 2.1.7<br></div><div> -PORTREVISION= 2<br></div><div> +PORTREVISION= 3<br></div><div> PKGNAMESUFFIX= 2<br></div><div><br></div><div> WWW= <a rel="noopener noreferrer" href="https://www.clusterlabs.org/pacemaker/" target="_blank">https://www.clusterlabs.org/pacemaker/</a><br></div><div>; diff --git a/net/pacemaker2/Makefile.common b/net/pacemaker2/Makefile.common<br></div><div> index 15526de4e5ea..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= GPLv2<br></div><div> LICENSE_FILE= ${WRKSRC}/COPYING<br></div><div><br></div><div> BUILD_DEPENDS= bash:shells/bash \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux<br></div><div> + getopt&gt;=0:misc/getopt<br></div><div> LIB_DEPENDS= <a rel="noopener noreferrer" href="http://libgnutls.so:security/gnutls" target="_blank">libgnutls.so:security/gnutls</a> \<br></div><div> <a rel="noopener noreferrer" href="http://libltdl.so:devel/libltdl" target="_blank">libltdl.so:devel/libltdl</a> \<br></div><div> <a rel="noopener noreferrer" href="http://libqb.so:devel/libqb" target="_blank">libqb.so:devel/libqb</a> \<br></div><div> @@ -17,7 +17,7 @@ LIB_DEPENDS= <a rel="noopener noreferrer" href="http://libgnutls.so:security/gnutls" target="_blank">libgnutls.so:security/gnutls</a> \<br></div><div> <a rel="noopener noreferrer" href="http://libxml2.so:textproc/libxml2" target="_blank">libxml2.so:textproc/libxml2</a> \<br></div><div> <a rel="noopener noreferrer" href="http://libxslt.so:textproc/libxslt" target="_blank">libxslt.so:textproc/libxslt</a><br></div><div> RUN_DEPENDS= bash:shells/bash \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux \<br></div><div> + getopt&gt;=0:misc/getopt \<br></div><div> ocf-tester:net-mgmt/resource-agents<br></div><div><br></div><div> CONFLICTS= heartbeat<br></div><div> diff --git a/sysutils/password-store/Makefile b/sysutils/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= password-store<br></div><div> PORTVERSION= 1.7.4<br></div><div> -PORTREVISION= 6<br></div><div> +PORTREVISION= 7<br></div><div> CATEGORIES= sysutils<br></div><div> MASTER_SITES= <a rel="noopener noreferrer" href="https://git.zx2c4.com/" target="_blank">https://git.zx2c4.com/</a>${PORTNAME}/snapshot/<br></div><div><br></div><div>; @@ -12,7 +12,7 @@ LICENSE= GPLv2+<br></div><div> LICENSE_FILE= ${WRKSRC}/COPYING<br></div><div><br></div><div> RUN_DEPENDS= bash:shells/bash \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux \<br></div><div> + getopt&gt;=0:misc/getopt \<br></div><div> gnupg&gt;=2:security/gnupg \<br></div><div> tree&gt;=1.7:sysutils/tree<br></div><div><br></div><div> diff --git a/sysutils/tartarus/Makefile b/sysutils/tartarus/Makefile<br></div><div> index f69bfc909eca..9d70ed65ac9c 100644<br></div><div> --- a/sysutils/tartarus/Makefile<br></div><div> +++ b/sysutils/tartarus/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME= tartarus<br></div><div> PORTVERSION= 0.9.8<br></div><div> -PORTREVISION= 7<br></div><div> +PORTREVISION= 8<br></div><div> CATEGORIES= sysutils<br></div><div> MASTER_SITES= <a rel="noopener noreferrer" href="http://wertarbyte.de/tartarus/" target="_blank">http://wertarbyte.de/tartarus/</a>; \<br></div><div> <a rel="noopener noreferrer" href="https://ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/" target="_blank">https://ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/</a><br></div><div>; @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING<br></div><div> RUN_DEPENDS= ${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;=0:misc/getopt<br></div><div><br></div><div> USES= gmake perl5 shebangfix tar:bzip2<br></div><div> SHEBANG_FILES= ${WRKSRC}/bin/*<br></div><div> diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile<br></div><div> index 412019de0593..747474c78089 100644<br></div><div> --- a/textproc/rarian/Makefile<br></div><div> +++ b/textproc/rarian/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME= rarian<br></div><div> DISTVERSION= 0.8.5<br></div><div> -PORTREVISION= 7<br></div><div> +PORTREVISION= 8<br></div><div> CATEGORIES= textproc gnome<br></div><div> MASTER_SITES= <a rel="noopener noreferrer" href="https://gitlab.freedesktop.org/" target="_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+ = ${WRKSRC}/COPYING.UTILS<br></div><div> LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB<br></div><div> LICENSE_FILE_ZLIB= ${WRKSRC}/COPYING<br></div><div><br></div><div> -BUILD_DEPENDS= ${LOCALBASE}/bin/getopt:devel/util-linux \<br></div><div> +BUILD_DEPENDS= getopt&gt;=0:misc/getopt \<br></div><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= <a rel="noopener noreferrer" href="http://libtinyxml.so:textproc/tinyxml" target="_blank">libtinyxml.so:textproc/tinyxml</a><br></div><div> -RUN_DEPENDS= ${LOCALBASE}/bin/getopt:devel/util-linux \<br></div><div> +RUN_DEPENDS= getopt&gt;=0:misc/getopt \<br></div><div> bash:shells/bash \<br></div><div> xsltproc:textproc/libxslt \<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= xmlto<br></div><div> PORTVERSION= 0.0.28<br></div><div> -PORTREVISION= 2<br></div><div> +PORTREVISION= 3<br></div><div> CATEGORIES= textproc<br></div><div> MASTER_SITES= <a rel="noopener noreferrer" href="https://releases.pagure.org/xmlto/:xmlto" target="_blank">https://releases.pagure.org/xmlto/:xmlto</a>; \<br></div><div> LOCAL/mandree/:xmlto \<br></div><div> @@ -18,7 +18,7 @@ WWW= <a rel="noopener noreferrer" href="https://pagure.io/xmlto/" target="_blank">https://pagure.io/xmlto/</a><br></div><div>; LICENSE= GPLv2<br></div><div><br></div><div> BUILD_DEPENDS= ${BASH_CMD}:shells/bash \<br></div><div> - ${GETOPT_CMD}:devel/util-linux \<br></div><div> + ${GETOPT_CMD}:misc/getopt \<br></div><div> xmllint:textproc/libxml2 \<br></div><div> xsltproc:textproc/libxslt \<br></div><div> docbook-xsl>0:textproc/docbook-xsl \<br></div><div> diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile<br></div><div> index d3060026ce88..3f22fea0ab26 100644<br></div><div> --- a/textproc/yodl/Makefile<br></div><div> +++ b/textproc/yodl/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME= yodl<br></div><div> PORTVERSION= 3.10.00<br></div><div> -PORTREVISION= 5<br></div><div> +PORTREVISION= 6<br></div><div> CATEGORIES= textproc<br></div><div><br></div><div> MAINTAINER= <a href="mailto:bofh@FreeBSD.org" target="_blank">bofh@FreeBSD.org</a><br></div><div> @@ -10,7 +10,7 @@ WWW= <a rel="noopener noreferrer" href="https://fbb-git.gitlab.io/yodl/" target="_blank">https://fbb-git.gitlab.io/yodl/</a><br></div><div>; LICENSE= GPLv3<br></div><div><br></div><div> RUN_DEPENDS= bash:shells/bash \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux<br></div><div> + getopt&gt;=0:misc/getopt<br></div><div> BUILD_DEPENDS= icmake:devel/icmake \<br></div><div> bash:shells/bash \<br></div><div> 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<br></div><div> +++ b/x11-fonts/fontpreview/Makefile<br></div><div> @@ -1,6 +1,6 @@<br></div><div> PORTNAME= fontpreview<br></div><div> DISTVERSION= 1.0.6<br></div><div> -PORTREVISION= 4<br></div><div> +PORTREVISION= 5<br></div><div> CATEGORIES= x11-fonts graphics<br></div><div><br></div><div> MAINTAINER= <a href="mailto:0mp@FreeBSD.org" target="_blank">0mp@FreeBSD.org</a><br></div><div> @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE<br></div><div><br></div><div> RUN_DEPENDS= bash:shells/bash \<br></div><div> fzf:textproc/fzf \<br></div><div> - ${LOCALBASE}/bin/getopt:devel/util-linux \<br></div><div> + getopt&gt;=0:misc/getopt \<br></div><div> nsxiv:graphics/nsxiv \<br></div><div> xdotool:x11/xdotool<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> Daniel<br></div></blockquote><div> <br></div><div>I don't follow you.<br></div><div>This is "getopt&gt;=0: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 the getopt binary<br></div><div>executable exists.<br></div><div>I see nothing wrong here.<br></div><div><br></div><div>Best regards,<br></div><div>sunpoet<br></div></pre></blockquote></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">Hi,<br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px"><br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">I'm asking why ${LOCALBASE}/bin/getopt is dropped as we have multiple binaries with the same name.<br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px"><br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">Best regards,<br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,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 previous mail.</div><div>Please re-read the commit.</div><div>My change is to check the port name (which is unique), rather than the binary executable name.</div><div><br></div><div>Regards,</div><div>sunpoet</div></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58T9KFEa59YFZzmvw8udMXL8TUhrsqO_vb8vnQnMZoQz3Q>