Re: git: c8ace2f4ca96 - main - /: Switch from misc/getopt to devel/util-linux

Reply: Daniel Engberg : "Re: git: c8ace2f4ca96 - main - */*: Switch from misc/getopt to devel/util-linux"
In reply to: Daniel Engberg : "git: c8ace2f4ca96 - main - */*: Switch from misc/getopt to devel/util-linux"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_freebsd.org>
Date: Sat, 02 Nov 2024 14:12:32 UTC
02.11.2024 15:10, Daniel Engberg пишет:
> The branch main has been updated by diizzy:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=c8ace2f4ca960d3a3a0038846923efcae2f8443d
>
> commit c8ace2f4ca960d3a3a0038846923efcae2f8443d
> Author:     Daniel Engberg <diizzy@FreeBSD.org>
> AuthorDate: 2024-11-02 11:59:48 +0000
> Commit:     Daniel Engberg <diizzy@FreeBSD.org>
> CommitDate: 2024-11-02 12:01:52 +0000
>
>      */*: Switch from misc/getopt to devel/util-linux
>      
>      misc/getopt expired on 2024-10-31 so it's time to switch
>      
>      PR:             281625
>      Approved by:    portmgr (blanket, build fix)
> ---
>   devel/compiz-bcop/Makefile       | 4 ++--
>   devel/gitflow/Makefile           | 3 ++-
>   french/aster/Makefile            | 2 +-
>   math/eukleides/Makefile          | 4 ++--
>   net/pacemaker2/Makefile          | 2 +-
>   net/pacemaker2/Makefile.common   | 6 +++---
>   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(+), 23 deletions(-)
>
> diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
> index 35119b2e8d61..38fb057dfbcb 100644
> --- a/devel/compiz-bcop/Makefile
> +++ b/devel/compiz-bcop/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	compiz-bcop
>   PORTVERSION=	0.8.8
> -PORTREVISION=	2
> +PORTREVISION=	3
>   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:misc/getopt
> +		${LOCALBASE}/bin/getopt:devel/util-linux
>   
>   GNU_CONFIGURE=	yes
>   
> diff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile
> index 8cb28da11fdd..8ee786beb94a 100644
> --- a/devel/gitflow/Makefile
> +++ b/devel/gitflow/Makefile
> @@ -1,5 +1,6 @@
>   PORTNAME=	gitflow
>   PORTVERSION=	1.12.3
> +PORTREVISION=	1
>   CATEGORIES=	devel
>   
>   MAINTAINER=	nbari@tequila.io
> @@ -9,7 +10,7 @@ WWW=		https://github.com/petervanderdoes/gitflow-avh
>   LICENSE=	BSD2CLAUSE LGPL21
>   LICENSE_COMB=	multi
>   
> -RUN_DEPENDS=	${LOCALBASE}/bin/getopt:misc/getopt
> +RUN_DEPENDS=	${LOCALBASE}/bin/getopt:devel/util-linux
>   
>   USES=		gmake
>   USE_GITHUB=	yes
> diff --git a/french/aster/Makefile b/french/aster/Makefile
> index 7e7938e04fb2..2ed680e509b0 100644
> --- a/french/aster/Makefile
> +++ b/french/aster/Makefile
> @@ -31,7 +31,7 @@ BUILD_DEPENDS+=	astk-serveur>0:cad/astk-serveur	\
>   		${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
>   		gnproc:sysutils/coreutils			\
>   		bash:shells/bash				\
> -		getopt>0:misc/getopt				\
> +		${LOCALBASE}/bin/getopt:devel/util-linux	\
>   		xterm:x11/xterm					\
>   		${PYNUMPY}	\
>   		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
> diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
> index 61eb94737fd4..5bad4688bab7 100644
> --- a/math/eukleides/Makefile
> +++ b/math/eukleides/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	eukleides
>   PORTVERSION=	1.5.4
> -PORTREVISION=	7
> +PORTREVISION=	8
>   CATEGORIES=	math
>   MASTER_SITES=	http://www.eukleides.org/files/
>   
> @@ -12,7 +12,7 @@ LICENSE=	GPLv3+
>   LICENSE_FILE=	${WRKSRC}/COPYING
>   
>   RUN_DEPENDS=	pstoedit:graphics/pstoedit \
> -		getopt>=0:misc/getopt
> +		${LOCALBASE}/bin/getopt:devel/util-linux
>   
>   USES=		bison gettext iconv gmake readline tar:bzip2 tex
>   USE_TEX=	latex
> diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
> index f06b987a6024..249cadf0c946 100644
> --- a/net/pacemaker2/Makefile
> +++ b/net/pacemaker2/Makefile
> @@ -1,5 +1,5 @@
>   PORTVERSION=		2.1.7
> -PORTREVISION=		1
> +PORTREVISION=		2
>   PKGNAMESUFFIX=		2
>   
>   WWW=		https://www.clusterlabs.org/pacemaker/
> diff --git a/net/pacemaker2/Makefile.common b/net/pacemaker2/Makefile.common
> index 434f980a4bf8..e304d4372a14 100644
> --- a/net/pacemaker2/Makefile.common
> +++ b/net/pacemaker2/Makefile.common
> @@ -9,15 +9,15 @@ LICENSE=		GPLv2
>   LICENSE_FILE=		${WRKSRC}/COPYING
>   
>   BUILD_DEPENDS=		bash:shells/bash \
> -			getopt>=0:misc/getopt
> -LIB_DEPENDS=		libgnutls.so:security/gnutls \
> +			${LOCALBASE}/bin/getopt:devel/util-linux \
> +LIB_DEPENDS=		libgnutls.so:security/gnutls
>   			libltdl.so:devel/libltdl \
>   			libqb.so:devel/libqb \
>   			libuuid.so:misc/e2fsprogs-libuuid \
>   			libxml2.so:textproc/libxml2 \
>   			libxslt.so:textproc/libxslt
>   RUN_DEPENDS=		bash:shells/bash \
> -			getopt>=0:misc/getopt \
> +			${LOCALBASE}/bin/getopt:devel/util-linux \
>   			ocf-tester:net-mgmt/resource-agents
>   
>   CONFLICTS=		heartbeat
> diff --git a/sysutils/password-store/Makefile b/sysutils/password-store/Makefile
> index 35cde8172da5..bc2635a9c0a9 100644
> --- a/sysutils/password-store/Makefile
> +++ b/sysutils/password-store/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	password-store
>   PORTVERSION=	1.7.4
> -PORTREVISION=	5
> +PORTREVISION=	6
>   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 \
> -		getopt>=0:misc/getopt \
> +		${LOCALBASE}/bin/getopt:devel/util-linux \
>   		gnupg>=2:security/gnupg \
>   		tree>=1.7:sysutils/tree
>   
> diff --git a/sysutils/tartarus/Makefile b/sysutils/tartarus/Makefile
> index a97119e44466..f69bfc909eca 100644
> --- a/sysutils/tartarus/Makefile
> +++ b/sysutils/tartarus/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	tartarus
>   PORTVERSION=	0.9.8
> -PORTREVISION=	6
> +PORTREVISION=	7
>   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:misc/getopt
> +		${LOCALBASE}/bin/getopt:devel/util-linux
>   
>   USES=		gmake perl5 shebangfix tar:bzip2
>   SHEBANG_FILES=	${WRKSRC}/bin/*
> diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
> index e6335abe3abf..412019de0593 100644
> --- a/textproc/rarian/Makefile
> +++ b/textproc/rarian/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	rarian
>   DISTVERSION=	0.8.5
> -PORTREVISION=	6
> +PORTREVISION=	7
>   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:misc/getopt \
> +BUILD_DEPENDS=	${LOCALBASE}/bin/getopt:devel/util-linux \
>   		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:misc/getopt \
> +RUN_DEPENDS=	${LOCALBASE}/bin/getopt:devel/util-linux \
>   		bash:shells/bash \
>   		xsltproc:textproc/libxslt \
>   		docbook-xml>0:textproc/docbook-xml \
> diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
> index 27ea964afc01..81e6b0a3c7c3 100644
> --- a/textproc/xmlto/Makefile
> +++ b/textproc/xmlto/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	xmlto
>   PORTVERSION=	0.0.28
> -PORTREVISION=	1
> +PORTREVISION=	2
>   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}:misc/getopt \
> +		${GETOPT_CMD}:devel/util-linux \
>   		xmllint:textproc/libxml2 \
>   		xsltproc:textproc/libxslt \
>   		docbook-xsl>0:textproc/docbook-xsl \
> diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
> index 253b9bac329c..d3060026ce88 100644
> --- a/textproc/yodl/Makefile
> +++ b/textproc/yodl/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	yodl
>   PORTVERSION=	3.10.00
> -PORTREVISION=	4
> +PORTREVISION=	5
>   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:misc/getopt
> +		${LOCALBASE}/bin/getopt:devel/util-linux
>   BUILD_DEPENDS=	icmake:devel/icmake \
>   		bash:shells/bash \
>   		gsed:textproc/gsed
> diff --git a/x11-fonts/fontpreview/Makefile b/x11-fonts/fontpreview/Makefile
> index c07f5681670d..f38bba80b735 100644
> --- a/x11-fonts/fontpreview/Makefile
> +++ b/x11-fonts/fontpreview/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	fontpreview
>   DISTVERSION=	1.0.6
> -PORTREVISION=	3
> +PORTREVISION=	4
>   CATEGORIES=	x11-fonts graphics
>   
>   MAINTAINER=	0mp@FreeBSD.org
> @@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
>   
>   RUN_DEPENDS=	bash:shells/bash \
>   		fzf:textproc/fzf \
> -		getopt>0:misc/getopt \
> +		${LOCALBASE}/bin/getopt:devel/util-linux \
>   		nsxiv:graphics/nsxiv \
>   		xdotool:x11/xdotool
>   

Hello!

Installing util-linux-2.39.4_2...
pkg-static: util-linux-2.39.4_2 conflicts with e2fsprogs-libblkid-1.47.1 
(installs files into the same place). Problematic file: 
/usr/local/include/blkid/blkid.h

$ cat /var/db/ports/devel_util-linux/options
# This file is auto-generated by 'make config'.
# Options for util-linux-2.39.4_2
_OPTIONS_READ=util-linux-2.39.4_2
_FILE_COMPLETE_OPTIONS_LIST=CAL FLOCK GETOPT HARDLINK UUID
OPTIONS_FILE_UNSET+=CAL
OPTIONS_FILE_UNSET+=FLOCK
OPTIONS_FILE_SET+=GETOPT
OPTIONS_FILE_UNSET+=HARDLINK
OPTIONS_FILE_UNSET+=UUID

$ pkg info -r e2fsprogs-libblkid-1.47.1
e2fsprogs-libblkid-1.47.1:
         e2fsprogs-core-1.47.1

-- 
Best regards,
Vladimir Druzenko