svn commit: r341457 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Mon Jan 27 21:23:49 2014
New Revision: 341457
URL: http://svnweb.freebsd.org/changeset/ports/341457
QAT: https://qat.redports.org/buildarchive/r341457/

Log:
  Fix make package-recursive
  
  Keep the ugly way for non staged ports
  and properly build the package for staged ports
  
  Tested by:	smh

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Jan 27 21:21:51 2014	(r341456)
+++ head/Mk/bsd.port.mk	Mon Jan 27 21:23:49 2014	(r341457)
@@ -4792,11 +4792,14 @@ pre-repackage:
 
 .if !target(package-noinstall)
 package-noinstall:
+.if defined(NO_STAGE)
 	@${MKDIR} ${WRKDIR}
-	@cd ${.CURDIR} && ${MAKE} pre-package \
-		pre-package-script do-package post-package-script
+	@cd ${.CURDIR} && ${MAKE} ${_PACKAGE_REAL_SEQ}
 	@${RM} -f ${TMPPLIST}
 	-@${RMDIR} ${WRKDIR}
+.else
+	@cd ${.CURDIR} && ${MAKE} package
+.endif
 .endif
 
 ################################################################