svn commit: r238041 - stable/7/sys/conf

Doug Barton dougb at
Mon Jul 2 22:19:04 UTC 2012

Author: dougb
Date: Mon Jul  2 22:19:02 2012
New Revision: 238041

  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.

Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/conf/
--- stable/7/sys/conf/	Mon Jul  2 22:18:49 2012	(r238040)
+++ stable/7/sys/conf/	Mon Jul  2 22:19:02 2012	(r238041)
@@ -52,11 +52,21 @@ PORTSMODULESENV=\
-.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
+.for __i in ${PORTS_MODULES}
+	@${ECHO} "===> Ports module ${__i} (all)"
+	cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean all
+.for __target in install reinstall clean
 ${__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/}

More information about the svn-src-stable-7 mailing list