svn commit: r352074 - head/Mk/Scripts

[Bryan Drewery]

Author: bdrewery
Date: Thu Apr 24 22:31:24 2014
New Revision: 352074
URL: http://svnweb.freebsd.org/changeset/ports/352074
QAT: https://qat.redports.org/buildarchive/r352074/

Log:
  - Fix false-positive orphanned dir when '@unexec rmdir -p' is used.
  
  Reported by:	antoine
  With hat:	portmgr

Modified:
  head/Mk/Scripts/check-stagedir.sh

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Thu Apr 24 22:30:05 2014	(r352073)
+++ head/Mk/Scripts/check-stagedir.sh	Thu Apr 24 22:31:24 2014	(r352074)
@@ -53,9 +53,9 @@ parse_plist() {
 		@dirrm*|'@unexec rmdir'*|'@unexec /bin/rmdir'*)
 			line="$(printf %s "$line" \
 			    | sed -Ee 's/\|\|.*//;s|[[:space:]]+[0-9]*[[:space:]]*>[&]?[[:space:]]*[^[:space:]]+||g' \
-				-e "/^@unexec[[:space:]]+(\/bin\/)?rmdir/s|([^%])%D([^%])|\1${PREFIX}\2|g" \
-				-e '/^@unexec[[:space:]]+(\/bin\/)?rmdir/s|"(.*)"[[:space:]]*|\1|g' \
-				-e 's/@unexec[[:space:]]+(\/bin\/)?rmdir[[:space:]]+//' \
+			        -e "/^@unexec[[:space:]]+(\/bin\/)?rmdir( -p)?/s|([^%])%D([^%])|\1${PREFIX}\2|g" \
+			        -e '/^@unexec[[:space:]]+(\/bin\/)?rmdir( -p)?/s|"(.*)"[[:space:]]*|\1|g' \
+			        -e 's/@unexec[[:space:]]+(\/bin\/)?rmdir( -p)?[[:space:]]+//' \
 				-e 's/@dirrm(try)?[[:space:]]+//' \
 				-e 's/[[:space:]]+$//')"
 			case "$line" in