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

Log:
  - 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:
  head/Mk/bsd.pkgng.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Thu Aug 21 18:22:17 2014	(r365575)
+++ head/Mk/bsd.pkgng.mk	Thu Aug 21 18:30:36 2014	(r365576)
@@ -246,7 +246,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: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Aug 21 18:22:17 2014	(r365575)
+++ head/Mk/bsd.port.mk	Thu Aug 21 18:30:36 2014	(r365576)
@@ -3776,7 +3776,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
@@ -3811,7 +3811,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
@@ -3853,6 +3853,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?201408211830.s7LIUbTA011793>