diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-05-17 01:21:44 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-05-17 01:21:44 +0800 |
| commit | 657bcbee4770823743ebf36b327d3a138644ebee (patch) | |
| tree | d3c5c896c36793524a49e7f45bfcc4f01df6bef5 | |
| parent | b3047fb5fb0bb15ad61627620aa76d34ad254f74 (diff) | |
| download | freebsd-ports-gnome-657bcbee4770823743ebf36b327d3a138644ebee.tar.gz freebsd-ports-gnome-657bcbee4770823743ebf36b327d3a138644ebee.tar.zst freebsd-ports-gnome-657bcbee4770823743ebf36b327d3a138644ebee.zip | |
- Fix check-plist showing @sample dest files as orphans and also showing in
makeplist.
Reported by: droso
With hat: portmgr
| -rw-r--r-- | Mk/Scripts/check-stagedir.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh index 0330dec83387..d4479d1cadea 100644 --- a/Mk/Scripts/check-stagedir.sh +++ b/Mk/Scripts/check-stagedir.sh @@ -64,11 +64,18 @@ parse_plist() { esac ;; # Handle [file] Keywords - @info\ *|@sample\ *) + @info\ *) set -- $line shift echo "${comment}${cwd}/$@" ;; + @sample\ *) + set -- $line + shift + # Ignore the actual file if it is in stagedir + echo "@comment ${cwd}/${@%.sample}" + echo "${comment}${cwd}/$@" + ;; # Handle [dirrmty] Keywords @fc\ *|@fcfontsdir\ *|@fontsdir\ *) set -- $line |