aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2022-01-18 19:01:55 +0000
committerMatthias Andree <mandree@FreeBSD.org>2022-01-18 19:03:32 +0000
commitcee87a1eefc85598a47f07fed7052b118e2992b1 (patch)
treeba791d7b8c86e346759ecf1fd97ae4b8914209c9
parent6d5dba7b5acdb1f0566257071d664cb95ae22a54 (diff)
downloadports-cee87a1eefc85598a47f07fed7052b118e2992b1.tar.gz
ports-cee87a1eefc85598a47f07fed7052b118e2992b1.zip
sysutils/e2fsprogs: resolve krb5 conflict with man3/com_err.3.gz
PR: 254751 Reported by: Felix Palmen
-rw-r--r--sysutils/e2fsprogs/Makefile6
-rw-r--r--sysutils/e2fsprogs/files/patch-lib_et_com__err.311
-rw-r--r--sysutils/e2fsprogs/pkg-plist2
3 files changed, 16 insertions, 3 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 45e9ef9ed007..e73c4b14d5de 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -14,7 +14,7 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.46.4
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -355,11 +355,13 @@ post-install:
${XARGS} <${FILESDIR}/unwanted ${RM} && \
${RMDIR} include/e2fsprogs/blkid
${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
- ${MV} ${STAGEDIR}${PREFIX}/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/man/man1/e2fsprogs-compile_et.1
+ ${MV} ${STAGEDIR}${MANPREFIX}/man/man1/compile_et.1 ${STAGEDIR}${MANPREFIX}/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
#
# the next line closes .if ${MASTERDIR} == ${.CURDIR}
diff --git a/sysutils/e2fsprogs/files/patch-lib_et_com__err.3 b/sysutils/e2fsprogs/files/patch-lib_et_com__err.3
new file mode 100644
index 000000000000..bc3b522f46ea
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-lib_et_com__err.3
@@ -0,0 +1,11 @@
+--- lib/et/com_err.3.orig 2021-08-19 02:53:01 UTC
++++ lib/et/com_err.3
+@@ -18,6 +18,8 @@ proc = reset_com_err_hook ();
+ void initialize_XXXX_error_table ();
+ .fi
+ .SH DESCRIPTION
++This is the manual page for com_err as bundled with the e2fsprogs package.
++.P
+ .I Com_err
+ displays an error message on the standard error stream
+ .I stderr
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index c6eb8d74c70f..a0e5ddf05f4f 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -47,7 +47,7 @@ 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/com_err.3.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