Received: by mail.netbsd.org (Postfix, from userid 605) id C9D2384D74; Sun, 22 May 2022 13:39:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0BD6A84D67 for ; Sun, 22 May 2022 13:39:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3uuzL4Zvodw6 for ; Sun, 22 May 2022 13:39:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7917F84CBC for ; Sun, 22 May 2022 13:39:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CC1ADFAEB; Sun, 22 May 2022 13:39:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1653226796116430" MIME-Version: 1.0 Date: Sun, 22 May 2022 13:39:56 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/misc/php-orangehrm To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20220522133956.CC1ADFAEB@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1653226796116430 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Sun May 22 13:39:56 UTC 2022 Modified Files: pkgsrc/misc/php-orangehrm: Makefile Log Message: misc/php-orangehrm: fix build problem * Remove "*.orig" files before install. * Replace interpreter of bash scripts. * Do not check interpreter for Symfony. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/php-orangehrm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1653226796116430 Content-Disposition: inline Content-Length: 1605 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/php-orangehrm/Makefile diff -u pkgsrc/misc/php-orangehrm/Makefile:1.11 pkgsrc/misc/php-orangehrm/Makefile:1.12 --- pkgsrc/misc/php-orangehrm/Makefile:1.11 Thu May 5 11:38:09 2022 +++ pkgsrc/misc/php-orangehrm/Makefile Sun May 22 13:39:56 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/05/05 11:38:09 mef Exp $ +# $NetBSD: Makefile,v 1.12 2022/05/22 13:39:56 taca Exp $ # DISTNAME= orangehrm-4.10.1 @@ -18,7 +18,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql>=5 PHP_VERSIONS_ACCEPTED= 56 74 80 EXTRACT_USING= bsdtar -USE_TOOLS+= pax +USE_TOOLS+= bash pax NO_BUILD= yes @@ -30,12 +30,15 @@ BUILD_DEFS+= APACHE_GROUP APACHE_USER FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \ OHRDIR=${OHRDIR} -CHECK_INTERPRETER_SKIP+= share/orangehrm/symfony/lib/vendor/symfony/data/bin/symfony -CHECK_INTERPRETER_SKIP+= share/orangehrm/symfony/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/symfony -CHECK_INTERPRETER_SKIP+= share/orangehrm/symfony/lib/vendor/symfony/lib/task/generator/skeleton/project/symfony -CHECK_INTERPRETER_SKIP+= share/orangehrm/symfony/symfony +REPLACE_BASH= installer/cli_common_commands.sh installer/cli_install.sh \ + travis-config-files/seeddb.sh + +CHECK_INTERPRETER_SKIP+= share/orangehrm/symfony/* CHECK_INTERPRETER_SKIP+= share/orangehrm/upgrader/symfony +pre-install: + ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \; + do-install: ${RM} -f symfony/lib/vendor/google/apiclient-services/generator/run_tests.sh.orig ${FIND} ${WRKSRC} -type f -exec ${CHMOD} og-w {} \; --_----------=_1653226796116430--