From nobody Thu Apr 11 18:54:41 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 4VFplj5VGRz5Htk1; Thu, 11 Apr 2024 18:54:41 +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 4VFplj4v86z4k1S; Thu, 11 Apr 2024 18:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712861681; 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=9YfO4tKYxqGfDtQQ0QZDL4wn4A5fC/qL3qHq6X2EvF4=; b=VOUcnkIMeAlRjL5XewRjuUMaz+0s2OkAz86CvuAZf5Ysp2GEdzCIyBGTgMQzpcopu8QDS2 lnBTpVuvjhdY+TaDlw8Z6dvFZdOrd9DMvI4A9oC0wohuNZVWhaiCYhX62RmCAzdOh30CXL hmwLkezTY9pdW4EPoQwC+Ugy2bmXpWDxldsA/TrhRmbw8aHoxI2F8AIJ2y3HmQilf40lKm VvdSPuLOv5esopW6/I18w+fOsjp5vm1Gc8UTO+pZGM44yV+awuIsa349YlQn5X0F3V58dB mnSef0X95X6FutYx1HcKqz8n05Mk+dV7RgezP7CNZeMlWOIZXsbEqhj4KcR+tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712861681; a=rsa-sha256; cv=none; b=C6DHfbSBXCZBE/B8oVeIYDMJByAYLCd9Wb3giXZv9DF+s+WKEnIOTNoGVHpBK9AEPwAbkS 0DwJPu0VcBzSjDCbkG7joyO7qEdVVtM5cUKQa0nOq1mL3k8MFn8ghhxzJ9aJXCY+YwypJ6 z+VeGeyIaoJour6GD146ZXe4yhcoFr8B6+Aemjtsdg9VAmddZ52xRn4xTak1Pgj+c9Vnq5 GB6JGkfBxlAWune0+nZAureZJUw+nsVFkgP6Fx7kKMU1z49yraKaozOYjr0QH2/8y8lOrv Dwmsoa7lIVhx/XH0BpPXD6TVJ07Wr2Rq3u/8rce7USUgUyIHi9bhqBvqLuu/+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712861681; 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=9YfO4tKYxqGfDtQQ0QZDL4wn4A5fC/qL3qHq6X2EvF4=; b=AxZY5rrm1+9FH+YP1c46WcGjJ6RNdQd1Kv7+qKmIvEyG7T6X6Jk8HGGEaZ9mpDVO01BWpy uL5ObUr7vb7EUuJl5grnZlIovfQBtZsEXWr9Y9ZVNfFD9Pup1Exn+LZcAi57UfasJ1kN4r exLqO7YdVxvBCKupg03zg+qZFvap5/L2T6p2g2egNFyWZvVKCwB7c7mOR8VSjklEHXJnJe lZECtCfwiHh1x9dRz23bk4S7l5KQgo8sfMskYvrL4yK8Q+t2I0usqY6PaYHS0jdYJvzdo9 +Rk7UTCfQOUdxLJ3iTlVNJVab7aGOT1C1qNB5LRKCk7TdRO/vhYIJuI8a/NGfQ== 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 4VFplj4VC0zHhl; Thu, 11 Apr 2024 18:54:41 +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 43BIsfpn005972; Thu, 11 Apr 2024 18:54:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BIsf1X005969; Thu, 11 Apr 2024 18:54:41 GMT (envelope-from git) Date: Thu, 11 Apr 2024 18:54:41 GMT Message-Id: <202404111854.43BIsf1X005969@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 9fd7ee1cdf6c - main - Framework: Finalize switch to share/man for manpages 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: dev-commits-ports-main+owner@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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9 commit 9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9 Author: Muhammad Moinur Rahman AuthorDate: 2024-04-11 12:32:07 +0000 Commit: Gleb Popov CommitDate: 2024-04-11 18:51:09 +0000 Framework: Finalize switch to share/man for manpages PR: 277603 Approved by: portmgr --- Mk/bsd.port.mk | 6 +- Templates/BSD.local.dist | 226 +---------------------------------------------- 2 files changed, 4 insertions(+), 228 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e120b2cd1632..1176da04e80e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -751,7 +751,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=${PREFIX}/man --build=${CONFIGURE_TARGET}" if +# --mandir=${PREFIX}/share/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 @@ -2730,7 +2730,7 @@ CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax . endif _EXPORTED_VARS+= CONFIGURE_MAX_CMD_LEN GNU_CONFIGURE_PREFIX?= ${PREFIX} -GNU_CONFIGURE_MANPREFIX?= ${PREFIX} +GNU_CONFIGURE_MANPREFIX?= ${PREFIX}/share CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS} . if defined(CROSS_TOOLCHAIN) CROSS_HOST= ${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL} @@ -2775,8 +2775,6 @@ SCRIPTS_ENV+= BATCH=yes . endif MANDIRS+= ${PREFIX}/share/man - -MANDIRS+= ${PREFIX}/man INFO_PATH?= share/info . if defined(INFO) diff --git a/Templates/BSD.local.dist b/Templates/BSD.local.dist index cdb864c54f8e..e40c6ae581e8 100644 --- a/Templates/BSD.local.dist +++ b/Templates/BSD.local.dist @@ -43,226 +43,6 @@ .. libexec .. - man -/set uname=man - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - .. - cat9 - .. - catl - .. - catn - .. - de.ISO8859-1 uname=root - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - .. - cat9 - .. - catl - .. - catn - .. -/set uname=root - man1 - .. - man2 - .. - man3 - .. - man4 - .. - man5 - .. - man6 - .. - man7 - .. - man8 - .. - man9 - .. - manl - .. - mann - .. - .. - en.ISO8859-1 -/set uname=man - cat1 - .. - cat1aout - .. - cat2 - .. - cat3 - .. - cat4 - i386 - .. - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - i386 - .. - .. - cat9 - i386 - .. - .. - catn - .. - .. - ja uname=root - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - .. - cat9 - .. - catl - .. - catn - .. -/set uname=root - man1 - .. - man2 - .. - man3 - .. - man4 - .. - man5 - .. - man6 - .. - man7 - .. - man8 - .. - man9 - .. - manl - .. - mann - .. - .. - man1 - .. - man2 - .. - man3 - .. - man4 - .. - man5 - .. - man6 - .. - man7 - .. - man8 - .. - man9 - .. - manl - .. - mann - .. - ru.KOI8-R -/set uname=man - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - .. - cat9 - .. - catl - .. - catn - .. -/set uname=root - man1 - .. - man2 - .. - man3 - .. - man4 - .. - man5 - .. - man6 - .. - man7 - .. - man8 - .. - man9 - .. - manl - .. - mann - .. - .. - .. sbin .. share @@ -671,8 +451,7 @@ .. cat9 .. - es uname=root -/set uname=root + es man7 .. man8 @@ -688,8 +467,7 @@ man8 .. .. - ja uname=root -/set uname=root + ja man1 .. man7