svn commit: r351974 - head/Mk/Scripts

[Antoine Brodin]

Author: antoine
Date: Wed Apr 23 20:46:45 2014
New Revision: 351974
URL: http://svnweb.freebsd.org/changeset/ports/351974
QAT: https://qat.redports.org/buildarchive/r351974/

Log:
  - Handle plist containing @unexec /bin/rmdir
  - Handle directories ending with digits
  
  With hat:	portmgr

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

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Wed Apr 23 20:44:14 2014	(r351973)
+++ head/Mk/Scripts/check-stagedir.sh	Wed Apr 23 20:46:45 2014	(r351974)
@@ -93,12 +93,12 @@ if [ $makeplist = 0 ] ; then
 		fi
 
 		case $line in
-		@dirrm*|'@unexec rmdir'*)
+		@dirrm*|'@unexec rmdir'*|'@unexec /bin/rmdir'*)
 			line="$(printf %s "$line" \
-			    | sed -Ee 's/\|\|.*//;s|[0-9]*[[:space:]]*>[&]?[[:space:]]*[^[:space:]]+||g' \
-				-e "/^@unexec[[:space:]]+rmdir/s|([^%])%D([^%])|\1${PREFIX}\2|g" \
-				-e '/^@unexec[[:space:]]+rmdir/s|"(.*)"[[:space:]]+|\1|g' \
-				-e 's/@unexec[[:space:]]+rmdir[[:space:]]+//' \
+			    | 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 's/@dirrm(try)?[[:space:]]+//' \
 				-e 's/[[:space:]]+$//')"
 			case "$line" in