Received: by mail.netbsd.org (Postfix, from userid 605) id 36EA584D60; Thu, 26 Mar 2020 21:51:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B56FB84D5B for ; Thu, 26 Mar 2020 21:51:12 +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 84ZWC6nAEO4L for ; Thu, 26 Mar 2020 21:51:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2CA7684D2C for ; Thu, 26 Mar 2020 21:51:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 28CFCFB27; Thu, 26 Mar 2020 21:51:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585259472122620" MIME-Version: 1.0 Date: Thu, 26 Mar 2020 21:51:12 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/graphics/zbar To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200326215112.28CFCFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1585259472122620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Thu Mar 26 21:51:12 UTC 2020 Modified Files: pkgsrc/graphics/zbar: distinfo Added Files: pkgsrc/graphics/zbar/patches: patch-test_test__examples.sh.in Log Message: Fix portability of test case. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/zbar/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/zbar/patches/patch-test_test__examples.sh.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585259472122620 Content-Disposition: inline Content-Length: 2986 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/zbar/distinfo diff -u pkgsrc/graphics/zbar/distinfo:1.1 pkgsrc/graphics/zbar/distinfo:1.2 --- pkgsrc/graphics/zbar/distinfo:1.1 Wed Dec 4 11:17:32 2019 +++ pkgsrc/graphics/zbar/distinfo Thu Mar 26 21:51:11 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2019/12/04 11:17:32 leot Exp $ +$NetBSD: distinfo,v 1.2 2020/03/26 21:51:11 joerg Exp $ SHA1 (zbar-0.23.tar.bz2) = 11a1d3f1aa8ef905fe16d88347a191909705d7ab RMD160 (zbar-0.23.tar.bz2) = 59ecd5c78fa91f6951a129377b4fa477307676bb @@ -6,3 +6,4 @@ SHA512 (zbar-0.23.tar.bz2) = 7eef2ee9976 Size (zbar-0.23.tar.bz2) = 1168183 bytes SHA1 (patch-configure) = 7cbc332aae614096b4dcc76af0dd831284639fcc SHA1 (patch-gtk_Makefile.in) = bf32ac312d0d00ed7ac152ddd849dae0fc681e74 +SHA1 (patch-test_test__examples.sh.in) = d8a91cf9f8d619723825d6b50c26e781b5411a43 Added files: Index: pkgsrc/graphics/zbar/patches/patch-test_test__examples.sh.in diff -u /dev/null pkgsrc/graphics/zbar/patches/patch-test_test__examples.sh.in:1.1 --- /dev/null Thu Mar 26 21:51:12 2020 +++ pkgsrc/graphics/zbar/patches/patch-test_test__examples.sh.in Thu Mar 26 21:51:11 2020 @@ -0,0 +1,72 @@ +$NetBSD: patch-test_test__examples.sh.in,v 1.1 2020/03/26 21:51:11 joerg Exp $ + +--- test/test_examples.sh.in.orig 2020-03-26 11:48:50.144837043 +0000 ++++ test/test_examples.sh.in +@@ -31,28 +31,28 @@ test() + fi + } + +-if [ "@ENABLE_CODE128@" == "1" ]; then ++if [ "@ENABLE_CODE128@" = "1" ]; then + test code-128.png + fi + +-if [ "@ENABLE_CODE93@" == "1" ]; then ++if [ "@ENABLE_CODE93@" = "1" ]; then + test code-93.png + fi + +-if [ "@ENABLE_CODE39@" == "1" ]; then ++if [ "@ENABLE_CODE39@" = "1" ]; then + test code-39.png + fi + +-if [ "@ENABLE_CODABAR@" == "1" ]; then ++if [ "@ENABLE_CODABAR@" = "1" ]; then + test codabar.png + fi + +-if [ "@ENABLE_DATABAR@" == "1" ]; then ++if [ "@ENABLE_DATABAR@" = "1" ]; then + test databar.png + test databar-exp.png + fi + +-if [ "@ENABLE_EAN@" == "1" ]; then ++if [ "@ENABLE_EAN@" = "1" ]; then + test -Sean2.enable ean-2.png + test -Sean5.enable ean-5.png + test ean-8.png +@@ -62,27 +62,27 @@ if [ "@ENABLE_EAN@" == "1" ]; then + test -Supca.enable code-upc-a.png + fi + +-if [ "@ENABLE_I25@" == "1" ]; then ++if [ "@ENABLE_I25@" = "1" ]; then + test i2-5.png + fi + +-if [ "@ENABLE_QRCODE@" == "1" ]; then ++if [ "@ENABLE_QRCODE@" = "1" ]; then + test qr-code.png + test -Stest-inverted qr-code-inverted.png + fi + +-if [ "@ENABLE_SQCODE@" == "1" ]; then ++if [ "@ENABLE_SQCODE@" = "1" ]; then + test sqcode1-generated.png + test sqcode1-scanned.png + fi + + # The pdf417 code is incomplete: it doesn't output any results + # +-#if [ "@ENABLE_PDF417@" == "1" ]; then ++#if [ "@ENABLE_PDF417@" = "1" ]; then + # test code-pdf417.png + #fi + +-if [ "$ERR" == "" ]; then ++if [ "$ERR" = "" ]; then + echo "zbarimg PASSED." + else + exit 1 --_----------=_1585259472122620--