diff options
| author | Muhammad Moinur Rahman <bofh@freebsd.org> | 2024-04-11 15:32:07 +0300 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2024-04-11 21:51:09 +0300 |
| commit | 9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9 (patch) | |
| tree | 658608832cb6330ed99fd4ce481c9bd5786f611f | |
| parent | Mk/Uses: Fix feature checks after my previous {WITH,WITHOUT}_*_PORTS change (diff) | |
Framework: Finalize switch to share/man for manpages
PR: 277603
Approved by: portmgr
| -rw-r--r-- | Mk/bsd.port.mk | 6 | ||||
| -rw-r--r-- | 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 |