svn commit: r328037 - in head/Mk: . Uses
Baptiste Daroussin
bapt at FreeBSD.org
Mon Sep 23 20:07:19 UTC 2013
Author: bapt
Date: Mon Sep 23 20:07:18 2013
New Revision: 328037
URL: http://svnweb.freebsd.org/changeset/ports/328037
Log:
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
Modified:
head/Mk/Uses/perl5.mk
head/Mk/bsd.port.mk
head/Mk/bsd.stage.mk
Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk Mon Sep 23 20:01:31 2013 (r328036)
+++ head/Mk/Uses/perl5.mk Mon Sep 23 20:07:18 2013 (r328037)
@@ -164,6 +164,7 @@ PLIST_SUB+= PERL5_MAN${sect}=lib/perl5/$
_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
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Mon Sep 23 20:01:31 2013 (r328036)
+++ head/Mk/bsd.port.mk Mon Sep 23 20:07:18 2013 (r328037)
@@ -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
Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk Mon Sep 23 20:01:31 2013 (r328036)
+++ head/Mk/bsd.stage.mk Mon Sep 23 20:07:18 2013 (r328037)
@@ -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 \
More information about the svn-ports-all
mailing list