From nobody Mon Jan 29 22:26:17 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 4TP2vY5mgHz59X7k; Mon, 29 Jan 2024 22:26:17 +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 4TP2vY57R8z4clf; Mon, 29 Jan 2024 22:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567177; 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=9HLUkN4/0mSwJxuIOKP/Vgfr6TII3yFvJd6j1D6jId8=; b=kxP3SCnufq+6wvGR/tiAAVNPYE2IFevwg+A5kUQ2aDT+ThPlfiO0Iujg1PGdiGIPd7xjyC e5bTVf2ZAVsq8EctmgED1g/HU8ffBqW1edFxEo56K4V+y29CwKGRXe1pTqqHKhsj76Czkb yYD0fEnAQfMvXZKgYKYenIVmWPf32QY1G1G1zd7ltohpj7j7EoVlEUSmQcKrZKoOWcg6+t xQ8QlOIvXtGs+31f+z4MUXvSxAGsw/b4BdU1mEv+EBkmUgkYBk7K8VcV2yy1UeRw3mw9HZ 33KH+SdlqLKleUSUwR2UkQogMOf6/GBS9h4nE8VxU74vXiD8J5vFlMFoqH15Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567177; 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=9HLUkN4/0mSwJxuIOKP/Vgfr6TII3yFvJd6j1D6jId8=; b=U1pOkHRDJQonUWNaSdZrtDz0KFGjjQuKYUfJSYqhgKs6ruoW8Uzr7jhvGYpo6UNsBXmXTm PT2p0vLFQskeHJFLZJ8pblcb3Rpz/L8XzqnXk9qQkX5Ij4IggBh2EyACMNihpfAEqKMB81 Snme46raO56WcQbNqVWn/irJOqRjI1lN6plSxd67YbdoYbUVaOWpyi2oO6CyfzGC4Qky5e yflamRjPa5jfjLRh7O1b9ZHBKVoeId9nqsV27+soidm8DLgo1JfmHeLAp8jwfzRejKH6/8 +SN+Uf4E6aBXxow+5Ex6YE8me86C1YpN3ctz1WUsNMFmw+E7QrsKR+7D9QGsDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567177; a=rsa-sha256; cv=none; b=dwbajmOSPV9xixGNwecV5XtNS0IeiLyql9FwX98E7ZOi8/yDJvuBylTzmmlCYPSlL/Vzx+ llY4H4ufj7xEfzTviZcBiwsHxUBDxe6bPX/Qh92FIGsIw8QRdL3WEsXeJIrf2kUDfva6+/ BqVS724/+GDw10OnQkX5PyTQJGUPVAGCs8HPItkxhtouEYh4aR695RlJN4rnQC3VxHDVym WqBlFmjp1FP0oh1/ghZq/n9dyFGy6Z5VpwtZUFpvXWZ7oGZbcDeuFBGG21WMQVeLZA/bkK KjbXlBKDbAP3BoAb7hfH2JfgjHaEyKHR/+GGdQthu4jwgMEycV88vcIiZdzHhw== 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 4TP2vY4CPKz18VL; Mon, 29 Jan 2024 22:26:17 +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 40TMQHbw095702; Mon, 29 Jan 2024 22:26:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMQHUp095699; Mon, 29 Jan 2024 22:26:17 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:26:17 GMT Message-Id: <202401292226.40TMQHUp095699@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: 8f80d6dde15c - main - Mk/bsd.port.mk: Sunset 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: 8f80d6dde15c23f550d7f2201299c04e49d91ecc Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f80d6dde15c23f550d7f2201299c04e49d91ecc commit 8f80d6dde15c23f550d7f2201299c04e49d91ecc Author: Muhammad Moinur Rahman AuthorDate: 2024-01-29 20:53:06 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-29 22:25:54 +0000 Mk/bsd.port.mk: Sunset MANPREFIX For historical reasons FreeBSD had been using PREFIX/man to install man pages and a variable MANPREFIX was utilized to do this. While the rest of the UNIX/Linux world had been mostly using PREFIX/share. As the first step of moving to PREFIX/share/man this commit removes all the references to the MANPREFIX variable. Apart from MAKE_ARGS this variable no longer exists and should not be used to refer to PREFIX anymore in the future. The entire shift to PREFIX/share/man will take some more times as there are around 4000 ports which installs man page to PREFIX/man. PR: 276551 Approved by: portmgr (exp-run) --- Mk/bsd.port.mk | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index f9eb4aebcb6a..0f0aa8c2c392 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -501,9 +501,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Installs all directories and files from ${WRKSRC}/doc # to ${DOCSDIR} except sed(1) backup files. # -# MANPREFIX - The directory prefix for manual pages. -# Default: ${PREFIX} -# # Set the following to specify all .info files your port installs. # # INFO - A list of .info files (omitting the trailing ".info"); @@ -752,7 +749,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - Pass these args to configure if ${HAS_CONFIGURE} is set. # Default: "--prefix=${GNU_CONFIGURE_PREFIX} # --infodir=${PREFIX}/${INFO_PATH} --localstatedir=/var -# --mandir=${MANPREFIX}/man --build=${CONFIGURE_TARGET}" if +# --mandir=${PREFIX}/man --build=${CONFIGURE_TARGET}" if # GNU_CONFIGURE is set, "CC=${CC} CFLAGS=${CFLAGS} # PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib # INSTALLARCHLIB=${PREFIX}/lib" if USES=perl5 and @@ -2028,8 +2025,7 @@ MAKE_ENV+= PREFIX=${PREFIX} \ CC="${CC}" CFLAGS="${CFLAGS}" \ CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ - CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - MANPREFIX="${MANPREFIX}" + CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher. # gcc 4.x enable strict aliasing optimization with -O2 which is known to break @@ -2701,7 +2697,7 @@ CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax . endif _EXPORTED_VARS+= CONFIGURE_MAX_CMD_LEN GNU_CONFIGURE_PREFIX?= ${PREFIX} -GNU_CONFIGURE_MANPREFIX?= ${MANPREFIX} +GNU_CONFIGURE_MANPREFIX?= ${PREFIX} CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS} . if defined(CROSS_TOOLCHAIN) CROSS_HOST= ${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL} @@ -2745,14 +2741,9 @@ SCRIPTS_ENV+= CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \ SCRIPTS_ENV+= BATCH=yes . endif -. if ${PREFIX} == /usr -MANPREFIX?= /usr/share -. else -MANPREFIX?= ${PREFIX} MANDIRS+= ${PREFIX}/share/man -. endif -MANDIRS+= ${MANPREFIX}/man +MANDIRS+= ${PREFIX}/man INFO_PATH?= share/info . if defined(INFO)