Skip to content

Commit

Permalink
Framework: Finalize switch to share/man for manpages
Browse files Browse the repository at this point in the history
PR:		277603
Approved by:	portmgr
  • Loading branch information
5u623l20 authored and arrowd committed Apr 11, 2024
1 parent 665b021 commit 9fd7ee1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 228 deletions.
6 changes: 2 additions & 4 deletions Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ FreeBSD_MAINTAINER= [email protected]
# - 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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -2775,8 +2775,6 @@ SCRIPTS_ENV+= BATCH=yes
. endif

MANDIRS+= ${PREFIX}/share/man

MANDIRS+= ${PREFIX}/man
INFO_PATH?= share/info

. if defined(INFO)
Expand Down
226 changes: 2 additions & 224 deletions Templates/BSD.local.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -671,8 +451,7 @@
..
cat9
..
es uname=root
/set uname=root
es
man7
..
man8
Expand All @@ -688,8 +467,7 @@
man8
..
..
ja uname=root
/set uname=root
ja
man1
..
man7
Expand Down

0 comments on commit 9fd7ee1

Please sign in to comment.