Date: Sun, 27 Jun 2021 22:55:09 GMT From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d0309aeae4bc - main - devel/util-linux: Remove setsid from package Message-ID: <202106272255.15RMt9gt069429@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0309aeae4bc847f9393c24015d482d5c28e182f commit d0309aeae4bc847f9393c24015d482d5c28e182f Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2021-06-27 22:46:04 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2021-06-27 22:54:06 +0000 devel/util-linux: Remove setsid from package This resolves the conflict with sysutils/setsid which provides a copy of util-linux's setsid too. PR: 256866 Approved by: yuri (maintainer) --- devel/util-linux/Makefile | 2 +- devel/util-linux/pkg-plist | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile index 3d046db78e93..44f04acee6e3 100644 --- a/devel/util-linux/Makefile +++ b/devel/util-linux/Makefile @@ -1,6 +1,6 @@ PORTNAME= util-linux DISTVERSION= 2.36 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION}/ diff --git a/devel/util-linux/pkg-plist b/devel/util-linux/pkg-plist index 4d94289f0c7a..85b1de9cfe64 100644 --- a/devel/util-linux/pkg-plist +++ b/devel/util-linux/pkg-plist @@ -19,7 +19,7 @@ bin/rename bin/renice bin/rev bin/scriptreplay -bin/setsid +@comment bin/setsid bin/ul %%UUID%%bin/uuidgen %%UUID%%bin/uuidparse @@ -69,7 +69,7 @@ man/man1/rename.1.gz man/man1/renice.1.gz man/man1/rev.1.gz man/man1/scriptreplay.1.gz -man/man1/setsid.1.gz +@comment man/man1/setsid.1.gz man/man1/ul.1.gz %%UUID%%man/man1/uuidgen.1.gz %%UUID%%man/man1/uuidparse.1.gz @@ -151,7 +151,7 @@ share/bash-completion/completions/rename share/bash-completion/completions/renice share/bash-completion/completions/rev share/bash-completion/completions/scriptreplay -share/bash-completion/completions/setsid +@comment share/bash-completion/completions/setsid %%UUID%%share/bash-completion/completions/sfdisk share/bash-completion/completions/swaplabel share/bash-completion/completions/ul
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106272255.15RMt9gt069429>