From owner-svn-ports-all@FreeBSD.ORG  Wed Sep  4 16:54:39 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 DD80D7D6;
 Wed,  4 Sep 2013 16:54:39 +0000 (UTC) (envelope-from az@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 CBC96226A;
 Wed,  4 Sep 2013 16:54:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r84Gsdc9005644;
 Wed, 4 Sep 2013 16:54:39 GMT (envelope-from az@svn.freebsd.org)
Received: (from az@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r84GsdLC005643;
 Wed, 4 Sep 2013 16:54:39 GMT (envelope-from az@svn.freebsd.org)
Message-Id: <201309041654.r84GsdLC005643@svn.freebsd.org>
From: Andrej Zverev <az@FreeBSD.org>
Date: Wed, 4 Sep 2013 16:54:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326295 - 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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Sep 2013 16:54:39 -0000

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})