svn commit: r354382 - head/Mk/Scripts

[Bryan Drewery]

Author: bdrewery
Date: Sun May 18 01:51:43 2014
New Revision: 354382
URL: http://svnweb.freebsd.org/changeset/ports/354382
QAT: https://qat.redports.org/buildarchive/r354382/

Log:
  - %D is based on @cwd, not PREFIX; Fix false-postives when using pkg_install
    and @cwd has changed away from PREFIX:
  
      plist:
        @cwd /
        @dirrmtry var/spool/dma
  
      ====> Checking for pkg-plist issues (check-plist)
      ===> Parsing plist
      DIR '/usr/local/etc/dma' CWD: /usr/local
      DIR '/usr/local/var/spool/dma' CWD:
      DIR 'share/licenses/dma-v0.9,1' CWD: /usr/local
      DIR '/usr/local/share/licenses' CWD: /usr/local
      ===> Checking for items in STAGEDIR missing from pkg-plist
      Error: Orphaned: @unexec rmdir "/var/spool/dma" >/dev/null 2>&1 || :
      ===> Checking for directories owned by MTREEs
      ===> Checking for directories handled by dependencies
      ===> Checking for items in pkg-plist which are not in STAGEDIR
      Error: Missing: @dirrmtry var/spool/dma
      ===> Error: Plist issues found.
  
  With hat:	portmgr
  Reported by:	erwin

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

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Sun May 18 01:10:14 2014	(r354381)
+++ head/Mk/Scripts/check-stagedir.sh	Sun May 18 01:51:43 2014	(r354382)
@@ -53,7 +53,7 @@ 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( -p)?/s|([^%])%D([^%])|\1${PREFIX}\2|g" \
+			        -e "/^@unexec[[:space:]]+(\/bin\/)?rmdir( -p)?/s|([^%])%D([^%])|\1${cwd}\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:]]+//' \