Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 21 Aug 2014 18:32:12 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r365577 - branches/2014Q3/Mk
Message-ID:  <201408211832.s7LIWCNx015277@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bdrewery
Date: Thu Aug 21 18:32:12 2014
New Revision: 365577
URL: http://svnweb.freebsd.org/changeset/ports/365577
QAT: https://qat.redports.org/buildarchive/r365577/

Log:
  MFH: r365576
  
  - Make 'clean-restricted' tell that it is deleting the package.
    Don't show this verbose output when calling delete-package on
    failures from do-package though.
  
  With hat:	portmgr

Modified:
  branches/2014Q3/Mk/bsd.pkgng.mk
  branches/2014Q3/Mk/bsd.port.mk
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/Mk/bsd.pkgng.mk
==============================================================================
--- branches/2014Q3/Mk/bsd.pkgng.mk	Thu Aug 21 18:30:36 2014	(r365576)
+++ branches/2014Q3/Mk/bsd.pkgng.mk	Thu Aug 21 18:32:12 2014	(r365577)
@@ -265,7 +265,7 @@ do-package: ${TMPPLIST}
 			fi; \
 		fi; \
 	else \
-		cd ${.CURDIR} && eval ${MAKE} delete-package; \
+		cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \
 		exit 1; \
 	fi
 .endif

Modified: branches/2014Q3/Mk/bsd.port.mk
==============================================================================
--- branches/2014Q3/Mk/bsd.port.mk	Thu Aug 21 18:30:36 2014	(r365576)
+++ branches/2014Q3/Mk/bsd.port.mk	Thu Aug 21 18:32:12 2014	(r365577)
@@ -3783,7 +3783,7 @@ do-package: ${TMPPLIST}
 			cd ${.CURDIR} && eval ${MAKE} package-links; \
 		fi; \
 	else \
-		cd ${.CURDIR} && eval ${MAKE} delete-package; \
+		cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \
 		exit 1; \
 	fi
 .else
@@ -3818,7 +3818,7 @@ do-package: ${TMPPLIST}
 		fi; \
 	else \
 		[ -n "$${made_prefix}" ] && ${RMDIR} ${PREFIX}; \
-		cd ${.CURDIR} && eval ${MAKE} delete-package; \
+		cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \
 		exit 1; \
 	fi
 .endif
@@ -3860,6 +3860,7 @@ delete-package-links:
 
 .if !target(delete-package)
 delete-package: delete-package-links
+	@${ECHO_MSG} "===>  Deleting package for ${PKGNAME}"
 .	if defined(NO_STAGE)
 	@${RM} -f ${PKGFILE}
 .	else

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408211832.s7LIWCNx015277>