Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 667B284E76 for ; Thu, 29 Jun 2023 18:27:43 +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 ezi5PKrqSteK for ; Thu, 29 Jun 2023 18:27:42 +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 BB69284CD8 for ; Thu, 29 Jun 2023 18:27:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AF41EFA89; Thu, 29 Jun 2023 18:27:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1688063262260550" MIME-Version: 1.0 Date: Thu, 29 Jun 2023 18:27:42 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/devel/gettext To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20230629182742.AF41EFA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1688063262260550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Thu Jun 29 18:27:42 UTC 2023 Modified Files: pkgsrc/devel/gettext: distinfo pkgsrc/devel/gettext/patches: patch-aa patch-ae Log Message: gettext: adjust patches for bash compatibility bash does not like if statements with empty compound-list. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/gettext/distinfo cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/gettext/patches/patch-aa cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/gettext/patches/patch-ae Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1688063262260550 Content-Disposition: inline Content-Length: 3623 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/gettext/distinfo diff -u pkgsrc/devel/gettext/distinfo:1.44 pkgsrc/devel/gettext/distinfo:1.45 --- pkgsrc/devel/gettext/distinfo:1.44 Wed Jun 28 21:14:10 2023 +++ pkgsrc/devel/gettext/distinfo Thu Jun 29 18:27:42 2023 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.44 2023/06/28 21:14:10 wiz Exp $ +$NetBSD: distinfo,v 1.45 2023/06/29 18:27:42 tnn Exp $ BLAKE2s (gettext-0.22.tar.gz) = 6b3b0b9824a6c8d58b28717b2d9089ed4895bbf4a1f7b0979117d8449a28b4ba SHA512 (gettext-0.22.tar.gz) = e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 Size (gettext-0.22.tar.gz) = 26105696 bytes -SHA1 (patch-aa) = 8bf684967fe7dc50d63c70665068c28911e8f53c +SHA1 (patch-aa) = 83e1314a01623b9ac68e4787983d42964be67869 SHA1 (patch-ad) = 030dc7d1b02ac01898cf456f79115c395cd36bcd -SHA1 (patch-ae) = bcfde6f6b70fbb383df08e0e3987874d2029cc52 +SHA1 (patch-ae) = 3e83e3cdebd1205b515a58cb838a5eb3fb2fe389 SHA1 (patch-ag) = 69b28fe217a9ac61d72f84fdfdd06e5b7158ad75 SHA1 (patch-aj) = bf45d1093d8156615670bd6c781796b62ad79b92 SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c Index: pkgsrc/devel/gettext/patches/patch-aa diff -u pkgsrc/devel/gettext/patches/patch-aa:1.14 pkgsrc/devel/gettext/patches/patch-aa:1.15 --- pkgsrc/devel/gettext/patches/patch-aa:1.14 Wed Jun 28 21:14:10 2023 +++ pkgsrc/devel/gettext/patches/patch-aa Thu Jun 29 18:27:42 2023 @@ -1,15 +1,18 @@ -$NetBSD: patch-aa,v 1.14 2023/06/28 21:14:10 wiz Exp $ +$NetBSD: patch-aa,v 1.15 2023/06/29 18:27:42 tnn Exp $ --- gettext-runtime/configure.orig 2023-06-17 11:53:59.000000000 +0000 +++ gettext-runtime/configure -@@ -22782,10 +22782,6 @@ printf "%s\n" "$ac_res" >&6; } +@@ -22781,13 +22781,6 @@ printf "%s\n" "$ac_res" >&6; } + fi fi - if test "$nls_cv_use_gnu_gettext" = "yes"; then +- if test "$nls_cv_use_gnu_gettext" = "yes"; then - USE_INCLUDED_LIBINTL=yes - LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV $LIBTHREAD" - LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV $LTLIBTHREAD" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - +- fi +- CATOBJEXT= + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then Index: pkgsrc/devel/gettext/patches/patch-ae diff -u pkgsrc/devel/gettext/patches/patch-ae:1.7 pkgsrc/devel/gettext/patches/patch-ae:1.8 --- pkgsrc/devel/gettext/patches/patch-ae:1.7 Wed Jun 28 21:14:10 2023 +++ pkgsrc/devel/gettext/patches/patch-ae Thu Jun 29 18:27:42 2023 @@ -1,15 +1,18 @@ -$NetBSD: patch-ae,v 1.7 2023/06/28 21:14:10 wiz Exp $ +$NetBSD: patch-ae,v 1.8 2023/06/29 18:27:42 tnn Exp $ --- gettext-tools/configure.orig 2023-06-17 11:54:38.000000000 +0000 +++ gettext-tools/configure -@@ -26146,10 +26146,6 @@ printf "%s\n" "$ac_res" >&6; } +@@ -26145,13 +26145,6 @@ printf "%s\n" "$ac_res" >&6; } + fi fi - if test "$nls_cv_use_gnu_gettext" = "yes"; then +- if test "$nls_cv_use_gnu_gettext" = "yes"; then - USE_INCLUDED_LIBINTL=yes - LIBINTL="\${top_builddir}/../gettext-runtime/intl/libintl.la $LIBICONV $LIBTHREAD" - LTLIBINTL="\${top_builddir}/../gettext-runtime/intl/libintl.la $LTLIBICONV $LTLIBTHREAD" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - +- fi +- CATOBJEXT= + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then --_----------=_1688063262260550--