diff options
Diffstat (limited to 'devel/util-linux')
| -rw-r--r-- | devel/util-linux/Makefile | 22 | ||||
| -rw-r--r-- | devel/util-linux/pkg-plist | 71 |
2 files changed, 29 insertions, 64 deletions
diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile index 8d7af3357de0..284d3758a6d6 100644 --- a/devel/util-linux/Makefile +++ b/devel/util-linux/Makefile @@ -1,6 +1,6 @@ PORTNAME= util-linux DISTVERSION= 2.39.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION:R}/ @@ -12,7 +12,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libuuid.so:misc/libuuid +LIB_DEPENDS= libblkid.so:filesystems/libblkid \ + libuuid.so:misc/libuuid RUN_DEPENDS= bash:shells/bash USES= autoreconf gettext-tools gmake libtool ncurses pkgconfig \ @@ -37,7 +38,7 @@ TEST_TARGET= check # tests fail due to https://bugs.freebsd.org/bugzilla/show_bu CONFLICTS_INSTALL= heirloom-doctools -OPTIONS_DEFINE= CAL FLOCK GETOPT HARDLINK UUID +OPTIONS_DEFINE= CAL FLOCK GETOPT HARDLINK OPTIONS_DEFAULT= GETOPT OPTIONS_SUB= yes @@ -45,18 +46,23 @@ CAL_DESC= Install util-linux cal(1) CAL_CONFIGURE_ENABLE= cal FLOCK_DESC= Install util-linux flock(1) -FLOCK_CONFIGURE_ENABLE= flock +FLOCK_RUN_DEPENDS= flock>=2:sysutils/flock GETOPT_DESC= Install util-linux getopt(1) -GETOPT_CONFIGURE_ENABLE=getopt +GETOPT_RUN_DEPENDS= getopt>=1:misc/getopt HARDLINK_DESC= Install util-linux hardlink(1) HARDLINK_CONFIGURE_ENABLE=hardlink -UUID_DESC= Install libuuid -UUID_CONFIGURE_ENABLE= libuuid - post-install: # https://github.com/karelzak/util-linux/issues/1149 ${RM} -r ${STAGEDIR}${DOCSDIR} + ${RM} -r ${STAGEDIR}${PREFIX}/include/blkid/ + ${RM} ${STAGEDIR}${PREFIX}/share/man/man5/terminal-colors.d.5* + ${FIND} ${STAGEDIR}${PREFIX} -name 'flock*' -delete + ${FIND} ${STAGEDIR}${PREFIX} -name 'getopt*' -delete + ${FIND} ${STAGEDIR}${PREFIX} -name 'blkid*' -delete + ${FIND} ${STAGEDIR}${PREFIX} -name 'libblkid*' -delete + ${FIND} ${STAGEDIR}${PREFIX} -name 'libuuid*' -delete + ${FIND} ${STAGEDIR}${PREFIX} -name 'uuid*' -delete .include <bsd.port.mk> diff --git a/devel/util-linux/pkg-plist b/devel/util-linux/pkg-plist index 4820ebac14e1..4a2f21638ef9 100644 --- a/devel/util-linux/pkg-plist +++ b/devel/util-linux/pkg-plist @@ -4,8 +4,6 @@ bin/col bin/colcrt bin/colrm bin/column -%%FLOCK%%bin/flock -%%GETOPT%%bin/getopt %%HARDLINK%%bin/hardlink bin/hexdump bin/ipcmk @@ -21,37 +19,22 @@ bin/rev bin/scriptreplay @comment bin/setsid bin/ul -%%UUID%%bin/uuidgen -%%UUID%%bin/uuidparse bin/wall bin/whereis -include/blkid/blkid.h -%%UUID%%include/libfdisk/libfdisk.h +include/libfdisk/libfdisk.h include/libsmartcols/libsmartcols.h -%%UUID%%include/uuid/uuid.h -lib/libblkid.a -lib/libblkid.so -lib/libblkid.so.1 -lib/libblkid.so.1.1.0 -%%UUID%%lib/libfdisk.a -%%UUID%%lib/libfdisk.so -%%UUID%%lib/libfdisk.so.1 -%%UUID%%lib/libfdisk.so.1.1.0 +lib/libfdisk.a +lib/libfdisk.so +lib/libfdisk.so.1 +lib/libfdisk.so.1.1.0 lib/libsmartcols.a lib/libsmartcols.so lib/libsmartcols.so.1 lib/libsmartcols.so.1.1.0 -%%UUID%%lib/libuuid.a -%%UUID%%lib/libuuid.so -%%UUID%%lib/libuuid.so.1 -%%UUID%%lib/libuuid.so.1.3.0 -libdata/pkgconfig/blkid.pc -%%UUID%%libdata/pkgconfig/fdisk.pc +libdata/pkgconfig/fdisk.pc libdata/pkgconfig/smartcols.pc -%%UUID%%libdata/pkgconfig/uuid.pc -sbin/blkid -%%UUID%%sbin/cfdisk -%%UUID%%sbin/fdisk +sbin/cfdisk +sbin/fdisk sbin/findfs sbin/fsck.cramfs sbin/fsck.minix @@ -61,23 +44,20 @@ sbin/mkfs.cramfs sbin/mkfs.minix sbin/mkswap sbin/nologin -%%UUID%%sbin/sfdisk +sbin/sfdisk sbin/swaplabel sbin/wipefs -share/bash-completion/completions/blkid %%CAL%%share/bash-completion/completions/cal -%%UUID%%share/bash-completion/completions/cfdisk +share/bash-completion/completions/cfdisk share/bash-completion/completions/chrt share/bash-completion/completions/col share/bash-completion/completions/colcrt share/bash-completion/completions/colrm share/bash-completion/completions/column -%%UUID%%share/bash-completion/completions/fdisk +share/bash-completion/completions/fdisk share/bash-completion/completions/findfs -%%FLOCK%%share/bash-completion/completions/flock share/bash-completion/completions/fsck.cramfs share/bash-completion/completions/fsck.minix -%%GETOPT%%share/bash-completion/completions/getopt %%HARDLINK%%share/bash-completion/completions/hardlink share/bash-completion/completions/hexdump share/bash-completion/completions/ipcmk @@ -97,11 +77,9 @@ share/bash-completion/completions/renice share/bash-completion/completions/rev share/bash-completion/completions/scriptreplay @comment share/bash-completion/completions/setsid -%%UUID%%share/bash-completion/completions/sfdisk +share/bash-completion/completions/sfdisk share/bash-completion/completions/swaplabel share/bash-completion/completions/ul -%%UUID%%share/bash-completion/completions/uuidgen -%%UUID%%share/bash-completion/completions/uuidparse share/bash-completion/completions/wall share/bash-completion/completions/whereis share/bash-completion/completions/wipefs @@ -111,8 +89,6 @@ share/man/man1/col.1.gz share/man/man1/colcrt.1.gz share/man/man1/colrm.1.gz share/man/man1/column.1.gz -%%FLOCK%%share/man/man1/flock.1.gz -%%GETOPT%%share/man/man1/getopt.1.gz %%HARDLINK%%share/man/man1/hardlink.1.gz share/man/man1/hexdump.1.gz share/man/man1/ipcmk.1.gz @@ -127,27 +103,10 @@ share/man/man1/rev.1.gz share/man/man1/scriptreplay.1.gz @comment share/man/man1/setsid.1.gz share/man/man1/ul.1.gz -%%UUID%%share/man/man1/uuidgen.1.gz -%%UUID%%share/man/man1/uuidparse.1.gz share/man/man1/wall.1.gz share/man/man1/whereis.1.gz -share/man/man3/libblkid.3.gz -%%UUID%%share/man/man3/uuid.3.gz -%%UUID%%share/man/man3/uuid_clear.3.gz -%%UUID%%share/man/man3/uuid_compare.3.gz -%%UUID%%share/man/man3/uuid_copy.3.gz -%%UUID%%share/man/man3/uuid_generate.3.gz -%%UUID%%share/man/man3/uuid_generate_random.3.gz -%%UUID%%share/man/man3/uuid_generate_time.3.gz -%%UUID%%share/man/man3/uuid_generate_time_safe.3.gz -%%UUID%%share/man/man3/uuid_is_null.3.gz -%%UUID%%share/man/man3/uuid_parse.3.gz -%%UUID%%share/man/man3/uuid_time.3.gz -%%UUID%%share/man/man3/uuid_unparse.3.gz -share/man/man5/terminal-colors.d.5.gz -share/man/man8/blkid.8.gz -%%UUID%%share/man/man8/cfdisk.8.gz -%%UUID%%share/man/man8/fdisk.8.gz +share/man/man8/cfdisk.8.gz +share/man/man8/fdisk.8.gz share/man/man8/findfs.8.gz share/man/man8/fsck.cramfs.8.gz share/man/man8/fsck.minix.8.gz @@ -158,6 +117,6 @@ share/man/man8/mkfs.cramfs.8.gz share/man/man8/mkfs.minix.8.gz share/man/man8/mkswap.8.gz share/man/man8/nologin.8.gz -%%UUID%%share/man/man8/sfdisk.8.gz +share/man/man8/sfdisk.8.gz share/man/man8/swaplabel.8.gz share/man/man8/wipefs.8.gz |