From owner-svn-ports-all@freebsd.org Thu Dec 31 18:44:02 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 141D64CB29F; Thu, 31 Dec 2020 18:44:02 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6H9t01vKz3Qc9; Thu, 31 Dec 2020 18:44:02 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7BC115447; Thu, 31 Dec 2020 18:44:01 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BVIi1Z7024010; Thu, 31 Dec 2020 18:44:01 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BVIi1vr024007; Thu, 31 Dec 2020 18:44:01 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202012311844.0BVIi1vr024007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 31 Dec 2020 18:44:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559764 - head/devel/util-linux X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/devel/util-linux X-SVN-Commit-Revision: 559764 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2020 18:44:02 -0000 Author: yuri Date: Thu Dec 31 18:44:01 2020 New Revision: 559764 URL: https://svnweb.freebsd.org/changeset/ports/559764 Log: devel/util-linux: Optionalize conflicting components PR: 252305 Submitted by: cem Modified: head/devel/util-linux/Makefile head/devel/util-linux/pkg-plist Modified: head/devel/util-linux/Makefile ============================================================================== --- head/devel/util-linux/Makefile Thu Dec 31 18:27:44 2020 (r559763) +++ head/devel/util-linux/Makefile Thu Dec 31 18:44:01 2020 (r559764) @@ -2,6 +2,7 @@ PORTNAME= util-linux DISTVERSION= 2.36 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION}/ @@ -27,10 +28,22 @@ CONFIGURE_ARGS= --disable-nls --disable-ipcrm --disabl INSTALL_TARGET= install-strip -CONFLICTS_INSTALL= cal +#CONFLICTS_INSTALL= cal getopt flock hardlink # non-default options conflicts -OPTIONS_DEFINE= UUID +OPTIONS_DEFINE= CAL FLOCK GETOPT HARDLINK UUID OPTIONS_SUB= yes + +CAL_DESC= Install util-linux cal(1) +CAL_CONFIGURE_ENABLE= cal + +FLOCK_DESC= Install util-linux flock(1) +FLOCK_CONFIGURE_ENABLE= flock + +GETOPT_DESC= Install util-linux getopt(1) +GETOPT_CONFIGURE_ENABLE=getopt + +HARDLINK_DESC= Install util-linux hardlink(1) +HARDLINK_CONFIGURE_ENABLE=hardlink UUID_DESC= Install libuuid UUID_CONFIGURE_ENABLE= libuuid Modified: head/devel/util-linux/pkg-plist ============================================================================== --- head/devel/util-linux/pkg-plist Thu Dec 31 18:27:44 2020 (r559763) +++ head/devel/util-linux/pkg-plist Thu Dec 31 18:44:01 2020 (r559764) @@ -1,12 +1,12 @@ -bin/cal +%%CAL%%bin/cal bin/chrt bin/col bin/colcrt bin/colrm bin/column -bin/flock -bin/getopt -bin/hardlink +%%FLOCK%%bin/flock +%%GETOPT%%bin/getopt +%%HARDLINK%%bin/hardlink bin/hexdump bin/ipcmk bin/isosize @@ -49,15 +49,15 @@ libdata/pkgconfig/blkid.pc %%UUID%%libdata/pkgconfig/fdisk.pc libdata/pkgconfig/smartcols.pc %%UUID%%libdata/pkgconfig/uuid.pc -man/man1/cal.1.gz +%%CAL%%man/man1/cal.1.gz man/man1/chrt.1.gz man/man1/col.1.gz man/man1/colcrt.1.gz man/man1/colrm.1.gz man/man1/column.1.gz -man/man1/flock.1.gz -man/man1/getopt.1.gz -man/man1/hardlink.1.gz +%%FLOCK%%man/man1/flock.1.gz +%%GETOPT%%man/man1/getopt.1.gz +%%HARDLINK%%man/man1/hardlink.1.gz man/man1/hexdump.1.gz man/man1/ipcmk.1.gz man/man1/logger.1.gz @@ -121,7 +121,7 @@ sbin/nologin sbin/swaplabel sbin/wipefs share/bash-completion/completions/blkid -share/bash-completion/completions/cal +%%CAL%%share/bash-completion/completions/cal %%UUID%%share/bash-completion/completions/cfdisk share/bash-completion/completions/chrt share/bash-completion/completions/col @@ -130,10 +130,10 @@ share/bash-completion/completions/colrm share/bash-completion/completions/column %%UUID%%share/bash-completion/completions/fdisk share/bash-completion/completions/findfs -share/bash-completion/completions/flock +%%FLOCK%%share/bash-completion/completions/flock share/bash-completion/completions/fsck.cramfs share/bash-completion/completions/fsck.minix -share/bash-completion/completions/getopt +%%GETOPT%%share/bash-completion/completions/getopt share/bash-completion/completions/hexdump share/bash-completion/completions/ipcmk share/bash-completion/completions/isosize