From owner-dev-commits-ports-main@freebsd.org Thu May 20 13:05:33 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2C14863E4AD; Thu, 20 May 2021 13:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fm92j0mkkz4WKF; Thu, 20 May 2021 13:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 02A10262F1; Thu, 20 May 2021 13:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14KD5WAI051421; Thu, 20 May 2021 13:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14KD5WBN051420; Thu, 20 May 2021 13:05:32 GMT (envelope-from git) Date: Thu, 20 May 2021 13:05:32 GMT Message-Id: <202105201305.14KD5WBN051420@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 1ec8ef21dda9 - main - www/glpi: fix plist, remove more garbage files in post-extract MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ec8ef21dda91f9228bae2734d86e1dd6e306b66 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2021 13:05:33 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ec8ef21dda91f9228bae2734d86e1dd6e306b66 commit 1ec8ef21dda91f9228bae2734d86e1dd6e306b66 Author: Dmitry Marakasov AuthorDate: 2021-05-20 13:01:37 +0000 Commit: Dmitry Marakasov 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 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