Date: Wed, 23 Apr 2014 20:46:45 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351974 - head/Mk/Scripts Message-ID: <201404232046.s3NKkjkf032804@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404232046.s3NKkjkf032804>