From owner-svn-ports-all@FreeBSD.ORG Mon Sep 23 20:07:19 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 64C014E1; Mon, 23 Sep 2013 20:07:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 37F4425F6; Mon, 23 Sep 2013 20:07:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NK7JGE034261; Mon, 23 Sep 2013 20:07:19 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8NK7IKP034258; Mon, 23 Sep 2013 20:07:18 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201309232007.r8NK7IKP034258@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 23 Sep 2013 20:07:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328037 - in head/Mk: . Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2013 20:07:19 -0000 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 \