Date: Wed, 4 Sep 2013 16:54:39 +0000 (UTC) From: Andrej Zverev <az@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326295 - head/Mk/Uses Message-ID: <201309041654.r84GsdLC005643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: az Date: Wed Sep 4 16:54:39 2013 New Revision: 326295 URL: http://svnweb.freebsd.org/changeset/ports/326295 Log: - Fix things after recent modbuildtiny commit Reviewed by: bapt@ Kudos to: bapt@ Modified: head/Mk/Uses/perl5.mk Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Wed Sep 4 16:54:13 2013 (r326294) +++ head/Mk/Uses/perl5.mk Wed Sep 4 16:54:39 2013 (r326295) @@ -153,12 +153,16 @@ _MANPAGES+= ${P5MAN${sect}:S%^%${PREFIX} .if ${_USE_PERL5:Mmodbuild} || ${_USE_PERL5:Mmodbuildtiny} _USE_PERL5+= configure CONFIGURE_SCRIPT?= Build.PL +.if ${_USE_PERL5:Mmodbuild} .if ${PORTNAME} != Module-Build BUILD_DEPENDS+= ${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build .endif +.endif .if ${_USE_PERL5:Mmodbuildtiny} +.if ${PORTNAME} != Module-Build-Tiny BUILD_DEPENDS+= ${SITE_PERL}/Module/Build/Tiny.pm:${PORTSDIR}/devel/p5-Module-Build-Tiny .endif +.endif ALL_TARGET?= PL_BUILD?= Build CONFIGURE_ARGS+= \ @@ -216,14 +220,14 @@ do-configure: @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} -.if !${_USE_PERL5:Mmodbuild} +.if !${_USE_PERL5:Mmodbuild*} @cd ${CONFIGURE_WRKSRC} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile .endif # ! modbuild .endif # !target(do-configure) .endif # configure -.if ${_USE_PERL5:Mmodbuild} +.if ${_USE_PERL5:Mmodbuild*} .if !target(do-build) do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309041654.r84GsdLC005643>