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

[Dmitry Marakasov]

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
 
 do-install:
-	${MKDIR} ${STAGEDIR}${WWWDIR}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
diff --git a/www/glpi/pkg-plist b/www/glpi/pkg-plist
index 4c21a2ee1500..4551a609ad22 100644
--- a/www/glpi/pkg-plist
+++ b/www/glpi/pkg-plist
@@ -3533,8 +3533,6 @@
 %%WWWDIR%%/vendor/laminas/laminas-mail/src/Header/Bcc.php
 %%WWWDIR%%/vendor/laminas/laminas-mail/src/Header/Cc.php
 %%WWWDIR%%/vendor/laminas/laminas-mail/src/Header/ContentDisposition.php
-%%WWWDIR%%/vendor/laminas/laminas-mail/src/Header/ContentDisposition.php.orig
-%%WWWDIR%%/vendor/laminas/laminas-mail/src/Header/ContentDisposition.php.rej
 %%WWWDIR%%/vendor/laminas/laminas-mail/src/Header/ContentTransferEncoding.php
 %%WWWDIR%%/vendor/laminas/laminas-mail/src/Header/ContentType.php
 %%WWWDIR%%/vendor/laminas/laminas-mail/src/Header/Date.php
@@ -5966,12 +5964,8 @@
 %%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_filters.php
 %%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_font_data.php
 %%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php
-%%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php.orig
-%%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php.rej
 %%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_images.php
 %%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_static.php
-%%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_static.php.orig
-%%WWWDIR%%/vendor/tecnickcom/tcpdf/include/tcpdf_static.php.rej
 %%WWWDIR%%/vendor/tecnickcom/tcpdf/tcpdf.php
 %%WWWDIR%%/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php
 %%WWWDIR%%/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php