cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devel/util-linux: Optionalize conflicting components

Browse Source 
PR:		252305
Submitted by:	cem
This commit is contained in:
Yuri Victorovich 2020-12-31 18:44:01 +00:00
parent 56c326cd19
commit 061953141a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=559764
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devel/util-linux/Makefile
View File

@ -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,11 +28,23 @@ CONFIGURE_ARGS= --disable-nls --disable-ipcrm --disable-ipcs \
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

22
devel/util-linux/pkg-plist
View File

@ -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