From owner-p4-projects@FreeBSD.ORG  Tue Jul 31 13:29:24 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8885816A420; Tue, 31 Jul 2007 13:29:24 +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 45E2416A41F
	for <perforce@freebsd.org>; Tue, 31 Jul 2007 13:29:24 +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 2B82613C4D5
	for <perforce@freebsd.org>; Tue, 31 Jul 2007 13:29:24 +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 l6VDTOiS039162
	for <perforce@freebsd.org>; Tue, 31 Jul 2007 13:29:24 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6VDTNVq039135
	for perforce@freebsd.org; Tue, 31 Jul 2007 13:29:23 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 31 Jul 2007 13:29:23 GMT
Message-Id: <200707311329.l6VDTNVq039135@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 124419 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jul 2007 13:29:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=124419

Change 124419 by gabor@gabor_server on 2007/07/31 13:28:34

	- Rework do-configure and do-build a bit

Affected files ...

.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#4 edit
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.mk#5 edit

Differences ...

==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#4 (text+ko) ====

@@ -77,10 +77,10 @@
 
 .if defined(PERL_CONFIGURE)
 USE_PERL5=	yes
-.if (defined(BATCH) && !defined(IS_INTERACTIVE))
+.if defined(BATCH) && !defined(IS_INTERACTIVE)
 CONFIGURE_ENV+=	PERL_MM_USE_DEFAULT="YES"
-.endif
-.endif
+.endif # defined(BATCH) && !defined(IS_INTERACTIVE)
+.endif # defined(PERL_CONFIGURE)
 
 EXTRACT_DEPENDS+=	${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
 PATCH_DEPENDS+=		${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
@@ -95,6 +95,26 @@
 CONFIGURE_SCRIPT?=	Makefile.PL
 MAN3PREFIX?=		${PREFIX}/lib/perl5/${PERL_VERSION}
 .undef HAS_CONFIGURE
-.endif
+.endif # defined(PERL_CONFIGURE)
+
+.if defined(PERL_CONFIGURE)
+.if !target(do-configure)
+do-configure:
+	@cd ${CONFIGURE_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} \
+		${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+.if !defined(PERL_MODBUILD)
+	@cd ${CONFIGURE_WRKSRC} && \
+		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
+.endif # !defined(PERL_MODBUILD)
+.endif # !target(do-configure)
+.endif # defined(PERL_CONFIGURE)
+
+.if defined(PERL_MODBUILD)
 
-.endif
+.if !target(do-build)
+do-build:
+        @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
+.endif # !target(do-build)
+.endif # defined(PERL_MODBUILD)
+.endif # !defined(_PERLMKINCLUDED)

==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.mk#5 (text+ko) ====

@@ -3556,15 +3556,6 @@
 			 ${FALSE}; \
 		fi)
 .endif
-.if defined(PERL_CONFIGURE)
-	@cd ${CONFIGURE_WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} \
-		${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
-.if !defined(PERL_MODBUILD)
-	@cd ${CONFIGURE_WRKSRC} && \
-		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
-.endif
-.endif
 .if defined(USE_IMAKE)
 	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
 .endif
@@ -3577,13 +3568,9 @@
 .if defined(USE_GMAKE)
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .else
-.if defined(PERL_MODBUILD)
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
-.else
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .endif
 .endif
-.endif
 
 # Check conflicts