From nobody Thu Jun 12 19:56:43 2025 X-Original-To: dev-commits-src-all@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 4bJCwC6wrgz5yKSw; Thu, 12 Jun 2025 19:56:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJCwC42Pyz3lfc; Thu, 12 Jun 2025 19:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749758203; 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=Ykv30TDrVsdhk9wOb6xocjnunczecUwvMpvlt8zuPpw=; b=bXWEIFQrTX4siw5oEODzZ7D7PlNiXCzCzkT5d7QXU8o7XJeo/kyiQA+9t7Dqjh1B1EdiIM vPNvqllh+T3sDxwNpyGQnPeDK7U+dRN1O/1WpLaGd2++z/AEx38mHS3mbPA7MOMPB2h7Vc JG4VMX9txSJPPPd3tx9BwE+wmqgCjSOel+LVnylI1Jg5TwCOCiRmFb4QB8mIphkDpbU6Ph 0WsKG7+d3kkzE5bYv/gtpPnf4IxmipnXxqZLzo2bXsPE0d1QmTmPOVOts8Tk5HF/YNKUNn GpWGYrTXnrfrh7TSqM1hG24Ip9W+eXIGabCPKdBMOfO+cgITRfsGNdYxssLjUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749758203; 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=Ykv30TDrVsdhk9wOb6xocjnunczecUwvMpvlt8zuPpw=; b=UFtaccyBVYIPvdVk348fv/Eq+/o5p8PIupzq8bTtYlfxczn6qYU7SH46loYntuFxFBTOgg WJQBmB/ja+IiVtZcQzWnSfDbXeLvzxDCmRGtbWdIlVZuWp3mHpyo09XV8uhC6rxhQE93QC fsKRQPRA0aZfF78ZsPUu/OzQamLBhPGh1/b4ndXX99TIwqUqkXLvBz2fdBNLtMDXItGyCb PyKvmSkbTiQE5fGy1mQlqmufGs4jT7FfetvhcolI91Dz5lT/DREeRt3/A8U/EIbdIzxN/o aXp/C2Uj/C4pQLoFtSB/9t2TsSi6B8F2pomtUSLZZ214Lhy22QJ/oZuCsHk4iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749758203; a=rsa-sha256; cv=none; b=px/6fkopBaa494RbYVfIad+lDrqtU2ZqMKkgdty2oJhvXfdbh/5mcGDJBsxodSwP23AeLa i/cIIIbvyxa/joISovhbSHEGCG6RJ66DpNtA0ggKRKmyih8oaIgHbrRj+tbF8J95UxBvRK oa8qEA7fUF+j65JaAWPta+hIh9ftAcnl1xIARv4KP7vNwRF8SpuuABncKTELXHLIz5iu/h 2q2ddfaGBR1yeXAHX8JLoxNVkQxTRb7MDaT+HKvtfiwhjoKTDTZKH5lbR5pQ5v+06O3X+5 eqEOFnBc5aYDTYy7jgHPQyvWNle8PZDEXSaoedoZxcm5a3/gICSdVNumvL5jjA== 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 4bJCwC3bp8z9xk; Thu, 12 Jun 2025 19:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55CJuhGL074388; Thu, 12 Jun 2025 19:56:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55CJuh9k074385; Thu, 12 Jun 2025 19:56:43 GMT (envelope-from git) Date: Thu, 12 Jun 2025 19:56:43 GMT Message-Id: <202506121956.55CJuh9k074385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f580578877c9 - main - Makefile.inc1: Cleanup (un)compressed manpages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f580578877c9c11ebe9103b203412680a87c64e2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f580578877c9c11ebe9103b203412680a87c64e2 commit f580578877c9c11ebe9103b203412680a87c64e2 Author: Ricardo Branco AuthorDate: 2024-06-16 18:39:49 +0000 Commit: Warner Losh 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