diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-09-23 20:07:18 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-09-23 20:07:18 +0000 |
| commit | b7af6146d2b62f3199efd5d72dec28c0df91bc0d (patch) | |
| tree | 546f87568dfdd858c7c14106585ede84daba58e6 | |
| parent | devel/py-hgtools: update to 4.0 (diff) | |
Introduce a new MANDIRS macros to make the compress-man determine where the makefiles should be found
Previous implementation was based on etc/man.d which doesn't exists in FreeBSD 8.
By default MANDIRS is ${MANPREFIX}/man. if a port adds USES=perl5 then the perl default locations is added
Reviewed by: bdrewery
| -rw-r--r-- | Mk/Uses/perl5.mk | 1 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 3 | ||||
| -rw-r--r-- | Mk/bsd.stage.mk | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index 8f69c14ac215..3c42b5e72c22 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -164,6 +164,7 @@ PLIST_SUB+= PERL5_MAN${sect}=lib/perl5/${PERL_VER}/man/man${sect}/ _MANPAGES+= ${P5MAN${sect}:S%^%${PREFIX}/lib/perl5/${PERL_VER}/man/man${sect}/%} .endif .endfor +MANDIRS+= ${PREFIX}/lib/perl5/${PERL_VER} .if ${_USE_PERL5:Mmodbuild} || ${_USE_PERL5:Mmodbuildtiny} _USE_PERL5+= configure diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 3db7dd6d1fa0..3395572ac14c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2889,7 +2889,7 @@ SET_LATE_CONFIGURE_ARGS= \ SCRIPTS_ENV+= CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \ WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \ SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \ - PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} + PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} .if defined(BATCH) SCRIPTS_ENV+= BATCH=yes @@ -2901,6 +2901,7 @@ MANPREFIX?= /usr/share MANPREFIX?= ${PREFIX} .endif +MANDIRS+= ${MANPREFIX}/man .for sect in 1 2 3 4 5 6 7 8 9 MAN${sect}PREFIX?= ${MANPREFIX} .endfor diff --git a/Mk/bsd.stage.mk b/Mk/bsd.stage.mk index bb3c32d5ec45..7c81d76955a8 100644 --- a/Mk/bsd.stage.mk +++ b/Mk/bsd.stage.mk @@ -25,8 +25,8 @@ stage-dir: .if !target(compress-man) compress-man: @${ECHO_CMD} "====> Compressing man pages" ; \ - mdirs="${STAGEDIR}${MANPREFIX}/man"; \ - for dir in `cat ${LOCALBASE}/etc/man.d/*.conf ${STAGEDIR}${PREFIX}/etc/man.d/*.conf 2>/dev/null| awk -vstagedir=${STAGEDIR} '{ print stagedir$$2 }'` ; do \ + mdirs= ; \ + for dir in ${MANDIRS:S/^/${STAGEDIR}/} ; do \ [ -d $$dir ] && mdirs="$$mdirs $$dir" ;\ done ; \ for dir in $$mdirs; do \ |