From sem@ciam.ru  Sat Jan  3 20:32:24 2004
Return-Path: <sem@ciam.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A60DB16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  3 Jan 2004 20:32:24 -0800 (PST)
Received: from harp.mtu.ru (harp.mtu.ru [212.188.8.34])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4EB1B43D66
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  3 Jan 2004 20:32:21 -0800 (PST)
	(envelope-from sem@ciam.ru)
Received: from hueymiccailhuitl.mtu.ru (hueytecuilhuitl.mtu.ru [195.34.32.123])
	by harp.mtu.ru (Postfix) with ESMTP id EAD5B23AE1
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  4 Jan 2004 07:32:19 +0300 (MSK)
Received: from Current.sem-home.ciam.ru (ppp137-58.dialup.mtu-net.ru [62.118.137.58])
	by hueymiccailhuitl.mtu.ru (Postfix) with ESMTP id F2324165D9B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  4 Jan 2004 07:32:18 +0300 (MSK)
	(envelope-from sem@ciam.ru)
Received: from root by Current.sem-home.ciam.ru with local (Exim 4.24; FreeBSD)
	id 1Aczw6-000350-2C
	for FreeBSD-gnats-submit@freebsd.org; Sun, 04 Jan 2004 07:32:22 +0300
Message-Id: <E1Aczw6-000350-2C@Current.sem-home.ciam.ru>
Date: Sun, 04 Jan 2004 07:32:22 +0300
From: Sergey Matveychuk <sem@ciam.ru>
Reply-To: Sergey Matveychuk <sem@ciam.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: bsd.port.mk: resort configure target and split do-configure
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         60882
>Category:       ports
>Synopsis:       bsd.port.mk: resort configure target and split do-configure
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 03 20:40:19 PST 2004
>Closed-Date:    Tue Jan 20 11:18:20 PST 2004
>Last-Modified:  Tue Jan 20 11:18:20 PST 2004
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD Current.sem-home.ciam.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Fri Nov 21 07:47:47 MSK 2003 root@Current.sem-home.ciam.ru:/usr/obj/usr/src/sys/CURRENT i386


	
>Description:
	
	* Some ports want to run aclocal. The best place for this IMO
	is pre-configure target. But it fails because of patch-libtool target
	placed before pre-configure target. So ports maintainers have to
	run aclocal in post-patch target. This patch resorts _CONFIGURE_SEQ
	to run pre-configure target before patch-libtool.

	* It's possible some maintainers can want run autotools with own
	way. Now autotools is run in do-configure target. This patch split
	do-configure onto run-autotools and do-configure where only configure
	script runs.
>How-To-Repeat:
	
>Fix:

	

--- fix-configure.patch begins here ---
--- bsd.port.mk.local	Sat Jan  3 23:07:27 2004
+++ bsd.port.mk	Sun Jan  4 07:12:36 2004
@@ -3018,8 +3018,8 @@
 
 # Configure
 
-.if !target(do-configure)
-do-configure:
+.if !target(run-autotools)
+run-autotools:
 .if defined(USE_AUTOMAKE)
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${AUTOMAKE} \
 		${AUTOMAKE_ARGS})
@@ -3032,6 +3032,10 @@
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOHEADER_ENV} ${AUTOHEADER} \
 		${AUTOHEADER_ARGS})
 .endif
+.endif
+
+.if !target(do-configure)
+do-configure:
 	@if [ -f ${SCRIPTDIR}/configure ]; then \
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
 		  ${SCRIPTDIR}/configure; \
@@ -3436,8 +3440,8 @@
 				do-patch post-patch post-patch-script
 _CONFIGURE_DEP=	patch
 _CONFIGURE_SEQ=	build-depends lib-depends misc-depends configure-message \
-				patch-libtool pre-configure pre-configure-script \
-				do-configure post-configure post-configure-script
+				pre-configure pre-configure-script patch-libtool \
+				run-autotools do-configure post-configure post-configure-script
 _BUILD_DEP=		configure
 _BUILD_SEQ=		build-message pre-build pre-build-script do-build \
 				post-build post-build-script
--- fix-configure.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Sat Jan 3 23:45:13 PST 2004 
Responsible-Changed-Why:  
Over to portmgr. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60882 
State-Changed-From-To: open->analyzed 
State-Changed-By: marcus 
State-Changed-When: Tue Jan 13 20:27:01 PST 2004 
State-Changed-Why:  
This is currently being tested on bento. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60882 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Jan 20 11:18:09 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60882 
>Unformatted:
