Received: by mail.netbsd.org (Postfix, from userid 605) id D002685370; Thu, 5 May 2022 11:38:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 167A684FB9 for ; Thu, 5 May 2022 11:38:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id jJX27hjsM0bu for ; Thu, 5 May 2022 11:38:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7435384D35 for ; Thu, 5 May 2022 11:38:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6D868FB1A; Thu, 5 May 2022 11:38:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16517506892010" MIME-Version: 1.0 Date: Thu, 5 May 2022 11:38:09 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/misc/php-orangehrm To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20220505113809.6D868FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16517506892010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Thu May 5 11:38:09 UTC 2022 Modified Files: pkgsrc/misc/php-orangehrm: Makefile distinfo Added Files: pkgsrc/misc/php-orangehrm/patches: patch-symfony_lib_vendor_google_apiclient-services_generator_run__tests.sh Log Message: (misc/php-orangehrm) Fix portability problem (==) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/php-orangehrm/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/php-orangehrm/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/misc/php-orangehrm/patches/patch-symfony_lib_vendor_google_apiclient-services_generator_run__tests.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16517506892010 Content-Disposition: inline Content-Length: 2781 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.10 pkgsrc/misc/php-orangehrm/Makefile:1.11 --- pkgsrc/misc/php-orangehrm/Makefile:1.10 Sun May 1 23:34:31 2022 +++ pkgsrc/misc/php-orangehrm/Makefile Thu May 5 11:38:09 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/05/01 23:34:31 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2022/05/05 11:38:09 mef Exp $ # DISTNAME= orangehrm-4.10.1 @@ -37,6 +37,7 @@ CHECK_INTERPRETER_SKIP+= share/orangehrm CHECK_INTERPRETER_SKIP+= share/orangehrm/upgrader/symfony do-install: + ${RM} -f symfony/lib/vendor/google/apiclient-services/generator/run_tests.sh.orig ${FIND} ${WRKSRC} -type f -exec ${CHMOD} og-w {} \; cd ${WRKSRC} && pax -rw -pmp * \ ${DESTDIR}${PREFIX}/${OHRDIR} Index: pkgsrc/misc/php-orangehrm/distinfo diff -u pkgsrc/misc/php-orangehrm/distinfo:1.6 pkgsrc/misc/php-orangehrm/distinfo:1.7 --- pkgsrc/misc/php-orangehrm/distinfo:1.6 Sat Apr 30 02:28:40 2022 +++ pkgsrc/misc/php-orangehrm/distinfo Thu May 5 11:38:09 2022 @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2022/04/30 02:28:40 wen Exp $ +$NetBSD: distinfo,v 1.7 2022/05/05 11:38:09 mef Exp $ BLAKE2s (orangehrm-4.10.1.zip) = 5c8e65bece6f65cc8b6eaf8ad39b8dd467f344872acf684b30f084c5c44f19cb SHA512 (orangehrm-4.10.1.zip) = 7c259f78f194c51abf72bac09407e12ca69b5dfa4e8ba559091e26845688c286def1ef4cccd5b50d8c4a0723b01cc66edd0bde0a28a4a85bf545fa50bdc4f139 Size (orangehrm-4.10.1.zip) = 44753882 bytes +SHA1 (patch-symfony_lib_vendor_google_apiclient-services_generator_run__tests.sh) = 31f9135db80f3c6a4149ffcc4fcae8d985b1712d Added files: Index: pkgsrc/misc/php-orangehrm/patches/patch-symfony_lib_vendor_google_apiclient-services_generator_run__tests.sh diff -u /dev/null pkgsrc/misc/php-orangehrm/patches/patch-symfony_lib_vendor_google_apiclient-services_generator_run__tests.sh:1.1 --- /dev/null Thu May 5 11:38:09 2022 +++ pkgsrc/misc/php-orangehrm/patches/patch-symfony_lib_vendor_google_apiclient-services_generator_run__tests.sh Thu May 5 11:38:09 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-symfony_lib_vendor_google_apiclient-services_generator_run__tests.sh,v 1.1 2022/05/05 11:38:09 mef Exp $ + +ERROR: [check-portability.awk] symfony/lib/vendor/google/apiclient-services/generator/run_tests.sh:25: if [ $? == 0 ]; then + +--- symfony/lib/vendor/google/apiclient-services/generator/run_tests.sh.orig 2022-03-23 13:53:28.000000000 +0900 ++++ symfony/lib/vendor/google/apiclient-services/generator/run_tests.sh 2022-05-05 20:27:42.340500900 +0900 +@@ -22,7 +22,7 @@ cd $TOP/tests + find . -name '*_test.py' | while read test + do + python $test +- if [ $? == 0 ]; then ++ if [ $? = 0 ]; then + echo "${test}" >> "${SUCCEEDED_FILE}" + else + echo "${test}" >> "${FAILED_FILE}" --_----------=_16517506892010--