git: 430da911bcbb - main - sysutils/e2fsprogs-core: Sanitize MANPREFIX

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=430da911bcbbabafaaf2602ab4e30ba7b22d624d

commit 430da911bcbbabafaaf2602ab4e30ba7b22d624d
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-22 13:08:51 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-22 13:52:02 +0000

    sysutils/e2fsprogs-core: Sanitize MANPREFIX
    
    Approved by:    portmgr (blanket)
---
 sysutils/e2fsprogs-core/Makefile  | 12 ++++---
 sysutils/e2fsprogs-core/pkg-plist | 68 +++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/sysutils/e2fsprogs-core/Makefile b/sysutils/e2fsprogs-core/Makefile
index 9401474667cf..b4803bccdc38 100644
--- a/sysutils/e2fsprogs-core/Makefile
+++ b/sysutils/e2fsprogs-core/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	e2fsprogs
 PORTVERSION=	1.47.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
 
@@ -24,6 +24,7 @@ USE_CSTD=	gnu99
 USE_LDCONFIG=	${PREFIX}/lib/e2fsprogs
 .endif
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 # while we use the system blkid, we need to --enable-libblkid
 # so that the tools get built:
@@ -293,7 +294,7 @@ post-install:
 	${LN} -fs e2fsck ${STAGEDIR}${PREFIX}/sbin/fsck.ext3
 	${LN} -fs e2fsck ${STAGEDIR}${PREFIX}/sbin/fsck.ext4
 	# now the remainder of the usual post-install jobs:
-	${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/man/man8/
+	${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
@@ -305,13 +306,14 @@ post-install:
 		${XARGS} <${FILESDIR}/unwanted ${RM} && \
 		${RMDIR} include/e2fsprogs/blkid
 	${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
-	${MV} ${STAGEDIR}${MANPREFIX}/man/man1/compile_et.1 ${STAGEDIR}${MANPREFIX}/man/man1/e2fsprogs-compile_et.1
+	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/share/man/man1/e2fsprogs-compile_et.1
 	${MKDIR} ${STAGEDIR}${DATADIR}/et/
 	${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/
 	${REINPLACE_CMD} -e 's}^DIR=.*$$}DIR=${DATADIR}/et}' -i '' ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/et
-	${MV} -f ${STAGEDIR}${MANPREFIX}/man/man3/com_err.3 \
-		 ${STAGEDIR}${MANPREFIX}/man/man3/e2fsprogs-com_err.3
+	${MV} -f ${STAGEDIR}${PREFIX}/share/man/man3/com_err.3 \
+		 ${STAGEDIR}${PREFIX}/share/man/man3/e2fsprogs-com_err.3
+	${RM} ${STAGEDIR}${PREFIX}/share/man/man3/libblkid.3
 
 #
 # the next line closes .if ${MASTERDIR} == ${.CURDIR}
diff --git a/sysutils/e2fsprogs-core/pkg-plist b/sysutils/e2fsprogs-core/pkg-plist
index c2ca3765b12b..71ab4cd1d662 100644
--- a/sysutils/e2fsprogs-core/pkg-plist
+++ b/sysutils/e2fsprogs-core/pkg-plist
@@ -40,40 +40,40 @@ libdata/pkgconfig/com_err.pc
 libdata/pkgconfig/e2p.pc
 libdata/pkgconfig/ext2fs.pc
 libdata/pkgconfig/ss.pc
-man/man1/chattr.1.gz
-man/man1/e2fsprogs-compile_et.1.gz
-%%FUSEFS%%man/man1/fuse2fs.1.gz
-man/man1/lsattr.1.gz
-man/man1/mk_cmds.1.gz
-man/man3/e2fsprogs-com_err.3.gz
-man/man5/e2fsck.conf.5.gz
-man/man5/mke2fs.conf.5.gz
-man/man5/ext2.5.gz
-man/man5/ext3.5.gz
-man/man5/ext4.5.gz
-man/man8/badblocks.8.gz
-man/man8/debugfs.8.gz
-man/man8/dumpe2fs.8.gz
-man/man8/e2fsck.8.gz
-man/man8/e2image.8.gz
-man/man8/e2label.8.gz
-man/man8/e2mmpstatus.8.gz
-man/man8/e2undo.8.gz
-man/man8/mke2fs.8.gz
-man/man8/mklost+found.8.gz
-man/man8/resize2fs.8.gz
-man/man8/tune2fs.8.gz
-man/man8/fsck.ext2.8.gz
-man/man8/fsck.ext3.8.gz
-man/man8/fsck.ext4.8.gz
-man/man8/mkfs.ext2.8.gz
-man/man8/mkfs.ext3.8.gz
-man/man8/mkfs.ext4.8.gz
-man/man8/findfs.8.gz
-man/man8/blkid.8.gz
-man/man8/logsave.8.gz
-man/man8/fsck_ext2fs.8.gz
-man/man8/e2freefrag.8.gz
+share/man/man1/chattr.1.gz
+share/man/man1/e2fsprogs-compile_et.1.gz
+%%FUSEFS%%share/man/man1/fuse2fs.1.gz
+share/man/man1/lsattr.1.gz
+share/man/man1/mk_cmds.1.gz
+share/man/man3/e2fsprogs-com_err.3.gz
+share/man/man5/e2fsck.conf.5.gz
+share/man/man5/mke2fs.conf.5.gz
+share/man/man5/ext2.5.gz
+share/man/man5/ext3.5.gz
+share/man/man5/ext4.5.gz
+share/man/man8/badblocks.8.gz
+share/man/man8/debugfs.8.gz
+share/man/man8/dumpe2fs.8.gz
+share/man/man8/e2fsck.8.gz
+share/man/man8/e2image.8.gz
+share/man/man8/e2label.8.gz
+share/man/man8/e2mmpstatus.8.gz
+share/man/man8/e2undo.8.gz
+share/man/man8/mke2fs.8.gz
+share/man/man8/mklost+found.8.gz
+share/man/man8/resize2fs.8.gz
+share/man/man8/tune2fs.8.gz
+share/man/man8/fsck.ext2.8.gz
+share/man/man8/fsck.ext3.8.gz
+share/man/man8/fsck.ext4.8.gz
+share/man/man8/mkfs.ext2.8.gz
+share/man/man8/mkfs.ext3.8.gz
+share/man/man8/mkfs.ext4.8.gz
+share/man/man8/findfs.8.gz
+share/man/man8/blkid.8.gz
+share/man/man8/logsave.8.gz
+share/man/man8/fsck_ext2fs.8.gz
+share/man/man8/e2freefrag.8.gz
 sbin/badblocks
 sbin/blkid
 sbin/debugfs