devel/util-linux: Move man pages to share/man

While here fix HARDLINK option plist

Approved by:	portmgr (blanket)

2 files changed, 59 insertions, 56 deletions

diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile
index bf9852c216ca..de6a05c095ee 100644
--- a/devel/util-linux/Makefile
+++ b/devel/util-linux/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	util-linux
 DISTVERSION=	2.39.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION:R}/
 
@@ -27,6 +28,7 @@ SHEBANG_FILES=	misc-utils/getopt-example.bash \
 		tests/run.sh
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-nls --disable-ipcrm --disable-ipcs \
 		--disable-makeinstall-chown --disable-makeinstall-setuid \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
diff --git a/devel/util-linux/pkg-plist b/devel/util-linux/pkg-plist
index 85b1de9cfe64..4820ebac14e1 100644
--- a/devel/util-linux/pkg-plist
+++ b/devel/util-linux/pkg-plist
@@ -49,62 +49,6 @@ libdata/pkgconfig/blkid.pc
 %%UUID%%libdata/pkgconfig/fdisk.pc
 libdata/pkgconfig/smartcols.pc
 %%UUID%%libdata/pkgconfig/uuid.pc
-%%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
-%%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
-man/man1/look.1.gz
-man/man1/mcookie.1.gz
-man/man1/mesg.1.gz
-man/man1/namei.1.gz
-man/man1/rename.1.gz
-man/man1/renice.1.gz
-man/man1/rev.1.gz
-man/man1/scriptreplay.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
-man/man1/wall.1.gz
-man/man1/whereis.1.gz
-man/man3/libblkid.3.gz
-%%UUID%%man/man3/uuid.3.gz
-%%UUID%%man/man3/uuid_clear.3.gz
-%%UUID%%man/man3/uuid_compare.3.gz
-%%UUID%%man/man3/uuid_copy.3.gz
-%%UUID%%man/man3/uuid_generate.3.gz
-%%UUID%%man/man3/uuid_generate_random.3.gz
-%%UUID%%man/man3/uuid_generate_time.3.gz
-%%UUID%%man/man3/uuid_generate_time_safe.3.gz
-%%UUID%%man/man3/uuid_is_null.3.gz
-%%UUID%%man/man3/uuid_parse.3.gz
-%%UUID%%man/man3/uuid_time.3.gz
-%%UUID%%man/man3/uuid_unparse.3.gz
-man/man5/terminal-colors.d.5.gz
-man/man8/blkid.8.gz
-%%UUID%%man/man8/cfdisk.8.gz
-%%UUID%%man/man8/fdisk.8.gz
-man/man8/findfs.8.gz
-man/man8/fsck.cramfs.8.gz
-man/man8/fsck.minix.8.gz
-man/man8/isosize.8.gz
-man/man8/mkfs.8.gz
-man/man8/mkfs.bfs.8.gz
-man/man8/mkfs.cramfs.8.gz
-man/man8/mkfs.minix.8.gz
-man/man8/mkswap.8.gz
-man/man8/nologin.8.gz
-%%UUID%%man/man8/sfdisk.8.gz
-man/man8/swaplabel.8.gz
-man/man8/wipefs.8.gz
 sbin/blkid
 %%UUID%%sbin/cfdisk
 %%UUID%%sbin/fdisk
@@ -134,6 +78,7 @@ share/bash-completion/completions/findfs
 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
 share/bash-completion/completions/isosize
@@ -160,3 +105,59 @@ share/bash-completion/completions/ul
 share/bash-completion/completions/wall
 share/bash-completion/completions/whereis
 share/bash-completion/completions/wipefs
+%%CAL%%share/man/man1/cal.1.gz
+share/man/man1/chrt.1.gz
+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
+share/man/man1/logger.1.gz
+share/man/man1/look.1.gz
+share/man/man1/mcookie.1.gz
+share/man/man1/mesg.1.gz
+share/man/man1/namei.1.gz
+share/man/man1/rename.1.gz
+share/man/man1/renice.1.gz
+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/findfs.8.gz
+share/man/man8/fsck.cramfs.8.gz
+share/man/man8/fsck.minix.8.gz
+share/man/man8/isosize.8.gz
+share/man/man8/mkfs.8.gz
+share/man/man8/mkfs.bfs.8.gz
+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/swaplabel.8.gz
+share/man/man8/wipefs.8.gz