git: 1ec8ef21dda9 - main - www/glpi: fix plist, remove more garbage files in post-extract

[Mathieu Arnold]

On Thu, May 20, 2021 at 01:05:32PM +0000, Dmitry Marakasov wrote:
> The branch main has been updated by amdmi3:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=1ec8ef21dda91f9228bae2734d86e1dd6e306b66
> 
> commit 1ec8ef21dda91f9228bae2734d86e1dd6e306b66
> Author:     Dmitry Marakasov <amdmi3 at FreeBSD.org>
> AuthorDate: 2021-05-20 13:01:37 +0000
> Commit:     Dmitry Marakasov <amdmi3 at FreeBSD.org>
> CommitDate: 2021-05-20 13:02:53 +0000
> 
>     www/glpi: fix plist, remove more garbage files in post-extract
>     
>     Approved by:    portmgr blanket
> ---
>  www/glpi/Makefile  | 4 ++--
>  www/glpi/pkg-plist | 6 ------
>  2 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/www/glpi/Makefile b/www/glpi/Makefile
> index 2ff7f0f4445a..94fd261426b9 100644
> --- a/www/glpi/Makefile
> +++ b/www/glpi/Makefile
> @@ -32,10 +32,10 @@ LDAP_USE=	PHP=ldap
>  IMAP_USE=	PHP=imap
>  
>  post-extract:
> -	@${FIND} ${WRKSRC} -name '*~' -delete
> +	@${FIND} ${WRKSRC} -name '*~' -o -name '*.orig' -o -name '*.rej' -delete

I know find(1)'s syntax is not easy, but this is not actually doing what
you think it does.
Because two predicates without `-o` (or) actually get a `-a` (and) and
because of precendence between "and" and "or", it ends up actually
doing this:

@${FIND} ${WRKSRC} ( -name '*~' ) -o ( -name '*.orig' ) -o ( -name '*.rej' -delete )

What you actually want is:

@${FIND} ${WRKSRC} ( -name '*~' -o -name '*.orig' -o -name '*.rej' ) -delete

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/attachments/20210520/0e6aece7/attachment.sig>