Re: git: 521da5fb1087 - main - */*: Change *_DEPENDS from devel/util-linux back to misc/getopt
- Reply: Po-Chuan Hsieh : "Re: git: 521da5fb1087 - main - */*: Change *_DEPENDS from devel/util-linux back to misc/getopt"
- In reply to: Po-Chuan Hsieh : "Re: git: 521da5fb1087 - main - */*: Change *_DEPENDS from devel/util-linux back to misc/getopt"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Nov 2024 23:46:43 UTC
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
>> [http://libgnutls.so:security/gnutls] \
>>
>> libltdl.so:devel/libltdl [http://libltdl.so:devel/libltdl] \
>>
>> libqb.so:devel/libqb [http://libqb.so:devel/libqb] \
>>
>> @@ -17,7 +17,7 @@ LIB_DEPENDS= libgnutls.so:security/gnutls
>> [http://libgnutls.so:security/gnutls] \
>>
>> libxml2.so:textproc/libxml2 [http://libxml2.so:textproc/libxml2]
>> \
>>
>> libxslt.so:textproc/libxslt [http://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
>> [http://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