The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f580578877c9c11ebe9103b203412680a87c64e2
commit f580578877c9c11ebe9103b203412680a87c64e2
Author: Ricardo Branco <rbra...@suse.de>
AuthorDate: 2024-06-16 18:39:49 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2025-06-12 19:55:51 +0000
Makefile.inc1: Cleanup (un)compressed manpages
When switching between compressed and uncompressed manual pages, the
other type is left behind as divots. Compensate by removing the
now-unwanted man pages automatically.
Reviewed by: imp, jhb
Pull Request: https://github.com/freebsd/freebsd-src/pull/1295
---
Makefile.inc1 | 36 ++++++++++++++++++++++++++++++++++++
share/mk/bsd.man.mk | 6 ++----
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index fc61f5ec54c6..157be6dfdfc6 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3512,6 +3512,25 @@ delete-old-files: .PHONY
rm ${RM_I} $${catpage} <&3; \
fi; \
done
+# Remove compressed copies of uncompressed manpages
+.if ${MK_MANCOMPRESS} != "yes"
+ @exec 3<&0; \
+ find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man ! -type
d ! -name \*.gz 2>/dev/null | \
+ while read manpage; do \
+ if [ -e "$${manpage}.gz" ]; then \
+ rm ${RM_I} $${manpage}.gz <&3; \
+ fi; \
+ done
+# Remove uncompressed copies of compressed manpages
+.else
+ @exec 3<&0; \
+ find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man ! -type
d ! -name \*.gz 2>/dev/null | \
+ while read manpage; do \
+ if [ -e "$${manpage}.gz" ]; then \
+ rm ${RM_I} $${manpage} <&3; \
+ fi; \
+ done
+.endif
@echo ">>> Old files removed"
check-old-files: .PHONY
@@ -3537,6 +3556,23 @@ check-old-files: .PHONY
echo $${catpage}; \
fi; \
done | sort
+# Check for compressed copies of uncompressed manpages
+.if ${MK_MANCOMPRESS} != "yes"
+ @find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man ! -type
d ! -name \*.gz 2>/dev/null | \
+ while read manpage; do \
+ if [ -e "$${manpage}.gz" ]; then \
+ echo $${manpage}.gz; \
+ fi; \
+ done | sort
+# Check for uncompressed copies of compressed manpages
+.else
+ @find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man ! -type
d ! -name \*.gz 2>/dev/null | \
+ while read manpage; do \
+ if [ -e "$${manpage}.gz" ]; then \
+ echo $${manpage}; \
+ fi; \
+ done | sort
+.endif
list-old-libs: .PHONY
@cd ${.CURDIR}; \
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 2845d0c1fc1c..96b8f07c25e2 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -237,11 +237,9 @@ maninstall: ${MAN}
# On MacOS, assume case folding FS, and don't install links from foo.x to
FOO.x.
.if ${.MAKE.OS} != "Darwin" || ${l:tu} != ${t:tu}
.if ${MK_MANSPLITPKG} == "no"
- rm -f ${DESTDIR}${t} ${DESTDIR}${t}${MCOMPRESS_EXT}; \
- ${INSTALL_MANLINK} ${TAG_ARGS} ${DESTDIR}${l}${ZEXT}
${DESTDIR}${t}${ZEXT}
+ ${INSTALL_MANLINK} ${TAG_ARGS} ${DESTDIR}${l}${ZEXT}
${DESTDIR}${t}${ZEXT}
.else
- rm -f ${DESTDIR}${t} ${DESTDIR}${t}${MCOMPRESS_EXT}; \
- ${INSTALL_MANLINK} ${TAG_ARGS:D${TAG_ARGS},man}
${DESTDIR}${l}${ZEXT} ${DESTDIR}${t}${ZEXT}
+ ${INSTALL_MANLINK} ${TAG_ARGS:D${TAG_ARGS},man} ${DESTDIR}${l}${ZEXT}
${DESTDIR}${t}${ZEXT}
.endif
.endif
.endfor
