From owner-p4-projects@FreeBSD.ORG Tue Jul 31 12:54:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03BCE16A41A; Tue, 31 Jul 2007 12:54:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99C0A16A41F for ; Tue, 31 Jul 2007 12:54:40 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7EFE813C45E for ; Tue, 31 Jul 2007 12:54:40 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6VCses2031278 for ; Tue, 31 Jul 2007 12:54:40 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6VCseu9031275 for perforce@freebsd.org; Tue, 31 Jul 2007 12:54:40 GMT (envelope-from gabor@freebsd.org) Date: Tue, 31 Jul 2007 12:54:40 GMT Message-Id: <200707311254.l6VCseu9031275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 124418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2007 12:54:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=124418 Change 124418 by gabor@gabor_server on 2007/07/31 12:53:55 - Also include bsd.perl.mk if PERL_CONFIGURE or PERL_MODBUILD is set - We're always having PERL5 in EXTRACT_DEPENDS, PATCH_DEPENDS and BUILD_DEPENDS when bsd.perl.mk is included, so remove the superfluous condition Affected files ... .. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#3 edit .. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.mk#4 edit Differences ... ==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#3 (text+ko) ==== @@ -82,11 +82,9 @@ .endif .endif -.if defined(USE_PERL5) || defined(USE_PERL5_BUILD) EXTRACT_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} PATCH_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} BUILD_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} -.endif .if defined(USE_PERL5) || defined(USE_PERL5_RUN) RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif ==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.mk#4 (text+ko) ==== @@ -1400,7 +1400,7 @@ .include "${PORTSDIR}/Mk/bsd.gnustep.mk" .endif -.if defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) +.if defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD) .include "${PORTSDIR}/Mk/bsd.perl.mk" .endif