From nobody Mon Jan 22 13:52:23 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJWqq6KM0z57xhD; Mon, 22 Jan 2024 13:52:23 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJWqq38LQz44YT; Mon, 22 Jan 2024 13:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705931543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rc9FQc4ZIB1DCmshIAuSQAt8Y/itztPXJE126PAMyzg=; b=wIbojF6kvsIT3a/3zeZIvxk7QQVZUosIF6KZjHELCOqxFJg8bj/5chUvlLyGrCTco17dkY olw03H4esJgesblS/bd1pRxqfuNiPByqHoDoY0ss46O2L4xXfQ6Mu+WXmgWbcciGyeBU80 OtEBNt89XiaVatxXsSAW5nN8sj6AnSn85geYUyhMFxg4We77H7kBu1nZ2GrLdjeSt3cZqj IG0JIqfE2vdFI80sdhvOSNGSGRdjlssiGWJtrLQLTPWliU9YW5c6QBV5bIcT5lIDmls9LD dTL5/ImYx3a078IeuwqXMxQrzHopOG60w3uKot1rN7G45dZ8aKVfWday0TZ1hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705931543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rc9FQc4ZIB1DCmshIAuSQAt8Y/itztPXJE126PAMyzg=; b=y3x4sut8m2WNfim/43ZekokCqmoVBPAsh0O52KjP0rAj/RM2gvzd+1PzDz8qpMSevWUoxY EdigRdlVM0qxXeWyyjDdkc1V2Jd3oP5S1e/uD2ZJkfaqFjo8TVIlG+mfeDSL9XDo7vzQLy /t6q0HXLPOMSfJRCVNhiXLX9t+9/VietvJkajH+ALhdyXLZ/XyFVEUjELF2HAyniyb7Hgd c5JUUHr6qNQMc7/wcpX67eJSm4PpIDm1WGm0Oq1xDPEhrzhZKD1hcoYv/hKYtUsuOtrgN+ hWSukQsK985vtYJap+TjGz/62AlmhkqPnbHWFKd6TqnojQY0JI3kI7RzFOZwtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705931543; a=rsa-sha256; cv=none; b=G4AM5U6wVDXfl9L2zRyVyeR87pdpOCmXvOSf3JuiYV7qMpABZW9wHHu2yaCTqj0CpQPl8M Z7lixKAb9B46wFo3gdFXbUPI2wl6Pg3xULt64EO6vy5bQeTMJIIRhFr02TtjXHtP2ZnwWO Ha1c/lP3ljkJV4KXkz4rK9DOndP2AFdJ+vdIf6fk6FWRGpVpDGH6etTvKlL546omu7H6P0 trQEAI37ebs2ZwLceJ87E8b6V8DBlXb6rkEPf8cojAwcJGop+k3kXKXyqUGeS3shw9DMwY I77MPGOGmVIrSbSMrRhqv35wtIk7GVopOV/6kPgojBGkFAPvMMj1mIlpZL73UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJWqq2GJsz146p; Mon, 22 Jan 2024 13:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40MDqNaM048742; Mon, 22 Jan 2024 13:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MDqNud048739; Mon, 22 Jan 2024 13:52:23 GMT (envelope-from git) Date: Mon, 22 Jan 2024 13:52:23 GMT Message-Id: <202401221352.40MDqNud048739@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 430da911bcbb - main - sysutils/e2fsprogs-core: Sanitize MANPREFIX List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 430da911bcbbabafaaf2602ab4e30ba7b22d624d Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=430da911bcbbabafaaf2602ab4e30ba7b22d624d commit 430da911bcbbabafaaf2602ab4e30ba7b22d624d Author: Muhammad Moinur Rahman AuthorDate: 2024-01-22 13:08:51 +0000 Commit: Muhammad Moinur Rahman 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