Received: by mail.netbsd.org (Postfix, from userid 605) id 8D5DA84DEC; Thu, 12 Mar 2020 17:39:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1475084DEB for ; Thu, 12 Mar 2020 17:39:29 +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 aFX-fYMfV5yf for ; Thu, 12 Mar 2020 17:39:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7288D84DBE for ; Thu, 12 Mar 2020 17:39:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 66213FB27; Thu, 12 Mar 2020 17:39:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158403476840780" MIME-Version: 1.0 Date: Thu, 12 Mar 2020 17:39:28 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/textproc/libexttextcat To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20200312173928.66213FB27@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. --_----------=_158403476840780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Mar 12 17:39:28 UTC 2020 Modified Files: pkgsrc/textproc/libexttextcat: distinfo Added Files: pkgsrc/textproc/libexttextcat/patches: patch-src_test-primary.sh.in patch-src_test-secondary.sh.in Log Message: libexttextcat: fix unportable test(1) operator To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/libexttextcat/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/textproc/libexttextcat/patches/patch-src_test-primary.sh.in \ pkgsrc/textproc/libexttextcat/patches/patch-src_test-secondary.sh.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158403476840780 Content-Disposition: inline Content-Length: 3216 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/libexttextcat/distinfo diff -u pkgsrc/textproc/libexttextcat/distinfo:1.9 pkgsrc/textproc/libexttextcat/distinfo:1.10 --- pkgsrc/textproc/libexttextcat/distinfo:1.9 Mon Oct 2 15:20:38 2017 +++ pkgsrc/textproc/libexttextcat/distinfo Thu Mar 12 17:39:28 2020 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.9 2017/10/02 15:20:38 wiz Exp $ +$NetBSD: distinfo,v 1.10 2020/03/12 17:39:28 wiz Exp $ SHA1 (libexttextcat-3.4.5.tar.xz) = dd6b4163c752a44384f309f8dabb830161f5f85f RMD160 (libexttextcat-3.4.5.tar.xz) = da7b61766ac962abb4e0b2bcb2de6555b49cefc5 SHA512 (libexttextcat-3.4.5.tar.xz) = f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6 Size (libexttextcat-3.4.5.tar.xz) = 1041268 bytes SHA1 (patch-src_Makefile.in) = a023cb31a7140e59b49cf022a4a47b59b6cb96b8 +SHA1 (patch-src_test-primary.sh.in) = b8e8016e6c718f43cbad29d6b277b9c5223f180e +SHA1 (patch-src_test-secondary.sh.in) = d74977c99a6bc9ec06973ff83badcda7a5bc3bd3 Added files: Index: pkgsrc/textproc/libexttextcat/patches/patch-src_test-primary.sh.in diff -u /dev/null pkgsrc/textproc/libexttextcat/patches/patch-src_test-primary.sh.in:1.1 --- /dev/null Thu Mar 12 17:39:28 2020 +++ pkgsrc/textproc/libexttextcat/patches/patch-src_test-primary.sh.in Thu Mar 12 17:39:28 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_test-primary.sh.in,v 1.1 2020/03/12 17:39:28 wiz Exp $ + +Fix unportable test(1) operator. + +--- src/test-primary.sh.in.orig 2017-09-20 11:10:50.000000000 +0000 ++++ src/test-primary.sh.in +@@ -6,7 +6,7 @@ fi + testtextcat="$testtextcat @top_builddir@/src/testtextcat" + #take first guess + res=`cat @top_srcdir@/langclass/ShortTexts/$1.txt | $testtextcat @top_srcdir@/langclass/fpdb.conf @top_srcdir@/langclass/LM/ | sed -e "s/].*/]/" | sed -e "s/zh-CN/zh-Hans/" | sed -e "s/zh-TW/zh-Hant/" | sed -e "s/--utf8//" | sed -e "s/-utf8//" | sed -e "s/^\[sh\]$/\[sr-Latn\]/" | sed -e "s/^\[sr\]$/\[sr-Cyrl\]/" | sed -e "s/cyrillic/Cyrl/"` +-if [ $res == "[$1]" ]; then ++if [ $res = "[$1]" ]; then + exit 0 + else + exit 1 Index: pkgsrc/textproc/libexttextcat/patches/patch-src_test-secondary.sh.in diff -u /dev/null pkgsrc/textproc/libexttextcat/patches/patch-src_test-secondary.sh.in:1.1 --- /dev/null Thu Mar 12 17:39:28 2020 +++ pkgsrc/textproc/libexttextcat/patches/patch-src_test-secondary.sh.in Thu Mar 12 17:39:28 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_test-secondary.sh.in,v 1.1 2020/03/12 17:39:28 wiz Exp $ + +Fix unportable test(1) operator. + +--- src/test-secondary.sh.in.orig 2017-09-20 11:10:50.000000000 +0000 ++++ src/test-secondary.sh.in +@@ -6,7 +6,7 @@ fi + testtextcat="$testtextcat @top_builddir@/src/testtextcat" + #take second guess + res=`cat @top_srcdir@/langclass/ShortTexts/$1.txt | $testtextcat @top_srcdir@/langclass/fpdb.conf @top_srcdir@/langclass/LM/ | sed -e "s/^.[^]]*]//" | sed -e "s/].*/]/" | sed -e "s/zh-CN/zh-Hans/" | sed -e "s/zh-TW/zh-Hant/" | sed -e "s/--utf8//" | sed -e "s/-utf8//" | sed -e "s/^\[sh\]$/\[sr-Latn\]/" | sed -e "s/^\[sr\]$/\[sr-Cyrl\]/" | sed -e "s/cyrillic/Cyrl/"` +-if [ $res == "[$1]" ]; then ++if [ $res = "[$1]" ]; then + exit 0 + else + exit 1 --_----------=_158403476840780--