From owner-svn-src-stable-7@FreeBSD.ORG  Mon Jul  2 22:19:03 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE4EA10658E5;
	Mon,  2 Jul 2012 22:19:03 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6426E8FC0A;
	Mon,  2 Jul 2012 22:19:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q62MJ33C003395;
	Mon, 2 Jul 2012 22:19:03 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q62MJ3El003393;
	Mon, 2 Jul 2012 22:19:03 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201207022219.q62MJ3El003393@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 2 Jul 2012 22:19:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238041 - stable/7/sys/conf
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 22:19:04 -0000

Author: dougb
Date: Mon Jul  2 22:19:02 2012
New Revision: 238041
URL: http://svn.freebsd.org/changeset/base/238041

Log:
  MFC r238038:
  
  Unfortunately the change in r237958 resulted in s/install/instclean/ due to
  the aggressive pattern matching of the :C modifier. I tested build and
  install in 2 phases, however with different solutions, resulting in the
  breakage. Mea culpa.
  
  The solution is to break out the all: target. This causes a few lines of
  code duplication, but now the all: target works as it should, and the
  other targets continue to work as they did before.
  
  While I'm here, add a ===> header line to the start of each port build
  to make it easier to find/more clear in the logs.

Modified:
  stable/7/sys/conf/kern.post.mk
Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/conf/kern.post.mk
==============================================================================
--- stable/7/sys/conf/kern.post.mk	Mon Jul  2 22:18:49 2012	(r238040)
+++ stable/7/sys/conf/kern.post.mk	Mon Jul  2 22:19:02 2012	(r238041)
@@ -52,11 +52,21 @@ PORTSMODULESENV=\
 	SRC_BASE=${SRC_BASE} \
 	OSVERSION=${OSRELDATE} \
 	WRKDIRPREFIX=${WRKDIRPREFIX}
-.for __target in all install reinstall clean
+
+# The WRKDIR needs to be cleaned before building, and trying to change the target
+# with a :C pattern below results in install -> instclean
+all:
+.for __i in ${PORTS_MODULES}
+	@${ECHO} "===> Ports module ${__i} (all)"
+	cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean all
+.endfor
+
+.for __target in install reinstall clean
 ${__target}: ports-${__target}
 ports-${__target}:
 .for __i in ${PORTS_MODULES}
-	cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/all/clean all/:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
+	@${ECHO} "===> Ports module ${__i} (${__target})"
+	cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
 .endfor
 .endfor
 .endif